Simulate the unreadable partitions.csv instead of chmod

Harden the summary against foreign json shapes and partition edge cases
Update the print_summary docstring
2026-09-04 20:16:01 +00:00 · 2026-08-28 11:58:13 -05:00 · 2026-08-28 11:44:48 -05:00 · 2026-08-28 11:36:30 -05:00 · 2026-08-28 10:39:37 -05:00 · 2026-08-28 09:15:35 -05:00
272 changed files with 2214 additions and 9829 deletions
@@ -1,50 +0,0 @@
-name: Cache clang-tidy idedata
-description: >
-  Cache the clang-tidy idedata and the headers it references under .temp
-  (headers only, about 30MB per env). Run after restore-python and cache-esp-idf.
-inputs:
-  environment:
-    description: 'clang-tidy environment (e.g. esp32-idf-tidy).'
-    required: true
-runs:
-  using: composite
-  steps:
-    - name: Compute cache key
-      id: key
-      shell: bash
-      run: |
-        . venv/bin/activate
-        [ -n "${{ inputs.environment }}" ] || { echo "::error::cache-clang-tidy-idedata: 'environment' input is empty"; exit 1; }
-        hash=$(python -c 'import sys; sys.path.insert(0, "script"); from clang_tidy_hash import idedata_cache_hash; print(idedata_cache_hash("${{ inputs.environment }}"))')
-        pyver=$(python -c 'import platform; print(platform.python_version())')
-        # Generating idedata is what installs ESP-IDF; never skip it over a missing
-        # install. This also skips the save, so a dev run that installs ESP-IDF
-        # warms the idedata cache on the next run.
-        if [ -d ~/.esphome-idf/frameworks ]; then
-          echo "skip=false" >> "$GITHUB_OUTPUT"
-        else
-          echo "ESP-IDF install missing, not using the clang-tidy idedata cache"
-          echo "skip=true" >> "$GITHUB_OUTPUT"
-        fi
-        echo "key=${{ runner.os }}-tidy-idedata-${{ inputs.environment }}-$hash-py$pyver" >> "$GITHUB_OUTPUT"
-        {
-          echo "path<<EOF"
-          printf '%s\n' '.temp/idedata-*.json' '.temp/idedata-*.hash'
-          printf '.temp/**/*.%s\n' h hpp hh hxx inc inl ipp tpp
-          echo "EOF"
-        } >> "$GITHUB_OUTPUT"
-    # Mirror cache-esp-idf: write on dev, restore-only on PRs. The post-step
-    # save only runs when the job succeeded, so a failed generation is never saved.
-    # Extend the extension list if a component ships extensionless headers.
-    - name: Cache clang-tidy idedata (write on dev)
-      if: (github.ref == 'refs/heads/dev' || contains(github.event.pull_request.labels.*.name, 'ci-cache-write')) && steps.key.outputs.skip != 'true'
-      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-      with:
-        path: ${{ steps.key.outputs.path }}
-        key: ${{ steps.key.outputs.key }}
-    - name: Cache clang-tidy idedata (restore-only off dev)
-      if: github.ref != 'refs/heads/dev' && !contains(github.event.pull_request.labels.*.name, 'ci-cache-write') && steps.key.outputs.skip != 'true'
-      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-      with:
-        path: ${{ steps.key.outputs.path }}
-        key: ${{ steps.key.outputs.key }}
@@ -26,9 +26,6 @@ runs:
      # The native-IDF version is pinned in code, not in any file that feeds the
      # other cache keys, so resolve it explicitly. Keying on it means the cache
      # invalidates on a version bump (actions/cache never overwrites a key).
-      # Also key on the Python version: the cached IDF venv links to the
-      # runner's toolcache interpreter and is reinstalled every run after a
-      # runner image bump.
      id: version
      shell: bash
      run: |
@@ -39,32 +36,19 @@ runs:
          version=$(python -c 'from esphome.components.esp32 import ESP_IDF_FRAMEWORK_VERSION_LOOKUP as L; print(L["recommended"])')
        fi
        echo "version=$version" >> "$GITHUB_OUTPUT"
-        echo "python-version=$(python -c 'import platform; print(platform.python_version())')" >> "$GITHUB_OUTPUT"
    # Mirror the adjacent PlatformIO cache: only dev-branch runs write the
    # shared cache (so it lives in the default-branch scope readable by all
    # PRs), and PRs are restore-only -- they never push multi-GB artifacts into
-    # their own scope / the repo quota (e.g. on a version-bump PR). The
-    # ci-cache-write label lets a PR write into its own scope to test the hit path;
-    # that costs about 1GB of the repo cache quota per run, so remove it when done.
-    # -slim: bump when prune-esp-idf changes what it removes; a key is never overwritten.
+    # their own scope / the repo quota (e.g. on a version-bump PR).
    - name: Cache ESP-IDF install (write on dev)
-      if: (github.ref == 'refs/heads/dev' || contains(github.event.pull_request.labels.*.name, 'ci-cache-write')) && inputs.restore-only != 'true'
+      if: github.ref == 'refs/heads/dev' && inputs.restore-only != 'true'
      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
      with:
        path: ~/.esphome-idf
-        key: ${{ runner.os }}-esphome-idf-${{ steps.version.outputs.version }}-py${{ steps.version.outputs.python-version }}-slim
+        key: ${{ runner.os }}-esphome-idf-${{ steps.version.outputs.version }}
    - name: Cache ESP-IDF install (restore-only off dev)
-      if: github.ref != 'refs/heads/dev' && !contains(github.event.pull_request.labels.*.name, 'ci-cache-write') || inputs.restore-only == 'true'
+      if: github.ref != 'refs/heads/dev' || inputs.restore-only == 'true'
      uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
      with:
        path: ~/.esphome-idf
-        key: ${{ runner.os }}-esphome-idf-${{ steps.version.outputs.version }}-py${{ steps.version.outputs.python-version }}-slim
-    # Install explicitly so the prune below sees the toolchains on a cache miss
-    # too, instead of the install happening inside the first build step.
-    - name: Install ESP-IDF
-      shell: bash
-      run: |
-        . venv/bin/activate
-        python -c 'from esphome.espidf.framework import check_esp_idf_install; check_esp_idf_install("${{ steps.version.outputs.version }}")'
-    - name: Prune ESP-IDF install
-      uses: ./.github/actions/prune-esp-idf
+        key: ${{ runner.os }}-esphome-idf-${{ steps.version.outputs.version }}
@@ -1,34 +0,0 @@
-name: Prune ESP-IDF install
-description: >
-  Remove the picolibc sysroots (1.1GB of the 3.9GB install) from the native
-  ESP-IDF toolchains; IDF 5.x links newlib. Skipped when an IDF 6 install is
-  present, which links picolibc (see esp32/__init__.py).
-runs:
-  using: composite
-  steps:
-    - name: Prune picolibc
-      shell: bash
-      run: |
-        shopt -s nullglob
-        prefix="${ESPHOME_ESP_IDF_PREFIX:-$HOME/.esphome-idf}"
-        prefix="${prefix/#\~/$HOME}"
-        for fw in "$prefix"/frameworks/*/; do
-          case "$(basename "$fw")" in
-            [6-9].*) echo "IDF $(basename "$fw") installed, keeping picolibc"; exit 0 ;;
-          esac
-        done
-        n=0
-        for dir in "$prefix"/tools/*-esp-elf/*/*-esp-elf/picolibc; do
-          echo "Removing $dir ($(du -sh "$dir" | cut -f1))"
-          rm -rf "$dir"
-          n=$((n + 1))
-        done
-        # The marker rides along in the cache entry so a restored slim tree stays quiet.
-        if [ "$n" -gt 0 ]; then
-          touch "$prefix/.picolibc-pruned"
-        elif [ -d "$prefix/tools" ] && [ ! -f "$prefix/.picolibc-pruned" ]; then
-          echo "::warning::no picolibc sysroots matched under $prefix/tools"
-        fi
-        if [ -d "$prefix" ]; then
-          du -sh "$prefix"
-        fi
@@ -92,7 +92,6 @@ jobs:
    outputs:
      core-ci: ${{ steps.determine.outputs.core-ci }}
      integration-tests: ${{ steps.determine.outputs.integration-tests }}
-      integration-run-all: ${{ steps.determine.outputs.integration-run-all }}
      integration-test-buckets: ${{ steps.determine.outputs.integration-test-buckets }}
      clang-tidy: ${{ steps.determine.outputs.clang-tidy }}
      clang-tidy-mode: ${{ steps.determine.outputs.clang-tidy-mode }}
@@ -153,9 +152,6 @@ jobs:
          # Extract individual fields
          echo "core-ci=$(echo "$output" | jq -r '.core_ci')" >> $GITHUB_OUTPUT
          echo "integration-tests=$(echo "$output" | jq -r '.integration_tests')" >> $GITHUB_OUTPUT
-          # A missing key must fail here, not silently disable the junit upload
-          run_all=$(echo "$output" | jq -r 'if has("integration_run_all") then .integration_run_all else error("integration_run_all missing") end')
-          echo "integration-run-all=${run_all}" >> $GITHUB_OUTPUT
          echo "integration-test-buckets=$(echo "$output" | jq -c '.integration_test_buckets')" >> $GITHUB_OUTPUT
          echo "clang-tidy=$(echo "$output" | jq -r '.clang_tidy')" >> $GITHUB_OUTPUT
          echo "clang-tidy-mode=$(echo "$output" | jq -r '.clang_tidy_mode')" >> $GITHUB_OUTPUT
@@ -359,15 +355,6 @@ jobs:
      fail-fast: false
      matrix:
        bucket: ${{ fromJson(needs.determine-jobs.outputs.integration-test-buckets) }}
-    env:
-      # What the cache steps persist; libdeps is excluded (keyed per xdist
-      # worker and env, it never crosses runs).
-      INTEGRATION_PIO_CACHE_PATH: |
-        ~/.esphome-integration-tests/platformio/platforms
-        ~/.esphome-integration-tests/platformio/packages
-        ~/.esphome-integration-tests/platformio/appstate.json
-        ~/.esphome-integration-tests/platformio/.cache
-        ~/.esphome-integration-tests/platformio/.esphome.pio.stamp.json
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -386,14 +373,6 @@ jobs:
        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: "3.13"
-      - name: Restore integration PlatformIO cache
-        # Native platform + toolchain installed by shared_platformio_cache in
-        # tests/integration/conftest.py; a miss self-heals, so no restore-keys.
-        id: pio-cache
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: ${{ env.INTEGRATION_PIO_CACHE_PATH }}
-          key: integration-pio-v1-${{ runner.os }}-py${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt', 'tests/integration/fixtures/cache_init.yaml', 'esphome/components/host/__init__.py') }}
      - name: Restore Python virtual environment
        id: cache-venv
        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
@@ -431,36 +410,12 @@ jobs:
        run: |
          . venv/bin/activate
          mapfile -t test_files < <(echo "$BUCKET_TESTS" | jq -r '.[]')
-          if [ "${#test_files[@]}" -eq 0 ]; then
-            echo "::error::Empty integration test bucket; pytest would collect the whole tree"
-            exit 1
-          fi
          echo "Bucket ${{ matrix.bucket.name }}: running ${#test_files[@]} integration tests"
-          pytest -vv --no-cov --tb=native --durations=30 -n auto --dist worksteal \
-            --junitxml=junit-integration.xml "${test_files[@]}"
-      - name: Upload junit timings
-        # Consumed by sync-integration-durations.yml through
-        # 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@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: junit-integration-${{ strategy.job-index }}
-          path: junit-integration.xml
-          if-no-files-found: error
-          # A full cron period of margin for the weekly refresh
-          retention-days: 14
+          pytest -vv --no-cov --tb=native --durations=30 -n auto "${test_files[@]}"
      - name: Print ccache statistics
        # esphome stores the PlatformIO ccache under the machine-global cache
        # dir (see _ccache_env() in esphome/platformio/toolchain.py).
        run: CCACHE_DIR="$HOME/.cache/esphome/platformio-ccache" ccache -s
-      - name: Save integration PlatformIO cache
-        # Bucket 0 only; the others would race the same immutable key.
-        if: success() && (github.ref == 'refs/heads/dev' || contains(github.event.pull_request.labels.*.name, 'ci-cache-write')) && strategy.job-index == 0 && steps.pio-cache.outputs.cache-hit != 'true'
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: ${{ env.INTEGRATION_PIO_CACHE_PATH }}
-          key: ${{ steps.pio-cache.outputs.cache-primary-key }}

  import-time:
    name: Check import esphome.__main__ time
@@ -694,12 +649,6 @@ jobs:
        with:
          framework: arduino

-      - name: Cache clang-tidy idedata
-        if: matrix.cache_idf
-        uses: ./.github/actions/cache-clang-tidy-idedata
-        with:
-          environment: esp32-arduino-tidy
-
      - name: Cache nRF Connect SDK install
        if: matrix.cache_sdk_nrf
        uses: ./.github/actions/cache-sdk-nrf
@@ -749,10 +698,6 @@ jobs:
          # Also cache libdeps, store them in a ~/.platformio subfolder
          PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps

-      - name: Prune ESP-IDF install before cache save
-        if: matrix.cache_idf && (github.ref == 'refs/heads/dev' || contains(github.event.pull_request.labels.*.name, 'ci-cache-write'))
-        uses: ./.github/actions/prune-esp-idf
-
      - name: Suggested changes
        run: script/ci-suggest-changes ${{ matrix.ignore_errors && '|| true' || '' }}
        # yamllint disable-line rule:line-length
@@ -785,11 +730,6 @@ jobs:
      - name: Cache ESP-IDF install
        uses: ./.github/actions/cache-esp-idf

-      - name: Cache clang-tidy idedata
-        uses: ./.github/actions/cache-clang-tidy-idedata
-        with:
-          environment: esp32-idf-tidy
-
      - name: Register problem matchers
        run: |
          echo "::add-matcher::.github/workflows/matchers/gcc.json"
@@ -824,10 +764,6 @@ jobs:
          # Also cache libdeps, store them in a ~/.platformio subfolder
          PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps

-      - name: Prune ESP-IDF install before cache save
-        if: (github.ref == 'refs/heads/dev' || contains(github.event.pull_request.labels.*.name, 'ci-cache-write'))
-        uses: ./.github/actions/prune-esp-idf
-
      - name: Suggested changes
        run: script/ci-suggest-changes
        if: always()
@@ -873,11 +809,6 @@ jobs:
      - name: Cache ESP-IDF install
        uses: ./.github/actions/cache-esp-idf

-      - name: Cache clang-tidy idedata
-        uses: ./.github/actions/cache-clang-tidy-idedata
-        with:
-          environment: esp32-idf-tidy
-
      - name: Register problem matchers
        run: |
          echo "::add-matcher::.github/workflows/matchers/gcc.json"
@@ -912,10 +843,6 @@ jobs:
          # Also cache libdeps, store them in a ~/.platformio subfolder
          PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps

-      - name: Prune ESP-IDF install before cache save
-        if: (github.ref == 'refs/heads/dev' || contains(github.event.pull_request.labels.*.name, 'ci-cache-write'))
-        uses: ./.github/actions/prune-esp-idf
-
      - name: Suggested changes
        run: script/ci-suggest-changes
        if: always()
@@ -939,19 +866,16 @@ jobs:
            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
-            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 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
            # yamllint disable-line rule:line-length
            options: --environment esp32c6-idf-tidy --grep SOC_LP_I2C_SUPPORTED --grep USE_ESP32_VARIANT_ESP32C6 --grep USE_OPENTHREAD --grep USE_ZIGBEE
-            tidy_environment: esp32c6-idf-tidy

    steps:
      - name: Check out code from GitHub
@@ -969,11 +893,6 @@ jobs:
      - name: Cache ESP-IDF install
        uses: ./.github/actions/cache-esp-idf

-      - name: Cache clang-tidy idedata
-        uses: ./.github/actions/cache-clang-tidy-idedata
-        with:
-          environment: ${{ matrix.tidy_environment }}
-
      - name: Register problem matchers
        run: |
          echo "::add-matcher::.github/workflows/matchers/gcc.json"
@@ -1007,10 +926,6 @@ jobs:
            script/clang-tidy --fix --changed ${{ matrix.options }}
          fi

-      - name: Prune ESP-IDF install before cache save
-        if: (github.ref == 'refs/heads/dev' || contains(github.event.pull_request.labels.*.name, 'ci-cache-write'))
-        uses: ./.github/actions/prune-esp-idf
-
      - name: Suggested changes
        run: script/ci-suggest-changes
        if: always()
@@ -56,7 +56,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
+        uses: github/codeql-action/init@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
        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@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
+        uses: github/codeql-action/analyze@db488ddef3bf6cb639b32c2e9a7c0a7ea8271d28 # v4.37.8
        with:
          category: "/language:${{matrix.language}}"
@@ -1,98 +0,0 @@
---
-name: Refresh integration test durations
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "45 5 * * 1"
-
-# Repo writes (branch push, PR open) happen via the App token minted below,
-# so the workflow's GITHUB_TOKEN does not need any write scopes.
-permissions:
-  contents: read
-  actions: read  # gh api / gh run download for the CI junit artifacts
-
-jobs:
-  sync:
-    name: Refresh integration test durations
-    runs-on: ubuntu-latest
-    if: github.repository == 'esphome/esphome'
-    steps:
-      - name: Generate a token
-        id: generate-token
-        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 }}
-          permission-contents: write       # push the sync branch
-          permission-pull-requests: write  # open or refresh the sync PR
-
-      - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Setup Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
-        with:
-          python-version: "3.13"
-
-      - name: Refresh from the newest usable dev run
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          # Only full matrix dev runs upload junit-integration-* artifacts
-          # (see the integration-tests job); the merge script re-checks
-          # coverage regardless.
-          # Newest-first candidates via their bucket-0 artifact. Fork PRs run
-          # their own ci.yml, so name and branch are spoofable; require
-          # same-repo. Assignment failures trip set -e and fail loudly.
-          candidates=$(
-            gh api "repos/${GITHUB_REPOSITORY}/actions/artifacts?name=junit-integration-0&per_page=100" \
-              --jq '.artifacts[] | select(.expired | not) | .workflow_run
-                    | select(.head_branch == "dev" and .head_repository_id != null
-                             and .head_repository_id == .repository_id)
-                    | .id'
-          )
-          # Green runs first, then the rest newest first; a run missing a
-          # bucket fails the coverage check and the next one is tried
-          green=""
-          rest=""
-          for id in ${candidates}; do
-            conclusion=$(gh api "repos/${GITHUB_REPOSITORY}/actions/runs/${id}" --jq '.conclusion // ""')
-            if [ "${conclusion}" = "success" ]; then
-              green="${green} ${id}"
-            elif [ -n "${conclusion}" ]; then
-              rest="${rest} ${id}"
-            fi
-          done
-          # helpers.py imports colorama; the script needs nothing else
-          pip install colorama
-          for id in ${green} ${rest}; do
-            rm -rf /tmp/junit
-            if ! gh run download "${id}" --repo "${GITHUB_REPOSITORY}" -p "junit-integration-*" -D /tmp/junit; then
-              echo "::warning::Could not download artifacts for run ${id}; trying the next"
-              continue
-            fi
-            status=0
-            python script/update_integration_test_durations.py /tmp/junit || status=$?
-            if [ "${status}" -eq 0 ]; then
-              echo "Refreshed from run ${id}"
-              exit 0
-            fi
-            # Only EXIT_LOW_COVERAGE (3) from the script advances to the next run
-            [ "${status}" -eq 3 ] || exit 1
-            echo "::warning::Run ${id} covers too few test files; trying the next"
-          done
-          echo "::error::No dev CI run with usable junit artifacts in range; the feed is starved"
-          exit 1
-
-      - name: Commit changes
-        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
-        with:
-          commit-message: "[ci] Refresh integration test durations"
-          committer: esphome[bot] <115708604+esphome[bot]@users.noreply.github.com>
-          author: esphome[bot] <115708604+esphome[bot]@users.noreply.github.com>
-          branch: sync/integration-durations
-          delete-branch: true
-          title: "[ci] Refresh integration test durations"
-          body-path: .github/PULL_REQUEST_TEMPLATE.md
-          token: ${{ steps.generate-token.outputs.token }}
@@ -350,7 +350,6 @@ esphome/components/mipi_spi/* @clydebarrow
 esphome/components/mitsubishi/* @RubyBailey
 esphome/components/mitsubishi_cn105/* @crnjan
 esphome/components/mixer/speaker/* @kahrendt
-esphome/components/mk2pvrouter/* @FredM67
 esphome/components/mlx90393/* @functionpointer
 esphome/components/mlx90614/* @jesserockz
 esphome/components/mmc5603/* @benhoff
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import argparse
-import os
 import re

 CHANNEL_DEV = "dev"
@@ -65,10 +64,7 @@ def main():

    suffix = f"-{args.suffix}" if args.suffix else ""

-    repository = (
-        (os.environ.get("GITHUB_REPOSITORY") or "esphome/esphome").strip().lower()
-    )
-    image_name = f"{repository}{suffix}"
+    image_name = f"esphome/esphome{suffix}"

    print(f"channel={channel}")

@@ -1670,26 +1670,20 @@ def command_compile(args: ArgsProtocol, config: ConfigType) -> int | None:
    if exit_code != 0:
        return exit_code
    if CORE.is_host:
-        _LOGGER.info(
-            "Successfully compiled program to path '%s'", _host_program_path(config)
-        )
+        if CORE.using_toolchain_esp_idf:
+            from esphome.espidf import toolchain
+
+            program_path = str(toolchain.get_elf_path())
+        else:
+            from esphome.platformio.toolchain import get_idedata
+
+            program_path = str(get_idedata(config).firmware_elf_path)
+        _LOGGER.info("Successfully compiled program to path '%s'", program_path)
    else:
        _LOGGER.info("Successfully compiled program.")
    return 0


-def _host_program_path(config: ConfigType) -> str:
-    """Return the compiled host ELF path."""
-    if CORE.using_toolchain_esp_idf:
-        from esphome.espidf import toolchain
-
-        return str(toolchain.get_elf_path())
-    from esphome.platformio.toolchain import get_idedata
-
-    # Memoized by compile_program's own call; this is a dict lookup
-    return str(get_idedata(config).firmware_elf_path)
-
-
 def command_upload(args: ArgsProtocol, config: ConfigType) -> int | None:
    # Get devices, resolving special identifiers like OTA
    devices = choose_upload_log_host(
@@ -1734,7 +1728,14 @@ def command_run(args: ArgsProtocol, config: ConfigType) -> int | None:
        return exit_code
    _LOGGER.info("Successfully compiled program.")
    if CORE.is_host:
-        program_path = _host_program_path(config)
+        if CORE.using_toolchain_esp_idf:
+            from esphome.espidf import toolchain
+
+            program_path = str(toolchain.get_elf_path())
+        else:
+            from esphome.platformio.toolchain import get_idedata
+
+            program_path = str(get_idedata(config).firmware_elf_path)
        _LOGGER.info("Running program from path '%s'", program_path)
        return run_external_process(program_path)

@@ -1,531 +0,0 @@
-"""Arduino-core backend for the shared PlatformIO library converter.
-
-Bundled names build straight from the framework tree; everything else goes
-through ``esphome.platformio.library``. Mirrors ``lib_ldf_mode=off``: each
-library builds its own archive; all include dirs join one global path.
-
-Deviations from PlatformIO: flat-layout libraries get the recursive default
-source filter; ``dot_a_linkage`` is honored; bundled libraries never run a
-manifest ``extraScript``; manifest ``-I`` flags join the global include path;
-``precompiled``/``ldflags`` properties are refused by name.
-"""
-
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-import logging
-from pathlib import Path
-import re
-
-from esphome.core import CORE, EsphomeError, Library
-from esphome.helpers import walk_files
-from esphome.platformio.extra_script import apply_extra_script
-from esphome.platformio.library import (
-    DEFAULT_BUILD_INCLUDE_DIR,
-    DEFAULT_BUILD_SRC_FILTER,
-    ESPHOME_DATA_KEY,
-    ESPHOME_DATA_LINK_FLAGS_KEY,
-    LIBRARY_HEADER_SUFFIXES,
-    SRC_FILE_EXTENSIONS,
-    ConvertedLibrary,
-    IncompatiblePlatform,
-    InvalidLibrary,
-    LibraryBackend,
-    _url_or_none,
-    check_library_data,
-    collect_filtered_files,
-    convert_libraries,
-    ensure_list,
-    is_lib_ignored,
-    lex_build_flags,
-    lib_ignore_set,
-    normalize_dependencies,
-    parse_library_json,
-    parse_library_properties,
-    warn_properties_depends,
-)
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class ArduinoLibrary:
-    """One resolved library, ready for the ninja generator."""
-
-    name: str
-    sources: list[Path] = field(default_factory=list)
-    include_dirs: list[Path] = field(default_factory=list)
-    # Extra compile flags private to this library's own sources
-    flags: list[str] = field(default_factory=list)
-    # PlatformIO's build.libArchive / Arduino's dot_a_linkage: when False the
-    # objects go to the linker directly (symbols nothing references survive)
-    lib_archive: bool = True
-    # Link inputs the library contributes (-L dirs / -l libs, e.g. from
-    # precompiled vendor blobs) and -Wl, options for the firmware link
-    link_dirs: list[Path] = field(default_factory=list)
-    link_libs: list[str] = field(default_factory=list)
-    link_flags: list[str] = field(default_factory=list)
-
-
-# Source-like suffixes the case-sensitive suffix map rejects
-_UNMAPPED_SOURCE_SUFFIXES = frozenset(
-    {s.lower() for s in SRC_FILE_EXTENSIONS} | {".ino"}
-)
-
-# Filename-plain names: an allowlist excludes separators, drive colons,
-# and dot-only names by shape
-_SAFE_LIBRARY_NAME_RE = re.compile(r"[A-Za-z0-9_][A-Za-z0-9_. +-]*\Z")
-
-
-def _is_safe_library_name(name: object) -> bool:
-    """Whether a name may be joined under the framework's libraries dir."""
-    return isinstance(name, str) and _SAFE_LIBRARY_NAME_RE.fullmatch(name) is not None
-
-
-def _manifest_build(name: str, data: object) -> dict:
-    """The manifest's ``build`` section; malformed manifests fail by name."""
-    build = data.get("build", {}) if isinstance(data, dict) else None
-    if not isinstance(build, dict):
-        raise EsphomeError(f"Library {name} has a malformed manifest")
-    return build
-
-
-def _resolve_src_dir(name: str, read_path: Path, build: dict) -> str:
-    """Resolve PIO's source dir: manifest srcDir, else src/Src, else the root."""
-    if "srcDir" not in build:
-        return next((d for d in ("src", "Src") if (read_path / d).is_dir()), ".")
-    # A declared srcDir (falsy included) that does not resolve is a manifest error
-    src_dir = build["srcDir"]
-    if not (isinstance(src_dir, str) and src_dir and (read_path / src_dir).is_dir()):
-        raise EsphomeError(
-            f"Library {name} declares srcDir {src_dir!r} which does not exist"
-        )
-    return src_dir
-
-
-def _reject_unsupported_link_fields(name: str, data: dict) -> None:
-    # PIO honors these; ignoring them would fail at link with no stated
-    # cause. Property values are strings, so "false" is not a declaration.
-    precompiled = data.get("precompiled")
-    if precompiled and str(precompiled).strip().lower() != "false":
-        raise EsphomeError(
-            f"Library {name} declares precompiled, which this backend does not support"
-        )
-    if data.get("ldflags"):
-        raise EsphomeError(
-            f"Library {name} declares ldflags, which this backend does not support"
-        )
-
-
-def _resolve_lib_archive(name: str, data: dict, build: dict) -> bool:
-    """build.libArchive, else dot_a_linkage (an Arduino IDE property PIO
-    ignores; a deliberate extra), else archive."""
-
-    # Strict parse: bool("false") is True
-    def _parse(key: str, raw: object) -> bool:
-        if isinstance(raw, bool):
-            return raw
-        value = str(raw).strip().lower()
-        if value in ("true", "false"):
-            return value == "true"
-        raise EsphomeError(f"Library {name} has a malformed {key} value {raw!r}")
-
-    if "libArchive" in build:
-        return _parse("libArchive", build["libArchive"])
-    if "dot_a_linkage" in data:
-        return _parse("dot_a_linkage", data["dot_a_linkage"])
-    return True
-
-
-def _classify_build_flags(
-    name: str, read_path: Path, lib: ArduinoLibrary, flag_tokens: list[str]
-) -> list[str]:
-    """Route the lexed build.flags into the library's flag lists.
-
-    Returns the ``-I`` arguments for the include-dir resolution.
-    """
-    include_flags: list[str] = []
-    for tok in flag_tokens:
-        if tok.startswith("-I"):
-            include_flags.append(tok[2:])
-        elif tok.startswith("-L"):
-            link_dir = (read_path / tok[2:]).resolve()
-            if not link_dir.is_dir():
-                # Kept (the linker ignores missing -L dirs); the warning
-                # names the culprit before a bare "cannot find -lfoo"
-                _LOGGER.warning(
-                    "Library %s declares library dir %s which does not exist",
-                    name,
-                    tok[2:],
-                )
-            lib.link_dirs.append(link_dir)
-        elif tok.startswith("-l"):
-            lib.link_libs.append(tok[2:])
-        elif tok.startswith("-Wl,"):
-            lib.link_flags.append(tok)
-        else:
-            lib.flags.append(tok)
-    return include_flags
-
-
-def _resolve_include_dirs(
-    name: str,
-    read_path: Path,
-    lib: ArduinoLibrary,
-    build: dict,
-    src_dir: str,
-    include_flags: list[str],
-) -> None:
-    include_dir = build.get("includeDir", DEFAULT_BUILD_INCLUDE_DIR)
-    if not isinstance(include_dir, str):
-        raise EsphomeError(f"Library {name} has a malformed includeDir")
-    for d, explicit in [
-        (include_dir, "includeDir" in build),
-        (src_dir, False),  # _resolve_src_dir already validated it
-        *((flag, True) for flag in include_flags),
-    ]:
-        if (path := (read_path / d)).is_dir():
-            lib.include_dirs.append(path.resolve())
-        elif explicit:
-            # Warn-and-drop (unlike srcDir): a missing include dir is
-            # harmless until a header is needed, and the compile names it
-            _LOGGER.warning(
-                "Library %s declares include dir %s which does not exist", name, d
-            )
-
-
-def _collect_lib_sources(
-    name: str,
-    read_path: Path,
-    lib: ArduinoLibrary,
-    src_dir: str,
-    src_filter: list[str],
-) -> None:
-    sources: list[Path] = []
-    dropped: list[str] = []
-    saw_header = False
-    for f in collect_filtered_files(read_path / src_dir, src_filter):
-        path = Path(f)
-        suffix = path.suffix
-        if suffix in SRC_FILE_EXTENSIONS:
-            # resolve() per file: srcFilter patterns may escape src_dir
-            sources.append(path.resolve())
-        elif suffix.lower() in _UNMAPPED_SOURCE_SUFFIXES:
-            # A source-like suffix the case-sensitive map rejects (.CPP,
-            # .ino) is a dropped compilation unit; headers fall through
-            dropped.append(path.name)
-        elif suffix.lower() in LIBRARY_HEADER_SUFFIXES:
-            saw_header = True
-    lib.sources = sorted(sources)
-    if dropped:
-        _LOGGER.warning(
-            "Library %s: %d file(s) with unmapped source suffixes are not compiled: %s",
-            name,
-            len(dropped),
-            ", ".join(sorted(dropped)),
-        )
-    if not lib.sources and not saw_header:
-        # Matched headers mean header-only; a filter matching nothing is
-        # a manifest/tree problem (a truly empty tree raises elsewhere)
-        _LOGGER.warning("Library %s: no source files matched", name)
-
-
-def _library_info(name: str, read_path: Path, data: dict) -> ArduinoLibrary:
-    """Resolve one library's sources, include dirs, and flags (PIO semantics)."""
-    build = _manifest_build(name, data)
-    _reject_unsupported_link_fields(name, data)
-    src_dir = _resolve_src_dir(name, read_path, build)
-    src_filter = ensure_list(build.get("srcFilter", DEFAULT_BUILD_SRC_FILTER))
-    if not all(isinstance(entry, str) for entry in src_filter):
-        raise EsphomeError(f"Library {name} has a malformed srcFilter")
-    lib = ArduinoLibrary(name=name, lib_archive=_resolve_lib_archive(name, data, build))
-    # PlatformIO shell-lexes each build.flags entry
-    include_flags = _classify_build_flags(
-        name, read_path, lib, lex_build_flags(build.get("flags", []), f"library {name}")
-    )
-    _resolve_include_dirs(name, read_path, lib, build, src_dir, include_flags)
-    _collect_lib_sources(name, read_path, lib, src_dir, src_filter)
-    return lib
-
-
-def _bundled_library(framework_path: Path, name: str) -> ArduinoLibrary:
-    """A library bundled with the Arduino core, read from the framework tree.
-
-    ``library.json`` wins over ``library.properties`` when both exist, as in
-    PlatformIO's LibBuilderFactory; only the JSON manifest can carry a
-    ``build`` section (srcDir, srcFilter, flags).
-    """
-    lib_dir = framework_path / "libraries" / name
-    manifest_json = lib_dir / "library.json"
-    if manifest_json.is_file():
-        try:
-            data = parse_library_json(manifest_json)
-        except ValueError as err:  # JSONDecodeError
-            raise EsphomeError(
-                f"Bundled library {name} has a corrupt library.json ({err}); "
-                "the framework install may be incomplete (run 'esphome clean-all')"
-            ) from err
-    elif (manifest := lib_dir / "library.properties").is_file():
-        data = parse_library_properties(manifest)
-    else:
-        # Debug, not warning: the legacy manifest-less layout is legal and
-        # the 3.1.2 core ships one such library (FSTools), so a warning
-        # would be unactionable noise on every build using it
-        _LOGGER.debug("Bundled library %s has no manifest; using defaults", name)
-        data = {}
-    if isinstance(data, dict):
-        # Bundled manifest deps are never walked; make the skip visible
-        if data.get("dependencies"):
-            _LOGGER.warning(
-                "Bundled library %s declares dependencies, which are not "
-                "resolved automatically; add them with add_library() if needed",
-                name,
-            )
-        warn_properties_depends(name, data)
-        build = data.get("build")
-        if isinstance(build, dict) and build.get("extraScript"):
-            # Scripts only run on the converted path; building without
-            # the script's flags would miscompile
-            raise EsphomeError(
-                f"Bundled library {name} declares an extraScript, which is "
-                "not run for bundled libraries"
-            )
-    lib = _library_info(name, lib_dir, data)
-    _assert_tree_has_code(
-        name,
-        lib_dir,
-        "the framework install may be incomplete (run 'esphome clean-all')",
-    )
-    return lib
-
-
-def _assert_tree_has_code(name: str, root: Path, hint: str) -> None:
-    """An empty or half-extracted tree can never link; fail by name (a
-    warning would scroll away and resurface as undefined symbols)."""
-    if not any(
-        Path(p).suffix in SRC_FILE_EXTENSIONS
-        or Path(p).suffix.lower() in LIBRARY_HEADER_SUFFIXES
-        for p in walk_files(root)
-    ):
-        raise EsphomeError(f"Library {name} has no sources or headers; {hint}")
-
-
-def _external_short_name(name: str) -> str:
-    """The short library name of a requested spec.
-
-    "owner/Name" and plain names take the last path segment; "Name=<url>"
-    takes the declared name. Git tails (".git", "#ref") are stripped like
-    the walk's URL normalization; the comparand is a manifest dependency
-    name, never a spec.
-    """
-    head, sep, tail = name.partition("=")
-    if sep and "://" in tail:
-        return head
-    short = name.rsplit("/", maxsplit=1)[-1]
-    return short.partition("#")[0].removesuffix(".git")
-
-
-def _check_unfulfilled_provides(
-    provided_requests: set[str], satisfied: set[str], still_requested: set[str]
-) -> None:
-    """Fail by name when a walk-skipped dependency was never added.
-
-    An unfulfilled provides() promise only surfaces as undefined symbols
-    at link. The walk records across re-resolutions, so a name no final
-    manifest still requests is stale state, never a failure.
-    """
-    if missing := sorted((provided_requests & still_requested) - satisfied):
-        raise EsphomeError(
-            "provides() skipped these dependencies but nothing added them: "
-            f"{', '.join(missing)}; the build is missing libraries"
-        )
-
-
-def resolve_libraries(
-    framework_path: Path, *, pio_platform: str, board_mcu: str, cache_key: str
-) -> list[ArduinoLibrary]:
-    """Resolve every ``cg.add_library()`` entry into an :class:`ArduinoLibrary`.
-
-    ``pio_platform``/``board_mcu`` filter manifests the way PlatformIO would
-    for that core (e.g. ``espressif8266``/``esp8266``); ``cache_key`` keys the
-    shared converter's download cache.
-
-    The returned list is not topologically sorted, so the caller must link
-    the archives inside one ``--start-group``/``--end-group`` pair (the
-    bundled-first grouping is incidental).
-    """
-    bundled: list[ArduinoLibrary] = []
-    external: list[Library] = []
-    # PlatformIO's lib_ignore covers framework-bundled libraries too; the
-    # shared converter only filters the registry/git ones.
-    lib_ignore = lib_ignore_set()
-    # Exact directory names keep membership case-sensitive everywhere
-    # (an is_dir() probe would match "wire" on macOS/Windows and build
-    # the bundled Wire twice)
-    libraries_dir = framework_path / "libraries"
-    if not libraries_dir.is_dir():
-        # A registry fallback would fail later with a misleading
-        # package-not-found error per bundled name
-        raise EsphomeError(
-            f"{libraries_dir} is missing; the framework install may be "
-            "incomplete (run 'esphome clean-all')"
-        )
-    bundled_dir_names = frozenset(p.name for p in libraries_dir.iterdir() if p.is_dir())
-
-    def _provided(name: object) -> bool:
-        return _is_safe_library_name(name) and name in bundled_dir_names
-
-    for library in CORE.platformio_libraries.values():
-        if is_lib_ignored(library.name, lib_ignore):
-            continue
-        # Bundled only for a bare name with a matching framework dir; pinned
-        # or unmatched names resolve from the registry, as under PlatformIO.
-        if not library.repository and not library.version and _provided(library.name):
-            # Bundled manifest deps are not walked; _bundled_library warns
-            bundled.append(_bundled_library(framework_path, library.name))
-        else:
-            external.append(library)
-
-    converted: list[ArduinoLibrary] = []
-    bundled_names = {lib.name for lib in bundled}
-    converted_manifest_names: set[str] = set()
-    # Bundled candidates skipped on purpose (platform filter); the
-    # provides() reconciliation must count them as satisfied
-    knowingly_skipped: set[str] = set()
-    # Dependency names of the manifests actually emitted; a walk recording
-    # for a since-re-resolved manifest must not fail the reconciliation
-    final_dep_names: set[str] = set()
-    # Ordered set of bundled dependency names to add once conversion is done
-    pending_bundled: dict[str, None] = {}
-    # Deps matching a separately-requested external are already in the build
-    # (a duplicate archive means duplicate-symbol link errors)
-    external_short_names = {
-        _external_short_name(lib.name) for lib in external if lib.name
-    }
-
-    def _add_bundled_dependencies(component: ConvertedLibrary) -> None:
-        # A version-less bare name ("Hash") is a core-bundled library the
-        # shared converter cannot resolve from the registry
-        for dep in normalize_dependencies(
-            component.data.get("dependencies"), component.name
-        ):
-            # normalize_dependencies guarantees a non-empty str name
-            name = dep["name"]
-            final_dep_names.add(name)
-            if "/" in name:
-                owner, _, pkg = name.partition("/")
-                if _is_safe_library_name(owner) and _is_safe_library_name(pkg):
-                    # Owner-qualified; the converter resolves it from the registry
-                    continue
-            if not _is_safe_library_name(name):
-                # The name becomes a path component; never join a traversal
-                _LOGGER.warning(
-                    "Ignoring malformed dependency entry %r of library %s",
-                    dep,
-                    component.name,
-                )
-                continue
-            if name in external_short_names:
-                if _provided(name):
-                    # A bundled copy is suppressed; a coincidental name
-                    # collision would surface as link errors
-                    _LOGGER.warning(
-                        "Dependency %s of %s is assumed satisfied by a "
-                        "requested external library; the bundled copy is "
-                        "not added",
-                        name,
-                        component.name,
-                    )
-                else:
-                    _LOGGER.debug(
-                        "Dependency %s of %s assumed satisfied by a requested "
-                        "external library",
-                        name,
-                        component.name,
-                    )
-                continue
-            if name in bundled_names or is_lib_ignored(name, lib_ignore):
-                continue
-            if _url_or_none(dep.get("version")) is not None:
-                # A URL names one specific source; never add the bundled copy
-                continue
-            if dep.get("owner") or not _provided(name):
-                # Only owner-less framework-tree names take the bundled
-                # copy (PIO's process_dependencies); the walk reports drops
-                continue
-            try:
-                # framework=None: the walk already warned for non-platform
-                # causes; debug keeps one fault from warning twice (pinned
-                # by test_nonplatform_rejection_warns_once_through_real_converter)
-                check_library_data(dep, pio_platform, None)
-            except IncompatiblePlatform as err:
-                # A knowing skip (platform filter), not a broken promise
-                knowingly_skipped.add(name)
-                _LOGGER.debug("Skip bundled candidate %s: %s", name, err)
-                continue
-            except InvalidLibrary as err:
-                # Malformed manifest data never counts as satisfied; the
-                # walk owns the warning (see the warns-once test above)
-                _LOGGER.debug("Skip malformed bundled candidate %s: %s", name, err)
-                continue
-            # Deferred: a later manifest name may satisfy this
-            pending_bundled.setdefault(name)
-
-    def _emit(component: ConvertedLibrary) -> None:
-        apply_extra_script(
-            component, board_mcu=lambda: board_mcu, pio_platform=pio_platform
-        )
-        _assert_tree_has_code(
-            component.get_require_name(),
-            component.source_dir,
-            "the download may be incomplete (run 'esphome clean-all')",
-        )
-        if isinstance(manifest_name := component.data.get("name"), str):
-            converted_manifest_names.add(manifest_name)
-        lib = _library_info(
-            component.get_require_name(), component.source_dir, component.data
-        )
-        # Extra-script LINKFLAGS travel outside build.flags; dropping
-        # them would link wrong with no stated cause
-        lib.link_flags.extend(
-            component.data.get(ESPHOME_DATA_KEY, {}).get(
-                ESPHOME_DATA_LINK_FLAGS_KEY, []
-            )
-        )
-        converted.append(lib)
-        _add_bundled_dependencies(component)
-
-    backend = LibraryBackend(
-        platform=pio_platform,
-        framework="arduino",
-        emit=_emit,
-        cache_key=cache_key,
-        # The walk must not resolve bundled names from the registry;
-        # _add_bundled_dependencies adds them after emit
-        provides=_provided,
-    )
-    if external:
-        convert_libraries(external, backend)
-    for name in pending_bundled:
-        if name in converted_manifest_names:
-            # The converted library is this one; the bundled copy would
-            # double the archive. Warn like the external_short_names twin.
-            _LOGGER.warning(
-                "Dependency %s is assumed satisfied by a converted library's "
-                "manifest name; the bundled copy is not added",
-                name,
-            )
-            continue
-        bundled_names.add(name)
-        bundled.append(_bundled_library(framework_path, name))
-
-    _check_unfulfilled_provides(
-        backend.provided_requests,
-        bundled_names
-        | converted_manifest_names
-        | external_short_names
-        | knowingly_skipped,
-        final_dep_names,
-    )
-
-    return bundled + converted
@@ -1,108 +0,0 @@
-"""Tiny cross-platform build steps invoked from the generated ninja file.
-
-Plain script (not ``python -m``): it runs from ninja with whatever Python
-started esphome and must not depend on the package being importable.
-
-Subcommands:
-    ar <ar-binary> <archive> <rspfile>   remove stale archive, then ``ar rcs``
-    copy <src> <dst>                     copy a file
-
-The ar rspfile carries one object path per line (the generating rule must
-use ``$in_newline``, never ``$in``).
-"""
-
-from pathlib import Path
-import shutil
-import subprocess
-import sys
-
-
-def _read_rspfile(rspfile: str) -> list[str]:
-    r"""The object paths listed in ``rspfile``, unquoted.
-
-    GNU ar treats backslashes in response files as escapes (corrupts
-    Windows paths), so the caller expands the list into argv; strip the
-    simple surrounding quote ninja adds to special paths, then undo
-    ninja's POSIX escape for an embedded quote ('a'\\''b.o' -> a'b.o).
-    """
-    return [
-        line[1:-1].replace("'\\''", "'")
-        if len(line) >= 2 and line[0] == line[-1] and line[0] in "'\""
-        else line
-        for line in Path(rspfile).read_text(encoding="utf-8").splitlines()
-        if line
-    ]
-
-
-def _run_ar(ar: str, archive: str, rspfile: str) -> int:
-    # Remove first: ``ar rcs`` replaces members but never drops ones whose
-    # source was removed from the build, which would leak stale objects.
-    Path(archive).unlink(missing_ok=True)
-    objects = _read_rspfile(rspfile)
-    if not objects:
-        # An empty archive would "succeed" here and fail far away at link
-        print(f"ar: no objects listed in {rspfile} for {archive}", file=sys.stderr)
-        return 1
-    # Batch by argv length: expanding the rspfile gives back the Windows
-    # 32767-char command-line limit it existed to avoid. "rcs" creates,
-    # "qs" appends; the s keeps the symbol index explicit on every ar.
-    op = "rcs"
-    ok = False
-    try:
-        while objects:
-            batch = [objects.pop(0)]
-            batch_len = len(batch[0])
-            while objects and batch_len + len(objects[0]) < 25000:
-                batch_len += len(objects[0]) + 1
-                batch.append(objects.pop(0))
-            rc = subprocess.run(
-                [ar, op, archive, *batch], check=False, close_fds=False
-            ).returncode
-            if rc != 0:
-                return rc
-            op = "qs"
-        ok = True
-        return 0
-    finally:
-        if not ok:
-            # Any failure (bad exit, missing ar binary, interrupt) must not
-            # leave a truncated archive behind
-            Path(archive).unlink(missing_ok=True)
-
-
-def _run_copy(src: str, dst: str) -> int:
-    try:
-        shutil.copyfile(src, dst)
-    except OSError as err:
-        # Never leave a partially written output (e.g. a firmware image);
-        # SameFileError means dst IS src, where unlinking destroys the input
-        if not isinstance(err, shutil.SameFileError):
-            Path(dst).unlink(missing_ok=True)
-        print(f"copy: {src} -> {dst} failed: {err}", file=sys.stderr)
-        return 1
-    return 0
-
-
-# mode -> (handler, expected operand count); surplus argv means a
-# mis-specified ninja rule and must error, not silently drop operands
-_MODES = {"ar": (_run_ar, 3), "copy": (_run_copy, 2)}
-
-
-def main() -> int:
-    mode = sys.argv[1] if len(sys.argv) > 1 else ""
-    if entry := _MODES.get(mode):
-        handler, argc = entry
-        args = sys.argv[2:]
-        if len(args) != argc:
-            print(
-                f"build_tool {mode}: expected {argc} arguments, got {len(args)}",
-                file=sys.stderr,
-            )
-            return 1
-        return handler(*args)
-    print(f"unknown build_tool mode: {mode}", file=sys.stderr)
-    return 1
-
-
-if __name__ == "__main__":  # pragma: no cover
-    sys.exit(main())
@@ -90,9 +90,10 @@ def get_project_cmakelists(
    """
    idf_target = variant_to_idf_target(get_esp32_variant())

-    # esp_idf_size 2.x (bundled with IDF >=6.0) made NG the default and
-    # removed the --ng flag; on 1.x (IDF 5.5) --ng is required to get
-    # --format=raw because the legacy mode doesn't support it.
+    # esp_idf_size 2.x (IDF >=6.0) made NG the default and removed --ng;
+    # 1.x (IDF 5.5) needs --ng for --format=json2. 1.x json2 also lacks
+    # total_size, hence the ELF fallback in espidf/size_summary.py; both
+    # go away together when 1.x support is dropped.
    size_ng_flag = "--ng" if idf_version() < cv.Version(6, 0, 0) else ""

    # Project-wide compile options: -D defines and -W warning flags (skip
@@ -211,10 +212,12 @@ include($ENV{{IDF_PATH}}/tools/cmake/project.cmake)

 project({CORE.name})

-# Emit raw JSON size data for ESPHome to read post-build.
+# 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.
 add_custom_command(
    TARGET ${{CMAKE_PROJECT_NAME}}.elf POST_BUILD
-    COMMAND ${{PYTHON}} -m esp_idf_size {size_ng_flag} --format=raw
+    COMMAND ${{PYTHON}} -m esp_idf_size {size_ng_flag} --format=json2
            -o ${{CMAKE_BINARY_DIR}}/esp_idf_size.json
            ${{CMAKE_PROJECT_NAME}}.map
    WORKING_DIRECTORY ${{CMAKE_BINARY_DIR}}
@@ -78,7 +78,6 @@ from esphome.cpp_types import (  # noqa: F401
    StringRef,
    arduino_json_ns,
    bool_,
-    char,
    const_char_ptr,
    double,
    esphome_ns,
@@ -13,7 +13,6 @@ from esphome.components.esp32 import (
    VARIANT_ESP32P4,
    VARIANT_ESP32S2,
    VARIANT_ESP32S3,
-    VARIANT_ESP32S31,
    get_esp32_variant,
 )
 import esphome.config_validation as cv
@@ -157,17 +156,6 @@ ESP32_VARIANT_ADC1_PIN_TO_CHANNEL = {
        9: adc_channel_t.ADC_CHANNEL_8,
        10: adc_channel_t.ADC_CHANNEL_9,
    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32s31/include/soc/adc_channel.h
-    VARIANT_ESP32S31: {
-        42: adc_channel_t.ADC_CHANNEL_0,
-        43: adc_channel_t.ADC_CHANNEL_1,
-        44: adc_channel_t.ADC_CHANNEL_2,
-        45: adc_channel_t.ADC_CHANNEL_3,
-        46: adc_channel_t.ADC_CHANNEL_4,
-        47: adc_channel_t.ADC_CHANNEL_5,
-        48: adc_channel_t.ADC_CHANNEL_6,
-        49: adc_channel_t.ADC_CHANNEL_7,
-    },
 }

 # pin to adc2 channel mapping
@@ -237,17 +225,6 @@ ESP32_VARIANT_ADC2_PIN_TO_CHANNEL = {
        19: adc_channel_t.ADC_CHANNEL_8,
        20: adc_channel_t.ADC_CHANNEL_9,
    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32s31/include/soc/adc_channel.h
-    VARIANT_ESP32S31: {
-        50: adc_channel_t.ADC_CHANNEL_0,
-        51: adc_channel_t.ADC_CHANNEL_1,
-        52: adc_channel_t.ADC_CHANNEL_2,
-        53: adc_channel_t.ADC_CHANNEL_3,
-        54: adc_channel_t.ADC_CHANNEL_4,
-        55: adc_channel_t.ADC_CHANNEL_5,
-        56: adc_channel_t.ADC_CHANNEL_6,
-        57: adc_channel_t.ADC_CHANNEL_7,
-    },
 }


@@ -74,7 +74,9 @@ void ADCSensor::setup() {
  if (this->calibration_handle_ == nullptr) {
    adc_cali_handle_t handle = nullptr;

-#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED)
+#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
+    USE_ESP32_VARIANT_ESP32C61 || USE_ESP32_VARIANT_ESP32H2 || USE_ESP32_VARIANT_ESP32P4 || USE_ESP32_VARIANT_ESP32S3
+    // RISC-V variants (except C2) and S3 use curve fitting calibration
    adc_cali_curve_fitting_config_t cali_config = {};  // Zero initialize first
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
    cali_config.chan = this->channel_;
@@ -92,7 +94,7 @@ void ADCSensor::setup() {
      ESP_LOGW(TAG, "Curve fitting calibration failed with error %d, will use uncalibrated readings", err);
      this->setup_flags_.calibration_complete = false;
    }
-#elif defined(ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED)
+#else  // ESP32, ESP32-S2, and ESP32-C2 use line fitting calibration
    adc_cali_line_fitting_config_t cali_config = {
      .unit_id = this->adc_unit_,
      .atten = this->attenuation_,
@@ -110,11 +112,7 @@ void ADCSensor::setup() {
      ESP_LOGW(TAG, "Line fitting calibration failed with error %d, will use uncalibrated readings", err);
      this->setup_flags_.calibration_complete = false;
    }
-#else   // No calibration scheme available
-    (void) handle;
-    ESP_LOGD(TAG, "No calibration scheme for this variant, readings are uncalibrated");
-    this->setup_flags_.calibration_complete = false;
-#endif
+#endif  // ESP32C3 || ESP32C5 || ESP32C6 || ESP32C61 || ESP32H2 || ESP32P4 || ESP32S3
  }

  this->setup_flags_.init_complete = true;
@@ -123,28 +121,23 @@ void ADCSensor::setup() {
 void ADCSensor::dump_config() {
  LOG_SENSOR("", "ADC Sensor", this);
  LOG_PIN("  Pin: ", this->pin_);
-#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) || defined(ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED)
-  const char *calibration_status = this->setup_flags_.calibration_complete ? "OK" : "FAILED";
-#else
-  const char *calibration_status = "N/A";  // This variant has no calibration scheme
-#endif
-  ESP_LOGCONFIG(TAG,
-                "  Channel:       %d\n"
-                "  Unit:          %s\n"
-                "  Attenuation:   %s\n"
-                "  Samples:       %i\n"
-                "  Sampling mode: %s\n"
-                "  Setup Status:\n"
-                "    Handle Init:  %s\n"
-                "    Config:       %s\n"
-                "    Calibration:  %s\n"
-                "    Overall Init: %s",
-                this->channel_, LOG_STR_ARG(adc_unit_to_str(this->adc_unit_)),
-                this->autorange_ ? "Auto" : LOG_STR_ARG(attenuation_to_str(this->attenuation_)), this->sample_count_,
-                LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)),
-                this->setup_flags_.handle_init_complete ? "OK" : "FAILED",
-                this->setup_flags_.config_complete ? "OK" : "FAILED", calibration_status,
-                this->setup_flags_.init_complete ? "OK" : "FAILED");
+  ESP_LOGCONFIG(
+      TAG,
+      "  Channel:       %d\n"
+      "  Unit:          %s\n"
+      "  Attenuation:   %s\n"
+      "  Samples:       %i\n"
+      "  Sampling mode: %s\n"
+      "  Setup Status:\n"
+      "    Handle Init:  %s\n"
+      "    Config:       %s\n"
+      "    Calibration:  %s\n"
+      "    Overall Init: %s",
+      this->channel_, LOG_STR_ARG(adc_unit_to_str(this->adc_unit_)),
+      this->autorange_ ? "Auto" : LOG_STR_ARG(attenuation_to_str(this->attenuation_)), this->sample_count_,
+      LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)),
+      this->setup_flags_.handle_init_complete ? "OK" : "FAILED", this->setup_flags_.config_complete ? "OK" : "FAILED",
+      this->setup_flags_.calibration_complete ? "OK" : "FAILED", this->setup_flags_.init_complete ? "OK" : "FAILED");

  LOG_UPDATE_INTERVAL(this);
 }
@@ -191,11 +184,12 @@ float ADCSensor::sample_fixed_attenuation_() {
    } else {
      ESP_LOGW(TAG, "ADC calibration conversion failed with error %d, disabling calibration", err);
      if (this->calibration_handle_ != nullptr) {
-#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED)
+#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
+    USE_ESP32_VARIANT_ESP32C61 || USE_ESP32_VARIANT_ESP32H2 || USE_ESP32_VARIANT_ESP32P4 || USE_ESP32_VARIANT_ESP32S3
        adc_cali_delete_scheme_curve_fitting(this->calibration_handle_);
-#elif defined(ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED)
+#else   // Other ESP32 variants use line fitting calibration
        adc_cali_delete_scheme_line_fitting(this->calibration_handle_);
-#endif
+#endif  // ESP32C3 || ESP32C5 || ESP32C6 || ESP32C61 || ESP32H2 || ESP32P4 || ESP32S3
        this->calibration_handle_ = nullptr;
      }
    }
@@ -223,9 +217,10 @@ float ADCSensor::sample_autorange_() {
    // Need to recalibrate for the new attenuation
    if (this->calibration_handle_ != nullptr) {
      // Delete old calibration handle
-#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED)
+#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
+    USE_ESP32_VARIANT_ESP32C61 || USE_ESP32_VARIANT_ESP32H2 || USE_ESP32_VARIANT_ESP32P4 || USE_ESP32_VARIANT_ESP32S3
      adc_cali_delete_scheme_curve_fitting(this->calibration_handle_);
-#elif defined(ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED)
+#else
      adc_cali_delete_scheme_line_fitting(this->calibration_handle_);
 #endif
      this->calibration_handle_ = nullptr;
@@ -234,7 +229,8 @@ float ADCSensor::sample_autorange_() {
    // Create new calibration handle for this attenuation
    adc_cali_handle_t handle = nullptr;

-#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED)
+#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
+    USE_ESP32_VARIANT_ESP32C61 || USE_ESP32_VARIANT_ESP32H2 || USE_ESP32_VARIANT_ESP32P4 || USE_ESP32_VARIANT_ESP32S3
    adc_cali_curve_fitting_config_t cali_config = {};
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
    cali_config.chan = this->channel_;
@@ -246,7 +242,7 @@ float ADCSensor::sample_autorange_() {
    err = adc_cali_create_scheme_curve_fitting(&cali_config, &handle);
    ESP_LOGVV(TAG, "Autorange atten=%d: Calibration handle creation %s (err=%d)", atten,
              (err == ESP_OK) ? "SUCCESS" : "FAILED", err);
-#elif defined(ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED)
+#else
    adc_cali_line_fitting_config_t cali_config = {
      .unit_id = this->adc_unit_,
      .atten = atten,
@@ -268,9 +264,10 @@ float ADCSensor::sample_autorange_() {
    if (err != ESP_OK) {
      ESP_LOGW(TAG, "ADC read failed in autorange with error %d", err);
      if (handle != nullptr) {
-#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED)
+#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
+    USE_ESP32_VARIANT_ESP32C61 || USE_ESP32_VARIANT_ESP32H2 || USE_ESP32_VARIANT_ESP32P4 || USE_ESP32_VARIANT_ESP32S3
        adc_cali_delete_scheme_curve_fitting(handle);
-#elif defined(ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED)
+#else
        adc_cali_delete_scheme_line_fitting(handle);
 #endif
      }
@@ -289,9 +286,10 @@ float ADCSensor::sample_autorange_() {
        ESP_LOGVV(TAG, "Autorange atten=%d: UNCALIBRATED FALLBACK - raw=%d -> %.6fV (3.3V ref)", atten, raw, voltage);
      }
      // Clean up calibration handle
-#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED)
+#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
+    USE_ESP32_VARIANT_ESP32C61 || USE_ESP32_VARIANT_ESP32H2 || USE_ESP32_VARIANT_ESP32P4 || USE_ESP32_VARIANT_ESP32S3
      adc_cali_delete_scheme_curve_fitting(handle);
-#elif defined(ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED)
+#else
      adc_cali_delete_scheme_line_fitting(handle);
 #endif
    } else {
@@ -3,7 +3,6 @@ import logging
 import esphome.codegen as cg
 from esphome.components import sensor, voltage_sampler
 from esphome.components.esp32 import (
-    VARIANT_ESP32S31,
    get_esp32_variant,
    include_builtin_idf_component,
    require_adc_oneshot_iram,
@@ -57,14 +56,6 @@ def validate_config(config: ConfigType) -> ConfigType:
    if config[CONF_RAW] and config.get(CONF_ATTENUATION, None) == "auto":
        raise cv.Invalid("Automatic attenuation cannot be used when raw output is set")

-    # The S31 ADC supports a single attenuation level (SOC_ADC_ATTEN_NUM is 1)
-    if (
-        CORE.is_esp32
-        and get_esp32_variant() == VARIANT_ESP32S31
-        and config.get(CONF_ATTENUATION, "0db") != "0db"
-    ):
-        raise cv.Invalid("ESP32-S31 only supports 'attenuation: 0db'")
-
    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"
@@ -5,7 +5,6 @@ from typing import Any
 from esphome import automation
 from esphome.automation import Condition
 import esphome.codegen as cg
-from esphome.components.const import CONF_DESCRIPTION, CONF_HOST
 from esphome.components.logger import request_log_listener

 # ENCRYPTION_SCHEMA and validate_encryption_key are re-exported for external
@@ -24,8 +23,6 @@ from esphome.const import (
    CONF_CAPTURE_RESPONSE,
    CONF_DATA,
    CONF_DATA_TEMPLATE,
-    CONF_DELAY,
-    CONF_ENABLE_IPV6,
    CONF_ENCRYPTION,
    CONF_EVENT,
    CONF_ID,
@@ -44,13 +41,10 @@ from esphome.const import (
    CONF_TAG,
    CONF_THEN,
    CONF_TRIGGER_ID,
-    CONF_TYPE,
    CONF_VARIABLES,
 )
 from esphome.core import CORE, ID, CoroPriority, EsphomeError, coroutine_with_priority
 from esphome.cpp_generator import MockObj, TemplateArgsType
-import esphome.final_validate as fv
-from esphome.helpers import fnv1_hash
 from esphome.types import ConfigFragmentType, ConfigType

 # Compat alias: downstream consumers (e.g. device-builder) referenced the
@@ -131,12 +125,10 @@ SERVICE_ARG_FALLBACK_TYPES: dict[str, MockObj] = {
 }
 CONF_BATCH_DELAY = "batch_delay"
 CONF_CUSTOM_SERVICES = "custom_services"
-CONF_EXAMPLE = "example"
 CONF_HOMEASSISTANT_SERVICES = "homeassistant_services"
 CONF_HOMEASSISTANT_STATES = "homeassistant_states"
 CONF_LISTEN_BACKLOG = "listen_backlog"
 CONF_MAX_SEND_QUEUE = "max_send_queue"
-CONF_OUTGOING_CONNECTION = "outgoing_connection"
 CONF_STATE_SUBSCRIPTION_ONLY = "state_subscription_only"


@@ -236,30 +228,14 @@ def _validate_supports_response(value: Any) -> str:
    return cv.enum(SUPPORTS_RESPONSE_OPTIONS, lower=True)(value)


-# ESP8266 copies every string of an action into a stack buffer sized by codegen; keep it small
-ESP8266_ACTION_STRINGS_MAX_TOTAL = 384
-
-VARIABLE_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_TYPE): cv.one_of(*SERVICE_ARG_NATIVE_TYPES, lower=True),
-        cv.Optional(CONF_DESCRIPTION): cv.string_strict,
-        cv.Optional(CONF_EXAMPLE): cv.string_strict,
-    }
-)
-
-# Accepts the plain `name: type` shorthand or the full mapping form
-validate_variable = cv.maybe_simple_value(VARIABLE_SCHEMA, key=CONF_TYPE)
-
-
 ACTIONS_SCHEMA = automation.validate_automation(
    {
        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(UserServiceTrigger),
        cv.Exclusive(CONF_SERVICE, group_of_exclusion=CONF_ACTION): cv.valid_name,
        cv.Exclusive(CONF_ACTION, group_of_exclusion=CONF_ACTION): cv.valid_name,
-        cv.Optional(CONF_DESCRIPTION): cv.string_strict,
        cv.Optional(CONF_VARIABLES, default={}): cv.Schema(
            {
-                cv.validate_id_name: validate_variable,
+                cv.validate_id_name: cv.one_of(*SERVICE_ARG_NATIVE_TYPES, lower=True),
            }
        ),
        # No default - auto-detected by _auto_detect_supports_response
@@ -288,53 +264,9 @@ def _consume_api_sockets(config: ConfigType) -> ConfigType:
    # (not max_connections, which is the upper limit rarely reached)
    socket.consume_sockets(3, "api")(config)
    socket.consume_sockets(1, "api", socket.SocketType.TCP_LISTEN)(config)
-    if CONF_OUTGOING_CONNECTION in config:
-        socket.consume_sockets(1, "api_outgoing_connection")(config)
    return config


-def _validate_outgoing_connection(config: ConfigType) -> ConfigType:
-    if CONF_OUTGOING_CONNECTION not in config:
-        return config
-    # Platform default check here for a friendly early error; an explicit
-    # lwip_tcp selection on other platforms is caught against the resolved
-    # implementation in _validate_outgoing_socket_implementation
-    if CORE.is_esp8266 or CORE.is_rp2:
-        raise cv.Invalid(
-            "outgoing_connection is not supported on this platform because its "
-            "socket layer cannot make outgoing connections",
-            path=[CONF_OUTGOING_CONNECTION],
-        )
-    if CONF_ENCRYPTION not in config:
-        raise cv.Invalid(
-            "outgoing_connection requires 'encryption' so the peer is verified by key",
-            path=[CONF_OUTGOING_CONNECTION],
-        )
-    return config
-
-
-_OUTGOING_CONNECTION_SCHEMA = cv.Schema(
-    {
-        cv.Optional(CONF_HOST): cv.ipaddress,
-        cv.Optional(CONF_PORT, default=6054): cv.port,
-        # Bounded to half the device's uint32 millisecond range so the wait
-        # always elapses under a wrapping clock
-        cv.Optional(CONF_DELAY, default="60s"): cv.All(
-            cv.positive_time_period_milliseconds,
-            cv.Range(max=cv.TimePeriod(milliseconds=2147483647)),
-        ),
-    }
-)
-
-
-def _outgoing_connection_schema(config: ConfigType | None) -> ConfigType:
-    # A bare `outgoing_connection:` block is valid; without a host the device
-    # dials the remembered last dial-back client
-    if config is None:
-        config = {}
-    return _OUTGOING_CONNECTION_SCHEMA(config)
-
-
 CONFIG_SCHEMA = cv.All(
    cv.Schema(
        {
@@ -359,7 +291,6 @@ CONFIG_SCHEMA = cv.All(
            ): ACTIONS_SCHEMA,
            cv.Exclusive(CONF_ACTIONS, group_of_exclusion=CONF_ACTIONS): ACTIONS_SCHEMA,
            cv.Optional(CONF_ENCRYPTION): encryption_schema,
-            cv.Optional(CONF_OUTGOING_CONNECTION): _outgoing_connection_schema,
            cv.Optional(CONF_BATCH_DELAY, default="100ms"): cv.All(
                cv.positive_time_period_milliseconds,
                cv.Range(max=cv.TimePeriod(milliseconds=65535)),
@@ -416,131 +347,11 @@ CONFIG_SCHEMA = cv.All(
        }
    ).extend(cv.COMPONENT_SCHEMA),
    cv.rename_key(CONF_SERVICES, CONF_ACTIONS),
-    _validate_outgoing_connection,
    _consume_api_sockets,
    _register_provisioning_source,
 )


-def _has_action_metadata(actions: list[ConfigType]) -> bool:
-    # Empty strings count as unset, matching _action_strings
-    return any(
-        conf.get(CONF_DESCRIPTION)
-        or any(
-            var_.get(CONF_DESCRIPTION) or var_.get(CONF_EXAMPLE)
-            for var_ in conf[CONF_VARIABLES].values()
-        )
-        for conf in actions
-    )
-
-
-def _action_strings(conf: ConfigType, has_metadata: bool) -> list[str | None]:
-    """Strings of one action in the table order UserServiceStatic (user_services.h) expects."""
-    # An empty description or example is treated as unset
-    strings: list[str | None] = [conf[CONF_ACTION]]
-    if has_metadata:
-        strings.append(conf.get(CONF_DESCRIPTION) or None)
-    for name, var_ in conf[CONF_VARIABLES].items():
-        strings.append(name)
-        if has_metadata:
-            strings += [
-                var_.get(CONF_DESCRIPTION) or None,
-                var_.get(CONF_EXAMPLE) or None,
-            ]
-    return strings
-
-
-def _action_strings_size(strings: list[str | None]) -> int:
-    """Bytes needed to copy every string out of flash, each with its terminator."""
-    return sum(
-        len(string.encode("utf-8")) + 1 for string in strings if string is not None
-    )
-
-
-def _validate_esp8266_action_strings(config: ConfigType) -> ConfigType:
-    if not CORE.is_esp8266:
-        return config
-    actions = config.get(CONF_ACTIONS, [])
-    has_metadata = _has_action_metadata(actions)
-    for conf in actions:
-        size = _action_strings_size(_action_strings(conf, has_metadata))
-        if size > ESP8266_ACTION_STRINGS_MAX_TOTAL:
-            raise cv.Invalid(
-                f"Action '{conf[CONF_ACTION]}' has {size} bytes of name, variable name, "
-                f"description and example text; ESP8266 allows at most "
-                f"{ESP8266_ACTION_STRINGS_MAX_TOTAL} bytes per action"
-            )
-    return config
-
-
-def _validate_outgoing_socket_implementation(config: ConfigType) -> ConfigType:
-    """A raw lwip_tcp socket can be selected explicitly on any platform."""
-    if CONF_OUTGOING_CONNECTION not in config:
-        return config
-    from esphome.components import socket
-
-    socket_conf = fv.full_config.get().get("socket") or {}
-    if (
-        impl := socket_conf.get(socket.CONF_IMPLEMENTATION)
-    ) in socket.IMPLEMENTATIONS_WITHOUT_CONNECT:
-        raise cv.Invalid(
-            f"outgoing_connection is not supported with the {impl} socket "
-            "implementation because it cannot make outgoing connections",
-            path=[CONF_OUTGOING_CONNECTION],
-        )
-    return config
-
-
-def _validate_outgoing_host_ipv6(config: ConfigType) -> ConfigType:
-    """An IPv6 host can never be parsed, so never dialed, without IPv6."""
-    if (
-        (outgoing := config.get(CONF_OUTGOING_CONNECTION)) is None
-        or (host := outgoing.get(CONF_HOST)) is None
-        or host.version != 6
-    ):
-        return config
-    network_conf = fv.full_config.get().get("network") or {}
-    if not network_conf.get(CONF_ENABLE_IPV6):
-        raise cv.Invalid(
-            "outgoing_connection host is an IPv6 address but IPv6 is not "
-            "enabled; set 'network: enable_ipv6: true'",
-            path=[CONF_OUTGOING_CONNECTION, CONF_HOST],
-        )
-    return config
-
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    _validate_esp8266_action_strings,
-    _validate_outgoing_socket_implementation,
-    _validate_outgoing_host_ipv6,
-)
-
-
-def _add_action_strings(
-    index: int, strings: list[str | None], interned: dict[str, MockObj]
-) -> MockObj:
-    """Emit the PROGMEM string table for one action.
-
-    Each string is its own PROGMEM array because on ESP8266 .rodata is RAM, and identical
-    strings are shared between actions through `interned`.
-    """
-    entries: list[MockObj] = []
-    for string in strings:
-        if string is None:
-            entries.append(cg.nullptr)
-            continue
-        if (var := interned.get(string)) is None:
-            var = interned[string] = cg.progmem_array(
-                ID(f"api_action_str{len(interned)}", is_declaration=True, type=cg.char),
-                string,
-            )
-        entries.append(var)
-    return cg.progmem_array(
-        ID(f"api_action{index}_strings", is_declaration=True, type=cg.const_char_ptr),
-        entries,
-    )
-
-
@coroutine_with_priority(CoroPriority.WEB)
 async def to_code(config: ConfigType) -> None:
    var = cg.new_Pvariable(config[CONF_ID])
@@ -560,10 +371,8 @@ async def to_code(config: ConfigType) -> None:
    cg.add_define("MAX_API_CONNECTIONS", config[CONF_MAX_CONNECTIONS])
    cg.add_define("API_MAX_SEND_QUEUE", config[CONF_MAX_SEND_QUEUE])

-    actions = config.get(CONF_ACTIONS, [])
-    has_user_actions = bool(actions) or config[CONF_CUSTOM_SERVICES]
    # Set USE_API_USER_DEFINED_ACTIONS if any services are enabled
-    if has_user_actions:
+    if config.get(CONF_ACTIONS) or config[CONF_CUSTOM_SERVICES]:
        cg.add_define("USE_API_USER_DEFINED_ACTIONS")

    # Set USE_API_CUSTOM_SERVICES if external components need dynamic service registration
@@ -576,17 +385,10 @@ async def to_code(config: ConfigType) -> None:
    if config[CONF_HOMEASSISTANT_STATES]:
        cg.add_define("USE_API_HOMEASSISTANT_STATES")

-    scratch_size = 0
-    if actions:
-        # Metadata is compiled in for every action once any action declares it, because the
-        # string table layout is fixed by the define rather than per action
-        has_metadata = _has_action_metadata(actions)
-        if has_metadata:
-            cg.add_define("USE_API_USER_DEFINED_ACTION_METADATA")
-        interned_strings: dict[str, MockObj] = {}
+    if actions := config.get(CONF_ACTIONS, []):
        # Collect all triggers first, then register all at once with initializer_list
        triggers: list[cg.MockObj] = []
-        for index, conf in enumerate(actions):
+        for conf in actions:
            func_args: list[tuple[MockObj, str]] = []
            service_template_args: list[MockObj] = []  # User service argument types

@@ -619,23 +421,22 @@ async def to_code(config: ConfigType) -> None:
                conf.get(CONF_THEN, [])
            )

+            service_arg_names: list[str] = []
            for name, var_ in conf[CONF_VARIABLES].items():
-                var_type = var_[CONF_TYPE]
-                if has_non_synchronous and var_type in SERVICE_ARG_FALLBACK_TYPES:
-                    native = SERVICE_ARG_FALLBACK_TYPES[var_type]
+                if has_non_synchronous and var_ in SERVICE_ARG_FALLBACK_TYPES:
+                    native = SERVICE_ARG_FALLBACK_TYPES[var_]
                else:
-                    native = SERVICE_ARG_NATIVE_TYPES[var_type]
+                    native = SERVICE_ARG_NATIVE_TYPES[var_]
                service_template_args.append(native)
                func_args.append((native, name))
-            strings = _action_strings(conf, has_metadata)
-            table = _add_action_strings(index, strings, interned_strings)
-            if CORE.is_esp8266:
-                scratch_size = max(scratch_size, _action_strings_size(strings))
+                service_arg_names.append(name)
            # Template args: supports_response mode, then user service arg types
            templ = cg.TemplateArguments(supports_response, *service_template_args)
-            # Key is hashed here because the name is not readable at runtime on ESP8266
            trigger = cg.new_Pvariable(
-                conf[CONF_TRIGGER_ID], templ, table, fnv1_hash(conf[CONF_ACTION])
+                conf[CONF_TRIGGER_ID],
+                templ,
+                conf[CONF_ACTION],
+                service_arg_names,
            )
            triggers.append(trigger)
            auto = await automation.build_automation(trigger, func_args, conf)
@@ -657,9 +458,6 @@ async def to_code(config: ConfigType) -> None:
                cg.add(auto.add_actions([unregister_action]))
        # Register all services at once - single allocation, no reallocations
        cg.add(var.initialize_user_services(triggers))
-    if CORE.is_esp8266 and has_user_actions:
-        # Stack buffer that list-entities copies PROGMEM strings into, sized for the largest action
-        cg.add_define("API_USER_ACTION_STRINGS_SCRATCH_SIZE", max(scratch_size, 1))

    if CONF_ON_CLIENT_CONNECTED in config:
        cg.add_define("USE_API_CLIENT_CONNECTED_TRIGGER")
@@ -696,13 +494,6 @@ async def to_code(config: ConfigType) -> None:
    else:
        cg.add_define("USE_API_PLAINTEXT")

-    if (outgoing := config.get(CONF_OUTGOING_CONNECTION)) is not None:
-        cg.add_define("USE_API_OUTGOING_CONNECTION")
-        if (host := outgoing.get(CONF_HOST)) is not None:
-            cg.add_define("API_OUTGOING_CONNECTION_HOST", str(host))
-        cg.add_define("API_OUTGOING_CONNECTION_PORT", outgoing[CONF_PORT])
-        cg.add_define("API_OUTGOING_CONNECTION_DELAY", outgoing[CONF_DELAY])
-
    cg.add_define("USE_API")
    cg.add_global(api_ns.using)

@@ -1089,7 +880,6 @@ _define_filter = filter_source_files_from_defines(
        "user_services.cpp": "USE_API_USER_DEFINED_ACTIONS",
        "api_frame_helper_noise.cpp": "USE_API_NOISE",
        "api_frame_helper_plaintext.cpp": "USE_API_PLAINTEXT",
-        "api_outgoing_connection.cpp": "USE_API_OUTGOING_CONNECTION",
    }
 )

@@ -112,11 +112,6 @@ message HelloRequest {
  string client_info = 1;
  uint32 api_version_major = 2;
  uint32 api_version_minor = 3;
-
-  // Set by clients that can accept connections the device opens to them
-  // (see api: outgoing_connection:). The device remembers this client's
-  // address as the target to dial when no such client is connected.
-  bool outgoing_connection_target = 4 [(field_ifdef) = "USE_API_OUTGOING_CONNECTION"];
 }

 // Confirmation of successful connection request.
@@ -336,10 +331,6 @@ message DeviceInfoResponse {
  // all-zeros PSK, so the api encryption key can be provisioned without being
  // sent in plaintext (protects against passive sniffing, not active MITM)
  bool api_encryption_provisionable = 26 [(field_ifdef) = "USE_API_NOISE"];
-
-  // Device is built with the api outgoing_connection option and can open
-  // the TCP connection to a dial-back target itself
-  bool api_outgoing_connection_supported = 27 [(field_ifdef) = "USE_API_OUTGOING_CONNECTION"];
 }

 // ==================== DEVICE CAPABILITIES ====================
@@ -1043,8 +1034,6 @@ message ListEntitiesServicesArgument {
  option (ifdef) = "USE_API_USER_DEFINED_ACTIONS";
  string name = 1;
  ServiceArgType type = 2;
-  string description = 3 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_METADATA"];
-  string example = 4 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_METADATA"];
 }
 message ListEntitiesServicesResponse {
  option (id) = 41;
@@ -1055,7 +1044,6 @@ message ListEntitiesServicesResponse {
  fixed32 key = 2 [(force) = true];
  repeated ListEntitiesServicesArgument args = 3 [(fixed_vector) = true];
  SupportsResponseType supports_response = 4;
-  string description = 5 [(field_ifdef) = "USE_API_USER_DEFINED_ACTION_METADATA"];
 }
 message ExecuteServiceArgument {
  option (ifdef) = "USE_API_USER_DEFINED_ACTIONS";
@@ -1822,19 +1822,6 @@ bool APIConnection::send_hello_response_(const HelloRequest &msg) {
  // Auto-authenticate - password auth was removed in ESPHome 2026.1.0
  this->complete_authentication_();

-#ifdef USE_API_OUTGOING_CONNECTION
-  // With a PSK set only key-verified transports reach hello: plaintext and
-  // zero-PSK are rejected, and pre-activation sessions are force-closed
-  if (msg.outgoing_connection_target && !this->flags_.outgoing_connection_target) {
-    if (this->parent_->get_noise_ctx().has_psk()) {
-      this->flags_.outgoing_connection_target = true;
-      this->parent_->on_outgoing_target_client(this);
-    } else {
-      this->log_client_(ESPHOME_LOG_LEVEL_WARN, LOG_STR("Dial-back target refused; no key active"));
-    }
-  }
-#endif
-
  return this->send_message(resp);
 }

@@ -1957,9 +1944,6 @@ bool APIConnection::send_device_info_response_() {
  // one) so this advertisement survives the plaintext removal in 2027.2.0.
  resp.api_encryption_provisionable = !this->parent_->get_noise_ctx().has_psk();
 #endif
-#ifdef USE_API_OUTGOING_CONNECTION
-  resp.api_outgoing_connection_supported = true;
-#endif
 #endif
 #ifdef USE_DEVICES
  size_t device_index = 0;
@@ -375,21 +375,6 @@ class APIConnection final : public APIServerConnectionBase {
    return this->helper_->get_peername_to(buf);
  }

-#ifdef USE_API_OUTGOING_CONNECTION
-  /// Outgoing connection: send our server hello immediately so the peer can
-  /// pick the matching key. Outgoing connections are only dialed when a PSK
-  /// is set, so the helper is always the noise helper. Call after start().
-  void mark_outgoing() {
-    if (this->flags_.remove) {
-      return;  // start() failed; the connection is already being torn down
-    }
-    APIError err = static_cast<APINoiseFrameHelper *>(this->helper_.get())->send_server_hello_first();
-    if (err != APIError::OK) {
-      this->fatal_error_with_log_(LOG_STR("Server hello failed"), err);
-    }
-  }
-#endif
-
 protected:
  bool try_to_clear_buffer_slow_(bool log_out_of_space);

@@ -760,9 +745,6 @@ class APIConnection final : public APIServerConnectionBase {
    uint8_t batch_first_message : 1;          // For batch buffer allocation
    uint8_t should_try_send_immediately : 1;  // True after initial states are sent
    uint8_t may_have_remaining_data : 1;      // Read loop hit limit, retry without ready check
-#ifdef USE_API_OUTGOING_CONNECTION
-    uint8_t outgoing_connection_target : 1;  // Client declared itself a dial-back target in its hello
-#endif
 #ifdef HAS_PROTO_MESSAGE_DUMP
    uint8_t log_only_mode : 1;
 #endif
@@ -18,7 +18,7 @@
 namespace esphome::api {

 // uncomment to log raw packets
-// #define HELPER_LOG_PACKETS
+//#define HELPER_LOG_PACKETS

 // Maximum message size limits to prevent OOM on constrained devices
 // Handshake messages are limited to a small size for security
@@ -282,8 +282,7 @@ class APIFrameHelper {
    DATA = 5,
    CLOSED = 6,
    FAILED = 7,
-    EXPLICIT_REJECT = 8,        // Noise only
-    CLIENT_HELLO_OUTGOING = 9,  // Noise only: like CLIENT_HELLO but the server hello already went out (outgoing conn)
+    EXPLICIT_REJECT = 8,  // Noise only
  };

  // Fast inline state check for read_packet/write_protobuf_messages hot path.
@@ -81,13 +81,6 @@ APIError APINoiseFrameHelper::init() {
  state_ = State::CLIENT_HELLO;
  return APIError::OK;
 }
-#ifdef USE_API_OUTGOING_CONNECTION
-APIError APINoiseFrameHelper::send_server_hello_first() {
-  // The peer needs our name and MAC to pick the key before its first message
-  this->state_ = State::CLIENT_HELLO_OUTGOING;
-  return this->send_server_hello_frame_();
-}
-#endif
 #ifdef USE_API_PLAINTEXT
 APIError APINoiseFrameHelper::init_from_handoff(const uint8_t *header, uint8_t header_len) {
  APIError err = this->init();
@@ -260,9 +253,6 @@ APIError APINoiseFrameHelper::state_action_() {
      HELPER_LOG("Bad state for method: %d", (int) this->state_);
      return APIError::BAD_STATE;
    case State::CLIENT_HELLO:
-#ifdef USE_API_OUTGOING_CONNECTION
-    case State::CLIENT_HELLO_OUTGOING:
-#endif
      return this->state_action_client_hello_();
    case State::SERVER_HELLO:
      return this->state_action_server_hello_();
@@ -295,16 +285,11 @@ APIError APINoiseFrameHelper::state_action_client_hello_() {
    std::memcpy(this->prologue_.data() + old_size + 2, this->rx_buf_.data(), rx_size);
  }

-#ifdef USE_API_OUTGOING_CONNECTION
-  if (this->state_ == State::CLIENT_HELLO_OUTGOING) {
-    // Server hello already went out at handoff
-    return this->start_handshake_();
-  }
-#endif
  state_ = State::SERVER_HELLO;
  return APIError::OK;
 }
-APIError APINoiseFrameHelper::send_server_hello_frame_() {
+APIError APINoiseFrameHelper::state_action_server_hello_() {
+  // send server hello
  const auto &name = App.get_name();
  char mac[MAC_ADDRESS_BUFFER_SIZE];
  get_mac_address_into_buffer(mac);
@@ -328,18 +313,15 @@ APIError APINoiseFrameHelper::send_server_hello_frame_() {
  // node mac, terminated by null byte
  std::memcpy(msg + mac_offset, mac, MAC_ADDRESS_BUFFER_SIZE);

-  return write_frame_(msg, total_size);
-}
-APIError APINoiseFrameHelper::state_action_server_hello_() {
-  APIError aerr = this->send_server_hello_frame_();
+  APIError aerr = write_frame_(msg, total_size);
  if (aerr != APIError::OK)
    return aerr;
-  return this->start_handshake_();
-}
-APIError APINoiseFrameHelper::start_handshake_() {
-  APIError aerr = init_handshake_();
+
+  // start handshake
+  aerr = init_handshake_();
  if (aerr != APIError::OK)
    return aerr;
+
  state_ = State::HANDSHAKE;
  return APIError::OK;
 }
@@ -28,12 +28,6 @@ class APINoiseFrameHelper final : public APIFrameHelper {
  // Seeds the already-read header bytes and pumps the handshake state machine
  // until it would block.
  APIError init_from_handoff(const uint8_t *header, uint8_t header_len);
-#endif
-#ifdef USE_API_OUTGOING_CONNECTION
-  // Send the server hello immediately so the peer can pick the key before
-  // its PSK-mixed message. Call after init(); the mode is tracked in state_
-  // so the helper does not grow.
-  APIError send_server_hello_first();
 #endif
  APIError loop() override;
  APIError read_packet(ReadPacketBuffer *buffer) override;
@@ -45,8 +39,6 @@ class APINoiseFrameHelper final : public APIFrameHelper {
  APIError state_action_();
  APIError state_action_client_hello_();
  APIError state_action_server_hello_();
-  APIError send_server_hello_frame_();
-  APIError start_handshake_();
  APIError state_action_handshake_();
  APIError state_action_handshake_read_();
  APIError state_action_handshake_write_();
@@ -1,237 +0,0 @@
-#include "api_outgoing_connection.h"
-#if defined(USE_API) && defined(USE_API_OUTGOING_CONNECTION)
-
-#include "api_connection.h"
-#include "api_server.h"
-#include "esphome/components/network/util.h"
-#include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#include <cerrno>
-#include <cinttypes>
-#include <cstring>
-
-namespace esphome::api {
-
-static const char *const TAG = "api.outgoing";
-
-void OutgoingConnectionManager::setup() {
-#ifndef API_OUTGOING_CONNECTION_HOST
-  this->target_pref_ = global_preferences->make_preference<SavedOutgoingTarget>(629847102UL, true);
-  if (this->target_pref_.load(&this->saved_)) {
-    this->host_persisted_ = true;
-    ESP_LOGD(TAG, "Loaded target %s", this->saved_.host);
-  } else {
-    // Never saved, or the blob failed its size/CRC check
-    ESP_LOGD(TAG, "No saved target");
-    this->saved_ = {};
-  }
-  // Defend against a corrupt or truncated preference blob
-  this->saved_.host[sizeof(this->saved_.host) - 1] = '\0';
-#endif
-}
-
-void OutgoingConnectionManager::loop(APIServer *server) {
-  if (server->has_outgoing_target_client_()) {
-    return;  // on_target_client() already reset the dial state
-  }
-  if (this->dialed_conn_ != nullptr) {
-    // A live dialed session (flagged or not, e.g. a host: peer) is the
-    // target; a silent one dies on the handshake timeout
-    return;
-  }
-  const uint32_t now = App.get_loop_component_start_time();
-  switch (this->state_) {
-    case DialState::DIAL_STATE_IDLE:
-#ifdef USE_DEEP_SLEEP
-      // A deep sleep wake window is too short to spend on the delay
-      this->schedule_wait_(now, BACKOFF_MIN_MS);
-#else
-      // Target went away; give it the configured delay to reconnect first
-      this->schedule_wait_(now, API_OUTGOING_CONNECTION_DELAY);
-#endif
-      break;
-    case DialState::DIAL_STATE_WAITING:
-      if (now - this->state_ts_ >= this->wait_) {
-        this->try_dial_(server, now);
-      }
-      break;
-    case DialState::DIAL_STATE_CONNECTING:
-      this->poll_connect_(server, now);
-      break;
-  }
-}
-
-void OutgoingConnectionManager::try_dial_(APIServer *server, uint32_t now) {
-  if (!network::is_connected()) {
-    // Flips within seconds of boot; recheck fast so a deep sleep wake
-    // window is not spent waiting
-    this->schedule_wait_(now, NETWORK_RETRY_MS);
-    return;
-  }
-  const char *host = this->target_host_();
-  if (host == nullptr) {
-    // The steady state until a dial-back client has ever connected
-    ESP_LOGV(TAG, "Not dialing: no target");
-    this->schedule_wait_(now, PRECONDITION_RETRY_MS);
-    return;
-  }
-  const bool at_limit = server->at_client_limit_();
-  if (at_limit || !server->noise_ctx_.has_psk()) {
-    ESP_LOGD(TAG, "Not dialing: %s", at_limit ? "max connections" : "no key");
-    // Not a dial failure; retry without escalating the backoff
-    this->schedule_wait_(now, PRECONDITION_RETRY_MS);
-    return;
-  }
-  struct sockaddr_storage addr;
-  socklen_t addr_len =
-      socket::set_sockaddr((struct sockaddr *) &addr, sizeof(addr), host, API_OUTGOING_CONNECTION_PORT);
-  if (addr_len == 0) {
-    ESP_LOGW(TAG, "Invalid target %s", host);
-#ifndef API_OUTGOING_CONNECTION_HOST
-    // A corrupt remembered value can never become dialable; forget it
-    // (covers an IPv6 literal left by an earlier enable_ipv6 build too)
-    this->saved_ = {};
-    if (!this->persist_target_()) {
-      ESP_LOGW(TAG, "Failed to clear target");
-    }
-#endif
-    this->schedule_retry_(now);
-    return;
-  }
-  this->dial_socket_ = socket::socket_loop_monitored(((struct sockaddr *) &addr)->sa_family, SOCK_STREAM, IPPROTO_TCP);
-  if (!this->dial_socket_ || this->dial_socket_->setblocking(false) != 0) {
-    ESP_LOGW(TAG, "Socket %s failed: errno %d", this->dial_socket_ ? "setblocking" : "create", errno);
-    this->schedule_retry_(now);
-    return;
-  }
-  ESP_LOGD(TAG, "Dialing %s:%u", host, API_OUTGOING_CONNECTION_PORT);
-  int err = this->dial_socket_->connect((struct sockaddr *) &addr, addr_len);
-  if (err == 0) {
-    // Immediate success (possible for localhost)
-    this->handoff_(server, now);
-    return;
-  }
-  if (errno != EINPROGRESS) {
-    ESP_LOGW(TAG, "Connect failed: errno %d", errno);
-    this->schedule_retry_(now);
-    return;
-  }
-  this->state_ = DialState::DIAL_STATE_CONNECTING;
-  this->state_ts_ = now;
-  this->last_poll_ = now;
-}
-
-void OutgoingConnectionManager::poll_connect_(APIServer *server, uint32_t now) {
-  if (now - this->state_ts_ >= CONNECT_TIMEOUT_MS) {
-    ESP_LOGW(TAG, "Connect timeout");
-    this->schedule_retry_(now);
-    return;
-  }
-  if (now - this->last_poll_ < CONNECT_POLL_INTERVAL_MS) {
-    return;
-  }
-  this->last_poll_ = now;
-  int err = 0;
-  switch (socket::poll_connect(*this->dial_socket_, err)) {
-    case socket::ConnectPollResult::CONNECT_POLL_PENDING:
-      break;
-    case socket::ConnectPollResult::CONNECT_POLL_CONNECTED:
-      this->handoff_(server, now);
-      break;
-    case socket::ConnectPollResult::CONNECT_POLL_ERROR:
-      ESP_LOGW(TAG, "Connect failed: %d", err);
-      this->schedule_retry_(now);
-      break;
-  }
-}
-
-void OutgoingConnectionManager::handoff_(APIServer *server, uint32_t now) {
-  this->dialed_conn_ = server->add_outgoing_client_(std::move(this->dial_socket_));
-  if (this->dialed_conn_ == nullptr) {
-    // Only preconditions (slot limit, key cleared) refuse the handoff; the
-    // peer is reachable, so do not escalate the backoff
-    this->schedule_wait_(now, PRECONDITION_RETRY_MS);
-    return;
-  }
-  // Connected; dialed_conn_ gates further dialing until the session settles
-  this->state_ = DialState::DIAL_STATE_IDLE;
-}
-
-void OutgoingConnectionManager::schedule_wait_(uint32_t now, uint32_t wait) {
-  this->dial_socket_.reset();  // no-op when the socket was handed off
-  this->state_ = DialState::DIAL_STATE_WAITING;
-  this->state_ts_ = now;
-  this->wait_ = wait;
-}
-
-void OutgoingConnectionManager::schedule_retry_(uint32_t now) {
-  // +/-20% jitter so a fleet of devices does not retry one server in lockstep
-  const uint32_t jitter_span = this->backoff_ / 5;
-  this->schedule_wait_(now, this->backoff_ - jitter_span + (random_uint32() % (2 * jitter_span + 1)));
-  this->backoff_ = std::min(this->backoff_ * 2, BACKOFF_MAX_MS);
-}
-
-void OutgoingConnectionManager::on_client_removed(APIConnection *conn, bool was_authenticated) {
-  if (conn != this->dialed_conn_) {
-    return;
-  }
-  this->dialed_conn_ = nullptr;
-  const uint32_t now = App.get_loop_component_start_time();
-  if (was_authenticated) {
-    // A working peer (e.g. a host: target that never sends the flag)
-    // disconnected normally; state is IDLE, so loop() applies the delay
-    this->backoff_ = BACKOFF_MIN_MS;
-  } else {
-    this->schedule_retry_(now);
-  }
-}
-
-void OutgoingConnectionManager::on_target_client(APIConnection *conn) {
-  // The target is connected; stop any dial in flight and reset the backoff.
-  // A dialed connection stays tracked unless it is this one: an inbound
-  // target must not orphan a still-open dial.
-  this->dial_socket_.reset();
-  if (conn == this->dialed_conn_) {
-    this->dialed_conn_ = nullptr;
-  }
-  this->state_ = DialState::DIAL_STATE_IDLE;
-  this->backoff_ = BACKOFF_MIN_MS;
-#ifndef API_OUTGOING_CONNECTION_HOST
-  SavedOutgoingTarget target{};
-  conn->get_peername_to(target.host);
-  if (target.host[0] == '\0') {
-    ESP_LOGW(TAG, "Could not read peer address; not remembering target");
-    return;
-  }
-  if (this->host_persisted_ && strcmp(target.host, this->saved_.host) == 0) {
-    return;  // unchanged and already on flash; avoid flash wear
-  }
-  // Use the fresh address this boot even if the flash write fails; a failed
-  // write is retried on the next flagged hello via host_persisted_
-  this->saved_ = target;
-  if (!this->persist_target_()) {
-    ESP_LOGW(TAG, "Failed to save target");
-    return;
-  }
-  ESP_LOGD(TAG, "Saved %s as outgoing connection target", this->saved_.host);
-#endif
-}
-
-void OutgoingConnectionManager::dump_config() const {
-  const char *host = this->target_host_();
-  if (host == nullptr) {
-    host = "none remembered yet";
-  }
-  // The boot delay differs from delay: on deep sleep builds, so print the
-  // value that actually applies
-  ESP_LOGCONFIG(TAG,
-                "  Outgoing connection port: %u\n"
-                "  Outgoing connection host: %s\n"
-                "  Outgoing connection boot delay: %" PRIu32 "ms",
-                API_OUTGOING_CONNECTION_PORT, host, BOOT_WAIT_MS);
-}
-
-}  // namespace esphome::api
-#endif  // USE_API && USE_API_OUTGOING_CONNECTION
@@ -1,117 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-#if defined(USE_API) && defined(USE_API_OUTGOING_CONNECTION)
-
-#ifdef USE_SOCKET_IMPL_LWIP_TCP
-#error "api outgoing_connection needs a socket implementation that can make outgoing connections"
-#endif
-#ifndef USE_API_NOISE
-#error "api outgoing_connection needs noise encryption so the peer is verified by key"
-#endif
-
-#include "esphome/components/socket/socket.h"
-#include "esphome/core/preferences.h"
-
-#include <memory>
-
-namespace esphome::api {
-
-class APIServer;
-class APIConnection;
-
-// Follows the build's address family (ifdef'd in socket/headers.h): toggling
-// enable_ipv6 changes the blob size, load() rejects the old blob, and the
-// target is simply relearned
-static constexpr size_t SAVED_TARGET_HOST_LEN = socket::SOCKADDR_STR_LEN;
-
-struct SavedOutgoingTarget {
-  // IP as text so the socket component's v4-mapped-IPv6 normalization is
-  // reused on both ends; empty = none remembered
-  char host[SAVED_TARGET_HOST_LEN];
-} PACKED;  // NOLINT
-
-/// Dials out when no dial-back target client is connected. Only the TCP
-/// direction flips: the device stays the Noise responder, so both sides
-/// still verify by key. Targets the YAML host or the last remembered client.
-class OutgoingConnectionManager {
- public:
-  void setup();
-  void loop(APIServer *server);
-  /// A key-verified client declared itself a dial-back target; last one wins
-  void on_target_client(APIConnection *conn);
-  /// Clears the dialed-connection gate; dying unauthenticated escalates the backoff
-  void on_client_removed(APIConnection *conn, bool was_authenticated);
-  void on_shutdown() { this->dial_socket_.reset(); }
-  void dump_config() const;
-
- protected:
-  enum class DialState : uint8_t {
-    DIAL_STATE_IDLE,
-    DIAL_STATE_WAITING,
-    DIAL_STATE_CONNECTING,
-  };
-
-  static constexpr uint32_t BACKOFF_MIN_MS = 5000;
-  static constexpr uint32_t BACKOFF_MAX_MS = 300000;
-  static constexpr uint32_t CONNECT_TIMEOUT_MS = 10000;
-  static constexpr uint32_t CONNECT_POLL_INTERVAL_MS = 250;
-  static constexpr uint32_t NETWORK_RETRY_MS = 500;
-  static constexpr uint32_t PRECONDITION_RETRY_MS = 5000;
-  // Boot waits for the client to connect in first; a deep sleep wake window
-  // is short, so connecting out immediately is the wake state
-#ifdef USE_DEEP_SLEEP
-  static constexpr uint32_t BOOT_WAIT_MS = 0;
-#else
-  static constexpr uint32_t BOOT_WAIT_MS = API_OUTGOING_CONNECTION_DELAY;
-#endif
-
-  void try_dial_(APIServer *server, uint32_t now);
-  void poll_connect_(APIServer *server, uint32_t now);
-  // Hand the connected socket to the server and gate on the new connection
-  void handoff_(APIServer *server, uint32_t now);
-  // Close any half-open dial and wait a jittered backoff before retrying
-  void schedule_retry_(uint32_t now);
-  // Wait without escalating the backoff (used for unmet preconditions)
-  void schedule_wait_(uint32_t now, uint32_t wait);
-#ifndef API_OUTGOING_CONNECTION_HOST
-  // Write saved_ to flash, tracking success in host_persisted_
-  bool persist_target_() {
-    this->host_persisted_ = this->target_pref_.save(&this->saved_) && global_preferences->sync();
-    return this->host_persisted_;
-  }
-#endif
-  const char *target_host_() const {
-#ifdef API_OUTGOING_CONNECTION_HOST
-    return API_OUTGOING_CONNECTION_HOST;
-#else
-    return this->saved_.host[0] != '\0' ? this->saved_.host : nullptr;
-#endif
-  }
-
-  // Pointers first (4 bytes each on 32-bit)
-  std::unique_ptr<socket::Socket> dial_socket_;
-  // Compared only, never dereferenced
-  APIConnection *dialed_conn_{nullptr};
-#ifndef API_OUTGOING_CONNECTION_HOST
-  ESPPreferenceObject target_pref_;
-#endif
-
-  // 4-byte types
-  uint32_t backoff_{BACKOFF_MIN_MS};
-  uint32_t wait_{BOOT_WAIT_MS};
-  uint32_t state_ts_{0};
-  uint32_t last_poll_{0};
-
-  // Byte-aligned types last
-#ifndef API_OUTGOING_CONNECTION_HOST
-  SavedOutgoingTarget saved_{};
-  // False while saved_ holds a value the flash write failed for; retried on
-  // the next flagged hello
-  bool host_persisted_{false};
-#endif
-  DialState state_{DialState::DIAL_STATE_WAITING};
-};
-
-}  // namespace esphome::api
-#endif  // USE_API && USE_API_OUTGOING_CONNECTION
@@ -15,11 +15,6 @@ bool HelloRequest::decode_varint(uint32_t field_id, proto_varint_value_t value)
    case 3:
      this->api_version_minor = value;
      break;
-#ifdef USE_API_OUTGOING_CONNECTION
-    case 4:
-      this->outgoing_connection_target = value != 0;
-      break;
-#endif
    default:
      return false;
  }
@@ -180,9 +175,6 @@ uint8_t *DeviceInfoResponse::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_
 #endif
 #ifdef USE_API_NOISE
  ProtoEncode::encode_bool(pos PROTO_ENCODE_DEBUG_ARG, 26, this->api_encryption_provisionable);
-#endif
-#ifdef USE_API_OUTGOING_CONNECTION
-  ProtoEncode::encode_bool(pos PROTO_ENCODE_DEBUG_ARG, 27, this->api_outgoing_connection_supported);
 #endif
  return pos;
 }
@@ -248,9 +240,6 @@ uint32_t DeviceInfoResponse::calculate_size() const {
 #endif
 #ifdef USE_API_NOISE
  size += ProtoSize::calc_bool(2, this->api_encryption_provisionable);
-#endif
-#ifdef USE_API_OUTGOING_CONNECTION
-  size += ProtoSize::calc_bool(2, this->api_outgoing_connection_supported);
 #endif
  return size;
 }
@@ -1286,24 +1275,12 @@ uint8_t *ListEntitiesServicesArgument::encode(ProtoWriteBuffer &buffer PROTO_ENC
  uint8_t *__restrict__ pos = buffer.get_pos();
  ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 1, this->name);
  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 2, static_cast<uint32_t>(this->type));
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 3, this->description);
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 4, this->example);
-#endif
  return pos;
 }
 uint32_t ListEntitiesServicesArgument::calculate_size() const {
  uint32_t size = 0;
  size += ProtoSize::calc_length(1, this->name.size());
  size += this->type ? 2 : 0;
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  size += ProtoSize::calc_length(1, this->description.size());
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  size += ProtoSize::calc_length(1, this->example.size());
-#endif
  return size;
 }
 uint8_t *ListEntitiesServicesResponse::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
@@ -1314,9 +1291,6 @@ uint8_t *ListEntitiesServicesResponse::encode(ProtoWriteBuffer &buffer PROTO_ENC
    ProtoEncode::encode_sub_message(pos PROTO_ENCODE_DEBUG_ARG, buffer, 3, it);
  }
  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 4, static_cast<uint32_t>(this->supports_response));
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  ProtoEncode::encode_string(pos PROTO_ENCODE_DEBUG_ARG, 5, this->description);
-#endif
  return pos;
 }
 uint32_t ListEntitiesServicesResponse::calculate_size() const {
@@ -1329,9 +1303,6 @@ uint32_t ListEntitiesServicesResponse::calculate_size() const {
    }
  }
  size += this->supports_response ? 2 : 0;
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  size += ProtoSize::calc_length(1, this->description.size());
-#endif
  return size;
 }
 bool ExecuteServiceArgument::decode_varint(uint32_t field_id, proto_varint_value_t value) {
@@ -412,16 +412,13 @@ class CommandProtoMessage : public ProtoDecodableMessage {
 class HelloRequest final : public ProtoDecodableMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 1;
-  static constexpr uint8_t ESTIMATED_SIZE = 19;
+  static constexpr uint8_t ESTIMATED_SIZE = 17;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const LogString *message_name() const override { return LOG_STR("hello_request"); }
 #endif
  StringRef client_info{};
  uint32_t api_version_major{0};
  uint32_t api_version_minor{0};
-#ifdef USE_API_OUTGOING_CONNECTION
-  bool outgoing_connection_target{false};
-#endif
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *dump_to(DumpBuffer &out) const override;
 #endif
@@ -552,7 +549,7 @@ class SerialProxyInfo final : public ProtoMessage {
 class DeviceInfoResponse final : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 10;
-  static constexpr uint16_t ESTIMATED_SIZE = 315;
+  static constexpr uint16_t ESTIMATED_SIZE = 312;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const LogString *message_name() const override { return LOG_STR("device_info_response"); }
 #endif
@@ -610,9 +607,6 @@ class DeviceInfoResponse final : public ProtoMessage {
 #endif
 #ifdef USE_API_NOISE
  bool api_encryption_provisionable{false};
-#endif
-#ifdef USE_API_OUTGOING_CONNECTION
-  bool api_outgoing_connection_supported{false};
 #endif
  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
  uint32_t calculate_size() const;
@@ -1323,12 +1317,6 @@ class ListEntitiesServicesArgument final : public ProtoMessage {
 public:
  StringRef name{};
  enums::ServiceArgType type{};
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  StringRef description{};
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  StringRef example{};
-#endif
  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
  uint32_t calculate_size() const;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -1340,7 +1328,7 @@ class ListEntitiesServicesArgument final : public ProtoMessage {
 class ListEntitiesServicesResponse final : public ProtoMessage {
 public:
  static constexpr uint16_t MESSAGE_TYPE = 41;
-  static constexpr uint8_t ESTIMATED_SIZE = 59;
+  static constexpr uint8_t ESTIMATED_SIZE = 50;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const LogString *message_name() const override { return LOG_STR("list_entities_services_response"); }
 #endif
@@ -1348,9 +1336,6 @@ class ListEntitiesServicesResponse final : public ProtoMessage {
  uint32_t key{0};
  FixedVector<ListEntitiesServicesArgument> args{};
  enums::SupportsResponseType supports_response{};
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  StringRef description{};
-#endif
  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
  uint32_t calculate_size() const;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -885,9 +885,6 @@ const char *HelloRequest::dump_to(DumpBuffer &out) const {
  dump_field(out, ESPHOME_PSTR("client_info"), this->client_info);
  dump_field(out, ESPHOME_PSTR("api_version_major"), this->api_version_major);
  dump_field(out, ESPHOME_PSTR("api_version_minor"), this->api_version_minor);
-#ifdef USE_API_OUTGOING_CONNECTION
-  dump_field(out, ESPHOME_PSTR("outgoing_connection_target"), this->outgoing_connection_target);
-#endif
  return out.c_str();
 }
 const char *HelloResponse::dump_to(DumpBuffer &out) const {
@@ -1011,9 +1008,6 @@ const char *DeviceInfoResponse::dump_to(DumpBuffer &out) const {
 #endif
 #ifdef USE_API_NOISE
  dump_field(out, ESPHOME_PSTR("api_encryption_provisionable"), this->api_encryption_provisionable);
-#endif
-#ifdef USE_API_OUTGOING_CONNECTION
-  dump_field(out, ESPHOME_PSTR("api_outgoing_connection_supported"), this->api_outgoing_connection_supported);
 #endif
  return out.c_str();
 }
@@ -1506,12 +1500,6 @@ const char *ListEntitiesServicesArgument::dump_to(DumpBuffer &out) const {
  MessageDumpHelper helper(out, ESPHOME_PSTR("ListEntitiesServicesArgument"));
  dump_field(out, ESPHOME_PSTR("name"), this->name);
  dump_field(out, ESPHOME_PSTR("type"), static_cast<enums::ServiceArgType>(this->type));
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  dump_field(out, ESPHOME_PSTR("description"), this->description);
-#endif
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  dump_field(out, ESPHOME_PSTR("example"), this->example);
-#endif
  return out.c_str();
 }
 const char *ListEntitiesServicesResponse::dump_to(DumpBuffer &out) const {
@@ -1524,9 +1512,6 @@ const char *ListEntitiesServicesResponse::dump_to(DumpBuffer &out) const {
    out.append("\n");
  }
  dump_field(out, ESPHOME_PSTR("supports_response"), static_cast<enums::SupportsResponseType>(this->supports_response));
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  dump_field(out, ESPHOME_PSTR("description"), this->description);
-#endif
  return out.c_str();
 }
 const char *ExecuteServiceArgument::dump_to(DumpBuffer &out) const {
@@ -34,52 +34,7 @@ APIServer::APIServer() { global_api_server = this; }
 void APIServer::socket_failed_(const LogString *msg) {
  ESP_LOGW(TAG, "Socket %s: errno %d", LOG_STR_ARG(msg), errno);
  this->destroy_socket_();
-#ifdef USE_API_OUTGOING_CONNECTION
-  // Dial-out needs no listener; degrade instead of stopping the component
-  this->status_set_error(LOG_STR("listen socket failed"));
-#else
  this->mark_failed();
-#endif
-}
-
-bool APIServer::create_listen_socket_() {
-  this->socket_ = socket::socket_ip_loop_monitored(SOCK_STREAM, 0).release();  // monitored for incoming connections
-  if (this->socket_ == nullptr) {
-    this->socket_failed_(LOG_STR("creation"));
-    return false;
-  }
-  int enable = 1;
-  int err = this->socket_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
-  if (err != 0) {
-    ESP_LOGW(TAG, "Socket reuseaddr: errno %d", errno);
-    // we can still continue
-  }
-  err = this->socket_->setblocking(false);
-  if (err != 0) {
-    this->socket_failed_(LOG_STR("nonblocking"));
-    return false;
-  }
-
-  struct sockaddr_storage server;
-
-  socklen_t sl = socket::set_sockaddr_any((struct sockaddr *) &server, sizeof(server), this->port_);
-  if (sl == 0) {
-    this->socket_failed_(LOG_STR("set sockaddr"));
-    return false;
-  }
-
-  err = this->socket_->bind((struct sockaddr *) &server, sl);
-  if (err != 0) {
-    this->socket_failed_(LOG_STR("bind"));
-    return false;
-  }
-
-  err = this->socket_->listen(this->listen_backlog_);
-  if (err != 0) {
-    this->socket_failed_(LOG_STR("listen"));
-    return false;
-  }
-  return true;
 }

 void APIServer::setup() {
@@ -98,14 +53,42 @@ void APIServer::setup() {
 #endif
 #endif

-#ifdef USE_API_OUTGOING_CONNECTION
-  // A dead listener degrades to an error status; dial-out still runs
-  this->create_listen_socket_();
-#else
-  if (!this->create_listen_socket_()) {
+  this->socket_ = socket::socket_ip_loop_monitored(SOCK_STREAM, 0).release();  // monitored for incoming connections
+  if (this->socket_ == nullptr) {
+    this->socket_failed_(LOG_STR("creation"));
+    return;
+  }
+  int enable = 1;
+  int err = this->socket_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
+  if (err != 0) {
+    ESP_LOGW(TAG, "Socket reuseaddr: errno %d", errno);
+    // we can still continue
+  }
+  err = this->socket_->setblocking(false);
+  if (err != 0) {
+    this->socket_failed_(LOG_STR("nonblocking"));
+    return;
+  }
+
+  struct sockaddr_storage server;
+
+  socklen_t sl = socket::set_sockaddr_any((struct sockaddr *) &server, sizeof(server), this->port_);
+  if (sl == 0) {
+    this->socket_failed_(LOG_STR("set sockaddr"));
+    return;
+  }
+
+  err = this->socket_->bind((struct sockaddr *) &server, sl);
+  if (err != 0) {
+    this->socket_failed_(LOG_STR("bind"));
+    return;
+  }
+
+  err = this->socket_->listen(this->listen_backlog_);
+  if (err != 0) {
+    this->socket_failed_(LOG_STR("listen"));
    return;
  }
-#endif

 #ifdef USE_LOGGER
  if (logger::global_logger != nullptr) {
@@ -152,9 +135,6 @@ void APIServer::setup() {
  if (this->reboot_timeout_ != 0 && !this->provisioning_pending_()) {
    this->status_set_warning(LOG_STR("waiting for client connection"));
  }
-#ifdef USE_API_OUTGOING_CONNECTION
-  this->outgoing_conn_.setup();
-#endif
 }

 void APIServer::loop() {
@@ -163,12 +143,6 @@ void APIServer::loop() {
    this->accept_new_connections_();
  }

-#ifdef USE_API_OUTGOING_CONNECTION
-  if (!this->shutting_down_) {
-    this->outgoing_conn_.loop(this);
-  }
-#endif
-
  if (this->api_connection_count_ == 0) {
    // Check reboot timeout - done in loop to avoid scheduler heap churn
    // (cancelled scheduler items sit in heap memory until their scheduled time).
@@ -177,12 +151,7 @@ void APIServer::loop() {
    if (this->reboot_timeout_ != 0 && !this->provisioning_pending_()) {
      const uint32_t now = App.get_loop_component_start_time();
      if (now - this->last_connected_ > this->reboot_timeout_) {
-        // Distinguish a wrong-key peer from nothing connecting at all
-        if (this->saw_unauthenticated_client_) {
-          ESP_LOGE(TAG, "Clients connected but none authenticated; rebooting");
-        } else {
-          ESP_LOGE(TAG, "No clients; rebooting");
-        }
+        ESP_LOGE(TAG, "No clients; rebooting");
        App.reboot();
      }
    }
@@ -234,15 +203,6 @@ void APIServer::remove_client_(uint8_t client_index) {
  std::string client_peername(client->get_peername_to(peername_buf));
 #endif

-  // Read before the swap-and-reset below destroys the connection
-  const bool was_authenticated = client->is_authenticated();
-#ifdef USE_API_OUTGOING_CONNECTION
-  if (client->flags_.outgoing_connection_target) {
-    this->outgoing_target_count_--;
-  }
-  this->outgoing_conn_.on_client_removed(client.get(), was_authenticated);
-#endif
-
  // Close socket now (was deferred from on_fatal_error to allow getpeername)
  client->helper_->close();

@@ -261,18 +221,9 @@ void APIServer::remove_client_(uint8_t client_index) {

  // Last client disconnected - set warning and start tracking for reboot timeout
  // (suppressed while provisioning is pending - see loop()).
-  // Refresh on every authenticated removal, not just the last one, so an
-  // unauthenticated straggler removed later (e.g. a port scan, or a dial to
-  // a host that accepts TCP but never speaks the API) cannot discard a
-  // healthy session's timestamp and trigger a spurious reboot
-  if (was_authenticated) {
-    this->last_connected_ = App.get_loop_component_start_time();
-    this->saw_unauthenticated_client_ = false;
-  } else {
-    this->saw_unauthenticated_client_ = true;
-  }
  if (this->api_connection_count_ == 0 && this->reboot_timeout_ != 0 && !this->provisioning_pending_()) {
    this->status_set_warning(LOG_STR("waiting for client connection"));
+    this->last_connected_ = App.get_loop_component_start_time();
  }

 #ifdef USE_API_CLIENT_DISCONNECTED_TRIGGER
@@ -294,7 +245,7 @@ void __attribute__((flatten)) APIServer::accept_new_connections_() {
    sock->getpeername_to(peername);

    // Check if we're at the connection limit
-    if (this->at_client_limit_()) {
+    if (this->api_connection_count_ >= MAX_API_CONNECTIONS) {
      ESP_LOGW(TAG, "Max connections (%d), rejecting %s", MAX_API_CONNECTIONS, peername);
      // Immediately close - socket destructor will handle cleanup
      sock.reset();
@@ -303,53 +254,18 @@ void __attribute__((flatten)) APIServer::accept_new_connections_() {

    ESP_LOGD(TAG, "Accept %s", peername);

-    this->add_client_(new APIConnection(std::move(sock), this));
+    auto *conn = new APIConnection(std::move(sock), this);
+    this->clients_[this->api_connection_count_++].reset(conn);
+    conn->start();
+
+    // First client connected - clear warning and update timestamp
+    if (this->api_connection_count_ == 1 && this->reboot_timeout_ != 0 && !this->provisioning_pending_()) {
+      this->status_clear_warning();
+      this->last_connected_ = App.get_loop_component_start_time();
+    }
  }
 }

-bool APIServer::add_client_(APIConnection *conn) {
-  if (this->at_client_limit_()) {
-    // Callers check first; enforce the array bound where the write happens
-    ESP_LOGW(TAG, "Max connections (%d), dropping client", MAX_API_CONNECTIONS);
-    delete conn;
-    return false;
-  }
-  this->clients_[this->api_connection_count_++].reset(conn);
-  conn->start();
-
-  // First client connected - clear warning. The reboot watchdog timestamp is
-  // refreshed when an authenticated client is removed (see remove_client_),
-  // never on bare TCP connects.
-  if (this->api_connection_count_ == 1 && this->reboot_timeout_ != 0 && !this->provisioning_pending_()) {
-    this->status_clear_warning();
-  }
-  return true;
-}
-
-#ifdef USE_API_OUTGOING_CONNECTION
-APIConnection *APIServer::add_outgoing_client_(std::unique_ptr<socket::Socket> sock) {
-  // Re-check at the handoff: inbound clients may have filled the slots and
-  // the PSK may have been cleared (mark_outgoing() needs the noise helper)
-  const bool at_limit = this->at_client_limit_();
-  if (at_limit || !this->noise_ctx_.has_psk()) {
-    ESP_LOGW(TAG, "Dropping outgoing connection (%s)", at_limit ? "max connections" : "no key");
-    return nullptr;
-  }
-  auto *conn = new APIConnection(std::move(sock), this);
-  if (!this->add_client_(conn)) {
-    return nullptr;
-  }
-  // After start(): sends our server hello first so the peer can pick the key
-  conn->mark_outgoing();
-  return conn;
-}
-
-void APIServer::on_outgoing_target_client(APIConnection *conn) {
-  this->outgoing_target_count_++;
-  this->outgoing_conn_.on_target_client(conn);
-}
-#endif
-
 void APIServer::dump_config() {
  char addr_buf[network::USE_ADDRESS_BUFFER_SIZE];
  ESP_LOGCONFIG(TAG,
@@ -366,9 +282,6 @@ void APIServer::dump_config() {
 #else
  ESP_LOGCONFIG(TAG, "  Noise encryption: NO");
 #endif
-#ifdef USE_API_OUTGOING_CONNECTION
-  this->outgoing_conn_.dump_config();
-#endif
 }

 void APIServer::handle_disconnect(APIConnection *conn) {}
@@ -520,10 +433,8 @@ void APIServer::send_homeassistant_action(const HomeassistantActionRequest &call
    // Home Assistant subscribes to actions shortly *after* authenticating, so actions
    // fired right at connection time (on_client_connected, on_time_sync, ...) can
    // arrive before the subscription and are lost - warn instead of failing silently.
-    ESP_LOGW(TAG, "Home Assistant %s '%s' dropped; %s",
-             call.is_event ? LOG_STR_LITERAL("event") : LOG_STR_LITERAL("action"), call.service.c_str(),
-             this->is_connected() ? LOG_STR_LITERAL("client has not subscribed to actions (yet)")
-                                  : LOG_STR_LITERAL("no client connected"));
+    ESP_LOGW(TAG, "Home Assistant %s '%s' dropped; %s", call.is_event ? "event" : "action", call.service.c_str(),
+             this->is_connected() ? "client has not subscribed to actions (yet)" : "no client connected");
  }
 }
 #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES
@@ -663,8 +574,6 @@ bool APIServer::update_noise_psk_(const SavedNoisePsk &new_psk, const LogString
        if (!c->send_message(req)) {
          API_LOG_MSG_DROPPED(TAG, "Disconnect request");
        }
-        // Force it: a session from before the key was active must not survive
-        c->flags_.next_close = true;
      }
    });
  }
@@ -776,9 +685,6 @@ void APIServer::on_shutdown() {

  // Close the listening socket to prevent new connections
  this->destroy_socket_();
-#ifdef USE_API_OUTGOING_CONNECTION
-  this->outgoing_conn_.on_shutdown();
-#endif

  // Change batch delay to 5ms for quick flushing during shutdown
  this->batch_delay_ = 5;
@@ -11,7 +11,6 @@
 #endif
 #include "api_pb2.h"
 #include "api_pb2_service.h"
-#include "api_outgoing_connection.h"
 #include "esphome/components/socket/socket.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
@@ -82,10 +81,6 @@ class APIServer final : public Component,
  void set_noise_psk(noise::psk_t psk) { this->noise_ctx_.set_psk(psk); }
  noise::NoiseContext &get_noise_ctx() { return this->noise_ctx_; }
 #endif  // USE_API_NOISE
-#ifdef USE_API_OUTGOING_CONNECTION
-  // Called by APIConnection when a client declares itself a dial-back target in its hello
-  void on_outgoing_target_client(APIConnection *conn);
-#endif

  void handle_disconnect(APIConnection *conn);
 #ifdef USE_BINARY_SENSOR
@@ -263,16 +258,6 @@ class APIServer final : public Component,
 protected:
  // Accept incoming socket connections. Only called when socket has pending connections.
  void __attribute__((noinline)) accept_new_connections_();
-  // Insert a constructed connection into the client slots and start it.
-  // Takes ownership; deletes the connection and returns false at the limit
-  bool add_client_(APIConnection *conn);
-  bool at_client_limit_() const { return this->api_connection_count_ >= MAX_API_CONNECTIONS; }
-#ifdef USE_API_OUTGOING_CONNECTION
-  // Returns the new connection, or nullptr (socket dropped) when at the limit
-  APIConnection *add_outgoing_client_(std::unique_ptr<socket::Socket> sock);
-  bool has_outgoing_target_client_() const { return this->outgoing_target_count_ != 0; }
-  friend class OutgoingConnectionManager;
-#endif
  // Remove a disconnected client by index. Swaps with the last populated slot and resets it.
  void __attribute__((noinline)) remove_client_(uint8_t client_index);

@@ -312,7 +297,6 @@ class APIServer final : public Component,
    this->socket_ = nullptr;
  }
  void socket_failed_(const LogString *msg);
-  bool create_listen_socket_();
  // Pointers and pointer-like types first (4 bytes each)
  socket::ListenSocket *socket_{nullptr};
 #ifdef USE_API_CLIENT_CONNECTED_TRIGGER
@@ -365,16 +349,8 @@ class APIServer final : public Component,
  // Connection limits - these defaults will be overridden by config values
  // from cv.SplitDefault in __init__.py which sets platform-specific defaults.
  uint8_t listen_backlog_{4};
-  // Bit-packed so the two flags share one byte
-  bool shutting_down_ : 1 = false;
-  // For the reboot log: whether any removal since the last watchdog refresh
-  // was an unauthenticated session (e.g. a wrong-key peer)
-  bool saw_unauthenticated_client_ : 1 = false;
+  bool shutting_down_ = false;
  uint8_t api_connection_count_{0};
-#ifdef USE_API_OUTGOING_CONNECTION
-  // Connected clients whose hello declared them a dial-back target
-  uint8_t outgoing_target_count_{0};
-#endif
 #if defined(USE_PROVISIONING) && defined(USE_API_NOISE)
  // Index assigned by the provisioning manager for reporting this transport's state.
  uint8_t provisioning_source_{0};
@@ -384,9 +360,6 @@ class APIServer final : public Component,
  noise::NoiseContext noise_ctx_;
  ESPPreferenceObject noise_pref_;
 #endif  // USE_API_NOISE
-#ifdef USE_API_OUTGOING_CONNECTION
-  OutgoingConnectionManager outgoing_conn_;
-#endif
 };

 extern APIServer *global_api_server;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -99,8 +99,7 @@ ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(clie
 static constexpr uint8_t SERVICE_YIELD_INTERVAL = 3;

 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
-  UserActionScratch scratch;
-  auto resp = service->encode_list_service_response(scratch);
+  auto resp = service->encode_list_service_response();
  if (!this->client_->send_message(resp))
    return false;
  // at_ is this service's index
@@ -1,52 +1,9 @@
 #include "user_services.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 #include "esphome/core/string_ref.h"

 namespace esphome::api {

-StringRef UserServiceStatic::str_(size_t idx, std::span<char> &scratch) const {
-  const char *s = progmem_read_ptr(&this->strings_[idx]);
-  if (s == nullptr)
-    return {};
-#ifdef USE_ESP8266
-  // Codegen sizes the scratch buffer for the largest service; the bound only guards other callers
-  if (scratch.empty())
-    return {};
-  size_t len = strnlen_P(s, scratch.size() - 1);
-  progmem_memcpy(scratch.data(), s, len);
-  scratch[len] = '\0';
-  StringRef ref(scratch.data(), len);
-  scratch = scratch.subspan(len + 1);
-  return ref;
-#else
-  return StringRef(s);
-#endif
-}
-
-ListEntitiesServicesResponse UserServiceStatic::encode_list_service_response_(
-    std::span<const enums::ServiceArgType> arg_types, std::span<char> scratch) const {
-  ListEntitiesServicesResponse msg;
-  msg.name = this->str_(0, scratch);
-  msg.key = this->key_;
-  msg.supports_response = this->supports_response_;
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-  msg.description = this->str_(1, scratch);
-#endif
-  msg.args.init(arg_types.size());
-  for (size_t i = 0; i < arg_types.size(); i++) {
-    size_t base = USER_ACTION_HEADER_STRINGS + i * USER_ACTION_ARG_STRINGS;
-    auto &arg = msg.args.emplace_back();
-    arg.type = arg_types[i];
-    arg.name = this->str_(base, scratch);
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-    arg.description = this->str_(base + 1, scratch);
-    arg.example = this->str_(base + 2, scratch);
-#endif
-  }
-  return msg;
-}
-
 template<> bool get_execute_arg_value<bool>(const ExecuteServiceArgument &arg) { return arg.bool_; }
 template<> int32_t get_execute_arg_value<int32_t>(const ExecuteServiceArgument &arg) {
  if (arg.legacy_int != 0)
@@ -1,6 +1,5 @@
 #pragma once

-#include <span>
 #include <tuple>
 #include <utility>
 #include <vector>
@@ -20,9 +19,7 @@ class APIServer;

 class UserServiceDescriptor {
 public:
-  /// Build the list-entities message. On ESP8266 the strings live in PROGMEM and are copied into
-  /// `scratch`, so the returned message is only valid while `scratch` is; other platforms ignore it.
-  virtual ListEntitiesServicesResponse encode_list_service_response(std::span<char> scratch) = 0;
+  virtual ListEntitiesServicesResponse encode_list_service_response() = 0;

  virtual bool execute_service(const ExecuteServiceRequest &req) = 0;
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES
@@ -37,51 +34,29 @@ template<typename T> T get_execute_arg_value(const ExecuteServiceArgument &arg);

 template<typename T> enums::ServiceArgType to_service_arg_type();

-// Scratch buffer list-entities hands to encode_list_service_response(); only ESP8266 copies into it
-#ifdef USE_ESP8266
-using UserActionScratch = std::array<char, API_USER_ACTION_STRINGS_SCRATCH_SIZE>;
-#else
-using UserActionScratch = std::array<char, 0>;
-#endif
-
-// Non-template base for YAML-defined services so the list-entities encoder is compiled once.
-// All strings live in one PROGMEM pointer table emitted by codegen (see _action_strings in
-// __init__.py), so each service costs a single pointer of RAM. Layout: the action name, then
-// each argument name; with USE_API_USER_DEFINED_ACTION_METADATA the action description follows
-// the name and every argument is (name, description, example). Unset metadata is nullptr.
-#ifdef USE_API_USER_DEFINED_ACTION_METADATA
-static constexpr size_t USER_ACTION_HEADER_STRINGS = 2;
-static constexpr size_t USER_ACTION_ARG_STRINGS = 3;
-#else
-static constexpr size_t USER_ACTION_HEADER_STRINGS = 1;
-static constexpr size_t USER_ACTION_ARG_STRINGS = 1;
-#endif
-class UserServiceStatic : public UserServiceDescriptor {
+// Base class for YAML-defined services (most common case)
+// Stores only pointers to string literals in flash - no heap allocation
+template<typename... Ts> class UserServiceBase : public UserServiceDescriptor {
 public:
-  UserServiceStatic(const char *const *strings, uint32_t key,
-                    enums::SupportsResponseType supports_response = enums::SUPPORTS_RESPONSE_NONE)
-      : strings_(strings), key_(key), supports_response_(supports_response) {}
+  UserServiceBase(const char *name, const std::array<const char *, sizeof...(Ts)> &arg_names,
+                  enums::SupportsResponseType supports_response = enums::SUPPORTS_RESPONSE_NONE)
+      : name_(name), arg_names_(arg_names), supports_response_(supports_response) {
+    this->key_ = fnv1_hash(name);
+  }

- protected:
-  ListEntitiesServicesResponse encode_list_service_response_(std::span<const enums::ServiceArgType> arg_types,
-                                                             std::span<char> scratch) const;
-  /// Reference table entry `idx`; nullptr gives an empty StringRef.
-  /// On ESP8266 the bytes are copied out of PROGMEM into `scratch` with a terminator, and the span
-  /// is advanced past the copy.
-  StringRef str_(size_t idx, std::span<char> &scratch) const;
-
-  const char *const *strings_;  // PROGMEM pointer table, read with progmem_read_ptr()
-  uint32_t key_;
-  enums::SupportsResponseType supports_response_;
-};
-
-template<typename... Ts> class UserServiceBase : public UserServiceStatic {
- public:
-  using UserServiceStatic::UserServiceStatic;
-
-  ListEntitiesServicesResponse encode_list_service_response(std::span<char> scratch) override {
+  ListEntitiesServicesResponse encode_list_service_response() override {
+    ListEntitiesServicesResponse msg;
+    msg.name = StringRef(this->name_);
+    msg.key = this->key_;
+    msg.supports_response = this->supports_response_;
    std::array<enums::ServiceArgType, sizeof...(Ts)> arg_types = {to_service_arg_type<Ts>()...};
-    return this->encode_list_service_response_(arg_types, scratch);
+    msg.args.init(sizeof...(Ts));
+    for (size_t i = 0; i < sizeof...(Ts); i++) {
+      auto &arg = msg.args.emplace_back();
+      arg.type = arg_types[i];
+      arg.name = StringRef(this->arg_names_[i]);
+    }
+    return msg;
  }

  bool execute_service(const ExecuteServiceRequest &req) override {
@@ -114,6 +89,12 @@ template<typename... Ts> class UserServiceBase : public UserServiceStatic {
  void execute_(const ArgsContainer &args, uint32_t call_id, bool return_response, std::index_sequence<S...> /*type*/) {
    this->execute(call_id, return_response, (get_execute_arg_value<Ts>(args[S]))...);
  }
+
+  // Pointers to string literals in flash - no heap allocation
+  const char *name_;
+  std::array<const char *, sizeof...(Ts)> arg_names_;
+  uint32_t key_{0};
+  enums::SupportsResponseType supports_response_{enums::SUPPORTS_RESPONSE_NONE};
 };

 // Separate class for custom_api_device services (rare case)
@@ -125,7 +106,7 @@ template<typename... Ts> class UserServiceDynamic : public UserServiceDescriptor
    this->key_ = fnv1_hash(this->name_.c_str());
  }

-  ListEntitiesServicesResponse encode_list_service_response(std::span<char> /*scratch*/) override {
+  ListEntitiesServicesResponse encode_list_service_response() override {
    ListEntitiesServicesResponse msg;
    msg.name = StringRef(this->name_);
    msg.key = this->key_;
@@ -186,8 +167,8 @@ template<typename... Ts>
 class UserServiceTrigger<enums::SUPPORTS_RESPONSE_NONE, Ts...> final : public UserServiceBase<Ts...>,
                                                                       public Trigger<Ts...> {
 public:
-  UserServiceTrigger(const char *const *strings, uint32_t key)
-      : UserServiceBase<Ts...>(strings, key, enums::SUPPORTS_RESPONSE_NONE) {}
+  UserServiceTrigger(const char *name, const std::array<const char *, sizeof...(Ts)> &arg_names)
+      : UserServiceBase<Ts...>(name, arg_names, enums::SUPPORTS_RESPONSE_NONE) {}

 protected:
  void execute(uint32_t /*call_id*/, bool /*return_response*/, Ts... x) override { this->trigger(x...); }
@@ -198,8 +179,8 @@ template<typename... Ts>
 class UserServiceTrigger<enums::SUPPORTS_RESPONSE_OPTIONAL, Ts...> final : public UserServiceBase<Ts...>,
                                                                           public Trigger<uint32_t, bool, Ts...> {
 public:
-  UserServiceTrigger(const char *const *strings, uint32_t key)
-      : UserServiceBase<Ts...>(strings, key, enums::SUPPORTS_RESPONSE_OPTIONAL) {}
+  UserServiceTrigger(const char *name, const std::array<const char *, sizeof...(Ts)> &arg_names)
+      : UserServiceBase<Ts...>(name, arg_names, enums::SUPPORTS_RESPONSE_OPTIONAL) {}

 protected:
  void execute(uint32_t call_id, bool return_response, Ts... x) override {
@@ -212,8 +193,8 @@ template<typename... Ts>
 class UserServiceTrigger<enums::SUPPORTS_RESPONSE_ONLY, Ts...> final : public UserServiceBase<Ts...>,
                                                                       public Trigger<uint32_t, Ts...> {
 public:
-  UserServiceTrigger(const char *const *strings, uint32_t key)
-      : UserServiceBase<Ts...>(strings, key, enums::SUPPORTS_RESPONSE_ONLY) {}
+  UserServiceTrigger(const char *name, const std::array<const char *, sizeof...(Ts)> &arg_names)
+      : UserServiceBase<Ts...>(name, arg_names, enums::SUPPORTS_RESPONSE_ONLY) {}

 protected:
  void execute(uint32_t call_id, bool /*return_response*/, Ts... x) override { this->trigger(call_id, x...); }
@@ -224,8 +205,8 @@ template<typename... Ts>
 class UserServiceTrigger<enums::SUPPORTS_RESPONSE_STATUS, Ts...> final : public UserServiceBase<Ts...>,
                                                                         public Trigger<uint32_t, Ts...> {
 public:
-  UserServiceTrigger(const char *const *strings, uint32_t key)
-      : UserServiceBase<Ts...>(strings, key, enums::SUPPORTS_RESPONSE_STATUS) {}
+  UserServiceTrigger(const char *name, const std::array<const char *, sizeof...(Ts)> &arg_names)
+      : UserServiceBase<Ts...>(name, arg_names, enums::SUPPORTS_RESPONSE_STATUS) {}

 protected:
  void execute(uint32_t call_id, bool /*return_response*/, Ts... x) override { this->trigger(call_id, x...); }
@@ -23,10 +23,8 @@ void AQISensor::setup() {

 void AQISensor::dump_config() {
  ESP_LOGCONFIG(TAG, "AQI Sensor:");
-  ESP_LOGCONFIG(TAG, "  Calculation Type: %s",
-                this->aqi_calc_type_ == AQI_TYPE ? LOG_STR_LITERAL("AQI") : LOG_STR_LITERAL("CAQI"));
-  ESP_LOGCONFIG(TAG, "  Extended Range: %s",
-                this->extended_range_ ? LOG_STR_LITERAL("enabled") : LOG_STR_LITERAL("disabled"));
+  ESP_LOGCONFIG(TAG, "  Calculation Type: %s", this->aqi_calc_type_ == AQI_TYPE ? "AQI" : "CAQI");
+  ESP_LOGCONFIG(TAG, "  Extended Range: %s", this->extended_range_ ? "enabled" : "disabled");
  if (this->pm_2_5_sensor_ != nullptr) {
    ESP_LOGCONFIG(TAG, "  PM2.5 Sensor: '%s'", this->pm_2_5_sensor_->get_name().c_str());
  }
@@ -42,16 +42,7 @@ bool AsyncClient::connect(const char *host, uint16_t port) {
    return false;
  }

-  if (socket_->setblocking(false) != 0) {
-    // Capture before the log and reset() below can clobber errno; a blocking
-    // connect()/read() would otherwise stall the whole loop
-    const int saved_errno = errno;
-    ESP_LOGE(TAG, "Failed to set nonblocking: errno %d", saved_errno);
-    socket_.reset();
-    if (error_cb_)
-      error_cb_(error_arg_, this, saved_errno);
-    return false;
-  }
+  socket_->setblocking(false);

  int err = socket_->connect((struct sockaddr *) &addr, addrlen);
  if (err == 0) {
@@ -106,22 +97,45 @@ void AsyncClient::loop() {
    return;

  if (connecting_) {
-    int err = 0;
-    switch (socket::poll_connect(*socket_, err)) {
-      case socket::ConnectPollResult::CONNECT_POLL_PENDING:
-        break;
-      case socket::ConnectPollResult::CONNECT_POLL_CONNECTED:
+    // For connecting, we need to check writability, not readability
+    // The Application's select() only monitors read FDs, so we do our own check here
+    // For ESP platforms lwip_select() might be faster, but this code isn't used
+    // on those platforms anyway. If it was, we'd fix the Application select()
+    // to report writability instead of doing it this way.
+    int fd = socket_->get_fd();
+    if (fd < 0) {
+      ESP_LOGW(TAG, "Invalid socket fd");
+      close();
+      return;
+    }
+
+    fd_set writefds;
+    FD_ZERO(&writefds);
+    FD_SET(fd, &writefds);
+
+    struct timeval tv = {0, 0};
+    int ret = select(fd + 1, nullptr, &writefds, nullptr, &tv);
+
+    if (ret > 0 && FD_ISSET(fd, &writefds)) {
+      int error = 0;
+      socklen_t len = sizeof(error);
+      if (socket_->getsockopt(SOL_SOCKET, SO_ERROR, &error, &len) == 0 && error == 0) {
        connecting_ = false;
        connected_ = true;
        if (connect_cb_)
          connect_cb_(connect_arg_, this);
-        break;
-      case socket::ConnectPollResult::CONNECT_POLL_ERROR:
-        ESP_LOGW(TAG, "Connection failed: %d", err);
+      } else {
+        ESP_LOGW(TAG, "Connection failed: %d", error);
        close();
        if (error_cb_)
-          error_cb_(error_arg_, this, err);
-        break;
+          error_cb_(error_arg_, this, error);
+      }
+    } else if (ret < 0) {
+      const int err = errno;
+      ESP_LOGE(TAG, "Select error: %d", err);
+      close();
+      if (error_cb_)
+        error_cb_(error_arg_, this, err);
    }
  } else if (connected_) {
    // For connected sockets, use the Application's select() results
@@ -100,15 +100,13 @@ void MultiClickTriggerBase::schedule_is_valid_(uint32_t min_length) {
  }
  this->is_valid_ = false;
  this->set_timeout(MULTICLICK_IS_VALID_ID, min_length, [this]() {
-    ESP_LOGV(TAG, "Multi Click: You can now %s the button.",
-             this->parent_->state ? LOG_STR_LITERAL("RELEASE") : LOG_STR_LITERAL("PRESS"));
+    ESP_LOGV(TAG, "Multi Click: You can now %s the button.", this->parent_->state ? "RELEASE" : "PRESS");
    this->is_valid_ = true;
  });
 }
 void MultiClickTriggerBase::schedule_is_not_valid_(uint32_t max_length) {
  this->set_timeout(MULTICLICK_IS_NOT_VALID_ID, max_length, [this]() {
-    ESP_LOGV(TAG, "Multi Click: You waited too long to %s.",
-             this->parent_->state ? LOG_STR_LITERAL("RELEASE") : LOG_STR_LITERAL("PRESS"));
+    ESP_LOGV(TAG, "Multi Click: You waited too long to %s.", this->parent_->state ? "RELEASE" : "PRESS");
    this->is_valid_ = false;
    this->schedule_cooldown_();
  });
@@ -162,9 +162,8 @@ void BME680BSECComponent::dump_config() {
                "  Supply Voltage: %sV\n"
                "  Sample Rate: %s\n"
                "  State Save Interval: %" PRIu32 "ms",
-                this->temperature_offset_,
-                this->iaq_mode_ == IAQ_MODE_STATIC ? LOG_STR_LITERAL("Static") : LOG_STR_LITERAL("Mobile"),
-                this->supply_voltage_ == SUPPLY_VOLTAGE_3V3 ? LOG_STR_LITERAL("3.3") : LOG_STR_LITERAL("1.8"),
+                this->temperature_offset_, this->iaq_mode_ == IAQ_MODE_STATIC ? "Static" : "Mobile",
+                this->supply_voltage_ == SUPPLY_VOLTAGE_3V3 ? "3.3" : "1.8",
                BME680_BSEC_SAMPLE_RATE_LOG(this->sample_rate_), this->state_save_interval_ms_);

  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
@@ -16,13 +16,11 @@ CONF_CO2_EQUIVALENT = "co2_equivalent"
 CONF_COLOR_DEPTH = "color_depth"
 CONF_CRC_ENABLE = "crc_enable"
 CONF_DATA_BITS = "data_bits"
-CONF_DESCRIPTION = "description"
 CONF_DRAW_ROUNDING = "draw_rounding"
 CONF_ENABLE_OTA_DOWNGRADE_PROTECTION = "enable_ota_downgrade_protection"
 CONF_ENABLED = "enabled"
 CONF_GYROSCOPE_ODR = "gyroscope_odr"
 CONF_GYROSCOPE_RANGE = "gyroscope_range"
-CONF_HOST = "host"
 CONF_IAQ = "iaq"
 CONF_IGNORE_NOT_FOUND = "ignore_not_found"
 CONF_IS_WRGB = "is_wrgb"
@@ -249,7 +249,7 @@ bool CS5460AComponent::check_status_() {
    bool dir = status & (1 << 21);
    if (current_gain_ < 0)
      dir = !dir;
-    ESP_LOGI(TAG, "Energy counter %s pulse", dir ? LOG_STR_LITERAL("negative") : LOG_STR_LITERAL("positive"));
+    ESP_LOGI(TAG, "Energy counter %s pulse", dir ? "negative" : "positive");
    clear |= 1 << 22;
  }

@@ -319,9 +319,7 @@ void CS5460AComponent::dump_config() {
  ESP_LOGCONFIG(TAG,
                "CS5460A:\n"
                "  Init status: %s",
-                state == COMPONENT_STATE_LOOP
-                    ? LOG_STR_LITERAL("OK")
-                    : (state == COMPONENT_STATE_FAILED ? LOG_STR_LITERAL("failed") : LOG_STR_LITERAL("other")));
+                state == COMPONENT_STATE_LOOP ? "OK" : (state == COMPONENT_STATE_FAILED ? "failed" : "other"));
  LOG_PIN("  CS Pin: ", cs_);
  ESP_LOGCONFIG(TAG,
                "  Samples / cycle: %" PRIu32 "\n"
@@ -332,10 +330,9 @@ void CS5460AComponent::dump_config() {
                "  Current HPF: %s\n"
                "  Voltage HPF: %s\n"
                "  Pulse energy: %.2f Wh",
-                samples_, phase_offset_,
-                pga_gain_ == CS5460A_PGA_GAIN_50X ? LOG_STR_LITERAL("50x") : LOG_STR_LITERAL("10x"), current_gain_,
-                voltage_gain_, current_hpf_ ? LOG_STR_LITERAL("enabled") : LOG_STR_LITERAL("disabled"),
-                voltage_hpf_ ? LOG_STR_LITERAL("enabled") : LOG_STR_LITERAL("disabled"), pulse_energy_wh_);
+                samples_, phase_offset_, pga_gain_ == CS5460A_PGA_GAIN_50X ? "50x" : "10x", current_gain_,
+                voltage_gain_, current_hpf_ ? "enabled" : "disabled", voltage_hpf_ ? "enabled" : "disabled",
+                pulse_energy_wh_);
  LOG_SENSOR("  ", "Voltage", voltage_sensor_);
  LOG_SENSOR("  ", "Current", current_sensor_);
  LOG_SENSOR("  ", "Power", power_sensor_);
@@ -20,8 +20,8 @@ void DHT::dump_config() {
                "DHT:\n"
                "  %sModel: %s\n"
                "  Internal pull-up: %s",
-                this->is_auto_detect_ ? LOG_STR_LITERAL("Auto-detected ") : "",
-                this->model_ == DHT_MODEL_DHT11 ? LOG_STR_LITERAL("DHT11") : LOG_STR_LITERAL("DHT22 or equivalent"),
+                this->is_auto_detect_ ? "Auto-detected " : "",
+                this->model_ == DHT_MODEL_DHT11 ? "DHT11" : "DHT22 or equivalent",
                ONOFF(this->t_pin_->get_flags() & gpio::FLAG_PULLUP));
  LOG_PIN("  Pin: ", this->t_pin_);
  LOG_UPDATE_INTERVAL(this);
@@ -93,7 +93,7 @@ void Emc2101Component::dump_config() {
  if (this->is_failed()) {
    ESP_LOGE(TAG, ESP_LOG_MSG_COMM_FAIL);
  }
-  ESP_LOGCONFIG(TAG, "  Mode: %s", this->dac_mode_ ? LOG_STR_LITERAL("DAC") : LOG_STR_LITERAL("PWM"));
+  ESP_LOGCONFIG(TAG, "  Mode: %s", this->dac_mode_ ? "DAC" : "PWM");
  if (this->dac_mode_) {
    ESP_LOGCONFIG(TAG, "  DAC Conversion Rate: %X", this->dac_conversion_rate_);
  } else {
@@ -216,7 +216,7 @@ void ENS210Component::extract_measurement_(uint32_t val, int *data, int *status)
 // Sets ENS210 to low (true) or high (false) power. Returns false on I2C problems.
 bool ENS210Component::set_low_power_(bool enable) {
  uint8_t low_power_cmd = enable ? 0x01 : 0x00;
-  ESP_LOGD(TAG, "Enable low power: %s", enable ? LOG_STR_LITERAL("true") : LOG_STR_LITERAL("false"));
+  ESP_LOGD(TAG, "Enable low power: %s", enable ? "true" : "false");
  bool result = this->write_byte(ENS210_REGISTER_SYS_CTRL, low_power_cmd);
  delay(ENS210_BOOTING_MS);
  return result;
@@ -214,13 +214,11 @@ COMPILER_OPTIMIZATIONS = {
 # builds that need them.
 DEFAULT_EXCLUDED_IDF_COMPONENTS = (
    "app_trace",  # CPU trace/SystemView support - unused by ESPHome
-    "bt",  # Bluetooth stack - re-included by request_bluetooth(); its REQUIRES pulls the WiFi stack back
    "cmock",  # Unit testing mock framework - ESPHome doesn't use IDF's testing
    "console",  # Console REPL - unused by ESPHome; espressif/mdns pulls it back when configured
    "driver",  # Legacy driver shim - only needed by esp32_touch, esp32_can for legacy headers
    "esp-tls",  # TLS wrapper - re-included by http_request, mqtt, web_server_idf
    "esp_adc",  # ADC driver - only needed by adc component
-    "esp_coex",  # WiFi/BT coexistence - re-included by esp32_ble_tracker, zigbee; esp_wifi/bt pull it back
    "esp_driver_cam",  # Camera driver - the esp32-camera managed component pulls it back
    "esp_driver_dac",  # DAC driver - only needed by esp32_dac component
    "esp_driver_gptimer",  # General purpose timer - re-included by ac_dimmer, opentherm, Arduino BLE libs
@@ -238,7 +236,6 @@ DEFAULT_EXCLUDED_IDF_COMPONENTS = (
    "esp_driver_twai",  # TWAI/CAN driver - only needed by esp32_can component
    "esp_eth",  # Ethernet driver - only needed by ethernet component
    "esp_gdbstub",  # GDB stub panic handler - unused by ESPHome; bt pulls it back
-    "esp_hal_ieee802154",  # 802.15.4 HAL - ieee802154 pulls it back
    "esp_hid",  # HID host/device support - ESPHome doesn't implement HID functionality
    "esp_http_client",  # HTTP client - only needed by http_request component
    "esp_http_server",  # HTTP server - re-included by web_server_idf, esp32_camera_web_server
@@ -246,11 +243,8 @@ DEFAULT_EXCLUDED_IDF_COMPONENTS = (
    "esp_https_server",  # HTTPS server - ESPHome has its own web server
    "esp_lcd",  # LCD controller drivers - only needed by display component
    "esp_local_ctrl",  # Local control over HTTPS/BLE - ESPHome has native API
-    "esp_phy",  # RF PHY - re-included by internal_temperature on the original ESP32; esp_wifi/bt/ieee802154 pull it back
-    "esp_wifi",  # WiFi stack - re-included by request_wifi(), espnow; bt pulls it back for BLE builds
    "espcoredump",  # Core dump support - ESPHome has its own debug component
    "fatfs",  # FAT filesystem - ESPHome doesn't use filesystem storage
-    "ieee802154",  # 802.15.4 radio - IDF openthread and the Zigbee libs pull it back
    "json",  # cJSON library - ESPHome uses ArduinoJson instead
    "mqtt",  # ESP-IDF MQTT library - ESPHome has its own MQTT implementation
    "nvs_sec_provider",  # NVS encryption key provider - re-included when CONFIG_NVS_ENCRYPTION is set
@@ -266,7 +260,6 @@ DEFAULT_EXCLUDED_IDF_COMPONENTS = (
    "unity",  # Unit testing framework - ESPHome doesn't use IDF's testing
    "wear_levelling",  # Flash wear levelling for fatfs - unused since fatfs unused
    "wifi_provisioning",  # WiFi provisioning - ESPHome uses its own improv implementation
-    "wpa_supplicant",  # WPA supplicant - re-included by request_wifi() for esp_eap_client.h
 )

 # Additional IDF managed components to exclude for Arduino framework builds
@@ -716,9 +709,6 @@ def request_wifi(ap: bool = False) -> None:
    net.wifi = True
    if ap:
        net.wifi_ap = True
-    include_builtin_idf_component("esp_wifi")
-    # wifi_component.cpp includes esp_eap_client.h/esp_wpa2.h
-    include_builtin_idf_component("wpa_supplicant")


 def request_ethernet() -> None:
@@ -730,14 +720,11 @@ def request_bluetooth() -> None:
    """Request the Bluetooth controller."""
    net = _network_sdkconfig()
    net.bluetooth = True
-    include_builtin_idf_component("bt")


 def request_software_coexistence() -> None:
    """Request WiFi/BT software coexistence (only valid alongside WiFi)."""
    _network_sdkconfig().software_coexistence = True
-    # Callers include esp_coexist.h directly.
-    include_builtin_idf_component("esp_coex")


 def add_idf_component(
@@ -2317,8 +2304,6 @@ async def _reconcile_network_sdkconfig() -> None:

    # WiFi stack: disable only when Ethernet is present and WiFi is not. WiFi
    # relies on the IDF default (enabled), so it is never written True here.
-    # esp_wifi is excluded by default on IDF, so this only matters for Arduino
-    # or when bt pulls it back.
    wifi_disabled = net.ethernet and not net.wifi
    if wifi_disabled:
        set_idf_sdkconfig_default("CONFIG_ESP_WIFI_ENABLED", False)
@@ -3249,13 +3234,7 @@ def _write_sdkconfig():
    if write_file_if_changed(internal_path, contents):
        # internal changed, update real one
        write_file_if_changed(sdk_path, contents)
-        if not CORE.using_toolchain_esp_idf:
-            # PIO's dependency tracking under-declares sdkconfig inputs
-            # (ldgen, linker scripts); without a clean the image can be
-            # unbootable (esphome#15336). The esp-idf toolchain tracks
-            # sdkconfig via IDF's cmake and has_outdated_files(), so a
-            # reconfigure suffices there; everything else fails safe.
-            clean_build(clear_pio_cache=False)
+        clean_build(clear_pio_cache=False)


 def _write_idf_component_yml():
@@ -5,14 +5,11 @@ import esphome.config_validation as cv
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER, CONF_SCL, CONF_SDA
 from esphome.pins import check_strapping_pin

-# Per the ESP32-S31 IDF DOCS and datasheet:
-# https://docs.espressif.com/projects/esp-idf/en/v6.1/esp32s31/api-reference/peripherals/gpio.html
+# Per the ESP32-S31 datasheet (page 96):
 # https://documentation.espressif.com/esp32-s31_datasheet_en.pdf
-_ESP32S31_SPI_FLASH_PINS: set[int] = {26, 27, 28, 30, 31, 32}
-_ESP32S31_INVALID_PINS: set[int] = {29, 41}
-# GPIO60/GPIO61 set the boot mode; GPIO37 selects the JTAG signal source;
-# GPIO36 sets the VDD_SPI voltage.
-_ESP32S31_STRAPPING_PINS: set[int] = {36, 37, 60, 61}
+_ESP32S31_SPI_FLASH_PINS: set[int] = {27, 28, 29, 31, 32, 33}
+# GPIO60/GPIO61 set the boot mode; GPIO37 selects the JTAG signal source.
+_ESP32S31_STRAPPING_PINS: set[int] = {37, 60, 61}
 # LP I2C is fixed to GPIO6 (SCL) / GPIO7 (SDA) per the datasheet IO MUX table.
 _ESP32S31_I2C_LP_PINS = {"SDA": 7, "SCL": 6}

@@ -22,8 +19,6 @@ _LOGGER = logging.getLogger(__name__)
 def esp32_s31_validate_gpio_pin(value: int) -> int:
    if value < 0 or value > 61:
        raise cv.Invalid(f"Invalid pin number: {value} (must be 0-61)")
-    if value in _ESP32S31_INVALID_PINS:
-        raise cv.Invalid(f"GPIO{value} does not exist on ESP32-S31.")
    if value in _ESP32S31_SPI_FLASH_PINS:
        raise cv.Invalid(
            f"GPIO{value} is reserved for the SPI flash interface on ESP32-S31 and cannot be used."
@@ -38,10 +33,6 @@ def esp32_s31_validate_supports(value: dict[str, Any]) -> dict[str, Any]:

    if num < 0 or num > 61:
        raise cv.Invalid(f"Invalid pin number: {num} (must be 0-61)")
-    # Checked here as well so ignore_pin_validation_error cannot bypass it;
-    # these pins are not bonded and can never work
-    if num in _ESP32S31_INVALID_PINS:
-        raise cv.Invalid(f"GPIO{num} does not exist on ESP32-S31.")
    if is_input:
        # All ESP32 pins support input mode
        pass
@@ -128,8 +128,7 @@ void ESPHomeOTAComponent::dump_config() {
  esp_partition_iterator_release(it);
  esp_bootloader_desc_t bootloader_desc;
  esp_err_t err = esp_ota_get_bootloader_description(nullptr, &bootloader_desc);
-  ESP_LOGCONFIG(TAG, "  Bootloader: ESP-IDF %s",
-                (err == ESP_OK) ? bootloader_desc.idf_ver : LOG_STR_LITERAL("version unknown"));
+  ESP_LOGCONFIG(TAG, "  Bootloader: ESP-IDF %s", (err == ESP_OK) ? bootloader_desc.idf_ver : "version unknown");
 #endif  // USE_ESP32
 #endif  // USE_OTA_PARTITIONS
 }
@@ -358,10 +357,7 @@ void ESPHomeOTAComponent::handle_data_() {
  tv.tv_usec = 0;
  this->client_->setsockopt(SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
  this->client_->setsockopt(SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
-  if (this->client_->setblocking(true) != 0) {
-    this->log_socket_error_(LOG_STR("blocking"));
-    goto error;  // NOLINT(cppcoreguidelines-avoid-goto)
-  }
+  this->client_->setblocking(true);

  // Acknowledge auth OK - 1 byte
  this->write_byte_(ota::OTA_RESPONSE_AUTH_OK);
@@ -155,11 +155,6 @@ async def to_code(config: ConfigType) -> None:
    cg.add_define("USE_ESPNOW")
    cg.add_define("USE_ESPNOW_MAX_PAYLOAD_SIZE", config[CONF_MAX_PAYLOAD_SIZE])

-    if CORE.is_esp32:
-        from esphome.components.esp32 import include_builtin_idf_component
-
-        include_builtin_idf_component("esp_wifi")
-
    if CONF_WIFI in CORE.config:
        # Track the Wi-Fi channel via connect events instead of polling every loop
        wifi.request_wifi_connect_state_listener()
@@ -93,8 +93,7 @@ void FeedbackCover::set_open_sensor(binary_sensor::BinarySensor *open_feedback)

  // setup callbacks to react to sensor changes
  open_feedback->add_on_state_callback([this](bool state) {
-    ESP_LOGD(TAG, "'%s' - Open feedback '%s'.", this->name_.c_str(),
-             state ? LOG_STR_LITERAL("STARTED") : LOG_STR_LITERAL("ENDED"));
+    ESP_LOGD(TAG, "'%s' - Open feedback '%s'.", this->name_.c_str(), state ? "STARTED" : "ENDED");
    this->recompute_position_();
    if (!state && this->infer_endstop_ && this->current_trigger_operation_ == COVER_OPERATION_OPENING) {
      this->endstop_reached_(true);
@@ -107,8 +106,7 @@ void FeedbackCover::set_close_sensor(binary_sensor::BinarySensor *close_feedback
  this->close_feedback_ = close_feedback;

  close_feedback->add_on_state_callback([this](bool state) {
-    ESP_LOGD(TAG, "'%s' - Close feedback '%s'.", this->name_.c_str(),
-             state ? LOG_STR_LITERAL("STARTED") : LOG_STR_LITERAL("ENDED"));
+    ESP_LOGD(TAG, "'%s' - Close feedback '%s'.", this->name_.c_str(), state ? "STARTED" : "ENDED");
    this->recompute_position_();
    if (!state && this->infer_endstop_ && this->current_trigger_operation_ == COVER_OPERATION_CLOSING) {
      this->endstop_reached_(false);
@@ -146,8 +144,7 @@ void FeedbackCover::endstop_reached_(bool open_endstop) {
  // from a position slightly past the endpoint
  if (this->current_trigger_operation_ == (open_endstop ? COVER_OPERATION_OPENING : COVER_OPERATION_CLOSING)) {
    float dur = (now - this->start_dir_time_) / 1e3f;
-    ESP_LOGD(TAG, "'%s' - %s endstop reached. Took %.1fs.", this->name_.c_str(),
-             open_endstop ? LOG_STR_LITERAL("Open") : LOG_STR_LITERAL("Close"), dur);
+    ESP_LOGD(TAG, "'%s' - %s endstop reached. Took %.1fs.", this->name_.c_str(), open_endstop ? "Open" : "Close", dur);

    // if there is no external mechanism, stop the cover
    if (!this->has_built_in_endstop_) {
@@ -369,7 +366,7 @@ void FeedbackCover::start_direction_(CoverOperation dir) {
  // the case when an obstacle appears while moving is handled in the callback
  if (obstacle != nullptr && obstacle->state) {
    ESP_LOGD(TAG, "'%s' - %s obstacle detected. Action not started.", this->name_.c_str(),
-             dir == COVER_OPERATION_OPENING ? LOG_STR_LITERAL("Open") : LOG_STR_LITERAL("Close"));
+             dir == COVER_OPERATION_OPENING ? "Open" : "Close");
    return;
  }
 #endif
@@ -386,9 +383,9 @@ void FeedbackCover::start_direction_(CoverOperation dir) {
    this->set_current_operation_(dir, true);
    this->prev_command_trigger_ = trig;
    ESP_LOGD(TAG, "'%s' - Firing '%s' trigger.", this->name_.c_str(),
-             dir == COVER_OPERATION_OPENING   ? LOG_STR_LITERAL("OPEN")
-             : dir == COVER_OPERATION_CLOSING ? LOG_STR_LITERAL("CLOSE")
-                                              : LOG_STR_LITERAL("STOP"));
+             dir == COVER_OPERATION_OPENING   ? "OPEN"
+             : dir == COVER_OPERATION_CLOSING ? "CLOSE"
+                                              : "STOP");
    trig->trigger();
  }
 }
@@ -547,8 +547,8 @@ void FingerprintGrowComponent::dump_config() {
                "  System Identifier Code: 0x%.4X\n"
                "  Touch Sensing Pin: %s\n"
                "  Sensor Power Pin: %s",
-                this->system_identifier_code_, this->has_sensing_pin_ ? sensing_pin_buf : LOG_STR_LITERAL("None"),
-                this->has_power_pin_ ? power_pin_buf : LOG_STR_LITERAL("None"));
+                this->system_identifier_code_, this->has_sensing_pin_ ? sensing_pin_buf : "None",
+                this->has_power_pin_ ? power_pin_buf : "None");
  if (this->idle_period_to_sleep_ms_ < UINT32_MAX) {
    ESP_LOGCONFIG(TAG, "  Idle Period to Sleep: %" PRIu32 " ms", this->idle_period_to_sleep_ms_);
  } else {
@@ -35,20 +35,18 @@ void GraphicalDisplayMenu::setup() {
 }

 void GraphicalDisplayMenu::dump_config() {
-  ESP_LOGCONFIG(
-      TAG,
-      "Graphical Display Menu\n"
-      "  Has Display: %s\n"
-      "  Popup Mode: %s\n"
-      "  Advanced Drawing Mode: %s\n"
-      "  Has Font: %s\n"
-      "  Mode: %s\n"
-      "  Active: %s\n"
-      "  Menu items:",
-      YESNO(this->display_ != nullptr), YESNO(this->display_ != nullptr), YESNO(this->display_ == nullptr),
-      YESNO(this->font_ != nullptr),
-      this->mode_ == display_menu_base::MENU_MODE_ROTARY ? LOG_STR_LITERAL("Rotary") : LOG_STR_LITERAL("Joystick"),
-      YESNO(this->active_));
+  ESP_LOGCONFIG(TAG,
+                "Graphical Display Menu\n"
+                "  Has Display: %s\n"
+                "  Popup Mode: %s\n"
+                "  Advanced Drawing Mode: %s\n"
+                "  Has Font: %s\n"
+                "  Mode: %s\n"
+                "  Active: %s\n"
+                "  Menu items:",
+                YESNO(this->display_ != nullptr), YESNO(this->display_ != nullptr), YESNO(this->display_ == nullptr),
+                YESNO(this->font_ != nullptr),
+                this->mode_ == display_menu_base::MENU_MODE_ROTARY ? "Rotary" : "Joystick", YESNO(this->active_));
  for (size_t i = 0; i < this->displayed_item_->items_size(); i++) {
    auto *item = this->displayed_item_->get_item(i);
    ESP_LOGCONFIG(TAG, "  %i: %s (Type: %s, Immediate Edit: %s)", i, item->get_text().c_str(),
@@ -1,68 +1,105 @@
 #include "growatt_solar.h"
+#include "esphome/core/application.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"

 namespace esphome::growatt_solar {

-namespace helpers = modbus::helpers;
-
 static const char *const TAG = "growatt_solar";

 static const uint8_t MODBUS_REGISTER_COUNT[] = {33, 95};  // indexed with enum GrowattProtocolVersion

-void GrowattSolar::update() { this->read_input_registers(0, MODBUS_REGISTER_COUNT[this->protocol_version_]); }
+void GrowattSolar::loop() {
+  // If update() was unable to send we retry until we can send.
+  if (!this->waiting_to_update_)
+    return;
+  update();
+}

-void GrowattSolar::on_read_input_registers(uint16_t start_address, std::span<const uint16_t> registers,
-                                           modbus::ResponseStatus status) {
-  if (!modbus::succeeded(status))
+void GrowattSolar::update() {
+  // If our last send has had no reply yet, and it wasn't that long ago, do nothing.
+  const uint32_t now = App.get_loop_component_start_time();
+  if (now - this->last_send_ < this->get_update_interval() / 2) {
+    return;
+  }
+
+  // The bus might be slow, or there might be other devices, or other components might be talking to our device.
+  if (!this->ready_for_immediate_send()) {
+    this->waiting_to_update_ = true;
+    return;
+  }
+
+  this->waiting_to_update_ = false;
+  this->read_input_registers(0, MODBUS_REGISTER_COUNT[this->protocol_version_]);
+  this->last_send_ = millis();
+}
+
+void GrowattSolar::on_response(std::span<const uint8_t> request_pdu, std::span<const uint8_t> response_pdu) {
+  auto data = modbus::helpers::server_pdu_payload(response_pdu);
+  // Other components might be sending commands to our device. But we don't get called with enough
+  // context to know what is what. So if we didn't do a send, we ignore the data.
+  if (!this->last_send_)
+    return;
+  this->last_send_ = 0;
+
+  // Also ignore the data if the message is too short. Otherwise we will publish invalid values.
+  if (data.size() < MODBUS_REGISTER_COUNT[this->protocol_version_] * 2)
    return;

-  // Publish a sensor if its register(s) are in this response; skipping absent registers keeps this
-  // correct for any read range, so the poll may be split into multiple requests.
-  auto publish_1_reg_sensor_state = [&](sensor::Sensor *sensor, uint16_t reg, float unit) -> void {
+  auto publish_1_reg_sensor_state = [&](sensor::Sensor *sensor, size_t i, float unit) -> void {
    if (sensor == nullptr)
      return;
-    if (auto value = helpers::value_at<helpers::SensorValueType::U_WORD>(registers, start_address, reg))
-      sensor->publish_state(*value * unit);
+    float value = encode_uint16(data[i * 2], data[i * 2 + 1]) * unit;
+    sensor->publish_state(value);
  };

-  auto publish_2_reg_sensor_state = [&](sensor::Sensor *sensor, uint16_t reg, float unit) -> void {
-    if (sensor == nullptr)
-      return;
-    if (auto value = helpers::value_at<helpers::SensorValueType::U_DWORD>(registers, start_address, reg))
-      sensor->publish_state(*value * unit);
+  auto publish_2_reg_sensor_state = [&](sensor::Sensor *sensor, size_t reg1, size_t reg2, float unit) -> void {
+    float value = ((encode_uint16(data[reg1 * 2], data[reg1 * 2 + 1]) << 16) +
+                   encode_uint16(data[reg2 * 2], data[reg2 * 2 + 1])) *
+                  unit;
+    if (sensor != nullptr)
+      sensor->publish_state(value);
  };

  switch (this->protocol_version_) {
    case RTU: {
      publish_1_reg_sensor_state(this->inverter_status_, RTU_INVERTER_STATUS, 1);

-      publish_2_reg_sensor_state(this->pv_active_power_sensor_, RTU_PV_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->pv_active_power_sensor_, RTU_PV_ACTIVE_POWER, RTU_PV_ACTIVE_POWER + 1,
+                                 ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->pvs_[0].voltage_sensor_, RTU_PV1_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->pvs_[0].current_sensor_, RTU_PV1_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->pvs_[0].active_power_sensor_, RTU_PV1_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->pvs_[0].active_power_sensor_, RTU_PV1_ACTIVE_POWER, RTU_PV1_ACTIVE_POWER + 1,
+                                 ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->pvs_[1].voltage_sensor_, RTU_PV2_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->pvs_[1].current_sensor_, RTU_PV2_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->pvs_[1].active_power_sensor_, RTU_PV2_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->pvs_[1].active_power_sensor_, RTU_PV2_ACTIVE_POWER, RTU_PV2_ACTIVE_POWER + 1,
+                                 ONE_DEC_UNIT);

-      publish_2_reg_sensor_state(this->grid_active_power_sensor_, RTU_GRID_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->grid_active_power_sensor_, RTU_GRID_ACTIVE_POWER, RTU_GRID_ACTIVE_POWER + 1,
+                                 ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->grid_frequency_sensor_, RTU_GRID_FREQUENCY, TWO_DEC_UNIT);

      publish_1_reg_sensor_state(this->phases_[0].voltage_sensor_, RTU_PHASE1_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->phases_[0].current_sensor_, RTU_PHASE1_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->phases_[0].active_power_sensor_, RTU_PHASE1_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->phases_[0].active_power_sensor_, RTU_PHASE1_ACTIVE_POWER,
+                                 RTU_PHASE1_ACTIVE_POWER + 1, ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->phases_[1].voltage_sensor_, RTU_PHASE2_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->phases_[1].current_sensor_, RTU_PHASE2_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->phases_[1].active_power_sensor_, RTU_PHASE2_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->phases_[1].active_power_sensor_, RTU_PHASE2_ACTIVE_POWER,
+                                 RTU_PHASE2_ACTIVE_POWER + 1, ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->phases_[2].voltage_sensor_, RTU_PHASE3_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->phases_[2].current_sensor_, RTU_PHASE3_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->phases_[2].active_power_sensor_, RTU_PHASE3_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->phases_[2].active_power_sensor_, RTU_PHASE3_ACTIVE_POWER,
+                                 RTU_PHASE3_ACTIVE_POWER + 1, ONE_DEC_UNIT);

-      publish_2_reg_sensor_state(this->today_production_, RTU_TODAY_PRODUCTION, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->total_energy_production_, RTU_TOTAL_ENERGY_PRODUCTION, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->today_production_, RTU_TODAY_PRODUCTION, RTU_TODAY_PRODUCTION + 1, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->total_energy_production_, RTU_TOTAL_ENERGY_PRODUCTION,
+                                 RTU_TOTAL_ENERGY_PRODUCTION + 1, ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->inverter_module_temp_, RTU_INVERTER_MODULE_TEMP, ONE_DEC_UNIT);
      break;
@@ -70,33 +107,42 @@ void GrowattSolar::on_read_input_registers(uint16_t start_address, std::span<con
    case RTU2: {
      publish_1_reg_sensor_state(this->inverter_status_, RTU2_INVERTER_STATUS, 1);

-      publish_2_reg_sensor_state(this->pv_active_power_sensor_, RTU2_PV_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->pv_active_power_sensor_, RTU2_PV_ACTIVE_POWER, RTU2_PV_ACTIVE_POWER + 1,
+                                 ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->pvs_[0].voltage_sensor_, RTU2_PV1_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->pvs_[0].current_sensor_, RTU2_PV1_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->pvs_[0].active_power_sensor_, RTU2_PV1_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->pvs_[0].active_power_sensor_, RTU2_PV1_ACTIVE_POWER, RTU2_PV1_ACTIVE_POWER + 1,
+                                 ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->pvs_[1].voltage_sensor_, RTU2_PV2_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->pvs_[1].current_sensor_, RTU2_PV2_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->pvs_[1].active_power_sensor_, RTU2_PV2_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->pvs_[1].active_power_sensor_, RTU2_PV2_ACTIVE_POWER, RTU2_PV2_ACTIVE_POWER + 1,
+                                 ONE_DEC_UNIT);

-      publish_2_reg_sensor_state(this->grid_active_power_sensor_, RTU2_GRID_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->grid_active_power_sensor_, RTU2_GRID_ACTIVE_POWER, RTU2_GRID_ACTIVE_POWER + 1,
+                                 ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->grid_frequency_sensor_, RTU2_GRID_FREQUENCY, TWO_DEC_UNIT);

      publish_1_reg_sensor_state(this->phases_[0].voltage_sensor_, RTU2_PHASE1_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->phases_[0].current_sensor_, RTU2_PHASE1_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->phases_[0].active_power_sensor_, RTU2_PHASE1_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->phases_[0].active_power_sensor_, RTU2_PHASE1_ACTIVE_POWER,
+                                 RTU2_PHASE1_ACTIVE_POWER + 1, ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->phases_[1].voltage_sensor_, RTU2_PHASE2_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->phases_[1].current_sensor_, RTU2_PHASE2_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->phases_[1].active_power_sensor_, RTU2_PHASE2_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->phases_[1].active_power_sensor_, RTU2_PHASE2_ACTIVE_POWER,
+                                 RTU2_PHASE2_ACTIVE_POWER + 1, ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->phases_[2].voltage_sensor_, RTU2_PHASE3_VOLTAGE, ONE_DEC_UNIT);
      publish_1_reg_sensor_state(this->phases_[2].current_sensor_, RTU2_PHASE3_CURRENT, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->phases_[2].active_power_sensor_, RTU2_PHASE3_ACTIVE_POWER, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->phases_[2].active_power_sensor_, RTU2_PHASE3_ACTIVE_POWER,
+                                 RTU2_PHASE3_ACTIVE_POWER + 1, ONE_DEC_UNIT);

-      publish_2_reg_sensor_state(this->today_production_, RTU2_TODAY_PRODUCTION, ONE_DEC_UNIT);
-      publish_2_reg_sensor_state(this->total_energy_production_, RTU2_TOTAL_ENERGY_PRODUCTION, ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->today_production_, RTU2_TODAY_PRODUCTION, RTU2_TODAY_PRODUCTION + 1,
+                                 ONE_DEC_UNIT);
+      publish_2_reg_sensor_state(this->total_energy_production_, RTU2_TOTAL_ENERGY_PRODUCTION,
+                                 RTU2_TOTAL_ENERGY_PRODUCTION + 1, ONE_DEC_UNIT);

      publish_1_reg_sensor_state(this->inverter_module_temp_, RTU2_INVERTER_MODULE_TEMP, ONE_DEC_UNIT);
      break;
@@ -17,59 +17,59 @@ enum GrowattProtocolVersion {
 };

 // Register addresses for the RTU protocol.
-constexpr uint16_t RTU_INVERTER_STATUS = 0;           // length = 1
-constexpr uint16_t RTU_PV_ACTIVE_POWER = 1;           // length = 2
-constexpr uint16_t RTU_PV1_VOLTAGE = 3;               // length = 1
-constexpr uint16_t RTU_PV1_CURRENT = 4;               // length = 1
-constexpr uint16_t RTU_PV1_ACTIVE_POWER = 5;          // length = 2
-constexpr uint16_t RTU_PV2_VOLTAGE = 7;               // length = 1
-constexpr uint16_t RTU_PV2_CURRENT = 8;               // length = 1
-constexpr uint16_t RTU_PV2_ACTIVE_POWER = 9;          // length = 2
-constexpr uint16_t RTU_GRID_ACTIVE_POWER = 11;        // length = 2
-constexpr uint16_t RTU_GRID_FREQUENCY = 13;           // length = 1
-constexpr uint16_t RTU_PHASE1_VOLTAGE = 14;           // length = 1
-constexpr uint16_t RTU_PHASE1_CURRENT = 15;           // length = 1
-constexpr uint16_t RTU_PHASE1_ACTIVE_POWER = 16;      // length = 2
-constexpr uint16_t RTU_PHASE2_VOLTAGE = 18;           // length = 1
-constexpr uint16_t RTU_PHASE2_CURRENT = 19;           // length = 1
-constexpr uint16_t RTU_PHASE2_ACTIVE_POWER = 20;      // length = 2
-constexpr uint16_t RTU_PHASE3_VOLTAGE = 22;           // length = 1
-constexpr uint16_t RTU_PHASE3_CURRENT = 23;           // length = 1
-constexpr uint16_t RTU_PHASE3_ACTIVE_POWER = 24;      // length = 2
-constexpr uint16_t RTU_TODAY_PRODUCTION = 26;         // length = 2
-constexpr uint16_t RTU_TOTAL_ENERGY_PRODUCTION = 28;  // length = 2
-constexpr uint16_t RTU_INVERTER_MODULE_TEMP = 32;     // length = 1
+constexpr size_t RTU_INVERTER_STATUS = 0;           // length = 1
+constexpr size_t RTU_PV_ACTIVE_POWER = 1;           // length = 2
+constexpr size_t RTU_PV1_VOLTAGE = 3;               // length = 1
+constexpr size_t RTU_PV1_CURRENT = 4;               // length = 1
+constexpr size_t RTU_PV1_ACTIVE_POWER = 5;          // length = 2
+constexpr size_t RTU_PV2_VOLTAGE = 7;               // length = 1
+constexpr size_t RTU_PV2_CURRENT = 8;               // length = 1
+constexpr size_t RTU_PV2_ACTIVE_POWER = 9;          // length = 2
+constexpr size_t RTU_GRID_ACTIVE_POWER = 11;        // length = 2
+constexpr size_t RTU_GRID_FREQUENCY = 13;           // length = 1
+constexpr size_t RTU_PHASE1_VOLTAGE = 14;           // length = 1
+constexpr size_t RTU_PHASE1_CURRENT = 15;           // length = 1
+constexpr size_t RTU_PHASE1_ACTIVE_POWER = 16;      // length = 2
+constexpr size_t RTU_PHASE2_VOLTAGE = 18;           // length = 1
+constexpr size_t RTU_PHASE2_CURRENT = 19;           // length = 1
+constexpr size_t RTU_PHASE2_ACTIVE_POWER = 20;      // length = 2
+constexpr size_t RTU_PHASE3_VOLTAGE = 22;           // length = 1
+constexpr size_t RTU_PHASE3_CURRENT = 23;           // length = 1
+constexpr size_t RTU_PHASE3_ACTIVE_POWER = 24;      // length = 2
+constexpr size_t RTU_TODAY_PRODUCTION = 26;         // length = 2
+constexpr size_t RTU_TOTAL_ENERGY_PRODUCTION = 28;  // length = 2
+constexpr size_t RTU_INVERTER_MODULE_TEMP = 32;     // length = 1

 // Input register addresses for the RTU2 protocol as described
 // in the "GROWATT INVERTER MODBUS PROTOCOL_II V1.39" document.
-constexpr uint16_t RTU2_INVERTER_STATUS = 0;           // length = 1
-constexpr uint16_t RTU2_PV_ACTIVE_POWER = 1;           // length = 2
-constexpr uint16_t RTU2_PV1_VOLTAGE = 3;               // length = 1
-constexpr uint16_t RTU2_PV1_CURRENT = 4;               // length = 1
-constexpr uint16_t RTU2_PV1_ACTIVE_POWER = 5;          // length = 2
-constexpr uint16_t RTU2_PV2_VOLTAGE = 7;               // length = 1
-constexpr uint16_t RTU2_PV2_CURRENT = 8;               // length = 1
-constexpr uint16_t RTU2_PV2_ACTIVE_POWER = 9;          // length = 2
-constexpr uint16_t RTU2_GRID_ACTIVE_POWER = 35;        // length = 2
-constexpr uint16_t RTU2_GRID_FREQUENCY = 37;           // length = 1
-constexpr uint16_t RTU2_PHASE1_VOLTAGE = 38;           // length = 1
-constexpr uint16_t RTU2_PHASE1_CURRENT = 39;           // length = 1
-constexpr uint16_t RTU2_PHASE1_ACTIVE_POWER = 40;      // length = 2
-constexpr uint16_t RTU2_PHASE2_VOLTAGE = 42;           // length = 1
-constexpr uint16_t RTU2_PHASE2_CURRENT = 43;           // length = 1
-constexpr uint16_t RTU2_PHASE2_ACTIVE_POWER = 44;      // length = 2
-constexpr uint16_t RTU2_PHASE3_VOLTAGE = 46;           // length = 1
-constexpr uint16_t RTU2_PHASE3_CURRENT = 47;           // length = 1
-constexpr uint16_t RTU2_PHASE3_ACTIVE_POWER = 48;      // length = 2
-constexpr uint16_t RTU2_TODAY_PRODUCTION = 53;         // length = 2
-constexpr uint16_t RTU2_TOTAL_ENERGY_PRODUCTION = 55;  // length = 2
-constexpr uint16_t RTU2_INVERTER_MODULE_TEMP = 93;     // length = 1
+constexpr size_t RTU2_INVERTER_STATUS = 0;           // length = 1
+constexpr size_t RTU2_PV_ACTIVE_POWER = 1;           // length = 2
+constexpr size_t RTU2_PV1_VOLTAGE = 3;               // length = 1
+constexpr size_t RTU2_PV1_CURRENT = 4;               // length = 1
+constexpr size_t RTU2_PV1_ACTIVE_POWER = 5;          // length = 2
+constexpr size_t RTU2_PV2_VOLTAGE = 7;               // length = 1
+constexpr size_t RTU2_PV2_CURRENT = 8;               // length = 1
+constexpr size_t RTU2_PV2_ACTIVE_POWER = 9;          // length = 2
+constexpr size_t RTU2_GRID_ACTIVE_POWER = 35;        // length = 2
+constexpr size_t RTU2_GRID_FREQUENCY = 37;           // length = 1
+constexpr size_t RTU2_PHASE1_VOLTAGE = 38;           // length = 1
+constexpr size_t RTU2_PHASE1_CURRENT = 39;           // length = 1
+constexpr size_t RTU2_PHASE1_ACTIVE_POWER = 40;      // length = 2
+constexpr size_t RTU2_PHASE2_VOLTAGE = 42;           // length = 1
+constexpr size_t RTU2_PHASE2_CURRENT = 43;           // length = 1
+constexpr size_t RTU2_PHASE2_ACTIVE_POWER = 44;      // length = 2
+constexpr size_t RTU2_PHASE3_VOLTAGE = 46;           // length = 1
+constexpr size_t RTU2_PHASE3_CURRENT = 47;           // length = 1
+constexpr size_t RTU2_PHASE3_ACTIVE_POWER = 48;      // length = 2
+constexpr size_t RTU2_TODAY_PRODUCTION = 53;         // length = 2
+constexpr size_t RTU2_TOTAL_ENERGY_PRODUCTION = 55;  // length = 2
+constexpr size_t RTU2_INVERTER_MODULE_TEMP = 93;     // length = 1

 class GrowattSolar final : public PollingComponent, public modbus::ModbusClientDevice {
 public:
+  void loop() override;
  void update() override;
-  void on_read_input_registers(uint16_t start_address, std::span<const uint16_t> registers,
-                               modbus::ResponseStatus status) override;
+  void on_response(std::span<const uint8_t> request_pdu, std::span<const uint8_t> response_pdu) override;
  void dump_config() override;

  void set_protocol_version(GrowattProtocolVersion protocol_version) { this->protocol_version_ = protocol_version; }
@@ -104,6 +104,9 @@ class GrowattSolar final : public PollingComponent, public modbus::ModbusClientD
  }

 protected:
+  bool waiting_to_update_{false};
+  uint32_t last_send_{0};
+
  struct GrowattPhase {
    sensor::Sensor *voltage_sensor_{nullptr};
    sensor::Sensor *current_sensor_{nullptr};
@@ -69,12 +69,10 @@ void GT911Touchscreen::setup_internal_() {
          // Direct MCU pin: attach a hardware interrupt, no polling needed.
          this->attach_interrupt_(static_cast<InternalGPIOPin *>(this->interrupt_pin_),
                                  active_high ? gpio::INTERRUPT_RISING_EDGE : gpio::INTERRUPT_FALLING_EDGE);
-          ESP_LOGD(TAG, "Interrupt pin: hardware interrupt, active %s",
-                   active_high ? LOG_STR_LITERAL("HIGH") : LOG_STR_LITERAL("LOW"));
+          ESP_LOGD(TAG, "Interrupt pin: hardware interrupt, active %s", active_high ? "HIGH" : "LOW");
        } else {
          // IO expander pin: leave as output for configuration only.
-          ESP_LOGD(TAG, "Interrupt pin: IO expander polling mode, active %s",
-                   active_high ? LOG_STR_LITERAL("HIGH") : LOG_STR_LITERAL("LOW"));
+          ESP_LOGD(TAG, "Interrupt pin: IO expander polling mode, active %s", active_high ? "HIGH" : "LOW");
        }
      }
    }
@@ -248,8 +248,7 @@ void HaierClimateBase::setup() {

 void HaierClimateBase::dump_config() {
  LOG_CLIMATE("", "Haier Climate", this);
-  ESP_LOGCONFIG(TAG, "  Device communication status: %s",
-                this->valid_connection() ? LOG_STR_LITERAL("established") : LOG_STR_LITERAL("none"));
+  ESP_LOGCONFIG(TAG, "  Device communication status: %s", this->valid_connection() ? "established" : "none");
 }

 void HaierClimateBase::loop() {
@@ -343,11 +343,11 @@ void HonClimate::dump_config() {
                  this->hvac_hardware_info_.value().software_version_,
                  this->hvac_hardware_info_.value().hardware_version_, this->hvac_hardware_info_.value().device_name_);
    ESP_LOGCONFIG(TAG, "  Device features:%s%s%s%s%s",
-                  (this->hvac_hardware_info_.value().functions_[0] ? LOG_STR_LITERAL(" interactive") : ""),
-                  (this->hvac_hardware_info_.value().functions_[1] ? LOG_STR_LITERAL(" controller-device") : ""),
-                  (this->hvac_hardware_info_.value().functions_[2] ? LOG_STR_LITERAL(" crc") : ""),
-                  (this->hvac_hardware_info_.value().functions_[3] ? LOG_STR_LITERAL(" multinode") : ""),
-                  (this->hvac_hardware_info_.value().functions_[4] ? LOG_STR_LITERAL(" role") : ""));
+                  (this->hvac_hardware_info_.value().functions_[0] ? " interactive" : ""),
+                  (this->hvac_hardware_info_.value().functions_[1] ? " controller-device" : ""),
+                  (this->hvac_hardware_info_.value().functions_[2] ? " crc" : ""),
+                  (this->hvac_hardware_info_.value().functions_[3] ? " multinode" : ""),
+                  (this->hvac_hardware_info_.value().functions_[4] ? " role" : ""));
    ESP_LOGCONFIG(TAG, "  Active alarms: %s", buf_to_hex(this->active_alarms_, sizeof(this->active_alarms_)).c_str());
  }
 }
@@ -1,71 +1,124 @@
 #include "havells_solar.h"
 #include "havells_solar_registers.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"

 namespace esphome::havells_solar {

-namespace helpers = modbus::helpers;
-
 static const char *const TAG = "havells_solar";

 static const uint8_t MODBUS_REGISTER_COUNT = 48;  // 48 x 16-bit registers

-void HavellsSolar::on_read_holding_registers(uint16_t start_address, std::span<const uint16_t> registers,
-                                             modbus::ResponseStatus status) {
-  if (!modbus::succeeded(status))
-    return;  // the hub already logs exception responses
+void HavellsSolar::on_response(std::span<const uint8_t> request_pdu, std::span<const uint8_t> response_pdu) {
+  auto data = modbus::helpers::server_pdu_payload(response_pdu);
+  if (data.size() < MODBUS_REGISTER_COUNT * 2) {
+    ESP_LOGW(TAG, "Invalid size for HavellsSolar!");
+    return;
+  }

-  // Publish a sensor if its register(s) are in this response; skipping absent registers keeps this
-  // correct for any read range, so the poll may be split into multiple requests.
-  auto publish_1_register = [&](sensor::Sensor *sensor, uint16_t reg, float unit) -> void {
-    if (sensor == nullptr)
-      return;
-    if (auto value = helpers::value_at<helpers::SensorValueType::U_WORD>(registers, start_address, reg))
-      sensor->publish_state(*value * unit);
+  /* Usage: returns the float value of 1 register read by modbus
+            Arg1: Register address * number of bytes per register
+            Arg2: Multiplier for final register value
+  */
+  auto havells_solar_get_2_registers = [&](size_t i, float unit) -> float {
+    uint32_t temp = encode_uint32(data[i], data[i + 1], data[i + 2], data[i + 3]);
+    return temp * unit;
  };

-  auto publish_2_registers = [&](sensor::Sensor *sensor, uint16_t reg, float unit) -> void {
-    if (sensor == nullptr)
-      return;
-    if (auto value = helpers::value_at<helpers::SensorValueType::U_DWORD>(registers, start_address, reg))
-      sensor->publish_state(*value * unit);
+  /* Usage: returns the float value of 2 registers read by modbus
+            Arg1: Register address * number of bytes per register
+            Arg2: Multiplier for final register value
+  */
+  auto havells_solar_get_1_register = [&](size_t i, float unit) -> float {
+    uint16_t temp = encode_uint16(data[i], data[i + 1]);
+    return temp * unit;
  };

  for (uint8_t i = 0; i < 3; i++) {
-    auto &phase = this->phases_[i];
+    auto phase = this->phases_[i];
    if (!phase.setup)
      continue;
-    publish_1_register(phase.voltage_sensor_, HAVELLS_PHASE_1_VOLTAGE + i * 2, ONE_DEC_UNIT);
-    publish_1_register(phase.current_sensor_, HAVELLS_PHASE_1_CURRENT + i * 2, TWO_DEC_UNIT);
+
+    float voltage = havells_solar_get_1_register(HAVELLS_PHASE_1_VOLTAGE * 2 + (i * 4), ONE_DEC_UNIT);
+    float current = havells_solar_get_1_register(HAVELLS_PHASE_1_CURRENT * 2 + (i * 4), TWO_DEC_UNIT);
+
+    if (phase.voltage_sensor_ != nullptr)
+      phase.voltage_sensor_->publish_state(voltage);
+    if (phase.current_sensor_ != nullptr)
+      phase.current_sensor_->publish_state(current);
  }

  for (uint8_t i = 0; i < 2; i++) {
-    auto &pv = this->pvs_[i];
+    auto pv = this->pvs_[i];
    if (!pv.setup)
      continue;
-    publish_1_register(pv.voltage_sensor_, HAVELLS_PV_1_VOLTAGE + i * 2, ONE_DEC_UNIT);
-    publish_1_register(pv.current_sensor_, HAVELLS_PV_1_CURRENT + i * 2, TWO_DEC_UNIT);
-    publish_1_register(pv.active_power_sensor_, HAVELLS_PV_1_POWER + i, MULTIPLY_TEN_UNIT);
-    publish_1_register(pv.voltage_sampled_by_secondary_cpu_sensor_, HAVELLS_PV1_VOLTAGE_SAMPLED_BY_SECONDARY_CPU + i,
-                       ONE_DEC_UNIT);
-    publish_1_register(pv.insulation_of_p_to_ground_sensor_, HAVELLS_PV1_INSULATION_OF_P_TO_GROUND + i, NO_DEC_UNIT);
+
+    float voltage = havells_solar_get_1_register(HAVELLS_PV_1_VOLTAGE * 2 + (i * 4), ONE_DEC_UNIT);
+    float current = havells_solar_get_1_register(HAVELLS_PV_1_CURRENT * 2 + (i * 4), TWO_DEC_UNIT);
+    float active_power = havells_solar_get_1_register(HAVELLS_PV_1_POWER * 2 + (i * 2), MULTIPLY_TEN_UNIT);
+    float voltage_sampled_by_secondary_cpu =
+        havells_solar_get_1_register(HAVELLS_PV1_VOLTAGE_SAMPLED_BY_SECONDARY_CPU * 2 + (i * 2), ONE_DEC_UNIT);
+    float insulation_of_p_to_ground =
+        havells_solar_get_1_register(HAVELLS_PV1_INSULATION_OF_P_TO_GROUND * 2 + (i * 2), NO_DEC_UNIT);
+
+    if (pv.voltage_sensor_ != nullptr)
+      pv.voltage_sensor_->publish_state(voltage);
+    if (pv.current_sensor_ != nullptr)
+      pv.current_sensor_->publish_state(current);
+    if (pv.active_power_sensor_ != nullptr)
+      pv.active_power_sensor_->publish_state(active_power);
+    if (pv.voltage_sampled_by_secondary_cpu_sensor_ != nullptr)
+      pv.voltage_sampled_by_secondary_cpu_sensor_->publish_state(voltage_sampled_by_secondary_cpu);
+    if (pv.insulation_of_p_to_ground_sensor_ != nullptr)
+      pv.insulation_of_p_to_ground_sensor_->publish_state(insulation_of_p_to_ground);
  }

-  publish_1_register(this->frequency_sensor_, HAVELLS_GRID_FREQUENCY, TWO_DEC_UNIT);
-  publish_1_register(this->active_power_sensor_, HAVELLS_SYSTEM_ACTIVE_POWER, MULTIPLY_TEN_UNIT);
-  publish_1_register(this->reactive_power_sensor_, HAVELLS_SYSTEM_REACTIVE_POWER, TWO_DEC_UNIT);
-  publish_1_register(this->today_production_sensor_, HAVELLS_TODAY_PRODUCTION, TWO_DEC_UNIT);
-  publish_2_registers(this->total_energy_production_sensor_, HAVELLS_TOTAL_ENERGY_PRODUCTION, NO_DEC_UNIT);
-  publish_2_registers(this->total_generation_time_sensor_, HAVELLS_TOTAL_GENERATION_TIME, NO_DEC_UNIT);
-  publish_1_register(this->today_generation_time_sensor_, HAVELLS_TODAY_GENERATION_TIME, NO_DEC_UNIT);
-  publish_1_register(this->inverter_module_temp_sensor_, HAVELLS_INVERTER_MODULE_TEMP, NO_DEC_UNIT);
-  publish_1_register(this->inverter_inner_temp_sensor_, HAVELLS_INVERTER_INNER_TEMP, NO_DEC_UNIT);
-  publish_1_register(this->inverter_bus_voltage_sensor_, HAVELLS_INVERTER_BUS_VOLTAGE, NO_DEC_UNIT);
-  publish_1_register(this->insulation_pv_n_to_ground_sensor_, HAVELLS_INSULATION_OF_PV_N_TO_GROUND, NO_DEC_UNIT);
-  publish_1_register(this->gfci_value_sensor_, HAVELLS_GFCI_VALUE, NO_DEC_UNIT);
-  publish_1_register(this->dci_of_r_sensor_, HAVELLS_DCI_OF_R, NO_DEC_UNIT);
-  publish_1_register(this->dci_of_s_sensor_, HAVELLS_DCI_OF_S, NO_DEC_UNIT);
-  publish_1_register(this->dci_of_t_sensor_, HAVELLS_DCI_OF_T, NO_DEC_UNIT);
+  float frequency = havells_solar_get_1_register(HAVELLS_GRID_FREQUENCY * 2, TWO_DEC_UNIT);
+  float active_power = havells_solar_get_1_register(HAVELLS_SYSTEM_ACTIVE_POWER * 2, MULTIPLY_TEN_UNIT);
+  float reactive_power = havells_solar_get_1_register(HAVELLS_SYSTEM_REACTIVE_POWER * 2, TWO_DEC_UNIT);
+  float today_production = havells_solar_get_1_register(HAVELLS_TODAY_PRODUCTION * 2, TWO_DEC_UNIT);
+  float total_energy_production = havells_solar_get_2_registers(HAVELLS_TOTAL_ENERGY_PRODUCTION * 2, NO_DEC_UNIT);
+  float total_generation_time = havells_solar_get_2_registers(HAVELLS_TOTAL_GENERATION_TIME * 2, NO_DEC_UNIT);
+  float today_generation_time = havells_solar_get_1_register(HAVELLS_TODAY_GENERATION_TIME * 2, NO_DEC_UNIT);
+  float inverter_module_temp = havells_solar_get_1_register(HAVELLS_INVERTER_MODULE_TEMP * 2, NO_DEC_UNIT);
+  float inverter_inner_temp = havells_solar_get_1_register(HAVELLS_INVERTER_INNER_TEMP * 2, NO_DEC_UNIT);
+  float inverter_bus_voltage = havells_solar_get_1_register(HAVELLS_INVERTER_BUS_VOLTAGE * 2, NO_DEC_UNIT);
+  float insulation_pv_n_to_ground = havells_solar_get_1_register(HAVELLS_INSULATION_OF_PV_N_TO_GROUND * 2, NO_DEC_UNIT);
+  float gfci_value = havells_solar_get_1_register(HAVELLS_GFCI_VALUE * 2, NO_DEC_UNIT);
+  float dci_of_r = havells_solar_get_1_register(HAVELLS_DCI_OF_R * 2, NO_DEC_UNIT);
+  float dci_of_s = havells_solar_get_1_register(HAVELLS_DCI_OF_S * 2, NO_DEC_UNIT);
+  float dci_of_t = havells_solar_get_1_register(HAVELLS_DCI_OF_T * 2, NO_DEC_UNIT);
+
+  if (this->frequency_sensor_ != nullptr)
+    this->frequency_sensor_->publish_state(frequency);
+  if (this->active_power_sensor_ != nullptr)
+    this->active_power_sensor_->publish_state(active_power);
+  if (this->reactive_power_sensor_ != nullptr)
+    this->reactive_power_sensor_->publish_state(reactive_power);
+  if (this->today_production_sensor_ != nullptr)
+    this->today_production_sensor_->publish_state(today_production);
+  if (this->total_energy_production_sensor_ != nullptr)
+    this->total_energy_production_sensor_->publish_state(total_energy_production);
+  if (this->total_generation_time_sensor_ != nullptr)
+    this->total_generation_time_sensor_->publish_state(total_generation_time);
+  if (this->today_generation_time_sensor_ != nullptr)
+    this->today_generation_time_sensor_->publish_state(today_generation_time);
+  if (this->inverter_module_temp_sensor_ != nullptr)
+    this->inverter_module_temp_sensor_->publish_state(inverter_module_temp);
+  if (this->inverter_inner_temp_sensor_ != nullptr)
+    this->inverter_inner_temp_sensor_->publish_state(inverter_inner_temp);
+  if (this->inverter_bus_voltage_sensor_ != nullptr)
+    this->inverter_bus_voltage_sensor_->publish_state(inverter_bus_voltage);
+  if (this->insulation_pv_n_to_ground_sensor_ != nullptr)
+    this->insulation_pv_n_to_ground_sensor_->publish_state(insulation_pv_n_to_ground);
+  if (this->gfci_value_sensor_ != nullptr)
+    this->gfci_value_sensor_->publish_state(gfci_value);
+  if (this->dci_of_r_sensor_ != nullptr)
+    this->dci_of_r_sensor_->publish_state(dci_of_r);
+  if (this->dci_of_s_sensor_ != nullptr)
+    this->dci_of_s_sensor_->publish_state(dci_of_s);
+  if (this->dci_of_t_sensor_ != nullptr)
+    this->dci_of_t_sensor_->publish_state(dci_of_t);
 }

 void HavellsSolar::update() { this->read_holding_registers(0, MODBUS_REGISTER_COUNT); }
@@ -77,8 +77,7 @@ class HavellsSolar final : public PollingComponent, public modbus::ModbusClientD

  void update() override;

-  void on_read_holding_registers(uint16_t start_address, std::span<const uint16_t> registers,
-                                 modbus::ResponseStatus status) override;
+  void on_response(std::span<const uint8_t> request_pdu, std::span<const uint8_t> response_pdu) override;

  void dump_config() override;

@@ -38,7 +38,7 @@ void HDC302XComponent::dump_config() {
  ESP_LOGCONFIG(TAG,
                "HDC302x:\n"
                "  Heater: %s",
-                this->heater_active_ ? LOG_STR_LITERAL("active") : LOG_STR_LITERAL("inactive"));
+                this->heater_active_ ? "active" : "inactive");
  LOG_I2C_DEVICE(this);
  LOG_UPDATE_INTERVAL(this);
  LOG_SENSOR("  ", "Temperature", this->temp_sensor_);
@@ -59,7 +59,7 @@ void HE60rCover::endstop_reached_(CoverOperation operation) {
    if (this->last_command_ == operation) {
      float dur = (float) (now - this->start_dir_time_) / 1e3f;
      ESP_LOGD(TAG, "'%s' - %s endstop reached. Took %.1fs.", this->name_.c_str(),
-               operation == COVER_OPERATION_OPENING ? LOG_STR_LITERAL("Open") : LOG_STR_LITERAL("Close"), dur);
+               operation == COVER_OPERATION_OPENING ? "Open" : "Close", dur);
    }
    this->publish_state();
  }
@@ -213,9 +213,9 @@ void HE60rCover::start_direction_(CoverOperation dir) {
  if (this->current_operation == dir)
    return;
  ESP_LOGD(TAG, "'%s' - Direction '%s' requested.", this->name_.c_str(),
-           dir == COVER_OPERATION_OPENING   ? LOG_STR_LITERAL("OPEN")
-           : dir == COVER_OPERATION_CLOSING ? LOG_STR_LITERAL("CLOSE")
-                                            : LOG_STR_LITERAL("STOP"));
+           dir == COVER_OPERATION_OPENING   ? "OPEN"
+           : dir == COVER_OPERATION_CLOSING ? "CLOSE"
+                                            : "STOP");

  if (dir == this->next_direction_) {
    // either moving and needs to stop, or stopped and will move correctly on one trigger
@@ -336,8 +336,7 @@ void HlkFm22xComponent::dump_config() {
  }
  if (this->enrolling_binary_sensor_) {
    LOG_BINARY_SENSOR("  ", "Enrolling", this->enrolling_binary_sensor_);
-    ESP_LOGCONFIG(TAG, "    Current Value: %s",
-                  this->enrolling_binary_sensor_->state ? LOG_STR_LITERAL("ON") : LOG_STR_LITERAL("OFF"));
+    ESP_LOGCONFIG(TAG, "    Current Value: %s", this->enrolling_binary_sensor_->state ? "ON" : "OFF");
  }
  if (this->face_count_sensor_) {
    LOG_SENSOR("  ", "Face Count", this->face_count_sensor_);
@@ -97,8 +97,7 @@ void HLW8012Component::update() {

  if (this->change_mode_every_ != 0 && this->change_mode_at_++ == this->change_mode_every_) {
    this->current_mode_ = !this->current_mode_;
-    ESP_LOGV(TAG, "Changing mode to %s mode",
-             this->current_mode_ ? LOG_STR_LITERAL("CURRENT") : LOG_STR_LITERAL("VOLTAGE"));
+    ESP_LOGV(TAG, "Changing mode to %s mode", this->current_mode_ ? "CURRENT" : "VOLTAGE");
    this->change_mode_at_ = 0;
    this->sel_pin_->digital_write(this->current_mode_);
  }
@@ -116,8 +116,8 @@ void ILI9XXXDisplay::dump_config() {
                "  Mirror_x: %s\n"
                "  Mirror_y: %s\n"
                "  Invert colors: %s",
-                this->color_order_ == display::COLOR_ORDER_BGR ? LOG_STR_LITERAL("BGR") : LOG_STR_LITERAL("RGB"),
-                YESNO(this->swap_xy_), YESNO(this->mirror_x_), YESNO(this->mirror_y_), YESNO(this->pre_invertcolors_));
+                this->color_order_ == display::COLOR_ORDER_BGR ? "BGR" : "RGB", YESNO(this->swap_xy_),
+                YESNO(this->mirror_x_), YESNO(this->mirror_y_), YESNO(this->pre_invertcolors_));

  if (this->is_failed()) {
    ESP_LOGCONFIG(TAG, "  => Failed to init Memory: YES!");
@@ -16,7 +16,7 @@ from esphome.types import ConfigType

 AUTO_LOAD = ["improv_base"]
 CODEOWNERS = ["@esphome/core"]
-DEPENDENCIES = ["logger", "network"]
+DEPENDENCIES = ["logger", "wifi"]

 improv_serial_ns = cg.esphome_ns.namespace("improv_serial")

@@ -1,5 +1,5 @@
 #include "improv_serial_component.h"
-#ifdef USE_IMPROV_SERIAL
+#ifdef USE_WIFI
 #include "esphome/core/application.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
@@ -7,10 +7,7 @@
 #include "esphome/core/version.h"

 #include "esphome/components/logger/logger.h"
-#include "esphome/components/network/util.h"
-#ifdef USE_WIFI
 #include "esphome/components/wifi/scan_list.h"
-#endif

 #include <array>

@@ -29,17 +26,13 @@ void ImprovSerialComponent::setup() {
  this->hw_serial_ = logger::global_logger->get_hw_serial();
 #endif

-  // The Improv state machine tracks Wi-Fi provisioning only. General device
-  // connectivity (e.g. Ethernet) is reported separately via GET_NETWORK_STATE.
-#ifdef USE_WIFI
-  if (wifi::global_wifi_component != nullptr && wifi::global_wifi_component->has_sta()) {
+  if (wifi::global_wifi_component->has_sta()) {
    this->state_ = improv::STATE_PROVISIONED;
-  } else if (wifi::global_wifi_component != nullptr && !wifi::global_wifi_component->is_disabled()) {
+  } else if (!wifi::global_wifi_component->is_disabled()) {
    // Respect Wi-Fi's disabled state; forcing a scan while disabled throws
    // the wifi component into an invalid state from which it cannot recover.
    wifi::global_wifi_component->start_scanning();
  }
-#endif
 }

 void ImprovSerialComponent::loop() {
@@ -62,14 +55,8 @@ void ImprovSerialComponent::loop() {
    }
  }

-#ifdef USE_WIFI
-  if (this->state_ == improv::STATE_PROVISIONING && wifi::global_wifi_component != nullptr &&
-      wifi::global_wifi_component->is_connected()) {
-    // Being connected is not enough: re-provisioning a device that is already online leaves the
-    // prior network up until it drops, so check that the joined network is the requested one
-    // before reporting success. Same test as the wifi.connect action.
-    char ssid_buf[wifi::SSID_BUFFER_SIZE];
-    if (strcmp(wifi::global_wifi_component->wifi_ssid_to(ssid_buf), this->connecting_sta_.get_ssid().c_str()) == 0) {
+  if (this->state_ == improv::STATE_PROVISIONING) {
+    if (wifi::global_wifi_component->is_connected()) {
      wifi::global_wifi_component->save_wifi_sta(this->connecting_sta_.get_ssid(),
                                                 this->connecting_sta_.get_password());
      this->connecting_sta_ = {};
@@ -79,7 +66,6 @@ void ImprovSerialComponent::loop() {
      this->send_settings_response_(improv::WIFI_SETTINGS);
    }
  }
-#endif
 }

 void ImprovSerialComponent::dump_config() { ESP_LOGCONFIG(TAG, "Improv Serial:"); }
@@ -157,17 +143,15 @@ void ImprovSerialComponent::write_data_(const uint8_t *data, const size_t size)
 #endif
 }

+void ImprovSerialComponent::send_settings_response_(improv::Command command) {
+  std::array<uint8_t, improv::RPC_RESPONSE_MAX_SIZE> buf;
+  improv::RpcResponseBuilder builder(buf, command);
+#ifdef USE_IMPROV_SERIAL_NEXT_URL
+  this->add_next_url_(builder, MAX_NEXT_URL_LEN);
+#endif
 #ifdef USE_WEBSERVER
-void ImprovSerialComponent::add_webserver_urls_(improv::RpcResponseBuilder &builder, [[maybe_unused]] bool wifi_first) {
-  // The webserver listens on every interface, so advertise each one that has a usable IPv4.
-  // network::get_ip_addresses() can't be used here: it returns only the highest-priority
-  // interface's addresses, which are all-unset (0.0.0.0) when e.g. Ethernet has no link while
-  // the device is online via Wi-Fi, and 0.0.0.0 must not become the advertised URL. OpenThread
-  // is omitted: it only ever has IPv6 addresses, which cannot form an IPv4 http:// URL.
-  const auto append_urls = [&builder](const network::IPAddresses &addresses) {
-    for (const auto &ip : addresses) {
-      if (!ip.is_ip4() || !ip.is_set())
-        continue;
+  for (auto &ip : wifi::global_wifi_component->wifi_sta_ip_addresses()) {
+    if (ip.is_ip4()) {
      char ip_buf[network::IP_ADDRESS_BUFFER_SIZE];
      ip.str_to(ip_buf);
      // "http://" (7) + IP (40) + ":" (1) + port (5) + null (1) = 54
@@ -178,43 +162,9 @@ void ImprovSerialComponent::add_webserver_urls_(improv::RpcResponseBuilder &buil
      if (!builder.add_string(webserver_url, len)) {
        ESP_LOGW(TAG, "Response full; URL dropped");
      }
+      break;
    }
-  };
-#ifdef USE_WIFI
-  // Clients redirect to the first URL, so the interface the client just configured has to lead:
-  // another interface's address can be on a subnet that client cannot reach.
-  const auto append_wifi_urls = [&append_urls]() {
-    if (wifi::global_wifi_component != nullptr)
-      append_urls(wifi::global_wifi_component->get_ip_addresses());
-  };
-  if (wifi_first)
-    append_wifi_urls();
-#endif
-#ifdef USE_ETHERNET
-  if (ethernet::global_eth_component != nullptr)
-    append_urls(ethernet::global_eth_component->get_ip_addresses());
-#endif
-#ifdef USE_MODEM
-  if (modem::global_modem_component != nullptr)
-    append_urls(modem::global_modem_component->get_ip_addresses());
-#endif
-#ifdef USE_WIFI
-  if (!wifi_first)
-    append_wifi_urls();
-#endif
-}
-#endif  // USE_WEBSERVER
-
-void ImprovSerialComponent::send_settings_response_(improv::Command command) {
-  std::array<uint8_t, improv::RPC_RESPONSE_MAX_SIZE> buf;
-  improv::RpcResponseBuilder builder(buf, command);
-#ifdef USE_IMPROV_SERIAL_NEXT_URL
-  this->add_next_url_(builder, MAX_NEXT_URL_LEN);
-#endif
-#ifdef USE_WEBSERVER
-  // This response only ever answers Wi-Fi provisioning, so lead with the Wi-Fi URL as it did
-  // before other interfaces were reported.
-  this->add_webserver_urls_(builder, /*wifi_first=*/true);
+  }
 #endif
  this->send_response_(builder.finish(false));
 }
@@ -281,8 +231,7 @@ bool ImprovSerialComponent::parse_improv_serial_byte_(uint8_t byte) {
 bool ImprovSerialComponent::parse_improv_payload_(improv::ImprovCommand &command) {
  switch (command.command) {
    case improv::WIFI_SETTINGS: {
-#ifdef USE_WIFI
-      if (wifi::global_wifi_component == nullptr || wifi::global_wifi_component->is_disabled()) {
+      if (wifi::global_wifi_component->is_disabled()) {
        // Wi-Fi is disabled, so we can't provision. Respond immediately
        // instead of letting the client wait out its provisioning timeout.
        ESP_LOGW(TAG, "Wi-Fi is disabled; cannot provision");
@@ -294,32 +243,21 @@ bool ImprovSerialComponent::parse_improv_payload_(improv::ImprovCommand &command
      sta.set_password(command.password.c_str());
      this->connecting_sta_ = sta;

-      // Sampled before start_connecting(): the old connection drops asynchronously after it.
-      const bool switching = wifi::global_wifi_component->is_connected();
      wifi::global_wifi_component->set_sta(sta);
      wifi::global_wifi_component->start_connecting(sta);
      this->set_state_(improv::STATE_PROVISIONING);
      ESP_LOGD(TAG, "Received settings: SSID=%s, password=" LOG_SECRET("%s"), command.ssid.c_str(),
               command.password.c_str());

-      this->set_timeout("wifi-connect-timeout", switching ? WIFI_SWITCH_TIMEOUT_MS : WIFI_CONNECT_TIMEOUT_MS,
-                        [this]() { this->on_wifi_connect_timeout_(); });
-#else
-      // No Wi-Fi support compiled in; there is nothing to provision.
-      ESP_LOGW(TAG, "Wi-Fi not supported; cannot provision");
-      this->set_error_(improv::ERROR_UNABLE_TO_CONNECT);
-#endif
+      this->set_timeout("wifi-connect-timeout", 30000, [this]() { this->on_wifi_connect_timeout_(); });
      return true;
    }
-    case improv::GET_CURRENT_STATE: {
-      // This state machine tracks Wi-Fi provisioning only. When Wi-Fi is disabled or not
-      // compiled in, provisioning is unavailable -> report STOPPED so the client doesn't
-      // offer a Wi-Fi form. General connectivity (e.g. Ethernet) is reported separately
-      // via GET_NETWORK_STATE.
-#ifdef USE_WIFI
-      if (wifi::global_wifi_component == nullptr || wifi::global_wifi_component->is_disabled()) {
-        // Reported transiently without disturbing our internal provisioning state machine,
-        // so a later `wifi.enable` still reports the correct state.
+    case improv::GET_CURRENT_STATE:
+      if (wifi::global_wifi_component->is_disabled()) {
+        // Wi-Fi is disabled; report the Improv "stopped" state so a client can tell
+        // the user that provisioning is unavailable. Reported transiently without
+        // disturbing our internal provisioning state machine, so a later `wifi.enable`
+        // still reports the correct state.
        this->send_current_state_(improv::STATE_STOPPED);
        return true;
      }
@@ -327,20 +265,14 @@ bool ImprovSerialComponent::parse_improv_payload_(improv::ImprovCommand &command
      if (this->state_ == improv::STATE_PROVISIONED) {
        this->send_settings_response_(improv::GET_CURRENT_STATE);
      }
-#else
-      this->send_current_state_(improv::STATE_STOPPED);
-#endif
      return true;
-    }
    case improv::GET_DEVICE_INFO: {
      this->send_version_info_();
      return true;
    }
    case improv::GET_WIFI_NETWORKS: {
-      // Declared out here because the terminating empty response is sent with or without Wi-Fi
-      std::array<uint8_t, improv::RPC_RESPONSE_MAX_SIZE> buf;
-#ifdef USE_WIFI
      const auto &results = wifi::global_wifi_component->get_scan_result();
+      std::array<uint8_t, improv::RPC_RESPONSE_MAX_SIZE> buf;
      for (const auto &scan : results) {
        bool with_auth = false;
        if (!wifi::should_show_scan_entry(results, scan, with_auth))
@@ -357,52 +289,11 @@ bool ImprovSerialComponent::parse_improv_payload_(improv::ImprovCommand &command
        builder.add_string(YESNO(with_auth));
        this->send_response_(builder.finish(false));
      }
-#endif  // USE_WIFI
      // Send empty response to signify the end of the list.
      improv::RpcResponseBuilder builder(buf, improv::GET_WIFI_NETWORKS);
      this->send_response_(builder.finish(false));
      return true;
    }
-    case improv::GET_NETWORK_STATE: {
-      // Reports general device connectivity and which network interfaces are present, decoupled
-      // from the Wi-Fi-only provisioning state machine. data[0] is a decimal flags byte;
-      // when online, the reachable device URL(s) follow.
-      uint8_t flags = 0;
-      if (network::is_connected())
-        flags |= improv::NETWORK_IS_ONLINE;
-#ifdef USE_WIFI
-      flags |= improv::NETWORK_SUPPORTS_WIFI;
-#endif
-#ifdef USE_ETHERNET
-      flags |= improv::NETWORK_SUPPORTS_ETHERNET;
-#endif
-#ifdef USE_OPENTHREAD
-      flags |= improv::NETWORK_SUPPORTS_THREAD;
-#endif
-#ifdef USE_MODEM
-      flags |= improv::NETWORK_SUPPORTS_MODEM;
-#endif
-      std::array<uint8_t, improv::RPC_RESPONSE_MAX_SIZE> buf;
-      improv::RpcResponseBuilder builder(buf, improv::GET_NETWORK_STATE);
-      // Every flag bit fits int8_t's positive range, so int8_to_str renders the byte
-      static_assert(improv::NETWORK_SUPPORTS_MODEM <= 0x7F, "network flags no longer fit int8_to_str");
-      char flags_buf[4];  // uint8_t: max "255" + null
-      char *flags_end = int8_to_str(flags_buf, static_cast<int8_t>(flags));
-      builder.add_string(flags_buf, flags_end - flags_buf);
-#ifdef USE_WEBSERVER
-      // Not tied to one interface, so follow the configured priority the way
-      // network::get_ip_addresses() does: a wifi-first network priority list leads with Wi-Fi.
-      if (flags & improv::NETWORK_IS_ONLINE) {
-#if defined(USE_NETWORK_PRIMARY_INTERFACE_WIFI) && defined(USE_WIFI)
-        this->add_webserver_urls_(builder, /*wifi_first=*/true);
-#else
-        this->add_webserver_urls_(builder, /*wifi_first=*/false);
-#endif
-      }
-#endif
-      this->send_response_(builder.finish(false));
-      return true;
-    }
    default: {
      ESP_LOGW(TAG, "Unknown payload");
      this->set_error_(improv::ERROR_UNKNOWN_RPC);
@@ -440,14 +331,12 @@ void ImprovSerialComponent::send_response_(std::span<const uint8_t> response) {
  this->write_data_(response.data(), response.size());
 }

-#ifdef USE_WIFI
 void ImprovSerialComponent::on_wifi_connect_timeout_() {
  this->set_error_(improv::ERROR_UNABLE_TO_CONNECT);
  this->set_state_(improv::STATE_AUTHORIZED);
  ESP_LOGW(TAG, "Timed out while connecting to Wi-Fi network");
  wifi::global_wifi_component->clear_sta();
 }
-#endif

 ImprovSerialComponent *global_improv_serial_component =  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
    nullptr;                                             // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -2,19 +2,15 @@

 #include "esphome/components/improv_base/improv_base.h"
 #include "esphome/components/logger/logger.h"
-#include "esphome/components/network/util.h"
+#include "esphome/components/wifi/wifi_component.h"
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
-#ifdef USE_IMPROV_SERIAL
+#ifdef USE_WIFI
 #include <improv.h>
 #include <span>
 #include <vector>

-#ifdef USE_WIFI
-#include "esphome/components/wifi/wifi_component.h"
-#endif
-
 #ifdef USE_IMPROV_SERIAL_UART
 #include "esphome/components/uart/uart_component.h"
 #elif defined(USE_ESP32)
@@ -52,22 +48,13 @@ enum ImprovSerialType : uint8_t {
 static const uint16_t IMPROV_SERIAL_TIMEOUT = 100;
 static const uint8_t IMPROV_SERIAL_VERSION = 1;

-#ifdef USE_WIFI
-// Wi-Fi connect failure timers: a fresh provision reports at 30 s (stock behavior), while
-// switching networks on an already-connected device (disconnect + reconnect) can legitimately
-// take longer; 90 s matches esp32_improv's default wifi_timeout.
-static const uint32_t WIFI_CONNECT_TIMEOUT_MS = 30000;
-static const uint32_t WIFI_SWITCH_TIMEOUT_MS = 90000;
-#endif
-
 // The serial frame length field is one byte
 static constexpr size_t MAX_SERIAL_RESPONSE = 255;
 // command + data length + trailing byte
 static constexpr size_t RPC_RESPONSE_OVERHEAD = 3;
 static constexpr size_t MAX_SERIAL_PAYLOAD = MAX_SERIAL_RESPONSE - RPC_RESPONSE_OVERHEAD;
 #ifdef USE_WEBSERVER
-// length byte + "http://" + IPv4 + ":" + port. Reserves the first URL only; a device with
-// several interfaces online adds the rest best-effort and warns if one no longer fits.
+// length byte + "http://" + IPv4 + ":" + port
 static constexpr size_t WEBSERVER_URL_RESERVE = 1 + 7 + 15 + 1 + 5;
 #else
 static constexpr size_t WEBSERVER_URL_RESERVE = 0;
@@ -97,15 +84,8 @@ class ImprovSerialComponent final : public Component, public improv_base::Improv
  void send_current_state_(improv::State state);
  void set_error_(improv::Error error);
  void send_response_(std::span<const uint8_t> response);
-#ifdef USE_WIFI
  void on_wifi_connect_timeout_();
-#endif

-#ifdef USE_WEBSERVER
-  /// Append one web server URL per interface that has a usable IPv4. With wifi_first the Wi-Fi
-  /// URL leads, for responses to Wi-Fi provisioning; otherwise interfaces go in priority order.
-  void add_webserver_urls_(improv::RpcResponseBuilder &builder, [[maybe_unused]] bool wifi_first);
-#endif
  void send_settings_response_(improv::Command command);
  void send_version_info_();

@@ -187,9 +167,7 @@ class ImprovSerialComponent final : public Component, public improv_base::Improv

  std::vector<uint8_t> rx_buffer_;
  uint32_t last_read_byte_{0};
-#ifdef USE_WIFI
  wifi::WiFiAP connecting_sta_;
-#endif
  improv::State state_{improv::STATE_AUTHORIZED};
 };

@@ -209,8 +209,7 @@ void INA2XX::dump_config() {
                "  CURRENT_LSB = %f\n"
                "  SHUNT_CAL = %d",
                this->shunt_resistance_ohm_, this->max_current_a_, this->shunt_tempco_ppm_c_,
-                (uint8_t) this->adc_range_,
-                this->adc_range_ ? LOG_STR_LITERAL("±40.96 mV") : LOG_STR_LITERAL("±163.84 mV"), this->current_lsb_,
+                (uint8_t) this->adc_range_, this->adc_range_ ? "±40.96 mV" : "±163.84 mV", this->current_lsb_,
                this->shunt_cal_);

  ESP_LOGCONFIG(TAG, "  ADC Samples = %d; ADC times: Bus = %d μs, Shunt = %d μs, Temp = %d μs",
@@ -1,7 +1,5 @@
 import esphome.codegen as cg
 from esphome.components import sensor
-from esphome.components.esp32 import get_esp32_variant, include_builtin_idf_component
-from esphome.components.esp32.const import VARIANT_ESP32
 from esphome.components.zephyr import zephyr_add_prj_conf
 from esphome.config_helpers import filter_source_files_from_platform
 import esphome.config_validation as cv
@@ -50,10 +48,6 @@ async def to_code(config: ConfigType) -> None:
    var = await sensor.new_sensor(config)
    await cg.register_component(var, config)

-    if CORE.is_esp32 and get_esp32_variant() == VARIANT_ESP32:
-        # temprature_sens_read() lives in the esp_phy blob, which is excluded by default
-        include_builtin_idf_component("esp_phy")
-
    if CORE.using_zephyr and CORE.is_nrf52:
        zephyr_add_prj_conf("SENSOR", True)
        zephyr_add_prj_conf("TEMP_NRF5", True)
@@ -740,7 +740,7 @@ bool IT8951Display::prepare_update_region_(UpdateMode &mode) {
  this->reset_dirty_region_();

  ESP_LOGV(TAG, "Update: %ux%u@%u,%u mode=%u (%s)", width, height, x, y, static_cast<unsigned>(mode),
-           this->grayscale_ ? LOG_STR_LITERAL("grayscale") : LOG_STR_LITERAL("mono"));
+           this->grayscale_ ? "grayscale" : "mono");
  return true;
 }

@@ -1063,27 +1063,25 @@ void IT8951Display::dump_config() {
    strncpy(force_temperature, "(controller default)", sizeof(force_temperature));
    force_temperature[sizeof(force_temperature) - 1] = '\0';
  }
-  ESP_LOGCONFIG(
-      TAG,
-      "  Model preset: %s"
-      "\n  Dimensions: %dx%d"
-      "\n  Buffer: %u bytes"
-      "\n  Image buffer addr: 0x%04X%04X"
-      "\n  VCOM: %.02fV (set selector 0x%04X)"
-      "\n  Force temperature: %s"
-      "\n  Display command: %s"
-      "\n  Sleep when done: %s"
-      "\n  Full update every: %u"
-      "\n  Inverted colors: %s"
-      "\n  Pixel format: %s"
-      "\n  Reset duration: %" PRIu32 "ms",
-      this->name_ != nullptr ? this->name_ : LOG_STR_LITERAL("(unknown)"), this->get_width_internal(),
-      this->get_height_internal(), static_cast<unsigned>(this->buffer_length_), this->img_buf_addr_h_,
-      this->img_buf_addr_l_, static_cast<float>(this->vcom_) / 1000.0f, this->vcom_register_, force_temperature,
-      this->use_legacy_dpy_area_ ? LOG_STR_LITERAL("DPY_AREA (0x0034, legacy)")
-                                 : LOG_STR_LITERAL("DPY_BUF_AREA (0x0037)"),
-      YESNO(this->sleep_when_done_), this->full_update_every_, YESNO(this->invert_colors_),
-      this->grayscale_ ? LOG_STR_LITERAL("4bpp grayscale") : LOG_STR_LITERAL("1bpp monochrome"), this->reset_duration_);
+  ESP_LOGCONFIG(TAG,
+                "  Model preset: %s"
+                "\n  Dimensions: %dx%d"
+                "\n  Buffer: %u bytes"
+                "\n  Image buffer addr: 0x%04X%04X"
+                "\n  VCOM: %.02fV (set selector 0x%04X)"
+                "\n  Force temperature: %s"
+                "\n  Display command: %s"
+                "\n  Sleep when done: %s"
+                "\n  Full update every: %u"
+                "\n  Inverted colors: %s"
+                "\n  Pixel format: %s"
+                "\n  Reset duration: %" PRIu32 "ms",
+                this->name_ != nullptr ? this->name_ : "(unknown)", this->get_width_internal(),
+                this->get_height_internal(), static_cast<unsigned>(this->buffer_length_), this->img_buf_addr_h_,
+                this->img_buf_addr_l_, static_cast<float>(this->vcom_) / 1000.0f, this->vcom_register_,
+                force_temperature, this->use_legacy_dpy_area_ ? "DPY_AREA (0x0034, legacy)" : "DPY_BUF_AREA (0x0037)",
+                YESNO(this->sleep_when_done_), this->full_update_every_, YESNO(this->invert_colors_),
+                this->grayscale_ ? "4bpp grayscale" : "1bpp monochrome", this->reset_duration_);
  LOG_PIN("  Reset Pin: ", this->reset_pin_);
  LOG_PIN("  Busy Pin: ", this->busy_pin_);
  LOG_PIN("  CS Pin: ", this->cs_);
@@ -1,74 +1,87 @@
 #include "kuntze.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
+#include "esphome/core/application.h"

 namespace esphome::kuntze {

 static const char *const TAG = "kuntze";

-static constexpr uint16_t REGISTER_PH = 4136;
-static constexpr uint16_t REGISTER_TEMPERATURE = 4160;
-static constexpr uint16_t REGISTER_DIS1 = 4680;
-static constexpr uint16_t REGISTER_DIS2 = 6000;
-static constexpr uint16_t REGISTER_REDOX = 4688;
-static constexpr uint16_t REGISTER_EC = 4728;
-static constexpr uint16_t REGISTER_OCI = 5832;
-static constexpr uint16_t REGISTER[] = {REGISTER_PH,    REGISTER_TEMPERATURE, REGISTER_DIS1, REGISTER_DIS2,
-                                        REGISTER_REDOX, REGISTER_EC,          REGISTER_OCI};
+static const uint16_t REGISTER[] = {4136, 4160, 4680, 6000, 4688, 4728, 5832};

-void Kuntze::on_read_holding_registers(uint16_t start_address, std::span<const uint16_t> registers,
-                                       modbus::ResponseStatus status) {
-  if (!modbus::succeeded(status) || registers.size() < 2)
-    return;
+// Maximum bytes to log for Modbus responses (2 registers = 4, plus count = 5)
+static constexpr size_t KUNTZE_MAX_LOG_BYTES = 8;

-  // Each value is a register pair: the reading, then the number of decimal places in its low byte.
-  float value = registers[0];
-  for (uint16_t i = 0; i < (registers[1] & 0xFF); i++)
-    value /= 10.0f;
+void Kuntze::on_response(std::span<const uint8_t> request_pdu, std::span<const uint8_t> response_pdu) {
+  auto data = modbus::helpers::server_pdu_payload(response_pdu);
+  auto get_16bit = [&](int i) -> uint16_t { return (uint16_t(data[i * 2]) << 8) | uint16_t(data[i * 2 + 1]); };

-  switch (start_address) {
-    case REGISTER_PH:
+  this->waiting_ = false;
+#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
+  char hex_buf[format_hex_pretty_size(KUNTZE_MAX_LOG_BYTES)];
+#endif
+  ESP_LOGV(TAG, "Data: %s", format_hex_pretty_to(hex_buf, data.data(), data.size()));
+
+  float value = (float) get_16bit(0);
+  for (int i = 0; i < data[3]; i++)
+    value /= 10.0;
+  switch (this->state_) {
+    case 1:
      ESP_LOGD(TAG, "pH=%.1f", value);
      if (this->ph_sensor_ != nullptr)
        this->ph_sensor_->publish_state(value);
      break;
-    case REGISTER_TEMPERATURE:
+    case 2:
      ESP_LOGD(TAG, "temperature=%.1f", value);
      if (this->temperature_sensor_ != nullptr)
        this->temperature_sensor_->publish_state(value);
      break;
-    case REGISTER_DIS1:
+    case 3:
      ESP_LOGD(TAG, "DIS1=%.1f", value);
      if (this->dis1_sensor_ != nullptr)
        this->dis1_sensor_->publish_state(value);
      break;
-    case REGISTER_DIS2:
+    case 4:
      ESP_LOGD(TAG, "DIS2=%.1f", value);
      if (this->dis2_sensor_ != nullptr)
        this->dis2_sensor_->publish_state(value);
      break;
-    case REGISTER_REDOX:
+    case 5:
      ESP_LOGD(TAG, "REDOX=%.1f", value);
      if (this->redox_sensor_ != nullptr)
        this->redox_sensor_->publish_state(value);
      break;
-    case REGISTER_EC:
+    case 6:
      ESP_LOGD(TAG, "EC=%.1f", value);
      if (this->ec_sensor_ != nullptr)
        this->ec_sensor_->publish_state(value);
      break;
-    case REGISTER_OCI:
+    case 7:
      ESP_LOGD(TAG, "OCI=%.1f", value);
      if (this->oci_sensor_ != nullptr)
        this->oci_sensor_->publish_state(value);
      break;
  }
+  if (++this->state_ > 7)
+    this->state_ = 0;
 }

-void Kuntze::update() {
-  for (uint16_t reg : REGISTER)
-    this->read_holding_registers(reg, 2);
+void Kuntze::loop() {
+  uint32_t now = App.get_loop_component_start_time();
+  // timeout after 15 seconds
+  if (this->waiting_ && (now - this->last_send_ > 15000)) {
+    ESP_LOGW(TAG, "timed out waiting for response");
+    this->waiting_ = false;
+  }
+  if (this->waiting_ || (this->state_ == 0))
+    return;
+  this->last_send_ = now;
+  this->read_holding_registers(REGISTER[this->state_ - 1], 2);
+  this->waiting_ = true;
 }

+void Kuntze::update() { this->state_ = 1; }
+
 void Kuntze::dump_config() {
  ESP_LOGCONFIG(TAG,
                "Kuntze:\n"
@@ -18,14 +18,18 @@ class Kuntze final : public PollingComponent, public modbus::ModbusClientDevice
  void set_ec_sensor(sensor::Sensor *ec_sensor) { ec_sensor_ = ec_sensor; }
  void set_oci_sensor(sensor::Sensor *oci_sensor) { oci_sensor_ = oci_sensor; }

+  void loop() override;
  void update() override;

-  void on_read_holding_registers(uint16_t start_address, std::span<const uint16_t> registers,
-                                 modbus::ResponseStatus status) override;
+  void on_response(std::span<const uint8_t> request_pdu, std::span<const uint8_t> response_pdu) override;

  void dump_config() override;

 protected:
+  int state_{0};
+  bool waiting_{false};
+  uint32_t last_send_{0};
+
  sensor::Sensor *ph_sensor_{nullptr};
  sensor::Sensor *temperature_sensor_{nullptr};
  sensor::Sensor *dis1_sensor_{nullptr};
@@ -150,8 +150,7 @@ void Lc709203f::dump_config() {
                "  Pack Size: %d mAH\n"
                "  Pack APA: 0x%02X\n"
                "  Pack Rated Voltage: 3.%sV",
-                this->pack_size_, this->apa_,
-                this->pack_voltage_ == 0x0000 ? LOG_STR_LITERAL("8") : LOG_STR_LITERAL("7"));
+                this->pack_size_, this->apa_, this->pack_voltage_ == 0x0000 ? "8" : "7");
  LOG_I2C_DEVICE(this);
  LOG_UPDATE_INTERVAL(this);
  LOG_SENSOR("  ", "Voltage", this->voltage_sensor_);
@@ -701,8 +701,7 @@ uint8_t LD2420Component::set_config_mode(bool enable) {
    cmd_frame.data_length += sizeof(CMD_PROTOCOL_VER);
  }
  cmd_frame.footer = CMD_FRAME_FOOTER;
-  ESP_LOGV(TAG, "Sending set config %s command: %2X", enable ? LOG_STR_LITERAL("enable") : LOG_STR_LITERAL("disable"),
-           cmd_frame.command);
+  ESP_LOGV(TAG, "Sending set config %s command: %2X", enable ? "enable" : "disable", cmd_frame.command);
  return this->send_cmd_from_array(cmd_frame);
 }

@@ -437,8 +437,7 @@ void LD6002BComponent::dump_config() {
                "HLK-LD6002B:\n"
                "  Auto wake: %s\n"
                "  Max data length: %u",
-                this->auto_wake_ ? LOG_STR_LITERAL("true") : LOG_STR_LITERAL("false"),
-                static_cast<unsigned>(this->max_data_len_));
+                this->auto_wake_ ? "true" : "false", static_cast<unsigned>(this->max_data_len_));
  if (this->wakeup_pin_ != nullptr) {
    LOG_PIN("  Wake-up Pin: ", this->wakeup_pin_);
    ESP_LOGCONFIG(TAG, "  Wake Pulse: %" PRIu32 "ms", this->wakeup_pulse_ms_);
@@ -5,11 +5,7 @@ namespace esphome::light {
 uint8_t ESPColorCorrection::gamma_correct_(uint8_t value) const {
  if (this->gamma_table_ == nullptr)
    return value;
-  uint16_t table_value = progmem_read_uint16(&this->gamma_table_[value]);
-  uint8_t result = (table_value + 128) / 257;
-  if (result == 0 && table_value != 0)
-    return 1;
-  return result;
+  return static_cast<uint8_t>((progmem_read_uint16(&this->gamma_table_[value]) + 128) / 257);
 }

 uint8_t ESPColorCorrection::gamma_uncorrect_(uint8_t value) const {
@@ -483,7 +483,6 @@ LV_ANIM = LvConstant(

 LV_GRAD_DIR = LvConstant("LV_GRAD_DIR_", "NONE", "HOR", "VER")
 LV_DITHER = LvConstant("LV_DITHER_", "NONE", "ORDERED", "ERR_DIFF")
-LV_GRAD_EXTEND = LvConstant("LV_GRAD_EXTEND_", "PAD", "REPEAT", "REFLECT")

 LV_LOG_LEVELS = {
    "VERBOSE": "TRACE",
@@ -628,6 +627,10 @@ OBJ_FLAGS = (
    "send_draw_task_events",
    "widget_1",
    "widget_2",
+    "user_1",
+    "user_2",
+    "user_3",
+    "user_4",
 )
 LV_OBJ_FLAG = LvConstant("LV_OBJ_FLAG_", *OBJ_FLAGS)

@@ -901,7 +904,7 @@ LV_COLOR_FORMATS = (

 LV_DEFINES = (
    "LV_USE_FREERTOS_TASK_NOTIFY", "LV_DRAW_BUF_STRIDE_ALIGN", "LV_USE_DRAW_SW", "LV_DRAW_SW_DRAW_UNIT_CNT",
-    "LV_DRAW_SW_COMPLEX", "LV_USE_DRAW_SW_COMPLEX_GRADIENTS", "LV_USE_DRAW_PXP", "LV_USE_PXP_DRAW_THREAD", "LV_USE_DRAW_G2D",
+    "LV_DRAW_SW_COMPLEX", "LV_USE_DRAW_PXP", "LV_USE_PXP_DRAW_THREAD", "LV_USE_DRAW_G2D",
    "LV_USE_G2D_DRAW_THREAD", "LV_VG_LITE_USE_BOX_SHADOW", "LV_VG_LITE_THORVG_16PIXELS_ALIGN", "LV_LOG_USE_TIMESTAMP",
    "LV_LOG_USE_FILE_LINE", "LV_USE_OBJ_ID_BUILTIN", "LV_USE_OBJ_PROPERTY_NAME", "LV_ATTRIBUTE_MEM_ALIGN_SIZE",
    "LV_FONT_MONTSERRAT_14", "LV_USE_FONT_PLACEHOLDER", "LV_WIDGETS_HAS_DEFAULT_VALUE", "LV_USE_ARCLABEL",
@@ -13,40 +13,18 @@ from esphome.core import ID
 from esphome.cpp_generator import MockObj

 from .defines import (
-    CONF_END_ANGLE,
    CONF_GRADIENTS,
    CONF_OPA,
-    CONF_START_ANGLE,
    LV_DITHER,
-    LV_GRAD_EXTEND,
    add_define,
    add_lv_use,
    add_warning,
 )
-from .lv_validation import (
-    lv_angle_degrees,
-    lv_color,
-    lv_percentage,
-    opacity,
-    pixels_or_percent,
-)
+from .lv_validation import lv_color, lv_percentage, opacity
 from .lvcode import lv
 from .types import lv_color_t, lv_gradient_t, lv_opa_t

 CONF_STOPS = "stops"
-CONF_LINEAR = "linear"
-CONF_RADIAL = "radial"
-CONF_CONICAL = "conical"
-CONF_EXTEND = "extend"
-CONF_FROM_X = "from_x"
-CONF_FROM_Y = "from_y"
-CONF_TO_X = "to_x"
-CONF_TO_Y = "to_y"
-CONF_CENTER_X = "center_x"
-CONF_CENTER_Y = "center_y"
-CONF_FOCAL_X = "focal_x"
-CONF_FOCAL_Y = "focal_y"
-CONF_FOCAL_RADIUS = "focal_radius"


 def min_stops(value):
@@ -55,109 +33,27 @@ def min_stops(value):
    return value


-STOPS_SCHEMA = cv.All(
-    [
-        cv.Schema(
-            {
-                cv.Required(CONF_COLOR): lv_color,
-                cv.Optional(CONF_OPA, default=1.0): opacity,
-                cv.Required(CONF_POSITION): lv_percentage,
-            }
-        )
-    ],
-    min_stops,
-)
-
-LINEAR_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_FROM_X): pixels_or_percent,
-        cv.Required(CONF_FROM_Y): pixels_or_percent,
-        cv.Required(CONF_TO_X): pixels_or_percent,
-        cv.Required(CONF_TO_Y): pixels_or_percent,
-        cv.Optional(CONF_EXTEND, default="PAD"): LV_GRAD_EXTEND.one_of,
-    }
-)
-
-RADIAL_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_CENTER_X): pixels_or_percent,
-        cv.Required(CONF_CENTER_Y): pixels_or_percent,
-        cv.Required(CONF_TO_X): pixels_or_percent,
-        cv.Required(CONF_TO_Y): pixels_or_percent,
-        cv.Optional(CONF_FOCAL_X): pixels_or_percent,
-        cv.Optional(CONF_FOCAL_Y): pixels_or_percent,
-        # No default: gradient_validator() must be able to tell whether this was actually
-        # given, to require it alongside focal_x/focal_y rather than silently drop it.
-        # LVGL's lv_grad_radial_set_focal() takes this as a scalar, not lv_pct() -
-        # unlike every other coordinate here, a percentage is not accepted.
-        cv.Optional(CONF_FOCAL_RADIUS): cv.positive_int,
-        cv.Optional(CONF_EXTEND, default="PAD"): LV_GRAD_EXTEND.one_of,
-    }
-)
-
-CONICAL_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_CENTER_X): pixels_or_percent,
-        cv.Required(CONF_CENTER_Y): pixels_or_percent,
-        cv.Optional(CONF_START_ANGLE, default=0): lv_angle_degrees,
-        cv.Optional(CONF_END_ANGLE, default=360): lv_angle_degrees,
-        cv.Optional(CONF_EXTEND, default="PAD"): LV_GRAD_EXTEND.one_of,
-    }
-)
-
-
-def gradient_validator(config):
-    direction = config[CONF_DIRECTION]
-    for gradient_direction, key in (
-        ("LINEAR", CONF_LINEAR),
-        ("RADIAL", CONF_RADIAL),
-        ("CONICAL", CONF_CONICAL),
-    ):
-        if direction == gradient_direction:
-            if key not in config:
-                raise cv.Invalid(
-                    f"'{key}' is required for {gradient_direction} gradient direction"
-                )
-        elif key in config:
-            raise cv.Invalid(
-                f"'{key}' is only valid with 'direction: {gradient_direction}'"
-            )
-    if CONF_RADIAL in config:
-        radial = config[CONF_RADIAL]
-        has_focal_x = CONF_FOCAL_X in radial
-        has_focal_y = CONF_FOCAL_Y in radial
-        has_focal_radius = CONF_FOCAL_RADIUS in radial
-        if has_focal_x != has_focal_y or (has_focal_radius and not has_focal_x):
-            raise cv.Invalid(
-                "'focal_x', 'focal_y' and 'focal_radius' must be specified together "
-                "in 'radial'"
-            )
-    return config
-
-
 GRADIENT_SCHEMA = cv.ensure_list(
-    cv.All(
-        cv.Schema(
-            {
-                cv.GenerateID(CONF_ID): cv.declare_id(lv_gradient_t),
-                cv.Required(CONF_DIRECTION): cv.one_of(
-                    "HOR",
-                    "HORIZONTAL",
-                    "VER",
-                    "VERTICAL",
-                    "LINEAR",
-                    "RADIAL",
-                    "CONICAL",
-                    upper=True,
-                ),
-                cv.Optional(CONF_DITHER): LV_DITHER.one_of,
-                cv.Optional(CONF_LINEAR): LINEAR_SCHEMA,
-                cv.Optional(CONF_RADIAL): RADIAL_SCHEMA,
-                cv.Optional(CONF_CONICAL): CONICAL_SCHEMA,
-                cv.Required(CONF_STOPS): STOPS_SCHEMA,
-            }
-        ),
-        gradient_validator,
+    cv.Schema(
+        {
+            cv.GenerateID(CONF_ID): cv.declare_id(lv_gradient_t),
+            cv.Required(CONF_DIRECTION): cv.one_of(
+                "HOR", "HORIZONTAL", "VER", "VERTICAL", upper=True
+            ),
+            cv.Optional(CONF_DITHER): LV_DITHER.one_of,
+            cv.Required(CONF_STOPS): cv.All(
+                [
+                    cv.Schema(
+                        {
+                            cv.Required(CONF_COLOR): lv_color,
+                            cv.Optional(CONF_OPA, default=1.0): opacity,
+                            cv.Required(CONF_POSITION): lv_percentage,
+                        }
+                    )
+                ],
+                min_stops,
+            ),
+        }
    )
 )

@@ -169,60 +65,15 @@ async def gradients_to_code(config):
        add_warning(
            "The 'dither' option for gradients is not supported by LVGL 9.x and will be ignored"
        )
-    if any(
-        x[CONF_DIRECTION] in ("LINEAR", "RADIAL", "CONICAL")
-        for x in config.get(CONF_GRADIENTS, ())
-    ):
-        # LVGL's software renderer only draws these gradient types when this is enabled; without
-        # it they silently fall back to a plain horizontal gradient.
-        add_define("LV_USE_DRAW_SW_COMPLEX_GRADIENTS")
    for gradient in config.get(CONF_GRADIENTS, ()):
        var = MockObj(cg.new_Pvariable(gradient[CONF_ID]), "->")
        idbase = gradient[CONF_ID].id
        stops = sorted(gradient[CONF_STOPS], key=itemgetter(CONF_POSITION))
        max_stops = max(max_stops, len(stops))
-        direction = gradient[CONF_DIRECTION]
-        if direction.startswith("VER"):
+        if gradient[CONF_DIRECTION].startswith("VER"):
            lv.grad_vertical_init(var)
-        elif direction.startswith("HOR"):
+        else:
            lv.grad_horizontal_init(var)
-        elif direction == "LINEAR":
-            linear = gradient[CONF_LINEAR]
-            lv.grad_linear_init(
-                var,
-                await pixels_or_percent.process(linear[CONF_FROM_X]),
-                await pixels_or_percent.process(linear[CONF_FROM_Y]),
-                await pixels_or_percent.process(linear[CONF_TO_X]),
-                await pixels_or_percent.process(linear[CONF_TO_Y]),
-                await LV_GRAD_EXTEND.process(linear[CONF_EXTEND]),
-            )
-        elif direction == "RADIAL":
-            radial = gradient[CONF_RADIAL]
-            lv.grad_radial_init(
-                var,
-                await pixels_or_percent.process(radial[CONF_CENTER_X]),
-                await pixels_or_percent.process(radial[CONF_CENTER_Y]),
-                await pixels_or_percent.process(radial[CONF_TO_X]),
-                await pixels_or_percent.process(radial[CONF_TO_Y]),
-                await LV_GRAD_EXTEND.process(radial[CONF_EXTEND]),
-            )
-            if CONF_FOCAL_X in radial:
-                lv.grad_radial_set_focal(
-                    var,
-                    await pixels_or_percent.process(radial[CONF_FOCAL_X]),
-                    await pixels_or_percent.process(radial[CONF_FOCAL_Y]),
-                    radial.get(CONF_FOCAL_RADIUS, 0),
-                )
-        elif direction == "CONICAL":
-            conical = gradient[CONF_CONICAL]
-            lv.grad_conical_init(
-                var,
-                await pixels_or_percent.process(conical[CONF_CENTER_X]),
-                await pixels_or_percent.process(conical[CONF_CENTER_Y]),
-                await lv_angle_degrees.process(conical[CONF_START_ANGLE]),
-                await lv_angle_degrees.process(conical[CONF_END_ANGLE]),
-                await LV_GRAD_EXTEND.process(conical[CONF_EXTEND]),
-            )
        stop_colors = cg.static_const_array(
            ID(idbase + "_colors_", type=lv_color_t),
            [await lv_color.process(x[CONF_COLOR]) for x in stops],
@@ -23,10 +23,8 @@ void MAX31856Sensor::setup() {
 void MAX31856Sensor::dump_config() {
  LOG_SENSOR("", "MAX31856", this);
  LOG_PIN("  CS Pin: ", this->cs_);
-  ESP_LOGCONFIG(
-      TAG, "  Mains Filter: %s",
-      (filter_ == FILTER_60HZ ? LOG_STR_LITERAL("60 Hz")
-                              : (filter_ == FILTER_50HZ ? LOG_STR_LITERAL("50 Hz") : LOG_STR_LITERAL("Unknown!"))));
+  ESP_LOGCONFIG(TAG, "  Mains Filter: %s",
+                (filter_ == FILTER_60HZ ? "60 Hz" : (filter_ == FILTER_50HZ ? "50 Hz" : "Unknown!")));
  if (this->thermocouple_type_ < 0 || this->thermocouple_type_ > 7) {
    ESP_LOGCONFIG(TAG, "  Thermocouple Type: Unknown");
  } else {
@@ -80,14 +80,12 @@ void MAX31865Sensor::dump_config() {
  LOG_SENSOR("", "MAX31865", this);
  LOG_PIN("  CS Pin: ", this->cs_);
  LOG_UPDATE_INTERVAL(this);
-  ESP_LOGCONFIG(
-      TAG,
-      "  Reference Resistance: %.2fΩ\n"
-      "  RTD: %u-wire %.2fΩ\n"
-      "  Mains Filter: %s",
-      reference_resistance_, rtd_wires_, rtd_nominal_resistance_,
-      (filter_ == FILTER_60HZ ? LOG_STR_LITERAL("60 Hz")
-                              : (filter_ == FILTER_50HZ ? LOG_STR_LITERAL("50 Hz") : LOG_STR_LITERAL("Unknown!"))));
+  ESP_LOGCONFIG(TAG,
+                "  Reference Resistance: %.2fΩ\n"
+                "  RTD: %u-wire %.2fΩ\n"
+                "  Mains Filter: %s",
+                reference_resistance_, rtd_wires_, rtd_nominal_resistance_,
+                (filter_ == FILTER_60HZ ? "60 Hz" : (filter_ == FILTER_50HZ ? "50 Hz" : "Unknown!")));
 }

 void MAX31865Sensor::read_data_() {
@@ -319,7 +319,7 @@ uint16_t Mcp4461Component::read_wiper_level_(uint8_t wiper_idx, bool *ok) {
  if (!(this->read_16_(reg, &buf))) {
    this->error_code_ = MCP4461_STATUS_I2C_ERROR;
    this->status_set_warning();
-    ESP_LOGW(TAG, "Error fetching %swiper %u value", (wiper_idx > 3) ? LOG_STR_LITERAL("nonvolatile ") : "", wiper_idx);
+    ESP_LOGW(TAG, "Error fetching %swiper %u value", (wiper_idx > 3) ? "nonvolatile " : "", wiper_idx);
    return 0;
  }
  if (ok != nullptr) {
@@ -377,8 +377,7 @@ void Mcp4461Component::write_wiper_level_(uint8_t wiper, uint16_t value) {
  if (!(this->mcp4461_write_(this->get_wiper_address_(wiper), value, nonvolatile))) {
    this->error_code_ = MCP4461_STATUS_I2C_ERROR;
    this->status_set_warning();
-    ESP_LOGW(TAG, "Error writing %swiper %u level %u", (wiper > 3) ? LOG_STR_LITERAL("nonvolatile ") : "", wiper,
-             value);
+    ESP_LOGW(TAG, "Error writing %swiper %u level %u", (wiper > 3) ? "nonvolatile " : "", wiper, value);
  }
 }

@@ -1,5 +1,5 @@
 import esphome.codegen as cg
-from esphome.components.esp32 import add_idf_component, add_idf_sdkconfig_option
+from esphome.components.esp32 import add_idf_component
 from esphome.config_helpers import filter_source_files_from_platform, get_logger_level
 import esphome.config_validation as cv
 from esphome.const import (
@@ -9,7 +9,6 @@ from esphome.const import (
    CONF_PROTOCOL,
    CONF_SERVICE,
    CONF_SERVICES,
-    CONF_WIFI,
    PlatformFramework,
 )
 from esphome.core import CORE, Lambda, coroutine_with_priority
@@ -209,16 +208,7 @@ async def to_code(config: ConfigType) -> None:
                ethernet.request_ethernet_ip_state_listener()

    if CORE.is_esp32:
-        add_idf_component(name="espressif/mdns", ref="1.12.0")
-        # ESPHome only advertises; the browse APIs are unused
-        add_idf_sdkconfig_option("CONFIG_MDNS_ENABLE_BROWSE", False)
-        # The mdns console CLI is never used by ESPHome
-        add_idf_sdkconfig_option("CONFIG_MDNS_ENABLE_CONSOLE_CLI", False)
-        if CONF_WIFI not in CORE.config:
-            # Without WiFi the predefined STA/AP interface handlers are dead
-            # code; disabling them lets mdns build without the WiFi stack.
-            add_idf_sdkconfig_option("CONFIG_MDNS_PREDEF_NETIF_STA", False)
-            add_idf_sdkconfig_option("CONFIG_MDNS_PREDEF_NETIF_AP", False)
+        add_idf_component(name="espressif/mdns", ref="1.11.3")

    cg.add_define("USE_MDNS")

@@ -122,7 +122,7 @@ void MediaPlayerCall::perform() {
    ESP_LOGV(TAG, "  Volume: %.2f", this->volume_.value());
  }
  if (this->announcement_.has_value()) {
-    ESP_LOGV(TAG, " Announcement: %s", this->announcement_.value() ? LOG_STR_LITERAL("yes") : LOG_STR_LITERAL("no"));
+    ESP_LOGV(TAG, " Announcement: %s", this->announcement_.value() ? "yes" : "no");
  }
  this->parent_->control(*this);
 }
@@ -12,12 +12,7 @@ from esphome.components.const import (
    CONF_DRAW_ROUNDING,
 )
 from esphome.components.display import CONF_SHOW_TEST_CARD
-from esphome.components.esp32 import (
-    VARIANT_ESP32P4,
-    VARIANT_ESP32S3,
-    VARIANT_ESP32S31,
-    only_on_variant,
-)
+from esphome.components.esp32 import VARIANT_ESP32P4, VARIANT_ESP32S3, only_on_variant
 from esphome.components.mipi import (
    COLOR_ORDERS,
    CONF_DE_PIN,
@@ -231,7 +226,7 @@ def _config_schema(config: ConfigType) -> ConfigType:
    config = cv.All(
        schema,
        cv.only_on_esp32,
-        only_on_variant(supported=[VARIANT_ESP32S3, VARIANT_ESP32P4, VARIANT_ESP32S31]),
+        only_on_variant(supported=[VARIANT_ESP32S3, VARIANT_ESP32P4]),
    )(config)
    model = MODELS[config[CONF_MODEL].upper()]
    model.check_requirements()
@@ -1,4 +1,4 @@
-#if defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32P4) || defined(USE_ESP32_VARIANT_ESP32S31)
+#if defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32P4)
 #include "mipi_rgb.h"
 #include "esphome/core/gpio.h"
 #include "esphome/core/hal.h"
@@ -400,5 +400,4 @@ void MipiRgb::dump_config() {
 }

 }  // namespace esphome::mipi_rgb
-#endif  // defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32P4) ||
-        // defined(USE_ESP32_VARIANT_ESP32S31)
+#endif  // defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32P4)
@@ -1,6 +1,6 @@
 #pragma once

-#if defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32P4) || defined(USE_ESP32_VARIANT_ESP32S31)
+#if defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32P4)
 #include "esphome/core/gpio.h"
 #include "esphome/components/display/display.h"
 #include "esp_lcd_panel_ops.h"
@@ -1,28 +0,0 @@
-from . import RgbDriverChip
-
-# fmt: off
-RgbDriverChip(
-    "CROWPANEL-ADVANCE-7",
-    requires={"psram"},
-    initsequence=(),
-    pclk_frequency="20MHz",
-    hsync_pulse_width=4,
-    hsync_front_porch=8,
-    hsync_back_porch=8,
-    vsync_pulse_width=4,
-    vsync_front_porch=8,
-    vsync_back_porch=8,
-    pclk_inverted=True,
-    color_order="RGB",
-    width=800,
-    height=480,
-    de_pin=42,
-    hsync_pin=40,
-    vsync_pin=41,
-    pclk_pin=39,
-    data_pins={
-        "red": [7, 17, 18, 3, 46],
-        "green": [9, 10, 11, 12, 13, 14],
-        "blue": [21, 47, 48, 45, 38],
-    },
-)
@@ -25,8 +25,7 @@ void internal_dump_config(const char *model, int width, int height, int offset_w
                "  SPI Bus width: %d",
                model, width, height, YESNO(madctl & MADCTL_MV), YESNO(madctl & (MADCTL_MX | MADCTL_XFLIP)),
                YESNO(madctl & (MADCTL_MY | MADCTL_YFLIP)), YESNO(has_hardware_rotation), YESNO(invert_colors),
-                (madctl & MADCTL_BGR) ? LOG_STR_LITERAL("BGR") : LOG_STR_LITERAL("RGB"), display_bits,
-                is_big_endian ? LOG_STR_LITERAL("Big") : LOG_STR_LITERAL("Little"), spi_mode,
+                (madctl & MADCTL_BGR) ? "BGR" : "RGB", display_bits, is_big_endian ? "Big" : "Little", spi_mode,
                static_cast<unsigned>(data_rate / 1000000), bus_width);
  LOG_PIN("  CS Pin: ", cs);
  LOG_PIN("  Reset Pin: ", reset);
@@ -1,69 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import uart
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_TAG
-from esphome.cpp_generator import MockObj
-from esphome.types import ConfigType
-
-CODEOWNERS = ["@FredM67"]
-DEPENDENCIES = ["uart"]
-
-mk2pvrouter_ns = cg.esphome_ns.namespace("mk2pvrouter")
-Mk2PVRouter = mk2pvrouter_ns.class_("Mk2PVRouter", cg.Component, uart.UARTDevice)
-
-CONF_MK2PVROUTER_ID = "mk2pvrouter_id"
-
-# Tags are copied into a fixed-size buffer (MAX_TAG_SIZE = 8 in mk2pvrouter.h),
-# which needs room for a trailing null terminator.
-MAX_TAG_LEN = 7
-
-MK2PVROUTER_LISTENER_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(CONF_MK2PVROUTER_ID): cv.use_id(Mk2PVRouter),
-        cv.Required(CONF_TAG): cv.All(
-            cv.string_strict, cv.Length(min=1, max=MAX_TAG_LEN), lambda x: x.upper()
-        ),
-    }
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(Mk2PVRouter),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-    .extend(uart.UART_DEVICE_SCHEMA)
-)
-
-
-def final_validate(config: ConfigType) -> None:
-    # Validate UART settings
-    schema = uart.final_validate_device_schema(
-        "mk2pvrouter",
-        baud_rate=9600,
-        parity="EVEN",
-        data_bits=7,
-        stop_bits=1,
-        require_rx=True,
-        require_tx=False,
-    )
-    schema(config)
-
-
-FINAL_VALIDATE_SCHEMA = final_validate
-
-
-_request_listener_slot = cg.slot_counter("MK2PVROUTER_LISTENER_COUNT")
-
-
-async def register_mk2pvrouter_listener(mk2pvrouter: MockObj, var: MockObj) -> None:
-    """Register a listener with its hub and count it for the compile-time buffer size."""
-    _request_listener_slot()
-    cg.add(mk2pvrouter.register_mk2pvrouter_listener(var))
-
-
-async def to_code(config: ConfigType) -> None:
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
@@ -1,177 +0,0 @@
-#include "mk2pvrouter.h"
-#include "esphome/core/log.h"
-#include <cstring>
-
-namespace esphome::mk2pvrouter {
-
-static const char *const TAG = "mk2pvrouter";
-
-constexpr uint8_t START_FRAME = 0x2;
-constexpr uint8_t END_FRAME = 0x3;
-constexpr uint8_t LINE_FEED = 0xa;
-constexpr uint8_t CARRIAGE_RETURN = 0xd;
-constexpr uint8_t TAB = 0x9;
-constexpr uint8_t MAX_ITERATIONS = 128;
-constexpr uint8_t CRC_MASK = 0x3F;
-constexpr uint8_t CRC_OFFSET = 0x20;
-
-// Extracts a TAB-delimited field from [buf_start, buf_end) into dest.
-// Returns the field length, or 0 if no TAB was found, or the (uncopied) field
-// length if it's >= max_len.
-static size_t get_field(char *dest, const char *buf_start, const char *buf_end, size_t max_len) {
-  const auto *const field_end = static_cast<const char *>(memchr(buf_start, TAB, buf_end - buf_start));
-  if (!field_end)
-    return 0;
-  const size_t len = field_end - buf_start;
-  if (len >= max_len) {
-    ESP_LOGE(TAG, "Field too long: %zu bytes (max %zu)", len, max_len);
-    return len;
-  }
-
-  memcpy(dest, buf_start, len);
-  dest[len] = '\0';  // Null-terminate
-  return len;
-}
-
-// Calculates the CRC (checksum) for a given group of characters.
-uint8_t Mk2PVRouter::calculate_crc_(const char *grp, size_t grp_len) {
-  uint8_t crc_tmp{0};
-  const auto effective_len = grp_len - CRC_SUFFIX_LEN;
-  for (size_t i = 0; i < effective_len; i++) {
-    crc_tmp += grp[i];
-  }
-  crc_tmp &= CRC_MASK;
-  crc_tmp += CRC_OFFSET;
-  return crc_tmp;
-}
-
-// Verifies the CRC of a group against its trailing CRC byte.
-bool Mk2PVRouter::check_crc_(const char *grp, const char *grp_end) {
-  const auto grp_len = grp_end - grp;
-  if (grp_len < static_cast<decltype(grp_len)>(CRC_SUFFIX_LEN)) {
-    ESP_LOGE(TAG, "Empty or too short group");
-    return false;
-  }
-  const auto raw_crc = grp[grp_len - 1];
-
-  const auto calculated_crc = this->calculate_crc_(grp, grp_len);
-
-  if (raw_crc != calculated_crc) {
-    ESP_LOGE(TAG, "CRC mismatch: expected %d, got %d", calculated_crc, raw_crc);
-    return false;
-  }
-  return true;
-}
-
-// Validates, parses, and publishes a single tag/value group.
-void Mk2PVRouter::process_group_(const char *grp, const char *grp_end) {
-  if (!this->check_crc_(grp, grp_end))
-    return;
-
-  size_t field_len = get_field(this->tag_, grp, grp_end, MAX_TAG_SIZE);
-  if (!field_len || field_len >= MAX_TAG_SIZE) {
-    ESP_LOGE(TAG, "Invalid tag");
-    return;
-  }
-  const auto *val_start = grp + field_len + 1;  // Skip tag + TAB.
-
-  field_len = get_field(this->val_, val_start, grp_end, MAX_VAL_SIZE);
-  if (!field_len || field_len >= MAX_VAL_SIZE) {
-    ESP_LOGE(TAG, "Invalid value for tag %s", this->tag_);
-    return;
-  }
-
-  this->publish_value_(this->tag_, this->val_);
-}
-
-// Reads characters until `c` is found or the internal buffer is full.
-bool Mk2PVRouter::read_chars_until_(bool drop, uint8_t c) {
-  size_t j{0};
-
-  while (this->available() > 0 && j++ < MAX_ITERATIONS) {
-    const auto received = this->read();
-    if (received < 0)
-      continue;
-    if (received == c)
-      return true;
-    if (drop)
-      continue;
-    if (this->buf_index_ >= (sizeof(this->buf_) - 1)) {
-      ESP_LOGW(TAG, "Internal buffer full");
-      this->buf_index_ = 0;
-      this->state_ = State::WAITING_FOR_START;
-      return false;
-    }
-    this->buf_[this->buf_index_++] = received;
-  }
-
-  return false;
-}
-
-void Mk2PVRouter::loop() {
-  switch (this->state_) {
-    case State::WAITING_FOR_START:
-      ESP_LOGVV(TAG, "State: WAITING_FOR_START");
-      if (this->read_chars_until_(true, START_FRAME))
-        this->state_ = State::START_FRAME_RECEIVED;
-      break;
-    case State::START_FRAME_RECEIVED:
-      ESP_LOGVV(TAG, "State: START_FRAME_RECEIVED");
-      if (this->read_chars_until_(false, END_FRAME))
-        this->state_ = State::END_FRAME_RECEIVED;
-      break;
-    case State::END_FRAME_RECEIVED: {
-      ESP_LOGVV(TAG, "State: END_FRAME_RECEIVED -> processing");
-
-      if (this->buf_index_ == 0) {
-        this->state_ = State::WAITING_FOR_START;
-        break;
-      }
-
-      auto *buf_finger = this->buf_;
-      auto *buf_end = this->buf_ + this->buf_index_;
-
-      // Each group: 0xa(LF) | Tag | 0x9(TAB) | Data | 0x9(TAB) | CRC | 0xd(CR)
-      // CRC is computed over "Tag | TAB | Data | TAB".
-      while ((buf_finger = static_cast<char *>(memchr(buf_finger, LINE_FEED, buf_end - buf_finger))) != nullptr) {
-        ++buf_finger;  // Skip LF to the start of the group.
-
-        auto *const grp_end = static_cast<char *>(memchr(buf_finger, CARRIAGE_RETURN, buf_end - buf_finger));
-        if (!grp_end) {
-          ESP_LOGE(TAG, "No group found");
-          break;
-        }
-
-        this->process_group_(buf_finger, grp_end);
-
-        buf_finger = grp_end;  // grp_end is always < buf_end, so this stays in bounds.
-      }
-      this->buf_index_ = 0;
-      this->state_ = State::WAITING_FOR_START;
-      break;
-    }
-  }
-}
-
-void Mk2PVRouter::publish_value_(const char *tag, const char *val) {
-#ifdef MK2PVROUTER_LISTENER_COUNT
-  for (auto *element : this->mk2pvrouter_listeners_) {
-    if (strcmp(tag, element->get_tag()) != 0)
-      continue;
-    element->publish_val(val);
-  }
-#endif
-}
-
-void Mk2PVRouter::dump_config() {
-  ESP_LOGCONFIG(TAG, "Mk2PVRouter:");
-  this->check_uart_settings(BAUD_RATE, 1, uart::UART_CONFIG_PARITY_EVEN, 7);
-}
-
-#ifdef MK2PVROUTER_LISTENER_COUNT
-void Mk2PVRouter::register_mk2pvrouter_listener(Mk2PVRouterListener *listener) {
-  this->mk2pvrouter_listeners_.push_back(listener);
-}
-#endif
-
-}  // namespace esphome::mk2pvrouter
@@ -1,69 +0,0 @@
-#pragma once
-
-#include "esphome/components/uart/uart.h"
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome::mk2pvrouter {
-/*
- * Buffer sizes based on the mk2pvrouter telemetry protocol, as implemented by the
- * firmware's teleinfo.h (see github.com/FredM67/PVRouter-{1,3}-phase):
- * - Tags: max 4 chars (S_MC is longest), most are 1-2 chars (P, V1, R2, etc.)
- * - Values: max 6 digits signed (-10000), typical 1-5 digits. Energy (E) is a daily
- *   counter reset at midnight, so it stays well within 6 digits.
- * - Frame: STX + multiple lines (LF+tag+TAB+value+TAB+crc+CR) + ETX
- * - Line format: \n<tag>\t<value>\t<crc>\r (8-15 bytes per line)
- * - Multi-phase with all features: ~150-200 bytes
- */
-static constexpr uint8_t MAX_TAG_SIZE = 8;     // S_MC (4) + digit (1) + null (1) + margin (2)
-static constexpr uint8_t MAX_VAL_SIZE = 8;     // -10000 (6) + null (1) + margin (1)
-static constexpr uint16_t MAX_BUF_SIZE = 256;  // Full frame with all features enabled
-
-// Listener interface for entities that want updates for a specific tag.
-class Mk2PVRouterListener {
- public:
-  explicit Mk2PVRouterListener(const char *tag) : tag_(tag) {}
-  virtual ~Mk2PVRouterListener() = default;
-  const char *get_tag() const { return this->tag_; }
-  virtual void publish_val(const char *val) = 0;
-
- protected:
-  const char *tag_;
-};
-
-// Reads frames via UART, validates their CRC, and publishes tag/value pairs to listeners.
-class Mk2PVRouter final : public Component, public uart::UARTDevice {
- public:
-#ifdef MK2PVROUTER_LISTENER_COUNT
-  void register_mk2pvrouter_listener(Mk2PVRouterListener *listener);
-#endif
-  void loop() override;
-  void dump_config() override;
-
- protected:
-  static constexpr size_t CRC_SUFFIX_LEN = 1;
-  static constexpr uint32_t BAUD_RATE = 9600;
-
-  enum class State : uint8_t {
-    WAITING_FOR_START,
-    START_FRAME_RECEIVED,
-    END_FRAME_RECEIVED,
-  };
-
-#ifdef MK2PVROUTER_LISTENER_COUNT
-  StaticVector<Mk2PVRouterListener *, MK2PVROUTER_LISTENER_COUNT> mk2pvrouter_listeners_;
-#endif
-  uint16_t buf_index_{0};
-  State state_{State::WAITING_FOR_START};
-  char tag_[MAX_TAG_SIZE];
-  char val_[MAX_VAL_SIZE];
-  char buf_[MAX_BUF_SIZE];  // Large buffer last to reduce padding
-
-  bool read_chars_until_(bool drop, uint8_t c);
-  uint8_t calculate_crc_(const char *grp, size_t grp_len);
-  bool check_crc_(const char *grp, const char *grp_end);
-  void process_group_(const char *grp, const char *grp_end);
-  void publish_value_(const char *tag, const char *val);
-};
-}  // namespace esphome::mk2pvrouter
@@ -1,27 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import sensor
-from esphome.const import CONF_ID, CONF_TAG
-from esphome.types import ConfigType
-
-from .. import (
-    CONF_MK2PVROUTER_ID,
-    MK2PVROUTER_LISTENER_SCHEMA,
-    mk2pvrouter_ns,
-    register_mk2pvrouter_listener,
-)
-
-Mk2PVRouterSensor = mk2pvrouter_ns.class_(
-    "Mk2PVRouterSensor", sensor.Sensor, cg.Component
-)
-
-CONFIG_SCHEMA = sensor.sensor_schema(Mk2PVRouterSensor).extend(
-    MK2PVROUTER_LISTENER_SCHEMA
-)
-
-
-async def to_code(config: ConfigType) -> None:
-    var = cg.new_Pvariable(config[CONF_ID], config[CONF_TAG])
-    await cg.register_component(var, config)
-    await sensor.register_sensor(var, config)
-    mk2pvrouter = await cg.get_variable(config[CONF_MK2PVROUTER_ID])
-    await register_mk2pvrouter_listener(mk2pvrouter, var)
@@ -1,24 +0,0 @@
-#include "mk2pvrouter_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome::mk2pvrouter {
-
-static const char *const TAG = "mk2pvrouter_sensor";
-
-Mk2PVRouterSensor::Mk2PVRouterSensor(const char *tag) : Mk2PVRouterListener(tag) {}
-
-void Mk2PVRouterSensor::publish_val(const char *val) {
-  auto result = parse_number<float>(val);
-  if (!result.has_value()) {
-    ESP_LOGW(TAG, "Failed to parse value '%s' for tag '%s'", val, this->get_tag());
-    return;
-  }
-  this->publish_state(result.value());
-}
-
-void Mk2PVRouterSensor::dump_config() {
-  LOG_SENSOR("  ", "Mk2PVRouter Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Tag: %s", this->get_tag());
-}
-
-}  // namespace esphome::mk2pvrouter
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "esphome/components/mk2pvrouter/mk2pvrouter.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome::mk2pvrouter {
-
-class Mk2PVRouterSensor final : public Mk2PVRouterListener, public sensor::Sensor, public Component {
- public:
-  explicit Mk2PVRouterSensor(const char *tag);
-  void publish_val(const char *val) override;
-  void dump_config() override;
-};
-
-}  // namespace esphome::mk2pvrouter
@@ -89,8 +89,9 @@ _WRITE_FUNCTION_CODES = frozenset({0x05, 0x06, 0x0F, 0x10, 0x16, 0x17})

 def is_function_code_write(function_code: int) -> bool:
    """True if the Modbus function code writes (mutates). The exception bit (0x80) is masked off first,
-    so an exception-flagged code still classifies by its base code (the runtime hub never queues one:
-    queue_pdu() refuses them). Keep in sync with modbus::helpers::is_function_code_write()."""
+    so an exception-flagged code still classifies by its base code - stricter than the runtime hub,
+    whose classify() treats an exception-flagged code as a read. Keep in sync with
+    modbus::helpers::is_function_code_write()."""
    return function_code & 0x7F in _WRITE_FUNCTION_CODES


@@ -3,7 +3,6 @@
 #include <algorithm>

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

@@ -11,55 +10,43 @@ namespace esphome::modbus {

 static const char *const TAG = "modbus";

+// Maximum bytes to log for Modbus frames (truncated if larger)
 static constexpr size_t MODBUS_MAX_LOG_BYTES = 64;

-static constexpr uint32_t US_PER_SEC = 1000000;
-static constexpr uint32_t US_PER_MS = 1000;
+// Approximate bits per character on the wire (depends on parity/stop bit config)
+static constexpr uint32_t MODBUS_BITS_PER_CHAR = 11;
+// Milliseconds per second
+static constexpr uint32_t MS_PER_SEC = 1000;

-// Minimum interframe delay per the Modbus spec (fixed 1750us above 19200 baud)
-static constexpr uint32_t MODBUS_MIN_FRAME_DELAY_US = 1750;
-
-// Diagnostics only: the backdated byte stamp can precede last_send_ (echo, or noise during our own
-// send), where an unsigned wrap would print ~4.29e9.
-static uint32_t us_since_send(uint32_t last_modbus_byte, uint32_t last_send) {
-  const uint32_t elapsed = last_modbus_byte - last_send;
-  return (int32_t) elapsed < 0 ? 0 : elapsed;
-}
+// Shortest gap between two "no device accepted broadcast" warnings
+static constexpr uint32_t UNACCEPTED_BROADCAST_WARN_INTERVAL_MS = 60 * MS_PER_SEC;

 void Modbus::setup() {
  if (this->flow_control_pin_ != nullptr) {
    this->flow_control_pin_->setup();
  }

-  // RTU specifies 11 bits per character but 8N1 is 10, so derive it from the framing. The schema
-  // forbids a zero, so one here means the hub never set it (weikai): fall back to 8N1 and a 1 baud floor.
-  const uint8_t data_bits = this->parent_->get_data_bits() != 0 ? this->parent_->get_data_bits() : 8;
-  const uint8_t stop_bits = this->parent_->get_stop_bits() != 0 ? this->parent_->get_stop_bits() : 1;
-  const uint32_t baud_rate = std::max<uint32_t>(1u, this->parent_->get_baud_rate());
-  this->bits_per_char_ = static_cast<uint8_t>(
-      1 + data_bits + (this->parent_->get_parity() == uart::UART_CONFIG_PARITY_NONE ? 0 : 1) + stop_bits);
-
-  // 3.5 characters * bits per character * 1e6 us/sec / (bits/sec) (Standard modbus frame delay)
-  this->frame_delay_us_ =
-      std::max(MODBUS_MIN_FRAME_DELAY_US, (uint32_t) (3.5 * this->bits_per_char_ * US_PER_SEC / baud_rate) + 1);
+  this->frame_delay_ms_ =
+      std::max(2,  // 1750us minimum per spec - rounded up to 2ms.
+                   // 3.5 characters * 11 bits per character * 1000ms/sec / (bits/sec) (Standard modbus frame delay)
+               (uint16_t) (3.5 * MODBUS_BITS_PER_CHAR * MS_PER_SEC / this->parent_->get_baud_rate()) + 1);

  // When rx_full_threshold is configured (non-zero), the UART has a hardware FIFO with a
  // meaningful threshold (e.g., ESP32 native UART), so we can calculate a precise delay.
  // Otherwise (e.g., USB UART), use 50ms to handle data arriving in chunks.
-  static constexpr uint32_t DEFAULT_LONG_RX_BUFFER_DELAY_US = 50 * US_PER_MS;
+  static constexpr uint16_t DEFAULT_LONG_RX_BUFFER_DELAY_MS = 50;
  size_t rx_threshold = this->parent_->get_rx_full_threshold();
-  this->long_rx_buffer_delay_us_ = rx_threshold != uart::UARTComponent::RX_FULL_THRESHOLD_UNSET
-                                       ? (uint32_t) (rx_threshold * this->bits_per_char_ * US_PER_SEC / baud_rate) + 1
-                                       : DEFAULT_LONG_RX_BUFFER_DELAY_US;
-
-  // The idle-timeout interrupt fires rx_timeout characters after the last byte, so that much silence
-  // has already passed by the time we read it: backdate so the gap measures silence on the wire.
-  this->rx_detect_latency_us_ =
-      (uint32_t) (this->parent_->get_rx_timeout() * this->bits_per_char_ * US_PER_SEC / baud_rate);
+  this->long_rx_buffer_delay_ms_ =
+      rx_threshold != uart::UARTComponent::RX_FULL_THRESHOLD_UNSET
+          ? (rx_threshold * MODBUS_BITS_PER_CHAR * MS_PER_SEC / this->parent_->get_baud_rate()) + 1
+          : DEFAULT_LONG_RX_BUFFER_DELAY_MS;
 }

 void Modbus::loop() {
+  // Receive any available bytes from UART
  this->receive_bytes_();
+
+  // Parse bytes into frames and process them
  this->parse_modbus_frames();
 }

@@ -68,12 +55,12 @@ void ModbusClientHub::loop() {
  // never times out an entry whose pending count has not been drained. No-op when nothing is owed.
  this->sweep_();

-  this->Modbus::loop();
+  this->Modbus::loop();  // receive bytes and parse frames

  // Send-wait watchdog: only the cheap time check runs at loop rate; expire_waiting_() looks the
  // entry up and holds off if the response has started arriving.
  if (this->waiting_for_response_ &&
-      this->last_receive_check_ - this->last_send_ > this->last_send_tx_offset_ + this->send_wait_time_us_) {
+      this->last_receive_check_ - this->last_send_ > this->last_send_tx_offset_ + this->send_wait_time_) {
    this->expire_waiting_();
  }

@@ -93,7 +80,7 @@ void ModbusClientHub::expire_waiting_() {
  }
  // Only a genuine WAITING entry warrants the log (a cleared or interrupted shell timing out is expected).
  if (cmd->state == FrameState::WAITING) {
-    ESP_LOGW(TAG, "Stop waiting for response from %" PRIu8 " %" PRIu32 "us after last send", cmd->frame.address(),
+    ESP_LOGW(TAG, "Stop waiting for response from %" PRIu8 " %" PRIu32 "ms after last send", cmd->frame.address(),
             this->last_receive_check_ - this->last_send_);
  }
  // Deliver on_no_response directly, the way the parse path delivers response()/error(): the entry
@@ -107,50 +94,52 @@ void ModbusClientHub::expire_waiting_() {
 bool Modbus::timeout_() {
  // If the response frame is finished (including interframe delay) - we timeout.
  // The long_rx_buffer_delay accounts for long responses (larger than the UART rx_full_threshold) to avoid timeouts
-  // when the buffer is filling the back half of the response. The latch decides, not the current size:
-  // parsing a leading frame can shrink the buffer below the threshold while the rest is still streaming.
-  // The latency term covers the final batch, which is idle-delivered.
-  const uint32_t timeout =
-      this->exceeded_rx_full_threshold_
-          ? std::max(this->frame_delay_us_, this->long_rx_buffer_delay_us_ + this->rx_detect_latency_us_)
-          : this->frame_delay_us_;
+  // when the buffer is filling the back half of the response
+  const uint16_t timeout = std::max(
+      (uint16_t) this->frame_delay_ms_,
+      (uint16_t) (this->rx_buffer_.size() >= this->parent_->get_rx_full_threshold() ? this->long_rx_buffer_delay_ms_
+                                                                                    : 0));

  return this->last_receive_check_ - this->last_modbus_byte_ > timeout;
 }

-// We use micros() here and elsewhere instead of App.get_loop_component_start_time() to avoid stale timestamps
-// It's critical in all timestamp comparisons that the left timestamp comes before the right one in time
-// If we use a cached value in place of micros() and last_modbus_byte_ is updated inside our loop
-// then the comparison is backwards (small negative which wraps to large positive) and will cause a false timeout
-// So in this component we don't use any cached timestamp values to avoid these annoying bugs.
-// Compare before subtracting: a signed difference would read a bus idle past half the micros() wrap
-// (~35 min) as a huge delay still owed.
-static inline uint32_t remaining_delay(uint32_t elapsed, uint32_t required) {
-  return elapsed >= required ? 0 : required - elapsed;
-}
-
 int32_t Modbus::tx_delay_remaining() {
-  const uint32_t now = micros();
-  return (int32_t) std::max(remaining_delay(now - this->last_send_, this->last_send_tx_offset_ + this->frame_delay_us_),
-                            remaining_delay(now - this->last_modbus_byte_, this->frame_delay_us_));
+  // We use millis() here and elsewhere instead of App.get_loop_component_start_time() to avoid stale timestamps
+  // It's critical in all timestamp comparisons that the left timestamp comes before the right one in time
+  // If we use a cached value in place of millis() and last_modbus_byte_ is updated inside our loop
+  // then the comparison is backwards (small negative which wraps to large positive) and will cause a false timeout
+  // So in this component we don't use any cached timestamp values to avoid these annoying bugs
+  const uint32_t now = millis();
+  return std::max({(int32_t) 0,
+                   (int32_t) (this->last_send_tx_offset_ + this->frame_delay_ms_ - (now - this->last_send_)),
+                   (int32_t) (this->frame_delay_ms_ - (now - this->last_modbus_byte_))});
 }

 int32_t ModbusClientHub::tx_delay_remaining() {
-  const uint32_t now = micros();
-  return (int32_t) std::max(
-      remaining_delay(now - this->last_send_,
-                      this->last_send_tx_offset_ + this->frame_delay_us_ + this->turnaround_delay_us_),
-      remaining_delay(now - this->last_modbus_byte_, this->frame_delay_us_ + this->turnaround_delay_us_));
+  const uint32_t now = millis();
+  return std::max({(int32_t) 0,
+                   (int32_t) (this->last_send_tx_offset_ + this->frame_delay_ms_ + this->turnaround_delay_ms_ -
+                              (now - this->last_send_)),
+                   (int32_t) (this->frame_delay_ms_ + this->turnaround_delay_ms_ - (now - this->last_modbus_byte_))});
 }

 bool Modbus::tx_blocked() {
-  // Blocked while any rx bytes are pending, or within tx_delay of the last byte in either direction
-  // (receivers must see our previous tx as done, and more rx may be coming). A remaining delay up to
-  // MODBUS_TX_MAX_DELAY_US doesn't block - send_frame_ absorbs it instead of looping on small waits.
-  return this->available() || !this->rx_buffer_.empty() || this->tx_delay_remaining() > MODBUS_TX_MAX_DELAY_US;
+  // We block transmission in any of these cases:
+  // 1. There are bytes in the UART Rx buffer
+  // 2. There are bytes in our Rx buffer
+  // 3. The last sent byte isn't more than tx_delay ms ago (i.e. wait to tell receivers that our previous Tx is done)
+  // 4. The last received byte isn't more than tx_delay ms ago (i.e. wait to be sure there isn't more Rx coming)
+  // N.B. We allow a small delay (MODBUS_TX_MAX_DELAY_MS) to avoid looping on small delays. This gets handled by
+  // send_frame_.
+  return this->available() || !this->rx_buffer_.empty() || this->tx_delay_remaining() > MODBUS_TX_MAX_DELAY_MS;
 }

-bool ModbusClientHub::tx_blocked() { return this->waiting_for_response_ || this->Modbus::tx_blocked(); }
+bool ModbusClientHub::tx_blocked() {
+  // We block transmission in any of these case:
+  // 1. We're waiting for a response (a waiting entry: WAITING/INTERRUPTED/WAITING_RETIRED/INTERRUPTED_RETIRED)
+  // 2. Any of the base class tx_blocked conditions
+  return this->waiting_for_response_ || this->Modbus::tx_blocked();
+}

 bool ModbusClientHub::tx_buffer_empty() {
  // "Empty" for ready_for_immediate_send(): no one-shot is queued ahead of the caller. Entries in
@@ -164,26 +153,20 @@ bool ModbusClientHub::tx_buffer_empty() {
 }

 void Modbus::receive_bytes_() {
-  this->last_receive_check_ = micros();
+  this->last_receive_check_ = millis();
  size_t bytes = this->available();

  if (bytes) {
    size_t buffer_size = this->rx_buffer_.size();
-    // Below the threshold the batch can only be idle-delivered, so its last byte finished one detection
-    // latency ago; at or above it the frame may still be streaming, so stamp now.
-    this->last_modbus_byte_ = bytes < this->parent_->get_rx_full_threshold()
-                                  ? this->last_receive_check_ - this->rx_detect_latency_us_
-                                  : this->last_receive_check_;
+    this->last_modbus_byte_ = this->last_receive_check_;
    this->rx_buffer_.resize(buffer_size + bytes);
    if (!this->read_array(this->rx_buffer_.data() + buffer_size, bytes)) {
      this->rx_buffer_.resize(buffer_size);
      return;
    }
-    if (this->rx_buffer_.size() >= this->parent_->get_rx_full_threshold())
-      this->exceeded_rx_full_threshold_ = true;
    if (buffer_size == 0) {
-      ESP_LOGV(TAG, "Received first byte %" PRIu8 " (0X%x) of %zu bytes %" PRIu32 "us after last send",
-               this->rx_buffer_[0], this->rx_buffer_[0], this->rx_buffer_.size(), micros() - this->last_send_);
+      ESP_LOGV(TAG, "Received first byte %" PRIu8 " (0X%x) of %zu bytes %" PRIu32 "ms after last send",
+               this->rx_buffer_[0], this->rx_buffer_[0], this->rx_buffer_.size(), millis() - this->last_send_);
    }
  }
 }
@@ -236,9 +219,10 @@ void ModbusServerHub::parse_modbus_frames() {
    this->clear_rx_buffer_(LOG_STR("timeout after partial response"), true);
 }

-// Scans forward from min_length to find a frame boundary by CRC match for unknown-length function codes.
-// Returns the matched frame length, or 0 if no valid CRC was found within MAX_FRAME_SIZE.
 uint16_t Modbus::find_frame_end_by_crc_(uint16_t min_length) const {
+  // Unknown-length functions (user-defined codes, unimplemented management codes, unassigned values)
+  // could be any length - we have to rely on the CRC to determine completeness.
+  // If a CRC match is never found, the buffer will eventually overflow and be cleared.
  const uint8_t *raw = &this->rx_buffer_[0];
  const size_t size = this->rx_buffer_.size();
  const auto max_len = static_cast<uint16_t>(std::min(size, size_t(MAX_FRAME_SIZE)));
@@ -336,8 +320,8 @@ void ModbusClientHub::process_modbus_server_frame(uint8_t address, std::span<con
  ModbusDeviceCommand *cmd = this->waiting_for_response_ ? this->find_waiting_() : nullptr;
  if (cmd == nullptr) {
    ESP_LOGW(TAG,
-             "Received unexpected frame from address %" PRIu8 ", function code 0x%X, %" PRIu32 "us after last send",
-             address, function_code, us_since_send(this->last_modbus_byte_, this->last_send_));
+             "Received unexpected frame from address %" PRIu8 ", function code 0x%X, %" PRIu32 "ms after last send",
+             address, function_code, this->last_modbus_byte_ - this->last_send_);
    return;
  }

@@ -347,9 +331,9 @@ void ModbusClientHub::process_modbus_server_frame(uint8_t address, std::span<con
  if (expected_address != address || expected_function_code != (function_code & FUNCTION_CODE_MASK)) {
    ESP_LOGW(TAG,
             "Received incorrect frame address %" PRIu8 " <> %" PRIu8 " or function code 0x%X <> 0x%X, %" PRIu32
-             "us after last send",
+             "ms after last send",
             address, expected_address, (function_code & FUNCTION_CODE_MASK), expected_function_code,
-             us_since_send(this->last_modbus_byte_, this->last_send_));
+             this->last_modbus_byte_ - this->last_send_);
    // Unexpected frame: flip a WAITING entry to an INTERRUPTED shell that ignores the rest of this
    // transaction and blocks tx until the send-wait timeout, where it gets its on_no_response.
    cmd->interrupt();
@@ -362,8 +346,8 @@ void ModbusClientHub::process_modbus_server_frame(uint8_t address, std::span<con
    // cleared-interrupted frame still ends in on_no_response rather than delivering a late response.
    ESP_LOGW(TAG,
             "Ignoring response from %" PRIu8 " - transmission interrupted by previous unexpected response, %" PRIu32
-             "us after last send",
-             address, us_since_send(this->last_modbus_byte_, this->last_send_));
+             "ms after last send",
+             address, this->last_modbus_byte_ - this->last_send_);
    return;
  }

@@ -374,12 +358,12 @@ void ModbusClientHub::process_modbus_server_frame(uint8_t address, std::span<con
  this->sweep_needed_ = true;
  if (helpers::is_function_code_exception(function_code)) {
    uint8_t exception = pdu[1];  // exception frames are fixed-length, so the code is always present
-    ESP_LOGW(TAG, "Error function code: 0x%X exception: %" PRIu8 ", address: %" PRIu8 ", %" PRIu32 "us after last send",
-             function_code, exception, address, us_since_send(this->last_modbus_byte_, this->last_send_));
+    ESP_LOGW(TAG, "Error function code: 0x%X exception: %" PRIu8 ", address: %" PRIu8 ", %" PRIu32 "ms after last send",
+             function_code, exception, address, this->last_modbus_byte_ - this->last_send_);
    cmd->error(static_cast<ExceptionCode>(exception));
  } else if (!cmd->response(pdu)) {
-    ESP_LOGV(TAG, "Ignoring response from %" PRIu8 " - no callback device set, %" PRIu32 "us after last send", address,
-             us_since_send(this->last_modbus_byte_, this->last_send_));
+    ESP_LOGV(TAG, "Ignoring response from %" PRIu8 " - no callback device set, %" PRIu32 "ms after last send", address,
+             this->last_modbus_byte_ - this->last_send_);
  }
 }

@@ -547,7 +531,8 @@ void ModbusServerHub::process_broadcast_frame_(uint8_t function_code, std::span<
    return;
  }
  // A broadcast is never answered, so a rejecting device has no other feedback channel: report the
-  // per-device outcome at V.
+  // per-device outcome at V, and warn if the write reached nobody at all.
+  bool accepted = false;
  for (auto *device : this->devices_) {
    // Same handlers as an addressed write - a device cannot tell a broadcast apart, and does not need
    // to: the hub owns the difference, which is only that no reply is ever sent.
@@ -557,6 +542,24 @@ void ModbusServerHub::process_broadcast_frame_(uint8_t function_code, std::span<
    if (device_status.has_value()) {
      ESP_LOGV(TAG, "Device %" PRIu8 " rejected broadcast write with exception %" PRIu8, device->get_address(),
               static_cast<uint8_t>(device_status.value()));
+    } else {
+      accepted = true;
+    }
+  }
+  if (!accepted && !this->devices_.empty()) {
+    const uint16_t entity_count = coils ? coil_count : static_cast<uint16_t>(registers.size());
+    const LogString *const entity_name = coils ? LOG_STR("coils") : LOG_STR("registers");
+    // Warn at most once per interval, then drop to VERBOSE: on a shared bus a broadcast aimed at other nodes
+    // repeats forever, so warning per frame would flood the log.
+    const uint32_t now = millis();
+    if (this->last_unaccepted_broadcast_warn_ == 0 ||
+        now - this->last_unaccepted_broadcast_warn_ > UNACCEPTED_BROADCAST_WARN_INTERVAL_MS) {
+      this->last_unaccepted_broadcast_warn_ = now;
+      ESP_LOGW(TAG, "No device accepted broadcast write of %" PRIu16 " %s at 0x%04X", entity_count,
+               LOG_STR_ARG(entity_name), start_address);
+    } else {
+      ESP_LOGV(TAG, "No device accepted broadcast write of %" PRIu16 " %s at 0x%04X", entity_count,
+               LOG_STR_ARG(entity_name), start_address);
    }
  }
 }
@@ -775,18 +778,13 @@ void ModbusServerHub::process_modbus_client_frame_(uint8_t address, uint8_t func
 // Callers gate on tx_blocked() first, but the pre-send delay below can span several ms, so re-check
 // after it and refuse (return false) if a byte arrived in that window rather than transmit over it.
 bool Modbus::send_frame_(const ModbusFrame &frame) {
-  int32_t tx_delay_remaining = this->tx_delay_remaining();
+  const int32_t tx_delay_remaining = this->tx_delay_remaining();
  if (tx_delay_remaining > 0) {
-    // Yield the whole-ms part: delay() never blocks past the request on FreeRTOS, and only slightly
-    // over elsewhere, which just lengthens the gap. The recompute below makes the remainder exact.
-    if (tx_delay_remaining >= (int32_t) US_PER_MS) {
-      delay(tx_delay_remaining / US_PER_MS);
-      tx_delay_remaining = this->tx_delay_remaining();
-    }
-    if (tx_delay_remaining > 0)
-      delayMicroseconds(tx_delay_remaining);
+    delay(tx_delay_remaining);
  }

+  // The delay above can span several ms; a byte arriving in that window blocks transmission after the
+  // caller's gate already passed. Don't collide with the incoming frame - leave the entry to retry.
  if (this->tx_blocked()) {
    return false;
  }
@@ -799,15 +797,14 @@ bool Modbus::send_frame_(const ModbusFrame &frame) {
    this->last_send_tx_offset_ = 0;
  } else {
    this->write_array(frame.data.data(), frame.size());
-    this->last_send_tx_offset_ =
-        frame.size() * this->bits_per_char_ * US_PER_SEC / std::max<uint32_t>(1u, this->parent_->get_baud_rate()) + 1;
+    this->last_send_tx_offset_ = frame.size() * MODBUS_BITS_PER_CHAR * MS_PER_SEC / this->parent_->get_baud_rate() + 1;
  }

-  uint32_t now = micros();
+  uint32_t now = millis();
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
  char hex_buf[format_hex_pretty_size(MODBUS_MAX_LOG_BYTES)];
 #endif
-  ESP_LOGV(TAG, "Write: %s %" PRIu32 "us after last send, %" PRIu32 "us after last receive",
+  ESP_LOGV(TAG, "Write: %s %" PRIu32 "ms after last send, %" PRIu32 "ms after last receive",
           format_hex_pretty_to(hex_buf, frame.data.data(), frame.size()), now - this->last_send_,
           now - this->last_modbus_byte_);
  this->last_send_ = now;
@@ -815,9 +812,6 @@ bool Modbus::send_frame_(const ModbusFrame &frame) {
 }

 void ModbusClientHub::send_next_frame_() {
-  if (this->tx_buffer_.empty())
-    return;
-
  if (this->tx_blocked())
    return;

@@ -837,7 +831,7 @@ void ModbusClientHub::send_next_frame_() {
    // reports the transmission, and the entry then retires with no terminal callback instead of
    // occupying the waiting slot until the send-wait timeout expires. The turnaround delay already
    // spaces the next frame; the following sweep erases the entry.
-    ESP_LOGV(TAG, "Broadcast to address 0 sent; no reply expected");
+    ESP_LOGV(TAG, "Broadcast to address 0 sent; no reply expected (fire-and-forget)");
    cmd->complete_broadcast();
    this->sweep_needed_ = true;
    return;
@@ -848,25 +842,20 @@ void ModbusClientHub::send_next_frame_() {
 void ModbusClientHub::dump_config() {
  ESP_LOGCONFIG(TAG,
                "Modbus:\n"
-                "  Send Wait Time: %" PRIu32 " ms\n"
-                "  Turnaround Time: %" PRIu32 " ms\n"
-                "  Frame Delay: %" PRIu32 " us\n"
-                "  Long Rx Buffer Delay: %" PRIu32 " us\n"
-                "  Bits Per Character: %" PRIu8 "\n"
-                "  Rx Detect Latency: %" PRIu32 " us",
-                this->send_wait_time_us_ / US_PER_MS, this->turnaround_delay_us_ / US_PER_MS, this->frame_delay_us_,
-                this->long_rx_buffer_delay_us_, this->bits_per_char_, this->rx_detect_latency_us_);
+                "  Send Wait Time: %" PRIu16 " ms\n"
+                "  Turnaround Time: %" PRIu16 " ms\n"
+                "  Frame Delay: %" PRIu16 " ms\n"
+                "  Long Rx Buffer Delay: %" PRIu16 " ms",
+                this->send_wait_time_, this->turnaround_delay_ms_, this->frame_delay_ms_,
+                this->long_rx_buffer_delay_ms_);
  LOG_PIN("  Flow Control Pin: ", this->flow_control_pin_);
 }
 void ModbusServerHub::dump_config() {
  ESP_LOGCONFIG(TAG,
                "Modbus:\n"
-                "  Frame Delay: %" PRIu32 " us\n"
-                "  Long Rx Buffer Delay: %" PRIu32 " us\n"
-                "  Bits Per Character: %" PRIu8 "\n"
-                "  Rx Detect Latency: %" PRIu32 " us",
-                this->frame_delay_us_, this->long_rx_buffer_delay_us_, this->bits_per_char_,
-                this->rx_detect_latency_us_);
+                "  Frame Delay: %" PRIu16 " ms\n"
+                "  Long Rx Buffer Delay: %" PRIu16 " ms",
+                this->frame_delay_ms_, this->long_rx_buffer_delay_ms_);
  LOG_PIN("  Flow Control Pin: ", this->flow_control_pin_);
 }

@@ -994,8 +983,6 @@ bool ModbusDeviceCommand::timed_out() {
  this->decrement_pending();            // resolve this request (WAITING-origin, so pending >= 1)
  if (this->device == nullptr)
    return false;  // resolved, no one to tell
-  // A cleared frame that timed out still honors a retry: the clear is address-scoped (any device may
-  // call it) while the retry is the owning device's call via on_no_response - the bus obeys the owner.
  if (this->device->on_no_response(this->frame.pdu()))
    this->increment_pending();  // granted retry = re-request (capped)
  return true;
@@ -1067,14 +1054,18 @@ bool ModbusClientHub::queue_pdu(uint8_t address, std::span<const uint8_t> pdu, M
    ESP_LOGE(TAG, "Frame too large, refused: %" PRIu8 ":%zu bytes", address, pdu.size());
    return false;
  }
+  // classify() drives both the broadcast guard and the continuous check below; compute it once.
+  const CommandPriority priority = ModbusDeviceCommand::classify(pdu[0]);

-  if (helpers::is_function_code_exception(pdu[0])) {
-    ESP_LOGW(TAG, "Exception PDU refused for address %" PRIu8 ": function code 0x%X has the exception bit set", address,
-             pdu[0]);
-    return false;
-  }
-
-  if (address == BROADCAST_ADDRESS && !helpers::is_function_code_broadcastable(pdu[0])) {
+  // A broadcast (address 0) is never answered (Modbus 4.1), so it is only meaningful for a command that
+  // changes state. Refuse a broadcast that expects a reply - anything but a write or a custom/vendor code -
+  // as it could never deliver a result, so the caller learns via the false return (and on_not_sent).
+  // 0x17 (read/write multiple) is a knowing inclusion: classify() treats it as a write, so its write half
+  // lands on every server and its unanswerable read half is simply discarded. An exception-flagged custom
+  // code (0x80 bit set) is refused: is_function_code_custom() masks that bit away, so exclude it explicitly
+  // here to match classify()'s exception-first handling of the write side.
+  if (address == BROADCAST_ADDRESS && priority != CommandPriority::WRITE &&
+      (!helpers::is_function_code_custom(pdu[0]) || helpers::is_function_code_exception(pdu[0]))) {
    ESP_LOGW(TAG, "Broadcast refused for function 0x%X: a broadcast (address 0) is never answered", pdu[0]);
    return false;
  }
@@ -1082,7 +1073,7 @@ bool ModbusClientHub::queue_pdu(uint8_t address, std::span<const uint8_t> pdu, M
  // Normalize the caller's options in place (the param is a by-value copy) so everything stored or
  // merged below carries effective options, never the raw request.
  // continuous is ignored for every mutating code (re-writing a value forever is never intended).
-  if (options.continuous && helpers::is_function_code_write(pdu[0])) {
+  if (options.continuous && priority == CommandPriority::WRITE) {
    ESP_LOGW(TAG, "continuous is ignored for a mutating function (0x%X, address %" PRIu8 ")", pdu[0], address);
    options.continuous = false;
  }
@@ -1098,7 +1089,9 @@ bool ModbusClientHub::queue_pdu(uint8_t address, std::span<const uint8_t> pdu, M
      continue;
    if (device == nullptr) {
      // A dropped read is routine (DEBUG); a dropped write/custom warns (unobservable without a device).
-      if (helpers::is_function_code_read_only(pdu[0])) {
+      const bool requeueable =
+          !helpers::is_function_code_exception(pdu[0]) && helpers::is_function_code_read_only(pdu[0]);
+      if (requeueable) {
        ESP_LOGD(TAG, "Anonymous duplicate of active frame for %" PRIu8 " (function 0x%X), dropped", address, pdu[0]);
      } else {
        ESP_LOGW(TAG,
@@ -1195,8 +1188,7 @@ void ModbusServerHub::send_raw_(const uint8_t *payload, uint16_t len) {
    // without a heap allocation. Only one server reply is ever waiting, so a single buffer suffices.
    std::memcpy(this->deferred_payload_.data(), payload, len);
    this->deferred_payload_len_ = len;
-    // set_timeout() takes milliseconds; round the microsecond delay up so we never fire early.
-    this->set_timeout("deferred_send", (this->tx_delay_remaining() + US_PER_MS - 1) / US_PER_MS, [this]() {
+    this->set_timeout("deferred_send", this->tx_delay_remaining(), [this]() {
      ModbusFrame frame(this->deferred_payload_[0], this->deferred_payload_.data() + 1,
                        this->deferred_payload_len_ - 1);
      if (!this->send_frame_(frame))
@@ -1216,11 +1208,11 @@ void Modbus::clear_rx_buffer_(const LogString *reason, bool warn, size_t bytes_t
    bytes = bytes_to_clear;
  if (bytes > 0) {
    if (warn) {
-      ESP_LOGW(TAG, "Clearing buffer of %zu bytes - %s %" PRIu32 "us after last send", bytes, LOG_STR_ARG(reason),
-               micros() - this->last_send_);
+      ESP_LOGW(TAG, "Clearing buffer of %zu bytes - %s %" PRIu32 "ms after last send", bytes, LOG_STR_ARG(reason),
+               millis() - this->last_send_);
    } else {
-      ESP_LOGV(TAG, "Clearing buffer of %zu bytes - %s %" PRIu32 "us after last send", bytes, LOG_STR_ARG(reason),
-               micros() - this->last_send_);
+      ESP_LOGV(TAG, "Clearing buffer of %zu bytes - %s %" PRIu32 "ms after last send", bytes, LOG_STR_ARG(reason),
+               millis() - this->last_send_);
    }
    if (bytes == this->rx_buffer_.size()) {
      this->rx_buffer_.clear();
@@ -1228,8 +1220,6 @@ void Modbus::clear_rx_buffer_(const LogString *reason, bool warn, size_t bytes_t
      this->rx_buffer_.erase(this->rx_buffer_.begin(), this->rx_buffer_.begin() + bytes);
    }
  }
-  if (this->rx_buffer_.empty())
-    this->exceeded_rx_full_threshold_ = false;
 }

 void ModbusClientDevice::dispatch_response_(std::span<const uint8_t> request_pdu, std::span<const uint8_t> response_pdu,
@@ -1374,6 +1364,7 @@ void ModbusClientDevice::dispatch_response_(std::span<const uint8_t> request_pdu
  }
 }

+// Default on_custom_response handler to warn when responses unexpectedly trigger on_custom_response
 void ModbusClientDevice::on_custom_response(std::span<const uint8_t> request_pdu, std::span<const uint8_t> response_pdu,
                                            ResponseStatus status) {
  // The dispatcher never calls this with an empty request, but this is a public virtual - stay safe.
@@ -16,21 +16,26 @@

 namespace esphome::modbus {

-// Tx queue backstop: duplicates dedup into one entry, so only a runaway generator of distinct frames
-// (e.g. a loop writing a changing value) could grow the heap unboundedly.
+// Tx queue backstop. Duplicate frames dedup into one entry, so reads can never approach this in a
+// sane config - it exists to stop a runaway generator of distinct frames (e.g. a loop writing a
+// changing value) from growing the heap unboundedly. The deque grows on demand; this reserves nothing.
+// Worst case the cap permits: 128 distinct max-size frames = ~32 kB of spilled frame data plus
+// ~3 kB of deque node storage (typical 8-byte frames stay inline; large PDUs spill to one
+// allocation each) - pathological configs only, but the numbers matter when tuning for ESP8266.
 static constexpr uint16_t MODBUS_TX_BUFFER_SIZE = 128;
-static constexpr uint16_t MODBUS_TX_MAX_DELAY_US = 5000;
+static constexpr uint16_t MODBUS_TX_MAX_DELAY_MS = 5;

 // Typical frames -- reads and single-register/coil writes -- are exactly 8 bytes
-// (address + 5-byte PDU + 2-byte CRC).
+// (address + 5-byte PDU + 2-byte CRC) and fit inline with no heap allocation.
 static constexpr uint16_t MODBUS_FRAME_INLINE_SIZE = 8;

 struct ModbusFrame {
-  // Small-buffer-optimized: typical frames fit inline, keeping high-frequency tx traffic off the
-  // heap; only large multi-register or custom frames spill to a single heap allocation.
-  SmallInlineBuffer<MODBUS_FRAME_INLINE_SIZE> data;
+  // Frame held in a small-buffer-optimized buffer. Typical frames fit inline; only larger
+  // multi-register or custom frames spill to a single heap allocation. This keeps the common,
+  // high-frequency tx traffic off the heap entirely, avoiding per-frame alloc/free churn.
+  // The buffer tracks its own length, so no separate size field is needed.
+  SmallInlineBuffer<MODBUS_FRAME_INLINE_SIZE> data;  // Modbus RTU max is 256 bytes

-  // A frame is [address][PDU...][CRC lo][CRC hi]. These are the only places that need to know that layout
  ModbusFrame(uint8_t address, const uint8_t *pdu, uint16_t pdu_len) {
    uint8_t *buf = this->data.init(pdu_len + 3);
    buf[0] = address;
@@ -41,9 +46,12 @@ struct ModbusFrame {
  }

  uint16_t size() const { return static_cast<uint16_t>(this->data.size()); }
+
+  // A frame is [address][PDU...][CRC lo][CRC hi]. These are the only places that need to know that layout
  uint8_t address() const { return this->data.data()[0]; }
-  /// A PDU is [function code][data...] without address or CRC. Only valid while the frame is alive.
-  /// Requires a complete frame (size() >= MIN_FRAME_SIZE, guaranteed by the constructors)
+  /// The PDU: function code + data, without address or CRC. Only valid while the frame is alive.
+  /// Requires a complete frame (size() >= MIN_FRAME_SIZE, guaranteed by the constructors) - the
+  /// subtraction would wrap on anything shorter.
  std::span<const uint8_t> pdu() const { return std::span<const uint8_t>(this->data.data() + 1, this->size() - 3u); }
 };

@@ -65,23 +73,23 @@ class Modbus : public uart::UARTDevice, public Component {
  virtual int32_t tx_delay_remaining();
  virtual void parse_modbus_frames() = 0;
  bool parse_modbus_server_frame_();
+  // pdu is the whole PDU (function code + payload, no address/CRC); pdu[0] is the (standard or custom) function code.
  virtual void process_modbus_server_frame(uint8_t address, std::span<const uint8_t> pdu) = 0;
  void clear_rx_buffer_(const LogString *reason, bool warn = false, size_t bytes_to_clear = 0);
+  // Transmit a frame. Callers gate on tx_blocked() first, but the pre-send delay can span several ms,
+  // so this re-checks after the delay and returns false without transmitting if a byte arrived in that
+  // window (the caller then leaves its entry to retry). Returns true once the frame has been transmitted.
  bool send_frame_(const ModbusFrame &frame);
+  // Scans forward from min_length to find a frame boundary by CRC match for custom function codes.
+  // Returns the matched frame length, or 0 if no valid CRC was found within MAX_FRAME_SIZE.
  uint16_t find_frame_end_by_crc_(uint16_t min_length) const;

-  // All timestamps and durations below are micros()-based
  uint32_t last_modbus_byte_{0};
  uint32_t last_receive_check_{0};
  uint32_t last_send_{0};
  uint32_t last_send_tx_offset_{0};
-  uint32_t frame_delay_us_{5000};
-  uint32_t long_rx_buffer_delay_us_{0};
-  uint32_t rx_detect_latency_us_{0};
-  // Bits on the wire per character (start + data + optional parity + stop); 12 at most.
-  uint8_t bits_per_char_{11};
-  // Latched when a read reaches rx_full_threshold, cleared when the buffer drains.
-  bool exceeded_rx_full_threshold_{false};
+  uint16_t frame_delay_ms_{5};
+  uint16_t long_rx_buffer_delay_ms_{0};

  GPIOPin *flow_control_pin_{nullptr};

@@ -91,7 +99,8 @@ class Modbus : public uart::UARTDevice, public Component {
 class ModbusClientDevice;
 class ModbusServerDevice;

-// Transmit ordering, highest first: writes before one-shot reads before continuous polls.
+// Transmit ordering, highest first: writes before one-shot reads before continuous polls. Derived
+// at selection time, never caller-chosen or stored.
 enum class CommandPriority : uint8_t { CONTINUOUS = 0, READ, WRITE };

 // Per-entry lifecycle state. Waiting states (see waiting_state()) hold the bus; the sweep delivers owed
@@ -103,15 +112,20 @@ enum class FrameState : uint8_t {
  RECEIVED_EXCEPTION,
  TIMED_OUT,            // on_no_response delivered at the send-wait timeout; awaiting reschedule/erase
  INTERRUPTED,          // unexpected frame arrived; ignores this transaction, waits out the timeout
-  WAITING_RETIRED,      // retired while WAITING: a late response is still delivered as its usual terminal
-  INTERRUPTED_RETIRED,  // retired while INTERRUPTED: still distrusts late frames, ends in on_no_response
-  RETIRED,              // retired, off the wire
+  WAITING_RETIRED,      // cleared while WAITING: a late response is still delivered as its usual terminal
+  INTERRUPTED_RETIRED,  // cleared while INTERRUPTED: still distrusts late frames, ends in on_no_response
+  RETIRED,              // cleared, off the wire
 };

 // Per-command send options. Append-only; pass via designated initializers ({.continuous = true}).
-// A new field reaches the queue with no plumbing but arrives inert until it defines three rules:
-// normalization in queue_pdu(), a merge rule for duplicate absorption, and teardown in
-// retire()/silent_retire().
+// The queue entry stores this struct whole, so a new field arrives at the queue with no plumbing -
+// but it arrives inert. Every new field must define three rules before it does anything:
+//   1. normalization in queue_pdu() (is it valid for this function code? e.g. continuous is
+//      stripped for mutating codes),
+//   2. a merge rule for when a duplicate send absorbs into a live entry (continuous
+//      upgrades/downgrades via make_continuous(); a new field needs its own answer),
+//   3. teardown: retire() resets the whole struct; silent_retire() leaves it, relying on the sweep
+//      to erase the entry.
 struct CommandOptions {
  // A continuous poll lives in the queue until cancelled or failed; ignored for mutating codes.
  bool continuous{false};
@@ -121,13 +135,17 @@ struct ModbusDeviceCommand {
  ModbusClientDevice *device;
  ModbusFrame frame;
  // Place-in-line stamp (hub's free-running counter); selection takes the oldest for round-robin
-  // fairness within a class. Meant to wrap.
+  // fairness within a class. Meant to wrap. Declared ahead of the byte fields so the tail packs
+  // densely and a growing CommandOptions eats trailing padding before enlarging the struct.
  uint16_t seq{0};
  FrameState state{FrameState::READY};
  // Accepted requests this entry stands for, capped at max_pending(); drains one terminal each.
  // A continuous poll is a subscription: pending fixed at 1, removed only by cancellation or failure.
  uint8_t pending{1};
-  // The entry's LIVE effective options, not a record of the caller's request
+  // The entry's LIVE effective options, not a record of the caller's request: queue_pdu() normalizes
+  // before storing, duplicate absorption mutates continuous via make_continuous(), and retire() resets
+  // the struct (silent_retire() leaves it, relying on the sweep to erase the entry). See the
+  // CommandOptions comment for the rules a new field must define.
  CommandOptions options;

  // Build a command from a PDU span (caller bounds it to MAX_PDU_SIZE) and pre-normalized options;
@@ -136,22 +154,28 @@ struct ModbusDeviceCommand {
                      CommandOptions options = {}, uint16_t seq = 0)
      : device(device), frame(address, pdu.data(), static_cast<uint16_t>(pdu.size())), seq(seq), options(options) {}

+  // Transmit ordering class, derived (never stored): a continuous poll ranks below every one-shot.
  CommandPriority priority() const {
-    if (this->options.continuous)
-      return CommandPriority::CONTINUOUS;
-    if (helpers::is_function_code_write(this->frame.pdu()[0])) {
+    return this->options.continuous ? CommandPriority::CONTINUOUS : classify(this->frame.pdu()[0]);
+  }
+  // Wire-derived class: mutating codes rank WRITE; exception-flagged codes are excluded.
+  static CommandPriority classify(uint8_t function_code) {
+    if (helpers::is_function_code_exception(function_code))
+      return CommandPriority::READ;
+    if (helpers::is_function_code_write(function_code)) {
      return CommandPriority::WRITE;
    }
    return CommandPriority::READ;
  }

-  // Requests this entry can serve
+  // Requests this entry can serve: a standard read twice (run plus one re-run), everything else once.
  uint8_t max_pending() const {
    const uint8_t fc = this->frame.pdu()[0];
-    return (helpers::is_function_code_read_only(fc) && !this->options.continuous) ? 2 : 1;
+    const bool requeueable = !helpers::is_function_code_exception(fc) && helpers::is_function_code_read_only(fc);
+    return (requeueable && !this->options.continuous) ? 2 : 1;
  }
-  // Device-scoped clear: detach with no callback. An entry still waiting for a response keeps its state as a
-  // reply-ignoring shell that resolves silently; any other goes RETIRED.
+  // Device-scoped clear: detach with no callback (device-less, pending 0). An entry still waiting for
+  // a response keeps its state as a reply-ignoring shell that resolves silently; any other goes RETIRED.
  void silent_retire() {
    if (!this->waiting_state())
      this->state = FrameState::RETIRED;
@@ -159,18 +183,28 @@ struct ModbusDeviceCommand {
    this->device = nullptr;
  }
  // Fire-and-forget completion for a broadcast (address 0): the frame was transmitted (on_sent already
-  // fired), but a broadcast is never answered (Modbus 4.1), so the entry retires with no terminal callback.
+  // fired), but a broadcast is never answered (Modbus 4.1), so the entry retires with NO terminal
+  // callback and the sweep erases it. Unlike response()/error()/timed_out(), it delivers nothing.
+  // A broadcast only carries a write or a custom code (reads are refused at queue_pdu()), and every such
+  // code caps pending at 1, so pending is always 1 here - clear it.
  void complete_broadcast() {
    this->state = FrameState::RETIRED;
    this->pending = 0;
  }
-  // Re-ready for another transmission, restamped to the tail of its class
+  // Re-ready for another transmission, restamped to the tail of its class (hub passes next_seq_++).
  void requeue(uint16_t seq) {
    this->state = FrameState::READY;
    this->seq = seq;
  }
  // Re-task a frame that lives on: upgrade a one-shot to a continuous poll, or downgrade a poll back to
-  // a one-shot.
+  // a one-shot. Either way the entry keeps running and owes a request, so this is not a plain setter -
+  // to tear an entry down instead, use retire()/silent_retire(), which leave pending as the count owed.
+  // On: the entry becomes a continuous poll, superseding any absorbed requests (pending resets to the
+  // single subscription). Off: a one-shot duplicate has cancelled the poll, but the entry must still run
+  // once to serve that request - so restore one first. While the flag is still set max_pending() is 1,
+  // so the restore lifts a terminated poll (pending 0, after an error/timeout) back to 1 and is a no-op
+  // on a live poll already at 1; the flag drops afterwards, when a read's cap can widen to 2 without
+  // retroactively inflating that no-op.
  void make_continuous(bool continuous) {
    if (continuous) {
      this->options.continuous = true;
@@ -180,9 +214,13 @@ struct ModbusDeviceCommand {
      this->options.continuous = false;
    }
  }
-  // Address-scoped clear: keep pending and device so the sweep delivers one on_not_sent() per un-delivered
+  // Address-scoped clear: keep pending and device so the sweep delivers one on_not_sent() per un-run
  // request. An entry still waiting for a response keeps its in-flight request (whose usual terminal is
-  // still coming) and drains only its duplicates.
+  // still coming) and drains only its duplicates: WAITING -> WAITING_RETIRED, and INTERRUPTED ->
+  // INTERRUPTED_RETIRED which keeps distrusting late frames (they were already interrupted). Any other
+  // state -> RETIRED, draining everything. A cleared frame that then times out still honors a retry:
+  // the clear is address-scoped (any device may call it) while the retry is the owning device's call
+  // via on_no_response - the bus obeys the owner.
  void retire() {
    if (this->state == FrameState::WAITING) {
      this->state = FrameState::WAITING_RETIRED;
@@ -191,10 +229,10 @@ struct ModbusDeviceCommand {
    } else if (!this->waiting_state()) {  // an already-retired shell stays put; off the wire -> RETIRED
      this->state = FrameState::RETIRED;
    }
-    this->options = {};  // reset every option
+    this->options = {};  // reset every option so a future field is torn down without editing here
  }

-  // True while the entry is still waiting for a response
+  // True while the entry is still waiting for a response; the erase pass exempts these even at pending 0.
  bool waiting_state() const {
    return this->state == FrameState::WAITING || this->state == FrameState::INTERRUPTED ||
           this->state == FrameState::WAITING_RETIRED || this->state == FrameState::INTERRUPTED_RETIRED;
@@ -207,7 +245,7 @@ struct ModbusDeviceCommand {
    }
    return false;
  }
-
+  // Add one request, honouring the cap; false = already at cap (absorb a duplicate, restore a retry).
  bool increment_pending() {
    if (this->pending < this->max_pending()) {
      this->pending++;
@@ -217,7 +255,7 @@ struct ModbusDeviceCommand {
  }

  // Terminal/lifecycle methods: each owns its transition, callback, and pending accounting and
-  // returns whether a callback ran.
+  // returns whether a callback ran. Out-of-line: ModbusClientDevice is incomplete here.
  bool sent();
  bool response(std::span<const uint8_t> response_pdu);
  bool error(ExceptionCode exception_code);
@@ -226,6 +264,9 @@ struct ModbusDeviceCommand {
  bool notify_retired();

  /// True if this command carries the same wire frame (address + PDU) as the given one.
+  /// Cancellation matches the exact frame, not the action instance: a continuous poll whose
+  /// start_address (or other field) is templated produces one poll per distinct frame, and a later
+  /// cancel built from different argument values will not reach the polls it does not byte-match.
  bool same_frame(uint8_t address, std::span<const uint8_t> pdu) const {
    const auto own_pdu = this->frame.pdu();
    return own_pdu.size() == pdu.size() && this->frame.address() == address &&
@@ -238,9 +279,8 @@ class ModbusClientHub : public Modbus {
  ModbusClientHub() = default;
  void dump_config() override;
  void loop() override;
-  // Config arrives in milliseconds; stored internally in microseconds like all other timing.
-  void set_send_wait_time(uint16_t time_in_ms) { this->send_wait_time_us_ = time_in_ms * 1000UL; }
-  void set_turnaround_time(uint16_t time_in_ms) { this->turnaround_delay_us_ = time_in_ms * 1000UL; }
+  void set_send_wait_time(uint16_t time_in_ms) { this->send_wait_time_ = time_in_ms; }
+  void set_turnaround_time(uint16_t time_in_ms) { this->turnaround_delay_ms_ = time_in_ms; }
  bool tx_buffer_empty();
  bool tx_blocked() override;
  ESPDEPRECATED("Use queue_pdu() with create_client_pdu() instead. Removed in 2026.10.0", "2026.4.0")
@@ -251,13 +291,17 @@ class ModbusClientHub : public Modbus {
                                               payload_len),
                    device);
  };
-  /// Queue a request. True = accepted: it resolves in exactly one terminal callback (a broadcast,
-  /// address 0, gets only on_sent()). False = refused, and no callback of any kind follows.
-  /// Neither means anything reached the wire - on_sent() reports that.
+  /// Queue a request. The name says queue, not send: the frame is appended to the transmit queue and
+  /// goes out later from loop(), so a true return means accepted into the machine (it will resolve in
+  /// exactly one terminal callback - except a broadcast (address 0), which is never answered and so gets
+  /// only on_sent()), NOT that anything reached the wire - that is on_sent(). False means
+  /// it never entered the machine at all (empty or oversize PDU, full queue, anonymous or over-cap
+  /// duplicate) and no callback of any kind will follow; the false return is the whole story.
  bool queue_pdu(uint8_t address, std::span<const uint8_t> pdu, ModbusClientDevice *device = nullptr,
                 CommandOptions options = {});
-  // Remove before 2027.2.0. Deliberately the void, no-options signature 2026.7.4 shipped: nothing
-  // external can rely on the later additions under this name.
+  // Remove before 2027.2.0. Deliberately the signature 2026.7.4 shipped - void, and no CommandOptions:
+  // the bool return and the options argument arrived after that release, so nothing external can be
+  // relying on them under this name. Callers who want the queued/refused answer move to queue_pdu().
  ESPDEPRECATED("Use queue_pdu() instead - the call queues a request, it does not send one, and it "
                "reports whether the request was accepted. Removed in 2027.2.0",
                "2026.8.0")
@@ -266,10 +310,9 @@ class ModbusClientHub : public Modbus {
  }
  ESPDEPRECATED("Use queue_pdu(payload[0], <pdu bytes>, device) instead. Removed in 2027.2.0", "2026.8.0")
  void send_raw(const std::vector<uint8_t> &payload, ModbusClientDevice *device = nullptr);
-  // Clear all commands matching the given address; each unsent request resolves via on_not_sent(), but a
-  // frame on the wire still runs to its usual terminal.
+  // Clear an address's commands; each un-run request resolves via on_not_sent(), but a frame on the
+  // wire still runs to its usual terminal. clear_tx_queue_for_device() instead discards silently.
  void clear_tx_queue_for_address(uint8_t address);
-  // Clear all commands for a given device; no callbacks are delivered.
  void clear_tx_queue_for_device(ModbusClientDevice *device);

 protected:
@@ -279,15 +322,16 @@ class ModbusClientHub : public Modbus {
  void send_next_frame_();
  // Deliver owed callbacks from a quiescent hub and apply lifecycle bookkeeping; see FrameState.
  void sweep_();
-  // The selection function: best READY entry (ordered by priority; FIFO by seq within each group), or nullptr.
+  // The selection function: best READY entry (WRITE class first, then one-shot reads, then the
+  // least-recently-served continuous; FIFO by seq within each group), or nullptr.
  ModbusDeviceCommand *select_next_ready_();
  // Locate the single entry waiting for a response (WAITING/INTERRUPTED/WAITING_RETIRED/INTERRUPTED_RETIRED).
  ModbusDeviceCommand *find_waiting_();
  // End the wait for a response on send-wait timeout (the loop() watchdog body); see FrameState.
  void expire_waiting_();

-  uint32_t send_wait_time_us_{2000000};
-  uint32_t turnaround_delay_us_{0};
+  uint16_t send_wait_time_{2000};
+  uint16_t turnaround_delay_ms_{0};

  // Set on transmit, cleared on the transaction-ending transition; send_next_frame_ won't select
  // while it is set, so at most one frame is awaiting a response.
@@ -305,10 +349,13 @@ class ModbusClientHub : public Modbus {
 // Transaction status: std::nullopt on success, otherwise a Modbus exception code
 using ResponseStatus = std::optional<ExceptionCode>;

-/// True when a transaction carried no exception.
+/// True when a transaction carried no exception. The optional holds the exception, so has_value() means
+/// the request FAILED - the inverse of how "status" usually reads. Prefer this at the call site; the
+/// bare !status.has_value() has already been mistaken for a failure check more than once. Where the code
+/// is going to unwrap the exception anyway, status.has_value() followed by status.value() stays clearer.
 inline bool succeeded(ResponseStatus status) { return !status.has_value(); }

-// Register values exchanged with server handlers, in address order. Sized at the larger of the two protocol
+// Register values exchanged with server handlers, in host byte order. Sized at the larger of the two protocol
 // maxima (read = 125 / 0x7D, write = 123 / 0x7B); the per-direction count limit is enforced by the hub, not by
 // the capacity of this type.
 using RegisterValues = StaticVector<uint16_t, MAX_NUM_OF_REGISTERS_TO_READ>;
@@ -326,46 +373,59 @@ class ModbusServerHub : public Modbus {
  void process_modbus_client_frame_(uint8_t address, uint8_t function_code, std::span<const uint8_t> data);
  // Dispatches a broadcast (address 0) write to every registered device; broadcasts are never answered.
  void process_broadcast_frame_(uint8_t function_code, std::span<const uint8_t> data);
-  // Parses a WRITE_SINGLE_REGISTER / WRITE_MULTIPLE_REGISTERS PDU into start_address and the address order register
-  // values, validating the register count and address range. Shared by unicast and broadcast writes.
+  // Parses a WRITE_SINGLE_REGISTER / WRITE_MULTIPLE_REGISTERS PDU into start_address and the host-order register
+  // values, validating the register count and address range. Returns std::nullopt on success, otherwise the Modbus
+  // exception code describing the failure. Shared by unicast writes (which reply with the exception) and broadcast
+  // writes (which silently drop invalid frames).
  ResponseStatus parse_write_single_(std::span<const uint8_t> data, uint16_t &start_address, RegisterValues &registers);
  ResponseStatus parse_write_multiple_(std::span<const uint8_t> data, uint16_t &start_address,
                                       RegisterValues &registers);
-  // Assembles host-order registers from the big-endian bytes in values and appends them to registers.
+  // Appends the big-endian register values in values to registers, in host byte order.
  void assemble_registers_(std::span<const uint8_t> values, RegisterValues &registers);
  ModbusServerDevice *find_device_(uint8_t address);
-  // Returns std::nullopt if [start_address, start_address + count) fits in a 16-bit address space, otherwise
-  // ILLEGAL_DATA_ADDRESS. The caller sends the exception reply if one is required. Shared by the
-  // register/coil/discrete-input handlers, which all use a 16-bit address space.
+  // Returns std::nullopt if [start_address, start_address + count) fits in the 16-bit address space,
+  // otherwise ILLEGAL_DATA_ADDRESS. The caller sends the exception reply if one is required - a broadcast
+  // write is never answered, so the check cannot send it itself. Shared by the register and
+  // coil/discrete-input handlers, which all address the same 16-bit space.
  ResponseStatus check_address_range_(uint16_t start_address, uint16_t count);

-  // Parses read request data. max_entities is the protocol ceiling for the function code; entity_name labels
-  // the rejection log.
+  // Parses a read request PDU (start address(2) + quantity(2)), shared by the register and
+  // coil/discrete-input reads so the two cannot drift apart. max_entities is the protocol ceiling for the
+  // function code; entity_name only labels the rejection log.
  ResponseStatus parse_read_request_(std::span<const uint8_t> data, uint16_t max_entities, const LogString *entity_name,
                                     uint16_t &start_address, uint16_t &count);

-  // Parses single-coil write data
+  // Parses a single-coil write PDU (FC 0x05), which carries a 2-byte on/off value rather than packed
+  // bytes. The caller packs value into a byte it owns to build the PackedBits view the handlers take.
  ResponseStatus parse_write_single_coil_(std::span<const uint8_t> data, uint16_t &start_address, bool &value);

-  // Parses write-multiple-coil data into a packed-bit view pointing straight into the receive buffer, so the
-  // coil values are never copied.
+  // Parses a multiple-coil write PDU (FC 0x0F) into a packed-bit view pointing straight into the receive
+  // buffer, so the coil values are never copied. Both coil parsers are shared by the addressed and
+  // broadcast paths so the two validate identically.
  ResponseStatus parse_write_multiple_coils_(std::span<const uint8_t> data, uint16_t &start_address, uint16_t &count,
                                             std::span<const uint8_t> &packed_bytes);

-  // Builds the body of a register read response into response_buffer. Returns false once an exception has
-  // been sent: the one the handler reported via status, or SERVICE_DEVICE_FAILURE if it returned the wrong
-  // number of registers, the count exceeds the protocol read limit, or the body does not fit.
+  // Builds the body of a register read response (byte count followed by the big-endian register values) into
+  // response_buffer. Shared by every function code that answers with register values, so the read reply stays
+  // identical across them. Returns false once an exception has been sent: the one the handler reported via
+  // status, or SERVICE_DEVICE_FAILURE if it returned the wrong number of registers, the count exceeds the
+  // protocol read limit, or the body does not fit.
  bool build_or_reject_read_response_(uint8_t address, uint8_t function_code, ResponseStatus status,
                                      uint16_t number_of_registers, const RegisterValues &registers,
                                      std::span<uint8_t> response_buffer, uint16_t &response_len);
  void send_raw_(const uint8_t *payload, uint16_t len);
  // Sends and logs the exception reply when status holds one; returns true if the request was rejected.
+  // Every parse and handler rejection funnels through here, so the reply and its log cannot drift apart.
  bool rejected_(uint8_t address, uint8_t function_code, ResponseStatus status);
  void send_exception_(uint8_t address, uint8_t function_code, ExceptionCode exception_code);
  void send_response_(uint8_t address, uint8_t function_code, const uint8_t *payload, uint16_t payload_len);
  uint8_t expecting_peer_response_{0};
  std::vector<ModbusServerDevice *> devices_;

+  // Stamp of the last "broadcast reached no device" warning, 0 until the first one is logged. Rate limiting
+  // on time rather than on address keeps the log bounded no matter how many addresses a shared bus carries.
+  uint32_t last_unaccepted_broadcast_warn_{0};
+
  // Holds the raw payload of a single reply deferred for sending when tx was blocked at send time.
  // Only one server reply can be waiting at once, so a single fixed buffer avoids heap allocation.
  std::array<uint8_t, MAX_RAW_SIZE> deferred_payload_;
@@ -495,7 +555,10 @@ class ModbusClientDevice {
        helpers::create_client_pdu((FunctionCode) function, start_address, number_of_entities, payload, payload_len),
        this);
  }
-  /// See ModbusClientHub::queue_pdu() for the return contract.
+  /// See ModbusClientHub::queue_pdu(): true = accepted into the queue and a terminal callback will
+  /// follow (except a broadcast (address 0), which is never answered and so gets only on_sent()),
+  /// false = refused at the door and nothing further happens. Neither means the frame is on the wire;
+  /// on_sent() reports that.
  bool queue_pdu(std::span<const uint8_t> pdu, CommandOptions options = {}) {
    return this->parent_->queue_pdu(this->address_, pdu, this, options);
  }
@@ -510,8 +573,11 @@ class ModbusClientDevice {
      return;  // too short to contain a PDU; refused at the door like any invalid send
    this->parent_->queue_pdu(payload[0], std::span<const uint8_t>(payload).subspan(1), this);
  }
-  // The typed request builders below all queue through queue_pdu() and share its return contract.
-  // Reads use the table-appropriate function code; an unreadable entity type maps to INVALID, which
+  // The typed request builders below all queue through queue_pdu(), so they share its contract: true
+  // means the request is queued and will resolve in exactly one terminal callback (except a broadcast
+  // (address 0), which is never answered and so gets only on_sent()), false means it was refused outright
+  // with no callback. Neither says the frame has been transmitted - on_sent() does.
+  // Reads via the table-appropriate function code; an unreadable entity type maps to INVALID, which
  // create_read_pdu() rejects into an empty PDU and queue_pdu() refuses with a false return.
  bool read_entities(EntityType entity_type, uint16_t start_address, uint16_t number_of_entities,
                     CommandOptions options = {}) {
@@ -541,9 +607,6 @@ class ModbusClientDevice {
    return this->queue_pdu(helpers::create_write_single_coil_pdu(address, value));
  }
  bool write_multiple_registers(uint16_t start_address, std::span<const uint16_t> values) {
-    // Empty goes to the full-size builder so the rejection log names this method's limit, not the small one's.
-    if (!values.empty() && values.size() <= helpers::MAX_FEW_REGISTERS)
-      return this->queue_pdu(helpers::create_write_few_registers_pdu(start_address, values));
    return this->queue_pdu(helpers::create_write_registers_pdu(start_address, values));
  }
  /// Note: std::vector<bool> cannot bind to std::span<const bool>; use a contiguous bool container or the packed
@@ -556,9 +619,11 @@ class ModbusClientDevice {
  bool write_multiple_coils(uint16_t start_address, PackedBits bits) {
    return this->queue_pdu(helpers::create_write_coils_pdu(start_address, bits));
  }
-  /// FC 0x17: the read-back is delivered through on_read_holding_registers(), and a device exception
-  /// (typically a rejected write half) arrives there too via its status - one callback handles both
-  /// outcomes with no on_error() override needed.
+  /// FC 0x17: the read-back is delivered through on_read_holding_registers() (the response carries only the
+  /// read registers, the same wire shape as a holding-register read). A device exception - typically a
+  /// rejected write half - arrives at that same on_read_holding_registers() with the error in its status,
+  /// exactly as success does, so a subclass overriding that one callback handles both outcomes and never
+  /// needs to also override on_error().
  bool read_write_multiple_registers(uint16_t read_start_address, uint16_t read_count, uint16_t write_start_address,
                                     std::span<const uint16_t> write_values) {
    return this->queue_pdu(helpers::create_read_write_multiple_registers_pdu(read_start_address, read_count,
@@ -579,9 +644,12 @@ class ModbusClientDevice {
  bool custom_response_warned_{false};  // first unhandled custom response warns; repeats log at VERBOSE
 };

-// Compatibility shim adapting the span-based hooks back to the pre-2026.8 on_modbus_data()/
-// on_modbus_error() signatures (the owning-vector heap copy exists only on this deprecated path).
-// Remove before 2027.2.0 (window restarted when the plain alias became a behavior shim in 2026.8.0).
+// Compatibility shim for external components written against the pre-2026.8 API, which subclassed
+// ModbusDevice and overrode on_modbus_data()/on_modbus_error(). The name is free (nothing in-tree
+// uses it), so instead of a plain alias it adapts the new span-based hooks back to the old
+// signatures: on_modbus_data() receives the response payload as an owning vector (the heap copy
+// exists only on this deprecated path) and on_modbus_error() the function code and exception code.
+// Remove before 2027.2.0 (window restarted when the plain alias became a behavior shim in 2026.8.0)
 class ESPDEPRECATED("Subclass ModbusClientDevice and override on_response()/on_error() instead. Removed in 2027.2.0",
                    "2026.8.0") ModbusDevice : public ModbusClientDevice {
 public:
@@ -47,6 +47,7 @@ enum class FunctionCode : uint8_t {
 using ModbusFunctionCode ESPDEPRECATED("Use modbus::FunctionCode instead. Removed in 2027.2.0",
                                       "2026.8.0") = FunctionCode;

+/*Allow direct comparison operators between FunctionCode and uint8_t*/
 inline bool operator==(FunctionCode lhs, uint8_t rhs) { return static_cast<uint8_t>(lhs) == rhs; }
 inline bool operator==(uint8_t lhs, FunctionCode rhs) { return lhs == static_cast<uint8_t>(rhs); }
 inline bool operator!=(FunctionCode lhs, uint8_t rhs) { return !(static_cast<uint8_t>(lhs) == rhs); }
@@ -116,9 +117,6 @@ static constexpr uint16_t MAX_RAW_SIZE = 254;  // Max RAW size is 256 - CRC(2) =
 static constexpr uint16_t READ_PDU_SIZE = 5;
 // A single-write PDU is always function code(1) + address(2) + value(2)
 static constexpr uint16_t WRITE_SINGLE_PDU_SIZE = 5;
-// A multiple-write PDU starts with function code(1) + start address(2) + quantity(2) + byte count(1),
-// followed by two bytes per register.
-static constexpr uint16_t WRITE_MULTIPLE_HEADER_SIZE = 6;
 static constexpr uint16_t MAX_FRAME_SIZE = 256;

 // 4.1 Address 0 is the broadcast address: the request is processed by every device and never answered.
@@ -30,11 +30,9 @@ uint16_t server_pdu_length(const uint8_t *frame, size_t size) {
  switch (static_cast<FunctionCode>(frame[0])) {
    case FunctionCode::READ_COILS:
    case FunctionCode::READ_DISCRETE_INPUTS:
-      // function(1) + byte count(1) + packed coil bytes
-      return 2 + (size > 1 ? std::min(frame[1], uint8_t(packed_bit_bytes(MAX_NUM_OF_COILS_TO_READ))) : 0);
    case FunctionCode::READ_HOLDING_REGISTERS:
    case FunctionCode::READ_INPUT_REGISTERS:
-      // function(1) + byte count(1) + register data
+      // function(1) + byte count(1) + data
      return 2 + (size > 1 ? std::min(frame[1], uint8_t(MAX_NUM_OF_REGISTERS_TO_READ * 2)) : 0);
    case FunctionCode::WRITE_SINGLE_COIL:
    case FunctionCode::WRITE_SINGLE_REGISTER:
@@ -62,9 +60,6 @@ uint16_t server_pdu_length(const uint8_t *frame, size_t size) {
 uint16_t client_pdu_length(const uint8_t *frame, size_t size) {
  if (size < MIN_PDU_SIZE)
    return MIN_PDU_SIZE;
-  if (is_function_code_exception(frame[0])) {
-    return 2;  // never a valid request; sized like the exception reply so the CRC fails at once
-  }
  switch (static_cast<FunctionCode>(frame[0])) {
    case FunctionCode::READ_COILS:
    case FunctionCode::READ_DISCRETE_INPUTS:
@@ -292,52 +287,25 @@ std::optional<int64_t> payload_to_number(const uint8_t *data, size_t size, Senso
 }

 std::optional<int64_t> registers_to_number(const uint16_t *registers, size_t count, SensorValueType sensor_value_type) {
-  // RAW and BIT carry no fixed-width number, so there is nothing to decode whatever the span holds.
-  // register_width_for() reports 1 for them, so this must be checked before the width test below.
-  if (sensor_value_type == SensorValueType::RAW || sensor_value_type == SensorValueType::BIT) {
-    return 0;
+  const size_t required_size = required_payload_size(sensor_value_type);
+  if (required_size == 0) {
+    return 0;  // RAW/unsupported: nothing to read
  }
-  const uint16_t required_words = register_width_for(sensor_value_type);
+  const size_t required_words = required_size / 2;
  if (required_words > count) {
-    ESP_LOGE(TAG, "not enough registers for value type=%u count=%zu required=%u",
-             static_cast<unsigned int>(sensor_value_type), count, static_cast<unsigned int>(required_words));
+    ESP_LOGE(TAG, "not enough registers for value type=%u count=%zu required=%zu",
+             static_cast<unsigned int>(sensor_value_type), count, required_words);
    return std::nullopt;
  }
-  // Registers are the wire's own unit, so decode them directly rather than serializing back to bytes.
-  // Each case defers to registers_to_value() so the word order and sign rules have one definition, with
-  // two deliberate exceptions matching what the byte decoder returned: the float types yield their bit
-  // pattern rather than a float, and U_QWORD shares the signed branch because the return type is int64_t.
-  switch (sensor_value_type) {
-    case SensorValueType::U_WORD:
-      return registers_to_value<SensorValueType::U_WORD>(registers);
-    case SensorValueType::U_WORD_S:
-      return registers_to_value<SensorValueType::U_WORD_S>(registers);
-    case SensorValueType::S_WORD:
-      return registers_to_value<SensorValueType::S_WORD>(registers);
-    case SensorValueType::S_WORD_S:
-      return registers_to_value<SensorValueType::S_WORD_S>(registers);
-    case SensorValueType::U_DWORD:
-      return registers_to_value<SensorValueType::U_DWORD>(registers);
-    case SensorValueType::U_DWORD_R:
-      return registers_to_value<SensorValueType::U_DWORD_R>(registers);
-    case SensorValueType::S_DWORD:
-      return registers_to_value<SensorValueType::S_DWORD>(registers);
-    case SensorValueType::S_DWORD_R:
-      return registers_to_value<SensorValueType::S_DWORD_R>(registers);
-    case SensorValueType::FP32:
-      return registers_to_uint32(registers[0], registers[1]);
-    case SensorValueType::FP32_R:
-      return registers_to_uint32(registers[1], registers[0]);
-    // Signed for both: an unsigned QWORD above INT64_MAX has to come back as a negative int64_t.
-    case SensorValueType::U_QWORD:
-    case SensorValueType::S_QWORD:
-      return registers_to_value<SensorValueType::S_QWORD>(registers);
-    case SensorValueType::U_QWORD_R:
-    case SensorValueType::S_QWORD_R:
-      return registers_to_value<SensorValueType::S_QWORD_R>(registers);
-    default:
-      return 0;
+  // Serialize the needed words back to big-endian bytes and reuse the audited byte decoder so the
+  // sign-extension behaviour stays identical to the wire path.
+  uint8_t bytes[8];  // at most 4 registers (QWORD)
+  for (size_t i = 0; i < required_words; i++) {
+    uint16_t reg = registers[i];
+    bytes[i * 2] = static_cast<uint8_t>(reg >> 8);
+    bytes[i * 2 + 1] = static_cast<uint8_t>(reg & 0xFF);
  }
+  return payload_to_number(bytes, required_size, sensor_value_type, 0, 0xFFFFFFFF);
 }

 // Append a 16-bit value to a PDU in big-endian (wire) byte order.
@@ -413,6 +381,8 @@ ReadPdu create_read_pdu(FunctionCode function_code, uint16_t start_address, uint
 PduBuffer create_client_pdu(FunctionCode function_code, uint16_t start_address, uint16_t number_of_entities,
                            const uint8_t *values, size_t values_len) {
  PduBuffer pdu;  // declared before every return so NRVO fires (all paths return the same object)
+  // Generic entry point; prefer the direction- and type-specific builders (create_read_pdu(),
+  // create_write_registers_pdu(), etc.) which bound their inputs per spec.
  if (is_function_code_read_only(static_cast<uint8_t>(function_code))) {
    if (values != nullptr || values_len > 0) {
      ESP_LOGW(TAG, "Values provided for read function code %02X, but will be ignored",
@@ -475,7 +445,9 @@ PduBuffer create_client_pdu(FunctionCode function_code, uint16_t start_address,
    return pdu;
  }
  // The quantity is spec-bounded above, so the data length just has to agree with it exactly
-  // (registers are 2 bytes each, coils pack 8 per byte).
+  // (registers are 2 bytes each, coils pack 8 per byte). This is the same consistency the response
+  // dispatch enforces via is_client_pdu_standard(), so a frame built here can never be classified
+  // non-standard on reply, and the spec bound keeps the PDU within capacity by construction.
  // Checked before the header append: a failed check must return an empty PDU, not a 5-byte partial one.
  const bool bits = function_code == FunctionCode::WRITE_MULTIPLE_COILS;
  const size_t expected_len = bits ? packed_bit_bytes(number_of_entities) : static_cast<size_t>(number_of_entities) * 2;
@@ -512,12 +484,9 @@ static bool register_block_in_range(const LogString *role, uint16_t start_addres
  return true;
 }

-// The ceiling comes from the buffer itself: push_back() drops silently, so a bound wider than the buffer
-// would put a truncated frame on the wire.
-template<typename Pdu> static Pdu build_write_registers_pdu(uint16_t start_address, std::span<const uint16_t> values) {
-  constexpr auto max_registers = static_cast<uint16_t>((Pdu::capacity() - WRITE_MULTIPLE_HEADER_SIZE) / 2);
-  Pdu pdu;  // declared before every return so NRVO fires (all paths return the same object)
-  if (!register_block_in_range(LOG_STR("Write"), start_address, values.size(), max_registers)) {
+PduBuffer create_write_registers_pdu(uint16_t start_address, std::span<const uint16_t> values) {
+  PduBuffer pdu;  // declared before every return so NRVO fires (all paths return the same object)
+  if (!register_block_in_range(LOG_STR("Write"), start_address, values.size(), MAX_NUM_OF_REGISTERS_TO_WRITE)) {
    return pdu;
  }
  append_pdu_header(pdu, FunctionCode::WRITE_MULTIPLE_REGISTERS, start_address, values.size());
@@ -528,19 +497,6 @@ template<typename Pdu> static Pdu build_write_registers_pdu(uint16_t start_addre
  return pdu;
 }

-static_assert((PduBuffer::capacity() - WRITE_MULTIPLE_HEADER_SIZE) / 2 == MAX_NUM_OF_REGISTERS_TO_WRITE,
-              "a full-frame PDU must hold exactly MAX_NUM_OF_REGISTERS_TO_WRITE registers");
-static_assert((WriteFewRegistersPdu::capacity() - WRITE_MULTIPLE_HEADER_SIZE) / 2 == MAX_FEW_REGISTERS,
-              "the small write buffer must hold exactly MAX_FEW_REGISTERS registers");
-
-PduBuffer create_write_registers_pdu(uint16_t start_address, std::span<const uint16_t> values) {
-  return build_write_registers_pdu<PduBuffer>(start_address, values);
-}
-
-WriteFewRegistersPdu create_write_few_registers_pdu(uint16_t start_address, std::span<const uint16_t> values) {
-  return build_write_registers_pdu<WriteFewRegistersPdu>(start_address, values);
-}
-
 PduBuffer create_read_write_multiple_registers_pdu(uint16_t read_start_address, uint16_t read_count,
                                                   uint16_t write_start_address,
                                                   std::span<const uint16_t> write_values) {
@@ -60,11 +60,14 @@ inline bool is_function_code_custom(uint8_t function_code) {
 /// in step with those switches). Deliberately wider than is_function_code_custom(): the user-defined
 /// ranges are unknown to the parser too, but so are the assigned-but-unimplemented codes
 /// (READ_EXCEPTION_STATUS, DIAGNOSTICS, GET_COMM_EVENT_*, REPORT_SERVER_ID) and every unassigned value.
-/// Exception-flagged codes (0x80 set) are always the 2-byte spec exception shape, so never unknown.
+/// The 0x80 exception flag is masked off first, so a frame with it set classifies by its base code -
+/// even though a spec exception reply has a known 2-byte PDU. That is deliberate, matching what
+/// is_function_code_custom() has always done: some vendors use codes with the 0x80 bit set as ordinary
+/// codes with longer payloads, so the response parser CRC-scans these rather than assuming the spec
+/// length. For an intact spec exception the scan matches at its first candidate, so only a corrupt one
+/// pays (recovery by timeout instead of an immediate CRC failure).
 inline bool is_function_code_unknown_length(uint8_t function_code) {
-  if (is_function_code_exception(function_code))
-    return false;
-  switch (static_cast<FunctionCode>(function_code)) {
+  switch (static_cast<FunctionCode>(function_code & FUNCTION_CODE_MASK)) {
    case FunctionCode::READ_COILS:
    case FunctionCode::READ_DISCRETE_INPUTS:
    case FunctionCode::READ_HOLDING_REGISTERS:
@@ -84,17 +87,6 @@ inline bool is_function_code_unknown_length(uint8_t function_code) {
  }
 }

-/// True when the underlying function code (exception bit masked off) may be broadcast (address 0).
-/// Refused: the reads (including read-write), plus every other code whose response length the parser
-/// knows (file record, FIFO). Allowed: the writes, and any code the parser does not know, since the
-/// hub cannot tell one of those apart from a vendor write.
-inline bool is_function_code_broadcastable(uint8_t function_code) {
-  uint8_t masked_function_code = function_code & FUNCTION_CODE_MASK;
-  if (is_function_code_read(masked_function_code))
-    return false;
-  return is_function_code_write(masked_function_code) || is_function_code_unknown_length(masked_function_code);
-}
-
 // Returns the expected length of a server response PDU based on the function code.
 // If too few bytes have arrived to determine the length, returns the minimum length. `size` is the
 // number of bytes available so far, which may exceed the eventual PDU (e.g. include the frame's CRC
@@ -213,7 +205,7 @@ enum class SensorValueType : uint8_t {
  S_DWORD = 0x4,  // 2 Registers signed
  BIT = 0x5,
  U_DWORD_R = 0x6,  // 2 Registers unsigned
-  S_DWORD_R = 0x7,  // 2 Registers signed
+  S_DWORD_R = 0x7,  // 2 Registers unsigned
  U_QWORD = 0x8,
  S_QWORD = 0x9,
  U_QWORD_R = 0xA,
@@ -228,26 +220,6 @@ inline bool value_type_is_float(SensorValueType v) {
  return v == SensorValueType::FP32 || v == SensorValueType::FP32_R;
 }

-/// Number of 16-bit registers a value of this type occupies (RAW counts as one register).
-constexpr uint16_t register_width_for(SensorValueType v) {
-  switch (v) {
-    case SensorValueType::U_DWORD:
-    case SensorValueType::S_DWORD:
-    case SensorValueType::U_DWORD_R:
-    case SensorValueType::S_DWORD_R:
-    case SensorValueType::FP32:
-    case SensorValueType::FP32_R:
-      return 2;
-    case SensorValueType::U_QWORD:
-    case SensorValueType::S_QWORD:
-    case SensorValueType::U_QWORD_R:
-    case SensorValueType::S_QWORD_R:
-      return 4;
-    default:
-      return 1;
-  }
-}
-
 /// Coils and discrete inputs are the bit-addressed entity tables; the other types are 16-bit registers.
 inline bool is_entity_type_binary(EntityType type) {
  return type == EntityType::COIL || type == EntityType::DISCRETE_INPUT;
@@ -288,7 +260,7 @@ inline uint8_t c_to_hex(char c) { return (c >= 'A') ? (c >= 'a') ? (c - 'a' + 10
 *  byte_from_hex_str("1122", 1) returns uint_8 value 0x22 == 34
 *  byte_from_hex_str("1122", 0) returns 0x11
 * @param value string containing hex encoding
- * @param pos  offset in bytes. Because each byte is encoded in 2 hex digits the position of the original byte in
+ * @param position  offset in bytes. Because each byte is encoded in 2 hex digits the position of the original byte in
 * the hex string is byte_pos * 2
 * @return byte value
 */
@@ -300,7 +272,8 @@ inline uint8_t byte_from_hex_str(const std::string &value, uint8_t pos) {

 /** Get a word from a hex string
 * @param value string containing hex encoding
- * @param pos offset in bytes (see byte_from_hex_str)
+ * @param position  offset in bytes. Because each byte is encoded in 2 hex digits the position of the original byte in
+ * the hex string is byte_pos * 2
 * @return word value
 */
 inline uint16_t word_from_hex_str(const std::string &value, uint8_t pos) {
@@ -309,7 +282,8 @@ inline uint16_t word_from_hex_str(const std::string &value, uint8_t pos) {

 /** Get a dword from a hex string
 * @param value string containing hex encoding
- * @param pos offset in bytes (see byte_from_hex_str)
+ * @param position  offset in bytes. Because each byte is encoded in 2 hex digits the position of the original byte in
+ * the hex string is byte_pos * 2
 * @return dword value
 */
 inline uint32_t dword_from_hex_str(const std::string &value, uint8_t pos) {
@@ -318,7 +292,8 @@ inline uint32_t dword_from_hex_str(const std::string &value, uint8_t pos) {

 /** Get a qword from a hex string
 * @param value string containing hex encoding
- * @param pos offset in bytes (see byte_from_hex_str)
+ * @param position  offset in bytes. Because each byte is encoded in 2 hex digits the position of the original byte in
+ * the hex string is byte_pos * 2
 * @return qword value
 */
 inline uint64_t qword_from_hex_str(const std::string &value, uint8_t pos) {
@@ -333,9 +308,9 @@ template<typename T> T get_data(const std::vector<uint8_t> &data, size_t buffer_
 * Responses for coil are packed into bytes .
 * coil 3 is bit 3 of the first response byte
 * coil 9 is bit 2 of the second response byte
- * @param bit index of the bit to extract
+ * @param coil number of the cil
 * @param data modbus response buffer (uint8_t)
- * @return value of the requested bit
+ * @return content of coil register
 */
 inline bool bit_from_packed(int bit, std::span<const uint8_t> data) {
  auto data_byte = bit / 8;
@@ -473,96 +448,11 @@ inline int64_t payload_to_number(const std::vector<uint8_t> &data, SensorValueTy
 */
 std::optional<int64_t> registers_to_number(const uint16_t *registers, size_t count, SensorValueType sensor_value_type);

-/// Combine two register words into a 32-bit value.
-constexpr uint32_t registers_to_uint32(uint16_t high_word, uint16_t low_word) {
-  return (static_cast<uint32_t>(high_word) << 16) | low_word;
-}
-
-/// Combine four register words into a 64-bit value, most significant word first.
-constexpr uint64_t registers_to_uint64(uint16_t word0, uint16_t word1, uint16_t word2, uint16_t word3) {
-  return (static_cast<uint64_t>(registers_to_uint32(word0, word1)) << 32) | registers_to_uint32(word2, word3);
-}
-
-// Always false, whatever the type: it exists only to make the static_assert below depend on the
-// template argument. Not a queryable trait.
-template<SensorValueType> inline constexpr bool VALUE_TYPE_SUPPORTED = false;
-
-/** Decode one value whose type is known at compile time, from registers in host byte order.
- * Unlike registers_to_number(), the type is a template argument, so only the one decode is compiled
- * and the caller gets the value's natural type back rather than an int64_t. The "_R" types take the
- * low word first; the rest take the high word first.
- * Supports every fixed-width type: the WORD, DWORD, QWORD and FP32 families, including their _S and
- * _R forms. RAW and BIT have no fixed width and fail to compile.
- * Use register_width_for() for the number of registers the caller must supply.
- * Note that the FP32 branches are only usable in a constant expression where std::bit_cast is
- * available; elsewhere bit_cast falls back to a non-constexpr memcpy (see core/helpers.h).
- */
-template<SensorValueType VALUE_TYPE> constexpr auto registers_to_value(const uint16_t *registers) {
-  if constexpr (VALUE_TYPE == SensorValueType::U_WORD) {
-    return registers[0];
-  } else if constexpr (VALUE_TYPE == SensorValueType::S_WORD) {
-    return static_cast<int16_t>(registers[0]);
-  } else if constexpr (VALUE_TYPE == SensorValueType::U_WORD_S) {
-    return byteswap(registers[0]);
-  } else if constexpr (VALUE_TYPE == SensorValueType::S_WORD_S) {
-    return static_cast<int16_t>(byteswap(registers[0]));
-  } else if constexpr (VALUE_TYPE == SensorValueType::U_DWORD) {
-    return registers_to_uint32(registers[0], registers[1]);
-  } else if constexpr (VALUE_TYPE == SensorValueType::U_DWORD_R) {
-    return registers_to_uint32(registers[1], registers[0]);
-  } else if constexpr (VALUE_TYPE == SensorValueType::S_DWORD) {
-    return static_cast<int32_t>(registers_to_uint32(registers[0], registers[1]));
-  } else if constexpr (VALUE_TYPE == SensorValueType::S_DWORD_R) {
-    return static_cast<int32_t>(registers_to_uint32(registers[1], registers[0]));
-  } else if constexpr (VALUE_TYPE == SensorValueType::FP32) {
-    return bit_cast<float>(registers_to_uint32(registers[0], registers[1]));
-  } else if constexpr (VALUE_TYPE == SensorValueType::FP32_R) {
-    return bit_cast<float>(registers_to_uint32(registers[1], registers[0]));
-  } else if constexpr (VALUE_TYPE == SensorValueType::U_QWORD) {
-    return registers_to_uint64(registers[0], registers[1], registers[2], registers[3]);
-  } else if constexpr (VALUE_TYPE == SensorValueType::U_QWORD_R) {
-    return registers_to_uint64(registers[3], registers[2], registers[1], registers[0]);
-  } else if constexpr (VALUE_TYPE == SensorValueType::S_QWORD) {
-    return static_cast<int64_t>(registers_to_uint64(registers[0], registers[1], registers[2], registers[3]));
-  } else if constexpr (VALUE_TYPE == SensorValueType::S_QWORD_R) {
-    return static_cast<int64_t>(registers_to_uint64(registers[3], registers[2], registers[1], registers[0]));
-  } else {
-    static_assert(VALUE_TYPE_SUPPORTED<VALUE_TYPE>, "registers_to_value() does not support this value type");
-  }
-}
-
-/// The type registers_to_value() yields for a given value type. Distinct from modbus::RegisterValues,
-/// which is a container of raw words.
-template<SensorValueType VALUE_TYPE>
-using RegisterValueType = decltype(registers_to_value<VALUE_TYPE>(static_cast<const uint16_t *>(nullptr)));
-
-/** The value stored at an absolute register address, or nullopt when it is not wholly inside this
- * response. Lets a device decode by address rather than by offset, so a poll split across several
- * requests needs no extra bookkeeping: a value outside the response simply yields nullopt.
- * @param registers the response registers, in host byte order
- * @param start_address the address the response begins at
- * @param address the address of the wanted value
- */
-template<SensorValueType VALUE_TYPE>
-constexpr std::optional<RegisterValueType<VALUE_TYPE>> value_at(std::span<const uint16_t> registers,
-                                                                uint16_t start_address, uint16_t address) {
-  if (address < start_address)
-    return std::nullopt;
-  const size_t offset = static_cast<size_t>(address) - start_address;
-  if (offset + register_width_for(VALUE_TYPE) > registers.size())
-    return std::nullopt;
-  return registers_to_value<VALUE_TYPE>(registers.data() + offset);
-}
-
-/// The widest standard numeric value (a QWORD) spans 4 registers, so one entity value never writes more.
-static constexpr uint16_t MAX_FEW_REGISTERS = 4;
-
 // Named PDU buffer types: the builders' storage strategy (currently stack-allocated StaticVector,
 // right-sized per shape) can be swapped in one place without touching every signature.
 using PduBuffer = StaticVector<uint8_t, MAX_PDU_SIZE>;
 using ReadPdu = StaticVector<uint8_t, READ_PDU_SIZE>;
 using WriteSinglePdu = StaticVector<uint8_t, WRITE_SINGLE_PDU_SIZE>;
-using WriteFewRegistersPdu = StaticVector<uint8_t, WRITE_MULTIPLE_HEADER_SIZE + 2 * MAX_FEW_REGISTERS>;
 /// Scratch space for packing coils into wire layout: one bit per coil, sized for the spec maximum.
 using CoilPackBuffer = StaticVector<uint8_t, packed_bit_bytes(MAX_NUM_OF_COILS_TO_WRITE)>;

@@ -606,15 +496,6 @@ PduBuffer create_client_pdu(FunctionCode function_code, uint16_t start_address,
 */
 PduBuffer create_write_registers_pdu(uint16_t start_address, std::span<const uint16_t> values);

-/** Create modbus write multiple registers command (function 0x10) on a right-sized stack buffer.
- * Identical wire bytes to create_write_registers_pdu() for any accepted input.
- * @param start_address modbus address of the first register to write
- * @param values register values to write, at most MAX_FEW_REGISTERS (an over-long or empty set is
- *               rejected and an empty PDU is returned)
- * @return PDU (function code + data, no address, no CRC)
- */
-WriteFewRegistersPdu create_write_few_registers_pdu(uint16_t start_address, std::span<const uint16_t> values);
-
 /** Create modbus read/write multiple registers command
 *  Function 0x17 Read/Write Multiple Registers
 * Writes write_values then reads read_count registers in one transaction (write first, per Modbus 6.17);
@@ -41,7 +41,6 @@ from .const import (
    CONF_REGISTER_COUNT,
    CONF_REGISTER_TYPE,
    CONF_RESPONSE_SIZE,
-    CONF_REUSE_PREVIOUS_RANGE,
    CONF_SERVER_COURTESY_RESPONSE,
    CONF_SERVER_REGISTERS,
    CONF_SKIP_UPDATES,
@@ -61,13 +60,6 @@ ModbusController = modbus_controller_ns.class_("ModbusController", cg.PollingCom

 SensorItem = modbus_controller_ns.struct("SensorItem")

-RangeReuse = modbus_controller_ns.enum("RangeReuse", is_class=True)
-RANGE_REUSE = {
-    "auto": RangeReuse.AUTO,
-    True: RangeReuse.ALWAYS,
-    False: RangeReuse.NEVER,
-}
-
 _LOGGER = logging.getLogger(__name__)


@@ -192,88 +184,13 @@ ModbusItemBaseSchema = cv.Schema(
        ): cv.positive_int,
        cv.Optional(CONF_BITMASK, default=0xFFFFFFFF): cv.hex_uint32_t,
        cv.Optional(CONF_SKIP_UPDATES): validate_skip_updates_deprecated,
-        cv.Optional(CONF_REUSE_PREVIOUS_RANGE, default="auto"): cv.Any(
-            cv.boolean, cv.one_of("auto", lower=True)
-        ),
-        # Deprecated options, migrated by validate_range_reuse_migration(). Remove before 2027.3.0
-        cv.Optional(CONF_FORCE_NEW_RANGE): cv.boolean,
-        cv.Optional(CONF_REGISTER_COUNT): cv.positive_int,
+        cv.Optional(CONF_FORCE_NEW_RANGE, default=False): cv.boolean,
        cv.Optional(CONF_LAMBDA): cv.returning_lambda,
-        cv.Optional(CONF_RESPONSE_SIZE, default=0): cv.int_range(min=0, max=250),
+        cv.Optional(CONF_RESPONSE_SIZE, default=0): cv.positive_int,
    },
 )


-def _derived_register_widths(config: ConfigType) -> set[int]:
-    """Register widths an item derives on its own; a matching register_count is redundant."""
-    response_size = config.get(CONF_RESPONSE_SIZE, 0)
-    if (value_type := config.get(CONF_VALUE_TYPE)) is not None:
-        widths = {TYPE_REGISTER_MAP[value_type]}
-        if value_type == "RAW" and response_size > 0:
-            widths.add((response_size + 1) // 2)
-        return widths
-    if response_size > 0:
-        # text sensors: the old default was floor(response_size / 2); the derived width is now ceil
-        return {response_size // 2, (response_size + 1) // 2}
-    return {1}
-
-
-def entity_label(config: ConfigType) -> str:
-    """The entity's name or id, so migration messages say which entry to edit."""
-    label = config.get(CONF_NAME) or config.get(CONF_ID)
-    return str(label) if label is not None else "<unnamed>"
-
-
-# Remove before 2027.3.0
-def validate_range_reuse_migration(config: ConfigType) -> ConfigType:
-    """Migrate the removed force_new_range/register_count options to reuse_previous_range."""
-    if (force_new_range := config.pop(CONF_FORCE_NEW_RANGE, None)) is not None:
-        if config[CONF_REUSE_PREVIOUS_RANGE] != "auto":
-            raise cv.Invalid(
-                f"'{CONF_FORCE_NEW_RANGE}' and '{CONF_REUSE_PREVIOUS_RANGE}' can't be used together; "
-                f"remove '{CONF_FORCE_NEW_RANGE}'"
-            )
-        if force_new_range:
-            _LOGGER.warning(
-                "%s: '%s' is deprecated; '%s: false' replaces it but only stops this entity joining "
-                "the PREVIOUS range - set it on the following entity too if the range must stay "
-                "isolated. Removed in 2027.3.0",
-                entity_label(config),
-                CONF_FORCE_NEW_RANGE,
-                CONF_REUSE_PREVIOUS_RANGE,
-            )
-            config[CONF_REUSE_PREVIOUS_RANGE] = False
-        else:
-            _LOGGER.warning(
-                "%s: '%s: false' has no effect; remove it. Removed in 2027.3.0",
-                entity_label(config),
-                CONF_FORCE_NEW_RANGE,
-            )
-    if (register_count := config.pop(CONF_REGISTER_COUNT, None)) is not None:
-        if (
-            register_count not in _derived_register_widths(config)
-            and register_count != 0
-        ):
-            raise cv.Invalid(
-                f"'{CONF_REGISTER_COUNT}' has been removed; the number of registers to read is now "
-                f"derived from '{CONF_VALUE_TYPE}' (or '{CONF_RESPONSE_SIZE}' for RAW values and text "
-                f"sensors). To make one request span extra registers up to the next sensor, set "
-                f"'{CONF_REUSE_PREVIOUS_RANGE}: true' on the NEXT sensor instead; for RAW or text block "
-                f"reads set '{CONF_RESPONSE_SIZE}' to the byte count; to force multi-register writes set "
-                f"'use_write_multiple: true'. See "
-                "https://esphome.io/components/modbus_controller/"
-            )
-        _LOGGER.warning(
-            "%s: '%s' is now derived from '%s' (or '%s' for RAW values and text sensors) and has no "
-            "effect; remove it. Removed in 2027.3.0",
-            entity_label(config),
-            CONF_REGISTER_COUNT,
-            CONF_VALUE_TYPE,
-            CONF_RESPONSE_SIZE,
-        )
-    return config
-
-
 def validate_modbus_register(config: ConfigType) -> ConfigType:
    # custom_command is the deprecated alias for custom_pdu (migrated later in final validate); treat
    # either as "a custom frame is configured" so the address/register_type rules match.
@@ -376,13 +293,20 @@ def reject_odd_holding_write_offset(config: ConfigType) -> ConfigType:
    return config


-def modbus_calc_properties(config: ConfigType) -> int:
+def modbus_calc_properties(config: ConfigType) -> tuple[int, int]:
    byte_offset = 0
+    reg_count = 0
    if CONF_OFFSET in config:
        byte_offset = config[CONF_OFFSET]
    # A CONF_BYTE_OFFSET setting overrides CONF_OFFSET
    if CONF_BYTE_OFFSET in config:
        byte_offset = config[CONF_BYTE_OFFSET]
+    if CONF_REGISTER_COUNT in config:
+        reg_count = config[CONF_REGISTER_COUNT]
+    if CONF_VALUE_TYPE in config:
+        value_type = config[CONF_VALUE_TYPE]
+        if reg_count == 0:
+            reg_count = TYPE_REGISTER_MAP[value_type]
    if CONF_CUSTOM_PDU in config:
        if CONF_ADDRESS not in config:
            # generate a unique modbus address using the hash of the name
@@ -393,7 +317,8 @@ def modbus_calc_properties(config: ConfigType) -> int:
                value = value.encode()
            config[CONF_ADDRESS] = binascii.crc_hqx(value, 0)
        config[CONF_REGISTER_TYPE] = cv.enum(MODBUS_REGISTER_TYPE)("custom")
-    return byte_offset
+        config[CONF_FORCE_NEW_RANGE] = True
+    return byte_offset, reg_count


 async def add_modbus_base_properties(
@@ -5,7 +5,6 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ADDRESS, CONF_ID

 from .. import (
-    RANGE_REUSE,
    ModbusItemBaseSchema,
    SensorItem,
    add_modbus_base_properties,
@@ -13,13 +12,12 @@ from .. import (
    modbus_controller_ns,
    validate_custom_pdu_item,
    validate_modbus_register,
-    validate_range_reuse_migration,
 )
 from ..const import (
    CONF_BITMASK,
+    CONF_FORCE_NEW_RANGE,
    CONF_MODBUS_CONTROLLER_ID,
    CONF_REGISTER_TYPE,
-    CONF_REUSE_PREVIOUS_RANGE,
 )

 DEPENDENCIES = ["modbus_controller"]
@@ -40,21 +38,20 @@ CONFIG_SCHEMA = cv.All(
        }
    ),
    validate_modbus_register,
-    validate_range_reuse_migration,
 )

 FINAL_VALIDATE_SCHEMA = validate_custom_pdu_item


 async def to_code(config):
-    byte_offset = modbus_calc_properties(config)
+    byte_offset, _ = modbus_calc_properties(config)
    var = cg.new_Pvariable(
        config[CONF_ID],
        config[CONF_REGISTER_TYPE],
        config[CONF_ADDRESS],
        byte_offset,
        config[CONF_BITMASK],
-        RANGE_REUSE[config[CONF_REUSE_PREVIOUS_RANGE]],
+        config[CONF_FORCE_NEW_RANGE],
    )
    await cg.register_component(var, config)
    await binary_sensor.register_binary_sensor(var, config)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
J. Nick Koston	e5632aa20e	Simulate the unreadable partitions.csv instead of chmod	2026-08-28 11:58:13 -05:00
J. Nick Koston	c75e3898e4	Harden the summary against foreign json shapes and partition edge cases	2026-08-28 11:44:48 -05:00
J. Nick Koston	b66990fbff	Update the print_summary docstring	2026-08-28 11:36:30 -05:00
J. Nick Koston	05ec260ff3	Split the summary skip diagnostics and validate total_size	2026-08-28 10:39:37 -05:00
J. Nick Koston	ad40853283	Pin the size command format in the template test, warn on schema drift	2026-08-28 09:15:35 -05:00
J. Nick Koston	52ce6668d6	Reject ELFs with no allocated PROGBITS sections	2026-08-28 00:51:02 -05:00
J. Nick Koston	2808837743	Parametrize the bad input cases as data	2026-08-28 00:22:45 -05:00
J. Nick Koston	4caf7bafb8	Trim comments and docstrings	2026-08-28 00:21:18 -05:00
J. Nick Koston	22e29df396	Tighten the ELF parser and log skipped summary lines	2026-08-28 00:19:54 -05:00
J. Nick Koston	cafc09bdca	Cover create_elf_copy	2026-08-28 00:13:15 -05:00
J. Nick Koston	e632661adf	Derive the exact image size from the ELF when json2 lacks total_size	2026-08-28 00:08:42 -05:00
J. Nick Koston	8d0f3ea2bb	Use json2 total_size when present, bin size as fallback	2026-08-28 00:01:13 -05:00
J. Nick Koston	8ee2f4247e	Document bin padding and pin the print_summary wiring	2026-08-27 23:59:10 -05:00
J. Nick Koston	edf2f7c62a	Let print_summary own missing input handling	2026-08-27 23:54:39 -05:00
J. Nick Koston	1fc7a0798d	Cover the unreadable firmware bin branch	2026-08-27 23:50:51 -05:00
J. Nick Koston	39092a791a	[espidf] Emit json2 size data so the link edge is not blocked	2026-08-27 23:44:45 -05:00