[voice_assistant] Note the background task exception in the threading comment

model_load_task is declared below the comment and runs off the main loop, so the blanket main-loop-only claim was wrong for it.
[voice_assistant] Add unit tests for runtime model config handling
2026-08-23 14:46:20 +00:00 · 2026-08-10 08:11:47 -04:00 · 2026-08-10 08:11:47 -04:00 · 2026-08-10 08:11:47 -04:00 · 2026-08-10 08:11:47 -04:00 · 2026-08-10 08:11:47 -04:00
1107 changed files with 8480 additions and 34526 deletions
@@ -32,7 +32,7 @@ runs:
      # detects the activated venv via ``VIRTUAL_ENV`` so the venv layout
      # downstream jobs rely on is preserved.
      if: steps.cache-venv.outputs.cache-hit != 'true'
-      uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+      uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
      with:
        enable-cache: true
        # Pull request saves land in per-PR scopes nothing else can
@@ -49,7 +49,7 @@ runs:
        python -m venv venv
        source venv/bin/activate
        python --version
-        uv pip install -r requirements.txt -r requirements_dev.txt -r requirements_test.txt
+        uv pip install -r requirements.txt -r requirements_test.txt
        uv pip install -e .
    - name: Create Python virtual environment
      if: steps.cache-venv.outputs.cache-hit != 'true' && runner.os == 'Windows'
@@ -58,5 +58,5 @@ runs:
        python -m venv venv
        source ./venv/Scripts/activate
        python --version
-        uv pip install -r requirements.txt -r requirements_dev.txt -r requirements_test.txt
+        uv pip install -r requirements.txt -r requirements_test.txt
        uv pip install -e .
@@ -70,7 +70,6 @@ async function isStackedPr(github, context) {
 async function detectMergeBranch(github, context) {
  const labels = new Set();
  const baseRef = context.payload.pull_request.base.ref;
-  const defaultBranch = context.payload.repository.default_branch;

  if (baseRef === 'release') {
    labels.add('merging-to-release');
@@ -79,7 +78,7 @@ async function detectMergeBranch(github, context) {
  } else if (await isStackedPr(github, context)) {
    // GitHub manages the merge order for a stack, so these are not blocked.
    labels.add('stacked-pr');
-  } else if (baseRef !== defaultBranch) {
+  } else if (baseRef !== 'dev') {
    // A chain built by hand: it must not merge until its base branch does.
    labels.add('chained-pr');
  }
@@ -43,14 +43,14 @@ const WITHOUT_SCHEMA = 'CODEOWNERS = ["@esphome/core"]';

 // Builds a fresh context for detectMergeBranch tests instead of mutating the
 // shared CONTEXT fixture above (which other describe blocks rely on).
-function makeMergeContext(baseRef, { stack, defaultBranch = 'dev' } = {}) {
+function makeMergeContext(baseRef, { stack } = {}) {
  const pull_request = { number: 1, base: { ref: baseRef } };
  if (stack !== undefined) {
    pull_request.stack = stack;
  }
  return {
    repo: { owner: 'esphome', repo: 'esphome' },
-    payload: { pull_request, repository: { default_branch: defaultBranch } }
+    payload: { pull_request }
  };
 }

@@ -136,21 +136,6 @@ describe('detectMergeBranch', () => {
    assert.deepEqual(Array.from(labels).sort(), ['chained-pr']);
    assert.equal(state.calls, 1);
  });
-
-  it('base ref matches default branch adds no labels', async () => {
-    const { github } = makeStackGithub({ stack: null });
-    const context = makeMergeContext('other', { defaultBranch: 'other' });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), []);
-  });
-
-  it('base ref dev when the default branch is main adds chained-pr', async () => {
-    const { github } = makeStackGithub({ stack: null });
-    const context = makeMergeContext('dev', { defaultBranch: 'main' });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['chained-pr']);
-  });
-
 });

 // ---------------------------------------------------------------------------
@@ -29,7 +29,7 @@ jobs:
      - name: Set up uv
        # ``--system`` (below) installs into the setup-python interpreter;
        # no venv is created or restored by this workflow.
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          enable-cache: true
          # Pull-request-only workflow: a save could never be shared and
@@ -41,32 +41,10 @@ jobs:
          version: "0.11.15"

      - name: Install apt dependencies
-        # PR-only workflow, so nothing on dev could seed a shared apt cache
-        # entry; the cached apt action would save one copy per PR. Plain apt
-        # with every call bounded: the apt.conf.d timeouts make a dead
-        # mirror fail over in seconds, and timeout runs under sudo so it can
-        # kill apt-get itself. Install without update first: image lists are
-        # fresh, and the index refresh is what a congested mirror makes slow.
-        timeout-minutes: 15
        run: |
-          sudo tee /etc/apt/apt.conf.d/99ci-acquire-timeouts >/dev/null <<'EOF'
-          Acquire::Retries "1";
-          Acquire::http::Timeout "15";
-          Acquire::https::Timeout "15";
-          EOF
-          # Common path: the image's package lists are fresh enough.
-          if sudo DEBIAN_FRONTEND=noninteractive timeout -k 15 90 \
-              apt-get install -y protobuf-compiler; then
-            protoc --version
-            exit 0
-          fi
-          # Rescue path: refresh the lists once with a generous bound; the
-          # apt config already fails a stalled mirror over quickly.
-          sudo DEBIAN_FRONTEND=noninteractive timeout -k 10 30 \
-            dpkg --configure -a || true
-          sudo timeout -k 15 300 apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive timeout -k 15 300 \
-            apt-get install -y protobuf-compiler
+          sudo apt update
+          sudo apt-cache show protobuf-compiler
+          sudo apt install -y protobuf-compiler
          protoc --version
      - name: Install python dependencies
        run: uv pip install --system aioesphomeapi -c requirements.txt -r requirements_dev.txt
@@ -67,7 +67,7 @@ jobs:
        with:
          python-version: "3.12"
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0

      - name: Determine tag and whether to push
        id: tag
@@ -153,7 +153,7 @@ jobs:
        with:
          python-version: "3.12"
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0

      - name: Log in to the GitHub container registry
        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
@@ -49,7 +49,7 @@ jobs:
        # detects the activated venv via ``VIRTUAL_ENV`` so downstream jobs
        # that ``. venv/bin/activate`` see an identical layout.
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          enable-cache: true
          # Pull request saves land in per-PR scopes nothing else can
@@ -68,22 +68,6 @@ jobs:
          uv pip install -r requirements.txt -r requirements_dev.txt -r requirements_test.txt
          uv pip install -e .

-  seed-apt-cache:
-    name: Seed apt package cache
-    runs-on: ubuntu-24.04
-    # PR-branch cache saves are invisible to other PRs, so dev/beta/release
-    # pushes seed the one shared entry PR jobs restore. The key is derived
-    # only from the package list and version; keep both identical in every
-    # step that restores it. In ci-status needs so a broken seed fails dev.
-    if: github.event_name == 'push'
-    timeout-minutes: 10
-    steps:
-      - name: Install apt packages (cached)
-        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
-        with:
-          packages: libsdl2-dev ccache
-          version: 1.1
-
  determine-jobs:
    name: Determine which jobs to run
    runs-on: ubuntu-24.04
@@ -195,7 +179,6 @@ jobs:
          . venv/bin/activate
          script/ci-custom.py
          script/build_codeowners.py --check
-          script/build_alias_registry.py --check
          script/build_language_schema.py --check
          script/generate-esp32-boards.py --check
          script/generate-rp2-boards.py --check
@@ -339,8 +322,7 @@ jobs:

  integration-tests:
    name: Run integration tests (${{ matrix.bucket.name }})
-    # Must match seed-apt-cache's image: the apt cache key has no OS in it.
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    needs:
      - common
      - determine-jobs
@@ -352,16 +334,24 @@ jobs:
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Install apt packages (cached)
-        # ccache speeds up the host compiles. A cache hit never touches apt
-        # (mirror outages cannot hang the job); the timeout bounds the cold
-        # path. Packages and version must match seed-apt-cache exactly;
-        # libsdl2-dev is unused here and carried only for cache-key parity.
-        timeout-minutes: 10
-        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
+      - name: Install ccache
+        # Speeds up the host compiles: tests in a bucket compile overlapping
+        # component sets, so later tests reuse earlier tests' objects.
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y --no-install-recommends ccache
+      - name: Restore ccache (restore-only)
+        # esphome stores the PlatformIO ccache under the machine-global cache
+        # dir (see _ccache_env() in esphome/platformio/toolchain.py). The
+        # bucket-name prefix prefers a same-bucket seed; the bare prefix falls
+        # back to any seed when the bucket layout differs from dev.
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
        with:
-          packages: libsdl2-dev ccache
-          version: 1.1
+          path: ~/.cache/esphome/platformio-ccache
+          key: integration-ccache-${{ matrix.bucket.name }}-${{ github.sha }}
+          restore-keys: |
+            integration-ccache-${{ matrix.bucket.name }}-
+            integration-ccache-
      - name: Set up Python 3.13
        id: python
        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
@@ -376,7 +366,7 @@ jobs:
      - name: Set up uv
        # Only needed on cache miss to populate the venv.
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          enable-cache: true
          # Pull request saves land in per-PR scopes nothing else can
@@ -410,6 +400,14 @@ jobs:
        # 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 ccache
+        # Pull request saves land in per-PR scopes nothing else can reuse;
+        # dev pushes seed the shared copy instead.
+        if: github.event_name != 'pull_request'
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.cache/esphome/platformio-ccache
+          key: integration-ccache-${{ matrix.bucket.name }}-${{ github.sha }}

  import-time:
    name: Check import esphome.__main__ time
@@ -442,17 +440,12 @@ jobs:
  benchmarks:
    name: Run CodSpeed benchmarks
    runs-on: ubuntu-24.04
-    timeout-minutes: 30
    needs:
      - common
      - determine-jobs
    if: >-
-      github.repository == 'esphome/esphome' && (
-        (github.event_name == 'push' && github.ref_name == 'dev') ||
-        (github.event_name == 'pull_request' && needs.determine-jobs.outputs.benchmarks == 'true')
-      )
-    # CodSpeed benchmarks require a CodSpeed account linked to the repository to run
-    # (https://codspeed.io) -- disabled on forks that aren't esphome/esphome itself.
+      (github.event_name == 'push' && github.ref_name == 'dev') ||
+      (github.event_name == 'pull_request' && needs.determine-jobs.outputs.benchmarks == 'true')
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -466,60 +459,14 @@ jobs:
      - name: Build benchmarks
        id: build
        run: |
-          # pipefail: without it a failed build is masked by the grep/cut
-          # pipeline below, leaving BINARY empty and silently dropping every
-          # C++ benchmark from the run while the job still reports success.
-          set -o pipefail
          . venv/bin/activate
-          BENCHMARK_LIB_CONFIG=$(python script/setup_codspeed_lib.py)
-          export BENCHMARK_LIB_CONFIG
-          # --build-only prints BUILD_BINARY=<path> to stdout; the grep is
-          # non-fatal so a missing marker reaches the check below instead of
-          # tripping errexit at this assignment
-          BINARY=$(script/cpp_benchmark.py --all --build-only | { grep '^BUILD_BINARY=' || true; } | tail -1 | cut -d= -f2-)
-          if [ -z "$BINARY" ]; then
-            echo "::error::Benchmark build did not report a binary path"
-            exit 1
-          fi
+          export BENCHMARK_LIB_CONFIG=$(python script/setup_codspeed_lib.py)
+          # --build-only prints BUILD_BINARY=<path> to stdout
+          BINARY=$(script/cpp_benchmark.py --all --build-only | grep '^BUILD_BINARY=' | tail -1 | cut -d= -f2-)
          echo "binary=$BINARY" >> $GITHUB_OUTPUT

-      - name: Bound apt fetches and pre-install libc6-dbg
-        # The CodSpeed runner installs valgrind + libc6-dbg via its own
-        # unbounded apt-get update; per-invocation apt options cannot reach
-        # it. The apt.conf.d timeouts below bound every later apt call in
-        # this job, the runner's included. Pre-installing libc6-dbg lets the
-        # runner skip apt once its valgrind cache is restored (it checks
-        # ``dpkg -s libc6-dbg``, so the cache action's unregistered restores
-        # would not count). Install without update first: image lists are
-        # fresh, and the index refresh is what a congested mirror makes
-        # slow. Best effort; the job timeout is the last backstop.
-        timeout-minutes: 15
-        continue-on-error: true
-        run: |
-          sudo tee /etc/apt/apt.conf.d/99ci-acquire-timeouts >/dev/null <<'EOF'
-          Acquire::Retries "1";
-          Acquire::http::Timeout "15";
-          Acquire::https::Timeout "15";
-          EOF
-          if dpkg -s libc6-dbg >/dev/null 2>&1; then
-            echo "libc6-dbg already installed"
-            exit 0
-          fi
-          # Common path: the image's package lists are fresh enough.
-          if sudo DEBIAN_FRONTEND=noninteractive timeout -k 15 90 \
-              apt-get install -y libc6-dbg; then
-            exit 0
-          fi
-          # Rescue path: refresh the lists once with a generous bound; the
-          # apt config already fails a stalled mirror over quickly.
-          sudo DEBIAN_FRONTEND=noninteractive timeout -k 10 30 \
-            dpkg --configure -a || true
-          sudo timeout -k 15 300 apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive timeout -k 15 300 \
-            apt-get install -y libc6-dbg
-
      - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@4296e51e7041e24dadb86d1d6e8b9320d223dbe8 # v5.0.3
+        uses: CodSpeedHQ/action@0ca9cbbf4623b599a6c3ed4fc8a922942705d9f1 # v5.0.2
        with:
          run: |
            . venv/bin/activate
@@ -602,29 +549,24 @@ jobs:
          fetch-depth: 2

      - name: Restore Python
-        id: restore-python
        uses: ./.github/actions/restore-python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}

-      # Key on the exact Python version as well: LibreTiny creates a venv under
-      # ~/.platformio/penv whose interpreter is a symlink into the runner's
-      # hosted toolcache, so a cache saved on an older runner image breaks once
-      # a new image ships a newer patch release and drops the old interpreter.
      - name: Cache platformio
        if: github.ref == 'refs/heads/dev' && matrix.pio_cache_key
        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
        with:
          path: ~/.platformio
-          key: platformio-${{ matrix.pio_cache_key }}-${{ steps.restore-python.outputs.python-version }}-${{ hashFiles('platformio.ini') }}
+          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}

      - name: Cache platformio
        if: github.ref != 'refs/heads/dev' && matrix.pio_cache_key
        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
        with:
          path: ~/.platformio
-          key: platformio-${{ matrix.pio_cache_key }}-${{ steps.restore-python.outputs.python-version }}-${{ hashFiles('platformio.ini') }}
+          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}

      - name: Cache ESP-IDF install
        if: matrix.cache_idf
@@ -941,17 +883,12 @@ jobs:
      - name: List components
        run: echo ${{ matrix.batch.components }}

-      - name: Install apt packages (cached)
-        # A cache hit (seeded on dev by seed-apt-cache) never touches apt,
-        # so mirror outages cannot hang this PR-only job; the timeout bounds
-        # the cold path. Packages and version must match seed-apt-cache
-        # exactly. The action has no --no-install-recommends; same package
-        # set this job used before #17463.
-        timeout-minutes: 10
-        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
-        with:
-          packages: libsdl2-dev ccache
-          version: 1.1
+      - name: Install apt packages
+        # Not cached: this job is pull-request-only, so a cache save could
+        # never be shared and would only consume quota.
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y --no-install-recommends libsdl2-dev ccache

      - name: Check out code from GitHub
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -1153,7 +1090,7 @@ jobs:
        # install step (order-of-magnitude faster on cold boots,
        # with its own wheel cache). actions/setup-python still
        # provides the interpreter.
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          enable-cache: true
          # Pull request saves land in per-PR scopes nothing else can
@@ -1486,7 +1423,6 @@ jobs:
    # this check.
    needs:
      - common
-      - seed-apt-cache
      - determine-jobs
      - ci-custom
      - pylint
@@ -56,7 +56,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
        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@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
        with:
          category: "/language:${{matrix.language}}"
@@ -14,4 +14,4 @@ jobs:
    permissions:
      issues: write         # issues.lock on closed issues
      pull-requests: write  # issues.lock on closed pull requests
-    uses: esphome/workflows/.github/workflows/lock.yml@0fdd5e311b7e744069166696072a1a9cbc5fbeb6  # 2026.8.1
+    uses: esphome/workflows/.github/workflows/lock.yml@9f6577fd37b5cf773ab1b9be929714a0dcd15661  # 2026.7.0
@@ -123,7 +123,7 @@ jobs:
          python-version: "3.12"

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0

      - name: Log in to docker hub
        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
@@ -202,7 +202,7 @@ jobs:
          merge-multiple: true

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0

      - name: Log in to docker hub
        if: matrix.registry == 'dockerhub'
@@ -16,7 +16,7 @@ jobs:
    # No GITHUB_TOKEN permissions: the reusable workflow mints an ESPHome
    # GitHub App token so the labels, comments and closures come from
    # esphome[bot] instead of github-actions[bot].
-    uses: esphome/workflows/.github/workflows/stale.yml@a1c1485ab46ef41a84a6a9d8abd7fa4b7628fd70  # main
+    uses: esphome/workflows/.github/workflows/stale.yml@61fd37a044cad4e9aa4303027b2a61b6a34da855  # main
    secrets:
      ESPHOME_GITHUB_APP_PRIVATE_KEY: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
    with:
@@ -47,7 +47,7 @@ jobs:
        # setup-python interpreter so subsequent ``prek`` /
        # ``script/run-in-env.py`` steps find the deps without a
        # ``uv run`` prefix.
-        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
        with:
          enable-cache: true
          # Pin uv version so the action does not have to fetch the
@@ -11,7 +11,7 @@ ci:
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.16.3
+    rev: v0.16.0
    hooks:
      # Run the linter.
      - id: ruff
@@ -57,12 +57,6 @@ This document provides essential context for AI models interacting with this pro
        - Function-local constants: `lower_snake_case`
        - Protected/private fields: `lower_snake_case_with_trailing_underscore_`
        - Favor descriptive names over abbreviations
-        - Enumerator names: prefix every value of an `enum class` with the enum name converted to
-          `UPPER_SNAKE_CASE` (e.g. `UARTFlushResult::UART_FLUSH_RESULT_SUCCESS`). Never use bare
-          names like `SUCCESS`, `FAILURE`, `OK`, or `FAIL`: platform SDK headers define macros with
-          these common names (for example the Realtek SDKs used by LibreTiny define
-          `#define SUCCESS 0` in `basic_types.h`), and the preprocessor replaces the enumerator
-          before the compiler sees it, breaking the build and clang-tidy on those platforms.

 *   **Python Idioms:**
    *   **Assignment expressions (PEP 572):** Prefer the walrus operator (`:=`) wherever it removes a redundant lookup or a throwaway temporary. The most common case in component code is presence-checking a config key and then indexing it separately — fetch once with `.get()` and bind in the condition instead:
@@ -763,13 +757,3 @@ The project uses English for non-code content. When drafting documentation, code
 PR descriptions, and similar text, avoid technical jargon. Instead, express concepts in plain English,
 using standard technical terms only when required. Ensure the text is readily comprehensible to a wide
 audience, including non-native English speakers.
-
-## 10. Code Comments
-
-Code comments on individual lines should be used only where necessary to flag issues that may not be obvious
-on a simple reading of the code. Keep them short (e.g. 1 or 2 lines).
-
-Function and method comment blocks may include more detail as required to make
-calling contracts clear and document parameter usage, but should still be kept concise.
-
-Avoid redundancy and repetition; comments should never simply restate what the code already says.
@@ -238,7 +238,6 @@ esphome/components/hlw8032/* @rici4kubicek
 esphome/components/hm3301/* @freekode
 esphome/components/hmac_md5/* @dwmw2
 esphome/components/hmac_sha256/* @dwmw2
-esphome/components/hoermann_hcp/* @zweckj
 esphome/components/homeassistant/* @esphome/core @OttoWinter
 esphome/components/homeassistant/number/* @landonr
 esphome/components/homeassistant/switch/* @Links2004
@@ -381,7 +380,6 @@ esphome/components/nextion/switch/* @senexcrenshaw
 esphome/components/nextion/text_sensor/* @senexcrenshaw
 esphome/components/nfc/* @jesserockz @kbx81
 esphome/components/noblex/* @AGalfra
-esphome/components/noise/* @esphome/core
 esphome/components/npi19/* @bakerkj
 esphome/components/nrf52/* @tomaszduda23
 esphome/components/number/* @esphome/core
@@ -467,7 +465,6 @@ esphome/components/sen21231/* @shreyaskarnik
 esphome/components/sen5x/* @martgras
 esphome/components/sen6x/* @martgras @mebner86 @tuct
 esphome/components/sendspin/* @kahrendt
-esphome/components/sendspin/image/* @kahrendt
 esphome/components/sendspin/media_player/* @kahrendt
 esphome/components/sendspin/media_source/* @kahrendt
 esphome/components/sendspin/sensor/* @kahrendt
@@ -48,7 +48,7 @@ PROJECT_NAME           = ESPHome
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 2026.9.0-dev
+PROJECT_NUMBER         = 2026.8.0-dev

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -22,7 +22,7 @@ RUN \
    -r /requirements.txt

 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.12.4
+RUN uv pip install --no-cache-dir esphome-device-builder==1.9.5

 RUN \
    platformio settings set enable_telemetry No \
@@ -10,7 +10,7 @@ from pathlib import Path
 import re
 import sys
 import time
-from typing import TYPE_CHECKING, Protocol
+from typing import Protocol

 # Note: Do not import modules from esphome.components here, as this would
 # cause them to be loaded before external components are processed, resulting
@@ -21,6 +21,7 @@ from esphome.const import (
    ARGUMENT_HELP_DEVICE,
    BUNDLE_EXTENSION,
    CONF_API,
+    CONF_AUTH,
    CONF_BAUD_RATE,
    CONF_BROKER,
    CONF_DEASSERT_RTS_DTR,
@@ -28,7 +29,6 @@ from esphome.const import (
    CONF_DISCOVER_IP,
    CONF_ESPHOME,
    CONF_LEVEL,
-    CONF_LOG,
    CONF_LOG_TOPIC,
    CONF_LOGGER,
    CONF_MDNS,
@@ -42,7 +42,7 @@ from esphome.const import (
    CONF_PORT,
    CONF_SUBSTITUTIONS,
    CONF_TOPIC,
-    CONF_VERSION,
+    CONF_USERNAME,
    CONF_WEB_SERVER,
    CONF_WIFI,
    ENV_NOGITIGNORE,
@@ -71,9 +71,6 @@ from esphome.util import (
    safe_print,
 )

-if TYPE_CHECKING:
-    import threading
-
 # Keep expensive imports (zeroconf, writer, yaml_util, etc.) out of this
 # module's top level. Every `esphome` invocation — including fast paths
 # like `esphome version` — pays the cost of what's imported here before
@@ -276,8 +273,8 @@ def _unresolved_default_error(purpose: Purpose, defaults: list[str]) -> str:
        if purpose == Purpose.LOGGING and not has_api():
            return (
                "Cannot view logs over the network: no 'api:' component is "
-                "configured. Add an 'api:' component, enable MQTT logging, add a "
-                "'web_server:' component, or view logs over USB."
+                "configured. Network log streaming requires the native API; add "
+                "an 'api:' component, enable MQTT logging, or view logs over USB."
            )
        if purpose == Purpose.UPLOADING and not has_ota():
            return (
@@ -317,12 +314,9 @@ def choose_upload_log_host(
                ]
                resolved.append(choose_prompt(options, purpose=purpose))
            elif device == "OTA":
-                # Logs can stream over a network transport via the native API
-                # or the web_server HTTP SSE feed.
-                network_logging = has_api() or has_web_server_logging()
                # ensure IP adresses are used first
                if is_ip_address(CORE.address) and (
-                    (purpose == Purpose.LOGGING and network_logging)
+                    (purpose == Purpose.LOGGING and has_api())
                    or (purpose == Purpose.UPLOADING and has_ota())
                ):
                    resolved.extend(_resolve_with_cache(CORE.address, purpose))
@@ -334,11 +328,7 @@ def choose_upload_log_host(
                    if has_mqtt_logging():
                        resolved.append("MQTT")

-                    if (
-                        network_logging
-                        and has_non_ip_address()
-                        and has_resolvable_address()
-                    ):
+                    if has_api() and has_non_ip_address() and has_resolvable_address():
                        resolved.extend(_ota_hostnames_for_default(purpose))

                elif purpose == Purpose.UPLOADING:
@@ -400,7 +390,7 @@ def choose_upload_log_host(
            mqtt_config = CORE.config[CONF_MQTT]
            options.append((f"MQTT ({mqtt_config[CONF_BROKER]})", "MQTT"))

-        if has_api() or has_web_server_logging():
+        if has_api():
            add_ota_options()

    elif purpose == Purpose.UPLOADING and has_ota():
@@ -493,21 +483,6 @@ def has_web_server_ota() -> bool:
    )


-def has_web_server_logging() -> bool:
-    """Check if logs can be streamed over the web_server HTTP SSE endpoint.
-
-    The ``web_server`` component exposes a ``/events`` Server-Sent Events
-    stream that carries ``event: log`` frames. This requires version 2+ (the
-    v1 UI has no ``/events`` endpoint) and the ``log`` option enabled (default).
-    """
-    web_conf = CORE.config.get(CONF_WEB_SERVER)
-    if web_conf is None:
-        return False
-    if web_conf.get(CONF_VERSION, 2) == 1:
-        return False
-    return web_conf.get(CONF_LOG, True)
-
-
 def has_mqtt_ip_lookup() -> bool:
    """Check if MQTT is available and IP lookup is supported."""
    if CONF_MQTT not in CORE.config:
@@ -570,48 +545,11 @@ def has_name_add_mac_suffix() -> bool:


 def mqtt_get_ip(
-    config: ConfigType,
-    username: str,
-    password: str,
-    client_id: str,
-    stop_event: "threading.Event | None" = None,
+    config: ConfigType, username: str, password: str, client_id: str
 ) -> list[str]:
    from esphome import mqtt

-    return mqtt.get_esphome_device_ip(
-        config, username, password, client_id, stop_event=stop_event
-    )
-
-
-def _add_network_device(device: str, network_devices: list[str]) -> None:
-    """Append a device to the list, expanding it through ``CORE.address_cache``.
-
-    If the hostname is already in the address cache (e.g. populated by mDNS
-    discovery), substitute the cached IPs so aioesphomeapi doesn't open its
-    own Zeroconf to re-resolve it. Duplicates are dropped.
-    """
-    if CORE.address_cache and (cached := CORE.address_cache.get_addresses(device)):
-        network_devices.extend(addr for addr in cached if addr not in network_devices)
-    elif device not in network_devices:
-        network_devices.append(device)
-
-
-def _split_network_devices(devices: list[str]) -> tuple[list[str], bool]:
-    """Split the device list into direct addresses and an MQTT-lookup flag.
-
-    Direct addresses are expanded through ``CORE.address_cache`` and deduped
-    the same way ``_resolve_network_devices`` does; MQTT/MQTTIP magic strings
-    are not resolved, only reported via the returned bool so the caller can
-    defer the broker lookup.
-    """
-    network_devices: list[str] = []
-    has_mqtt_lookup = False
-    for device in devices:
-        if get_port_type(device) in _MQTT_PORT_TYPES:
-            has_mqtt_lookup = True
-        else:
-            _add_network_device(device, network_devices)
-    return network_devices, has_mqtt_lookup
+    return mqtt.get_esphome_device_ip(config, username, password, client_id)


 def _resolve_network_devices(
@@ -644,44 +582,40 @@ def _resolve_network_devices(
        if port_type in _MQTT_PORT_TYPES:
            # Only resolve MQTT once, even if multiple MQTT entries
            if not mqtt_resolved:
-                mqtt_ips = _mqtt_get_ip_or_warn(
-                    config, args.username, args.password, args.client_id
-                )
-                network_devices.extend(
-                    addr for addr in mqtt_ips if addr not in network_devices
-                )
+                try:
+                    mqtt_ips = mqtt_get_ip(
+                        config, args.username, args.password, args.client_id
+                    )
+                    # pylint can't infer mqtt_get_ip's return through its
+                    # lazy ``from esphome import mqtt`` import, so it flags
+                    # the genexpr below.
+                    network_devices.extend(
+                        addr
+                        for addr in mqtt_ips  # pylint: disable=not-an-iterable
+                        if addr not in network_devices
+                    )
+                except EsphomeError as err:
+                    _LOGGER.warning(
+                        "MQTT IP discovery failed (%s), will try other devices if available",
+                        err,
+                    )
                mqtt_resolved = True
            continue

-        _add_network_device(device, network_devices)
+        # If the hostname is already in the address cache (e.g. populated by
+        # mDNS discovery), substitute the cached IPs so aioesphomeapi doesn't
+        # open its own Zeroconf to re-resolve it.
+        if CORE.address_cache and (cached := CORE.address_cache.get_addresses(device)):
+            network_devices.extend(
+                addr for addr in cached if addr not in network_devices
+            )
+        elif device not in network_devices:
+            # Regular network address or IP - add if not already present
+            network_devices.append(device)

    return network_devices


-def _mqtt_get_ip_or_warn(
-    config: ConfigType,
-    username: str,
-    password: str,
-    client_id: str,
-    stop_event: "threading.Event | None" = None,
-) -> list[str]:
-    """Look up the device IP via MQTT, returning [] with a warning on failure.
-
-    This owns the failure policy for MQTT IP discovery on paths that have
-    other addresses to fall back on: a broker problem must not abort the
-    operation. Also used as the deferred resolver handed to ``run_logs``,
-    where it runs in a worker thread.
-    """
-    try:
-        return mqtt_get_ip(config, username, password, client_id, stop_event=stop_event)
-    except EsphomeError as err:
-        _LOGGER.warning(
-            "MQTT IP discovery failed (%s), will try other devices if available",
-            err,
-        )
-        return []
-
-
 def run_miniterm(config: ConfigType, port: str, args) -> int:
    from datetime import datetime

@@ -762,11 +696,9 @@ def _wrap_to_code(name, comp, yaml_util):
    async def wrapped(conf):
        cg.add(cg.LineComment(f"{name}:"))
        if comp.config_schema is not None:
-            # sort_keys: voluptuous fills defaults in set order, so an
-            # unsorted dump would churn main.cpp and relink every run
-            conf_str = yaml_util.dump(conf, sort_keys=True)
+            conf_str = yaml_util.dump(conf)
            conf_str = conf_str.replace("//", "")
-            # remove trailing \ to avoid multi-line comment warning
+            # remove tailing \ to avoid multi-line comment warning
            conf_str = conf_str.replace("\\\n", "\n")
            cg.add(cg.LineComment(indent(conf_str)))
        await coro(conf)
@@ -1359,23 +1291,25 @@ def _upload_via_native_api(
 def _upload_via_web_server(
    config: ConfigType, network_devices: list[str], binary: Path
 ) -> tuple[int, str | None]:
+    web_conf = config.get(CONF_WEB_SERVER)
+    if not web_conf:
+        raise EsphomeError(
+            f"Cannot upload via web_server OTA: the {CONF_WEB_SERVER} component "
+            f"is not configured."
+        )
+
+    remote_port = int(web_conf[CONF_PORT])
+    auth = web_conf.get(CONF_AUTH) or {}
+    username = auth.get(CONF_USERNAME)
+    password = auth.get(CONF_PASSWORD)
+
    from esphome import web_server_ota
-    from esphome.web_server_helpers import get_web_server_connection

-    remote_port, username, password = get_web_server_connection(config)
    return web_server_ota.run_ota(
        network_devices, remote_port, username, password, binary
    )


-def _show_logs_via_web_server(config: ConfigType, network_devices: list[str]) -> int:
-    from esphome import web_server_logs
-    from esphome.web_server_helpers import get_web_server_connection
-
-    port, username, password = get_web_server_connection(config)
-    return web_server_logs.run_logs(network_devices, port, username, password)
-
-
 # Layout of esp_partition_info_t on flash. Each entry is 32 bytes, leading with a
 # 16-bit little-endian magic. ESP-IDF defines ESP_PARTITION_MAGIC = 0x50AA (stored as
 # bytes 0xAA, 0x50) for partition entries and ESP_PARTITION_MAGIC_MD5 = 0xEBEB for the
@@ -1484,37 +1418,17 @@ def show_logs(config: ConfigType, args: ArgsProtocol, devices: list[str]) -> int
        return run_miniterm(config, port, args)

    # Check if we should use API for logging
-    if has_api():
-        network_devices, has_mqtt_lookup = _split_network_devices(devices)
-        mqtt_resolver = None
-        if has_mqtt_lookup:
-            if network_devices:
-                # Addresses are already known, so don't block startup on the
-                # MQTT broker lookup; hand it to run_logs as a deferred
-                # resolver that runs in the background and feeds discovered
-                # addresses into the running log client, keeping MQTT as a
-                # fallback for when the known addresses are stale (e.g. DHCP
-                # reassigned the IP).
-                mqtt_resolver = functools.partial(
-                    _mqtt_get_ip_or_warn,
-                    config,
-                    args.username,
-                    args.password,
-                    args.client_id,
-                )
-            else:
-                # The MQTT lookup is the only way to find the device; resolve
-                # it up front since the client needs an address to start with.
-                network_devices = _resolve_network_devices(devices, config, args)
-        if network_devices:
-            from esphome.api_client import run_logs
+    # Resolve MQTT magic strings to actual IP addresses
+    if has_api() and (
+        network_devices := _resolve_network_devices(devices, config, args)
+    ):
+        from esphome.api_client import run_logs

-            return run_logs(
-                config,
-                network_devices,
-                subscribe_states=_should_subscribe_states(args),
-                mqtt_resolver=mqtt_resolver,
-            )
+        return run_logs(
+            config,
+            network_devices,
+            subscribe_states=_should_subscribe_states(args),
+        )

    if port_type in (PortType.NETWORK, PortType.MQTT) and has_mqtt_logging():
        from esphome import mqtt
@@ -1523,13 +1437,6 @@ def show_logs(config: ConfigType, args: ArgsProtocol, devices: list[str]) -> int
            config, args.topic, args.username, args.password, args.client_id
        )

-    # Fall back to the web_server HTTP SSE log stream for devices that have
-    # web_server: but no api: (the logging counterpart to web_server OTA).
-    if has_web_server_logging() and (
-        network_devices := _resolve_network_devices(devices, config, args)
-    ):
-        return _show_logs_via_web_server(config, network_devices)
-
    raise EsphomeError("No remote or local logging method configured (api/mqtt/logger)")


@@ -2034,7 +1941,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
    new_name = args.name
    for c in new_name:
        if c not in ALLOWED_NAME_CHARS:
-            safe_print(
+            print(
                color(
                    AnsiFore.BOLD_RED,
                    f"'{c}' is an invalid character for names. Valid characters are: "
@@ -2047,7 +1954,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:

    yaml = yaml_util.load_yaml(CORE.config_path)
    if CONF_ESPHOME not in yaml or CONF_NAME not in yaml[CONF_ESPHOME]:
-        safe_print(
+        print(
            color(
                AnsiFore.BOLD_RED, "Complex YAML files cannot be automatically renamed."
            )
@@ -2094,9 +2001,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
            )
            > 1
        ):
-            safe_print(
-                color(AnsiFore.BOLD_RED, "Too many matches in YAML to safely rename")
-            )
+            print(color(AnsiFore.BOLD_RED, "Too many matches in YAML to safely rename"))
            return 1

        new_raw = re.sub(
@@ -2114,7 +2019,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
    # ``kitchen``; running ``esphome rename weird-file.yaml kitchen``
    # would otherwise just re-flash the same hostname).
    if new_name == old_name:
-        safe_print(
+        print(
            color(
                AnsiFore.BOLD_RED,
                f"'{new_name}' is already the device's name.",
@@ -2124,7 +2029,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:

    new_path: Path = CORE.config_dir / (new_name + ".yaml")
    if new_path.resolve() == CORE.config_path.resolve():
-        safe_print(
+        print(
            color(
                AnsiFore.BOLD_RED,
                f"'{new_name}' is already the device's name.",
@@ -2132,7 +2037,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
        )
        return 1
    if new_path.exists():
-        safe_print(
+        print(
            color(
                AnsiFore.BOLD_RED,
                f"Cannot rename: {new_path} already exists. "
@@ -2140,7 +2045,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
            )
        )
        return 1
-    safe_print(
+    print(
        f"Updating {color(AnsiFore.CYAN, str(CORE.config_path))} to {color(AnsiFore.CYAN, str(new_path))}"
    )
    print()
@@ -2149,7 +2054,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:

    rc = run_external_process(*ESPHOME_COMMAND, "config", str(new_path))
    if rc != 0:
-        safe_print(color(AnsiFore.BOLD_RED, "Rename failed. Reverting changes."))
+        print(color(AnsiFore.BOLD_RED, "Rename failed. Reverting changes."))
        new_path.unlink()
        return 1

@@ -2175,7 +2080,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
    if CORE.config_path != new_path:
        CORE.config_path.unlink()

-    safe_print(color(AnsiFore.BOLD_GREEN, "SUCCESS"))
+    print(color(AnsiFore.BOLD_GREEN, "SUCCESS"))
    print()
    return 0

@@ -2602,49 +2507,6 @@ def parse_args(argv):
    return parser.parse_args(arguments)


-def _warn_if_source_tree_mismatch() -> None:
-    """Warn when the checkout the user is standing in is not the one being run.
-
-    An editable install records one absolute path, so a venv shared between git
-    worktrees (or reused after a checkout is copied or renamed) keeps importing
-    the tree it was installed from. Every command then silently runs, and
-    compiles, sources the user is not looking at. Only fires inside a checkout,
-    so ordinary installs never see it.
-    """
-    try:
-        cwd = Path.cwd()
-    except OSError:
-        return  # working directory is gone; a diagnostic must not break startup
-    for candidate in (cwd, *cwd.parents):
-        if (candidate / "esphome" / "__main__.py").is_file():
-            standing_in = candidate.resolve()
-            break
-    else:
-        return  # not inside a checkout; nothing to compare against
-
-    running = Path(__file__).resolve().parent.parent
-    # Both sides are resolved, so on a case-sensitive filesystem this matches
-    # plain equality. samefile() compares device and inode, which additionally
-    # covers a case-insensitive filesystem (macOS) reaching one directory by
-    # differently cased paths. Falls back to equality if either path is gone.
-    try:
-        same = standing_in.samefile(running)
-    except OSError:
-        same = standing_in == running
-    if same:
-        return
-
-    _LOGGER.warning(
-        "Running ESPHome from a different checkout than the one you are in:\n"
-        "  running from: %s\n"
-        "  you are in:   %s\n"
-        "The installed esphome resolves to the first, so its sources are used.\n"
-        "Run 'python -m esphome' from the second to use that one instead.",
-        running,
-        standing_in,
-    )
-
-
 def run_esphome(argv):
    from esphome.address_cache import AddressCache

@@ -2663,7 +2525,6 @@ def run_esphome(argv):
        args.log_level = "CRITICAL"

    setup_log(log_level=args.log_level)
-    _warn_if_source_tree_mismatch()

    if args.command in PRE_CONFIG_ACTIONS:
        try:
@@ -2734,8 +2595,7 @@ def run_esphome(argv):
                conf_path.name,
            )

-    cache_missed = config is None
-    if cache_missed:
+    if config is None:
        from esphome.config import read_config

        config = read_config(
@@ -2744,25 +2604,26 @@ def run_esphome(argv):
            # Snapshot only needed by `esphome config --no-defaults`.
            snapshot_user_config=getattr(args, "no_defaults", False),
        )
-        if config is None:
-            return 2
+        # Refresh the cache so the next upload/logs hits the fast path
+        # instead of re-running read_config. Skip when the storage
+        # sidecar is absent (no compile has run): the cache would
+        # never be loaded back, so writing secrets to disk is wasted.
+        if cache_eligible and config is not None:
+            from esphome.compiled_config import save_compiled_config
+            from esphome.storage_json import ext_storage_path
+
+            if ext_storage_path(conf_path.name).exists():
+                save_compiled_config(config)
+    if config is None:
+        return 2
    CORE.config = config

    # Fallback for platforms whose validators didn't set the toolchain
    # (only the esp32 component reads esp32.framework.toolchain). All
-    # other platforms only support PlatformIO today. Must run before the
-    # cache refresh below so its sidecar records the same toolchain a
-    # compile would.
+    # other platforms only support PlatformIO today.
    if CORE.toolchain is None:
        CORE.toolchain = Toolchain.PLATFORMIO

-    # Refresh the cache so the next upload/logs hits the fast path
-    # instead of re-running read_config.
-    if cache_eligible and cache_missed:
-        from esphome.compiled_config import save_compiled_config_and_sidecar
-
-        save_compiled_config_and_sidecar(config)
-
    if args.command not in POST_CONFIG_ACTIONS:
        safe_print(f"Unknown command {args.command}")
        return 1
@@ -3,7 +3,6 @@ from __future__ import annotations
 import asyncio
 from contextlib import suppress
 import logging
-import threading
 from typing import TYPE_CHECKING, Any
 import warnings

@@ -21,8 +20,6 @@ from esphome.stacktrace import LogLineProcessor
 from esphome.util import safe_print

 if TYPE_CHECKING:
-    from collections.abc import Callable
-
    from aioesphomeapi.api_pb2 import (
        SubscribeLogsResponse,  # pylint: disable=no-name-in-module
    )
@@ -35,18 +32,8 @@ async def async_run_logs(
    config: dict[str, Any],
    addresses: list[str],
    subscribe_states: bool = True,
-    mqtt_resolver: Callable[[threading.Event], list[str]] | None = None,
 ) -> None:
-    """Run the logs command in the event loop.
-
-    If ``mqtt_resolver`` is given, it is called in a worker thread (paho-mqtt
-    has no asyncio support on Windows) concurrently with the connection
-    attempts to ``addresses``, and any addresses it discovers are fed into
-    the running client. It owns its own failure handling (returning [] when
-    discovery fails) and must honor the ``threading.Event`` it is passed so
-    teardown is not delayed by the lookup's wait window; the initial broker
-    connect itself is only bounded by the socket timeout.
-    """
+    """Run the logs command in the event loop."""
    from datetime import datetime

    conf = config["api"]
@@ -73,41 +60,6 @@ async def async_run_logs(
    # Decoder resolution policy lives in LogLineProcessor.
    processor = LogLineProcessor(config, CORE.target_platform)

-    mqtt_task: asyncio.Task[None] | None = None
-    mqtt_stop_event = threading.Event()
-
-    def _cancel_mqtt_discovery() -> None:
-        """Stop the broker lookup once a connection has been established.
-
-        Its answer is only useful while still disconnected: after that it
-        either duplicates the connected address or arrives too late to
-        matter, so don't keep an idle broker session open for it.
-        """
-        mqtt_stop_event.set()
-        if mqtt_task is not None and not mqtt_task.done():
-            mqtt_task.cancel()
-
-    async def _resolve_mqtt_addresses() -> None:
-        """Discover the device address via the MQTT broker in the background."""
-        try:
-            mqtt_ips = await asyncio.to_thread(mqtt_resolver, mqtt_stop_event)
-            if not mqtt_ips:
-                _LOGGER.debug(
-                    "MQTT discovery %s",
-                    "aborted" if mqtt_stop_event.is_set() else "found no addresses",
-                )
-                return
-            if cli.add_addresses(mqtt_ips):
-                _LOGGER.info("Discovered address(es) via MQTT: %s", ", ".join(mqtt_ips))
-            else:
-                _LOGGER.debug(
-                    "MQTT-discovered address(es) already known: %s", ", ".join(mqtt_ips)
-                )
-        except Exception:  # pylint: disable=broad-except
-            # A background task failure would otherwise stay invisible for
-            # the whole session and only re-raise at teardown
-            _LOGGER.exception("MQTT address discovery failed")
-
    def on_log(msg: SubscribeLogsResponse) -> None:
        """Handle a new log message."""
        time_ = datetime.now().astimezone()
@@ -146,53 +98,20 @@ async def async_run_logs(
        # A top-level ``deep_sleep:`` block means the device is only awake
        # briefly; cap the reconnect backoff so a wake window is not missed.
        deep_sleep="deep_sleep" in config,
-        on_connect=_cancel_mqtt_discovery if mqtt_resolver is not None else None,
    )
    try:
-        # Don't start (or keep) the broker lookup if a connection already
-        # succeeded; the stop event doubles as the not-needed-anymore latch
-        # and get_esphome_device_ip returns immediately when it is set.
-        if mqtt_resolver is not None and not mqtt_stop_event.is_set():
-            mqtt_task = asyncio.create_task(_resolve_mqtt_addresses())
        await asyncio.Event().wait()
    finally:
-        try:
-            if mqtt_task is not None:
-                # Unblock the worker thread first so it can't hold up
-                # loop.shutdown_default_executor() for the full lookup timeout.
-                mqtt_stop_event.set()
-                # Give the worker a moment to exit through its own error
-                # handling; cancelling first would race out a late failure.
-                done, _ = await asyncio.wait([mqtt_task], timeout=1.0)
-                if not done:
-                    mqtt_task.cancel()
-                # return_exceptions keeps a CancelledError from the cancel()
-                # above from re-raising here and jumping over the stop() below.
-                # The task handles Exception itself, so only a BaseException
-                # escape (e.g. SystemExit from the worker) can land here.
-                (result,) = await asyncio.gather(mqtt_task, return_exceptions=True)
-                if isinstance(result, BaseException) and not isinstance(
-                    result, asyncio.CancelledError
-                ):
-                    _LOGGER.error("MQTT address discovery failed", exc_info=result)
-        finally:
-            # Must run even if a second cancellation lands mid-cleanup above
-            await stop()
+        await stop()


 def run_logs(
    config: dict[str, Any],
    addresses: list[str],
    subscribe_states: bool = True,
-    mqtt_resolver: Callable[[threading.Event], list[str]] | None = None,
 ) -> None:
    """Run the logs command."""
    with suppress(KeyboardInterrupt):
        asyncio.run(
-            async_run_logs(
-                config,
-                addresses,
-                subscribe_states=subscribe_states,
-                mqtt_resolver=mqtt_resolver,
-            )
+            async_run_logs(config, addresses, subscribe_states=subscribe_states)
        )
@@ -3,12 +3,7 @@
 import json
 from pathlib import Path

-from esphome.components.esp32 import (
-    get_esp32_variant,
-    get_excluded_builtin_components,
-    get_managed_component_require_names,
-    idf_version,
-)
+from esphome.components.esp32 import get_esp32_variant, idf_version
 import esphome.config_validation as cv
 from esphome.core import CORE
 from esphome.framework_helpers import (
@@ -72,13 +67,6 @@ def has_discovered_components() -> bool:
    return get_available_components() is not None


-def _cmake_quote(value: str) -> str:
-    """Quote a cmake arg value for a set() line. add_cmake_arg rejects
-    whitespace, quotes, and '$', so only backslashes need escaping."""
-    escaped = value.replace("\\", "\\\\")
-    return f'"{escaped}"'
-
-
 def get_project_cmakelists(minimal: bool = False) -> str:
    """Generate the top-level CMakeLists.txt for ESP-IDF project.

@@ -121,15 +109,6 @@ def get_project_cmakelists(minimal: bool = False) -> str:
        else ""
    )

-    # CMake variables registered via cg.add_cmake_arg(). Emitted before
-    # include(project.cmake) so values like EXCLUDE_COMPONENTS are already
-    # set when project.cmake seeds the component list, and on minimal
-    # (discovery) writes too so excluded components never register.
-    cmake_args = "\n".join(
-        f"set({name} {_cmake_quote(value)})"
-        for name, value in sorted(CORE.cmake_args.items())
-    )
-
    # Per-project list exposed as a CMake variable so converted PIO libs
    # can reference ${ESPHOME_PROJECT_MANAGED_COMPONENTS} without baking
    # project-specific names into their cached CMakeLists.
@@ -140,6 +119,8 @@ def get_project_cmakelists(minimal: bool = False) -> str:
    # runs as a separate CMake script invocation that doesn't load the
    # project's top-level CMakeLists; without this, ${ESPHOME_PROJECT_
    # MANAGED_COMPONENTS} in a converted-lib REQUIRES expands to empty).
+    from esphome.components.esp32 import get_managed_component_require_names
+
    managed_components_property = "\n".join(
        f"idf_build_set_property(ESPHOME_PROJECT_MANAGED_COMPONENTS {name} APPEND)"
        for name in get_managed_component_require_names()
@@ -150,22 +131,12 @@ def get_project_cmakelists(minimal: bool = False) -> str:
    # component's REQUIRES including real IDF components). Referenced by
    # src/CMakeLists and by each converted PIO lib's CMakeLists. Skipped
    # on minimal writes because project_description.json may be stale.
-    # Excluded components are dropped here as well: a stale
-    # project_description.json from a build without exclusions may still
-    # list them, and requiring an excluded component pulls it back into
-    # the build (IDF requirement expansion overrides EXCLUDE_COMPONENTS).
-    # Derived from the EXCLUDE_COMPONENTS cmake arg emitted above so the
-    # two can never disagree within one generated file.
    builtin_components_property = (
        ""
        if minimal
        else "\n".join(
            f"idf_build_set_property(ESPHOME_PROJECT_BUILTIN_COMPONENTS {name} APPEND)"
-            for name in sorted(
-                set(get_available_components() or []).difference(
-                    CORE.cmake_args.get("EXCLUDE_COMPONENTS", "").split(";")
-                )
-            )
+            for name in sorted(get_available_components() or [])
        )
    )

@@ -192,8 +163,6 @@ set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
 set(IDF_TARGET {idf_target})
 set(EXTRA_COMPONENT_DIRS ${{CMAKE_SOURCE_DIR}}/src)

-{cmake_args}
-
 include($ENV{{IDF_PATH}}/tools/cmake/project.cmake)

 {cpp_standard_options}
@@ -295,13 +264,3 @@ def write_project(minimal: bool = False) -> None:
        CORE.relative_src_path("CMakeLists.txt"),
        get_component_cmakelists(),
    )
-
-    # Snapshot the exclusion set so has_outdated_files() can trigger a
-    # discovery reconfigure when it changes. Excluded components never
-    # register in project_description.json, so re-including one (e.g. a
-    # config gains mqtt) requires a fresh discovery pass before the
-    # ESPHOME_PROJECT_BUILTIN_COMPONENTS property can list it.
-    write_file_if_changed(
-        CORE.relative_build_path("exclude_components.esphomeinternal"),
-        ";".join(get_excluded_builtin_components()),
-    )
@@ -63,17 +63,6 @@ def get_ini_content():
    # Add extra script for C++ flags
    CORE.add_platformio_option("extra_scripts", [f"pre:{CXX_FLAGS_FILE_NAME}"])

-    # Add CMake args. A user-supplied value (str or list) is deliberately
-    # replaced; this option was always overwritten at FINAL priority.
-    if CORE.cmake_args:
-        CORE.add_platformio_option(
-            "board_build.cmake_extra_args",
-            " ".join(
-                f"-D{name}={value}" for name, value in sorted(CORE.cmake_args.items())
-            ),
-            replace=True,
-        )
-
    content = "[platformio]\n"
    content += f"description = ESPHome {__version__}\n"

@@ -25,7 +25,6 @@ from esphome.cpp_generator import (  # noqa: F401
    add,
    add_build_flag,
    add_build_unflag,
-    add_cmake_arg,
    add_cxx_build_flag,
    add_define,
    add_global,
@@ -18,9 +18,9 @@ from pathlib import Path
 from typing import Any

 from esphome.const import __version__ as ESPHOME_VERSION
-from esphome.core import CORE, EsphomeError, Lambda
+from esphome.core import CORE, Lambda
 from esphome.helpers import write_file
-from esphome.storage_json import StorageJSON, ext_storage_path, storage_path
+from esphome.storage_json import StorageJSON, ext_storage_path
 from esphome.types import ConfigType

 _LOGGER = logging.getLogger(__name__)
@@ -65,71 +65,7 @@ def save_compiled_config(config: ConfigType) -> None:
        # non-basic dict key), so every upload/logs pays the slow path.
        _LOGGER.warning("Cannot cache the validated config: %s", err)
    except Exception as err:  # noqa: BLE001  # pylint: disable=broad-except
-        # Likely persistent (permissions, full disk): every upload/logs
-        # pays the slow path until it clears, so surface it.
-        _LOGGER.warning("Skipping compiled config cache write: %s", err)
-
-
-def save_compiled_config_and_sidecar(config: ConfigType) -> None:
-    """Refresh the cache from the upload/logs fallback (CORE.config must be set).
-
-    The cache is only written when a complete sidecar is on disk:
-    load_compiled_config can't use it otherwise, and it holds resolved
-    secrets.
-    """
-    if _refresh_sidecar():
-        save_compiled_config(config)
-
-
-def _refresh_sidecar() -> bool:
-    """Ensure a complete sidecar is on disk; True when one is.
-
-    Writes one (without claiming a build) when missing or wizard-only.
-    Failures are non-fatal; the next upload/logs pays the slow path again.
-    """
-    try:
-        path = storage_path()
-        try:
-            old = StorageJSON.load_strict(path)
-        except Exception as err:  # noqa: BLE001  # pylint: disable=broad-except
-            # Present but unreadable: it may hold a real build's metadata,
-            # and a fresh rewrite would also stop the next compile from
-            # cleaning a possibly incoherent build tree.
-            _LOGGER.warning(
-                "Not caching: storage sidecar %s is unreadable (%s)", path, err
-            )
-            return False
-        if old is not None and old.can_apply_to_core():
-            # Compile-written; nothing to refresh.
-            return True
-        if CORE.build_path is not None and CORE.build_path.exists():
-            # An unvalidated build tree: its absent or mismatched sidecar
-            # is what makes the next compile wipe it, so don't vouch for
-            # a build this run never saw.
-            _LOGGER.warning(
-                "Not caching: build tree %s has no matching sidecar; "
-                "'esphome compile' will settle it",
-                CORE.build_path,
-            )
-            return False
-        new = StorageJSON.from_esphome_core(CORE, old, claim_build=False)
-        if not new.can_apply_to_core():
-            _LOGGER.warning("Not caching: rebuilt storage sidecar is still incomplete")
-            return False
-        new.save(path)
-        return True
-    except (OSError, EsphomeError) as err:
-        # write_file wraps OSError into EsphomeError. Persistent
-        # (unwritable storage dir), so surface that every upload/logs
-        # pays the slow path.
-        _LOGGER.warning("Could not refresh the storage sidecar: %s", err)
-    except Exception:  # noqa: BLE001  # pylint: disable=broad-except
-        # A structural bug; keep the traceback so it isn't mistaken
-        # for the I/O failure above.
-        _LOGGER.warning(
-            "Unexpected error refreshing the storage sidecar", exc_info=True
-        )
-    return False
+        _LOGGER.debug("Skipping compiled config cache write: %s", err)


 def load_compiled_config(conf_path: Path) -> ConfigType | None:
@@ -162,8 +98,11 @@ def load_compiled_config(conf_path: Path) -> ConfigType | None:
        return None

    storage = StorageJSON.load(ext_storage_path(conf_path.name))
-    if storage is None or not storage.can_apply_to_core():
-        _LOGGER.debug("Ignoring compiled config cache: sidecar missing or incomplete")
+    if storage is None:
+        return None
+    # apply_to_core assumes a real compile wrote the sidecar; wizard-only
+    # sidecars leave both of these unset and can't drive upload/logs.
+    if not storage.core_platform and not storage.target_platform:
        return None
    storage.apply_to_core()
    return config
@@ -1,10 +0,0 @@
-"""Component alias registry.
-
-Generated by script/build_alias_registry.py - do not edit manually.
-See the component-alias section of esphome/loader.py.
-"""
-
-# alias -> (canonical component, removal version or None)
-COMPONENT_ALIASES: dict[str, tuple[str, str | None]] = {
-    "rp2040": ("rp2", "2027.7.0"),
-}
@@ -49,12 +49,6 @@ CONFIG_SCHEMA = cv.All(


 async def to_code(config):
-    if CORE.is_esp32:
-        from esphome.components.esp32 import include_builtin_idf_component
-
-        # Re-enable the gptimer driver (excluded by default to save compile time)
-        include_builtin_idf_component("esp_driver_gptimer")
-
    if CORE.is_esp8266:
        # ac_dimmer uses setTimer1Callback which requires the waveform generator
        from esphome.components.esp8266.const import require_waveform
@@ -1,5 +1,3 @@
-from typing import Any
-
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components.esp32 import (
@@ -18,7 +16,6 @@ from esphome.components.esp32 import (
 import esphome.config_validation as cv
 from esphome.const import CONF_ANALOG, CONF_INPUT, CONF_NUMBER, PLATFORM_ESP8266
 from esphome.core import CORE
-from esphome.types import ConfigType

 CODEOWNERS = ["@esphome/core"]

@@ -228,13 +225,12 @@ ESP32_VARIANT_ADC2_PIN_TO_CHANNEL = {
 }


-def validate_adc_pin(value: Any) -> ConfigType | str:
+def validate_adc_pin(value):
    if str(value).upper() == "VCC":
        if CORE.is_rp2:
            return pins.internal_gpio_input_pin_schema(29)
        return cv.only_on([PLATFORM_ESP8266])("VCC")

-    # Deprecated in favour of the `internal_temperature` platform, remove before 2027.2.0
    if str(value).upper() == "TEMPERATURE":
        return cv.only_on_rp2("TEMPERATURE")

@@ -3,7 +3,7 @@

 namespace esphome::adc {

-static const char *const TAG = "adc";
+static const char *const TAG = "adc.common";

 const LogString *sampling_mode_to_str(SamplingMode mode) {
  switch (mode) {
@@ -6,7 +6,7 @@

 namespace esphome::adc {

-static const char *const TAG = "adc";
+static const char *const TAG = "adc.esp32";

 adc_oneshot_unit_handle_t ADCSensor::shared_adc_handles[2] = {nullptr, nullptr};

@@ -13,7 +13,7 @@ ADC_MODE(ADC_VCC)

 namespace esphome::adc {

-static const char *const TAG = "adc";
+static const char *const TAG = "adc.esp8266";

 void ADCSensor::setup() {
 #ifndef USE_ADC_SENSOR_VCC
@@ -5,7 +5,7 @@

 namespace esphome::adc {

-static const char *const TAG = "adc";
+static const char *const TAG = "adc.libretiny";

 void ADCSensor::setup() {
 #ifndef USE_ADC_SENSOR_VCC
@@ -17,26 +17,7 @@

 namespace esphome::adc {

-static const char *const TAG = "adc";
-
-// The on-die temperature sensor sits on the last ADC channel: input 4 on RP2040
-// and RP2350A, but input 8 on RP2350B, which has eight external channels rather
-// than four.
-//
-// This deliberately does not use the SDK's ADC_TEMPERATURE_CHANNEL_NUM. That
-// derives from NUM_ADC_CHANNELS, which <pico.h> settles from a board header, and
-// arduino-pico supplies a fixed B-die one for every RP2350 build. The real die
-// is only declared later, by the variant's pins_arduino.h, so the SDK constant
-// reads 8 on A-die boards. PICO_RP2350A itself is correct by the time this file
-// is compiled, on both arduino-pico and pico-sdk builds.
-#if defined(PICO_RP2350) && !defined(PICO_RP2350A)
-#error "PICO_RP2350A is not defined, so the RP2350 die is unknown and the temperature ADC channel cannot be chosen"
-#endif
-#if defined(PICO_RP2350) && !PICO_RP2350A
-static constexpr uint8_t TEMPERATURE_ADC_INPUT = 8;
-#else
-static constexpr uint8_t TEMPERATURE_ADC_INPUT = 4;
-#endif
+static const char *const TAG = "adc.rp2";

 void ADCSensor::setup() {
  static bool initialized = false;
@@ -71,7 +52,7 @@ float ADCSensor::sample() {
  if (this->is_temperature_) {
    adc_set_temp_sensor_enabled(true);
    delay(1);
-    adc_select_input(TEMPERATURE_ADC_INPUT);
+    adc_select_input(4);

    for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
      raw = adc_read();
@@ -7,7 +7,7 @@

 namespace esphome::adc {

-static const char *const TAG = "adc";
+static const char *const TAG = "adc.zephyr";

 void ADCSensor::setup() {
  if (!adc_is_ready_dt(this->channel_)) {
@@ -52,7 +52,7 @@ _attenuation = cv.enum(ATTENUATION_MODES, lower=True)
 _sampling_mode = cv.enum(SAMPLING_MODES, lower=True)


-def validate_config(config: ConfigType) -> ConfigType:
+def validate_config(config):
    if config[CONF_RAW] and config.get(CONF_ATTENUATION, None) == "auto":
        raise cv.Invalid("Automatic attenuation cannot be used when raw output is set")

@@ -67,13 +67,6 @@ def validate_config(config: ConfigType) -> ConfigType:
        # Alter value here so `config` command prints the recommended change
        config[CONF_ATTENUATION] = _attenuation("12db")

-    # Remove before 2027.2.0
-    if config[CONF_PIN] == "TEMPERATURE":
-        _LOGGER.warning(
-            "[adc] `pin: TEMPERATURE` is deprecated, use the `internal_temperature` "
-            "sensor platform instead. Will be removed in 2027.2.0"
-        )
-
    return config


@@ -120,7 +113,7 @@ CONFIG_SCHEMA = cv.All(
 CONF_ADC_CHANNEL_ID = "adc_channel_id"


-def _overlay_io_channels() -> str:
+def _overlay_io_channels():
    channel_count = CORE.data[CONF_ADC_CHANNEL_ID]
    entries = ", ".join(f"<&adc {channel_id}>" for channel_id in range(channel_count))
    return f"""
@@ -132,7 +125,7 @@ def _overlay_io_channels() -> str:
            """


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await sensor.register_sensor(var, config)
@@ -140,7 +133,6 @@ async def to_code(config: ConfigType) -> None:
    if config[CONF_PIN] == "VCC":
        cg.add_define("USE_ADC_SENSOR_VCC")
    elif config[CONF_PIN] == "TEMPERATURE":
-        # Remove before 2027.2.0
        cg.add(var.set_is_temperature())
    elif not CORE.is_nrf52 or config[CONF_PIN][CONF_NUMBER] not in EXTRA_ADC:
        pin = await cg.gpio_pin_expression(config[CONF_PIN])
@@ -17,9 +17,6 @@ from esphome.const import (
    UNIT_OHM,
    UNIT_PARTS_PER_BILLION,
 )
-from esphome.core import ID
-from esphome.cpp_generator import MockObj, TemplateArgsType
-from esphome.types import ConfigType

 CONF_RESISTANCE = "resistance"

@@ -65,7 +62,7 @@ CONFIG_SCHEMA = (
 FINAL_VALIDATE_SCHEMA = i2c.final_validate_device_schema("ags10", max_frequency="15khz")


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await i2c.register_i2c_device(var, config)
@@ -97,12 +94,7 @@ AGS10_NEW_I2C_ADDRESS_SCHEMA = cv.maybe_simple_value(
    AGS10_NEW_I2C_ADDRESS_SCHEMA,
    synchronous=True,
 )
-async def ags10newi2caddress_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def ags10newi2caddress_to_code(config, action_id, template_arg, args):
    var = cg.new_Pvariable(action_id, template_arg)
    await cg.register_parented(var, config[CONF_ID])
    address = await cg.templatable(config[CONF_ADDRESS], args, cg.uint8)
@@ -134,12 +126,7 @@ AGS10_SET_ZERO_POINT_SCHEMA = cv.Schema(
    AGS10_SET_ZERO_POINT_SCHEMA,
    synchronous=True,
 )
-async def ags10setzeropoint_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def ags10setzeropoint_to_code(config, action_id, template_arg, args):
    var = cg.new_Pvariable(action_id, template_arg)
    await cg.register_parented(var, config[CONF_ID])
    mode = await cg.templatable(
@@ -4,9 +4,6 @@ from esphome.components import i2c
 from esphome.components.audio_dac import AudioDac
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MODE
-from esphome.core import ID
-from esphome.cpp_generator import MockObj, TemplateArgsType
-from esphome.types import ConfigType

 CODEOWNERS = ["@kbx81"]
 DEPENDENCIES = ["i2c"]
@@ -42,12 +39,7 @@ SET_AUTO_MUTE_ACTION_SCHEMA = cv.maybe_simple_value(
    SET_AUTO_MUTE_ACTION_SCHEMA,
    synchronous=True,
 )
-async def aic3204_set_volume_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def aic3204_set_volume_to_code(config, action_id, template_arg, args):
    paren = await cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, paren)

@@ -57,7 +49,7 @@ async def aic3204_set_volume_to_code(
    return var


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await i2c.register_i2c_device(var, config)
@@ -13,13 +13,8 @@
 import esphome.components.image as espImage
 import esphome.config_validation as cv

-from . import image as animation_image
 from .image import ANIMATION_CONFIG_SCHEMA, setup_animation

-# The deprecated top-level `animation:` shim gets the same batched
-# downloads as the `image:` platform form.
-PREFETCH_FILES = animation_image.PREFETCH_FILES
-
 AUTO_LOAD = ["image", "file"]
 CODEOWNERS = ["@syndlex"]
 DEPENDENCIES = ["display"]
@@ -1,20 +1,13 @@
 from esphome import automation
 import esphome.codegen as cg
 from esphome.components.const import CONF_LOOP
-from esphome.components.file import image as file_image
 from esphome.components.file.image import image_schema, write_image
 from esphome.components.image import Image_, validate_settings
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_REPEAT
-from esphome.core import ID
-from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigType

 CODEOWNERS = ["@syndlex"]
-
-# The animation platform shares the file platform's remote file handling,
-# including its batch-download hook.
-PREFETCH_FILES = file_image.PREFETCH_FILES
 AUTO_LOAD = ["file"]
 DEPENDENCIES = ["display"]

@@ -81,12 +74,7 @@ SET_FRAME_SCHEMA = cv.Schema(
@automation.register_action(
    "animation.set_frame", SetFrameAction, SET_FRAME_SCHEMA, synchronous=True
 )
-async def animation_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def animation_action_to_code(config, action_id, template_arg, args):
    paren = await cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, paren)

@@ -2,7 +2,6 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_ID
-from esphome.types import ConfigType

 DEPENDENCIES = ["i2c"]
 MULTI_CONF = True
@@ -58,7 +57,7 @@ CONFIG_SCHEMA = (
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await i2c.register_i2c_device(var, config)
@@ -2,7 +2,6 @@ import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_DIRECTION, DEVICE_CLASS_MOVING
-from esphome.types import ConfigType

 from . import APDS9960, CONF_APDS9960_ID

@@ -20,7 +19,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    hub = await cg.get_variable(config[CONF_APDS9960_ID])
    var = await binary_sensor.new_binary_sensor(config)
    func = getattr(hub, f"set_{config[CONF_DIRECTION]}_direction_binary_sensor")
@@ -7,7 +7,6 @@ from esphome.const import (
    STATE_CLASS_MEASUREMENT,
    UNIT_PERCENT,
 )
-from esphome.types import ConfigType

 from . import APDS9960, CONF_APDS9960_ID

@@ -28,7 +27,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    hub = await cg.get_variable(config[CONF_APDS9960_ID])
    var = await sensor.new_sensor(config)
    func = getattr(hub, f"set_{config[CONF_TYPE]}_sensor")
@@ -1,19 +1,10 @@
+import base64
 import logging
-from typing import Any

 from esphome import automation
 from esphome.automation import Condition
 import esphome.codegen as cg
 from esphome.components.logger import request_log_listener
-
-# ENCRYPTION_SCHEMA and validate_encryption_key are re-exported for external
-# components and downstream consumers that import them from api
-from esphome.components.noise import (  # noqa: F401
-    ENCRYPTION_SCHEMA,
-    decode_encryption_key,
-    encryption_schema,
-    validate_encryption_key,
-)
 from esphome.config_helpers import get_logger_level
 import esphome.config_validation as cv
 from esphome.const import (
@@ -46,10 +37,6 @@ from esphome.core import CORE, ID, CoroPriority, EsphomeError, coroutine_with_pr
 from esphome.cpp_generator import MockObj, TemplateArgsType
 from esphome.types import ConfigFragmentType, ConfigType

-# Compat alias: downstream consumers (e.g. device-builder) referenced the
-# schema by its old private name before it moved to the noise component
-_encryption_schema = encryption_schema
-
 _LOGGER = logging.getLogger(__name__)

 DOMAIN = "api"
@@ -58,15 +45,9 @@ CODEOWNERS = ["@esphome/core"]


 def AUTO_LOAD(config: ConfigType) -> list[str]:
-    """Conditionally auto-load noise (encryption) and json (capture_response)."""
+    """Conditionally auto-load json only when capture_response is used."""
    base = ["socket"]

-    # A falsy config is a tooling probe for the maximal set (None from
-    # dependency resolution, {} from the components-graph platform probe);
-    # a validated config always carries defaults, never empty
-    if not config or CONF_ENCRYPTION in config:
-        base = base + ["noise"]
-
    # Check if any homeassistant.action/homeassistant.service has capture_response: true
    # This flag is set during config validation in _validate_response_config
    if not config or CORE.data.get(DOMAIN, {}).get(CONF_CAPTURE_RESPONSE, False):
@@ -148,6 +129,20 @@ def _register_provisioning_source(config: ConfigType) -> ConfigType:
    return config


+def validate_encryption_key(value):
+    value = cv.string_strict(value)
+    try:
+        decoded = base64.b64decode(value, validate=True)
+    except ValueError as err:
+        raise cv.Invalid("Invalid key format, please check it's using base64") from err
+
+    if len(decoded) != 32:
+        raise cv.Invalid("Encryption key must be base64 and 32 bytes long")
+
+    # Return original data for roundtrip conversion
+    return value
+
+
 CONF_SUPPORTS_RESPONSE = "supports_response"

 # Enum values in api::enums namespace
@@ -222,7 +217,7 @@ def _auto_detect_supports_response(config: ConfigType) -> ConfigType:
    return config


-def _validate_supports_response(value: Any) -> str:
+def _validate_supports_response(value):
    """Validate supports_response after auto-detection has set the value."""
    return cv.enum(SUPPORTS_RESPONSE_OPTIONS, lower=True)(value)

@@ -254,6 +249,18 @@ ACTIONS_SCHEMA = automation.validate_automation(
    ),
 )

+ENCRYPTION_SCHEMA = cv.Schema(
+    {
+        cv.Optional(CONF_KEY): cv.sensitive(validate_encryption_key),
+    }
+)
+
+
+def _encryption_schema(config):
+    if config is None:
+        config = {}
+    return ENCRYPTION_SCHEMA(config)
+

 def _consume_api_sockets(config: ConfigType) -> ConfigType:
    """Register socket needs for API component."""
@@ -289,7 +296,7 @@ CONFIG_SCHEMA = cv.All(
                CONF_SERVICES, group_of_exclusion=CONF_ACTIONS
            ): ACTIONS_SCHEMA,
            cv.Exclusive(CONF_ACTIONS, group_of_exclusion=CONF_ACTIONS): ACTIONS_SCHEMA,
-            cv.Optional(CONF_ENCRYPTION): encryption_schema,
+            cv.Optional(CONF_ENCRYPTION): _encryption_schema,
            cv.Optional(CONF_BATCH_DELAY, default="100ms"): cv.All(
                cv.positive_time_period_milliseconds,
                cv.Range(max=cv.TimePeriod(milliseconds=65535)),
@@ -386,7 +393,7 @@ async def to_code(config: ConfigType) -> None:

    if actions := config.get(CONF_ACTIONS, []):
        # Collect all triggers first, then register all at once with initializer_list
-        triggers: list[cg.MockObj] = []
+        triggers: list[cg.Pvariable] = []
        for conf in actions:
            func_args: list[tuple[MockObj, str]] = []
            service_template_args: list[MockObj] = []  # User service argument types
@@ -476,7 +483,7 @@ async def to_code(config: ConfigType) -> None:

    if (encryption_config := config.get(CONF_ENCRYPTION, None)) is not None:
        if key := encryption_config.get(CONF_KEY):
-            decoded = decode_encryption_key(key)
+            decoded = base64.b64decode(key)
            cg.add(var.set_noise_psk(list(decoded)))
            cg.add_define("USE_API_NOISE_PSK_FROM_YAML")
        else:
@@ -490,6 +497,10 @@ async def to_code(config: ConfigType) -> None:
            # and plaintext disabled. Only a factory reset can remove it.
            cg.add_define("USE_API_PLAINTEXT")
        cg.add_define("USE_API_NOISE")
+        cg.add_library("esphome/noise-c", "0.1.11")
+        # Enable optimized memzero/memcmp in libsodium instead of volatile byte loops
+        cg.add_build_flag("-DHAVE_WEAK_SYMBOLS=1")
+        cg.add_build_flag("-DHAVE_INLINE_ASM=1")
    else:
        cg.add_define("USE_API_PLAINTEXT")

@@ -570,7 +581,7 @@ async def homeassistant_service_to_code(
    action_id: ID,
    template_arg: cg.TemplateArguments,
    args: TemplateArgsType,
-) -> MockObj:
+):
    cg.add_define("USE_API_HOMEASSISTANT_SERVICES")
    serv = await cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, serv, False)
@@ -636,7 +647,7 @@ async def homeassistant_service_to_code(
    return var


-def validate_homeassistant_event(value: Any) -> str:
+def validate_homeassistant_event(value):
    value = cv.string(value)
    if not value.startswith("esphome."):
        raise cv.Invalid(
@@ -665,12 +676,7 @@ HOMEASSISTANT_EVENT_ACTION_SCHEMA = cv.Schema(
    HOMEASSISTANT_EVENT_ACTION_SCHEMA,
    synchronous=True,
 )
-async def homeassistant_event_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def homeassistant_event_to_code(config, action_id, template_arg, args):
    cg.add_define("USE_API_HOMEASSISTANT_SERVICES")
    serv = await cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, serv, True)
@@ -718,12 +724,7 @@ HOMEASSISTANT_TAG_SCANNED_ACTION_SCHEMA = cv.maybe_simple_value(
    HOMEASSISTANT_TAG_SCANNED_ACTION_SCHEMA,
    synchronous=True,
 )
-async def homeassistant_tag_scanned_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def homeassistant_tag_scanned_to_code(config, action_id, template_arg, args):
    cg.add_define("USE_API_HOMEASSISTANT_SERVICES")
    serv = await cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, serv, True)
@@ -739,7 +740,7 @@ CONF_SUCCESS = "success"
 CONF_ERROR_MESSAGE = "error_message"


-def _validate_api_respond_data(config: ConfigType) -> ConfigType:
+def _validate_api_respond_data(config):
    """Set flag during validation so AUTO_LOAD can include json component."""
    if CONF_DATA in config:
        CORE.data.setdefault(DOMAIN, {})[CONF_CAPTURE_RESPONSE] = True
@@ -823,12 +824,7 @@ API_CONNECTED_CONDITION_SCHEMA = cv.Schema(
@automation.register_condition(
    "api.connected", APIConnectedCondition, API_CONNECTED_CONDITION_SCHEMA
 )
-async def api_connected_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def api_connected_to_code(config, condition_id, template_arg, args):
    var = cg.new_Pvariable(condition_id, template_arg)
    templ = await cg.templatable(config[CONF_STATE_SUBSCRIPTION_ONLY], args, cg.bool_)
    cg.add(var.set_state_subscription_only(templ))
@@ -19,7 +19,6 @@ service APIConnection {
  rpc device_info (DeviceInfoRequest) returns (DeviceInfoResponse) {
    option (needs_authentication) = false;
  }
-  rpc device_capabilities (DeviceCapabilitiesRequest) returns (DeviceCapabilitiesResponse) {}
  rpc list_entities (ListEntitiesRequest) returns (void) {}
  rpc subscribe_states (SubscribeStatesRequest) returns (void) {}
  rpc subscribe_logs (SubscribeLogsRequest) returns (void) {}
@@ -244,12 +243,6 @@ message SerialProxyInfo {
 //   model = 127 (core/config.BOARD_MAX_LENGTH, validated in platform schemas)
 //   project_name/project_version = 127 (core/config.PROJECT_MAX_LENGTH)
 //   suggested_area = 120 (core/config.FRIENDLY_NAME_MAX_LEN via AREA_SCHEMA)
-//
-// Some fields below are marked "Superseded by DeviceCapabilitiesResponse". They
-// have moved to that message as of API 1.15, but are still sent here so that
-// older clients keep working. Do NOT mark them (deprecated) until the removal
-// release: in this repo (deprecated) makes the generator drop the field
-// entirely, so the device would stop sending it.
 message DeviceInfoResponse {
  option (id) = 10;
  option (source) = SOURCE_SERVER;
@@ -287,8 +280,6 @@ message DeviceInfoResponse {

  // Deprecated in API version 1.9
  uint32 legacy_bluetooth_proxy_version = 11 [deprecated=true, (field_ifdef) = "USE_BLUETOOTH_PROXY"];
-
-  // Superseded by DeviceCapabilitiesResponse.bluetooth_proxy as of API 1.15.
  uint32 bluetooth_proxy_feature_flags = 15 [(field_ifdef) = "USE_BLUETOOTH_PROXY"];

  string manufacturer = 12 [(max_data_length) = 20, (force) = true];
@@ -297,14 +288,11 @@ message DeviceInfoResponse {

  // Deprecated in API version 1.10
  uint32 legacy_voice_assistant_version = 14 [deprecated=true, (field_ifdef) = "USE_VOICE_ASSISTANT"];
-
-  // Superseded by DeviceCapabilitiesResponse.voice_assistant as of API 1.15.
  uint32 voice_assistant_feature_flags = 17 [(field_ifdef) = "USE_VOICE_ASSISTANT"];

  string suggested_area = 16 [(max_data_length) = 120, (force) = true, (field_ifdef) = "USE_AREAS"];

  // The Bluetooth mac address of the device. For example "AC:BC:32:89:0E:AA"
-  // Superseded by DeviceCapabilitiesResponse.bluetooth_proxy.mac_address as of API 1.15.
  string bluetooth_mac_address = 18 [(max_data_length) = 17, (force) = true, (field_ifdef) = "USE_BLUETOOTH_PROXY"];

  // Supports receiving and saving api encryption key
@@ -317,13 +305,10 @@ message DeviceInfoResponse {
  AreaInfo area = 22 [(field_ifdef) = "USE_AREAS"];

  // Indicates if Z-Wave proxy support is available and features supported
-  // Superseded by DeviceCapabilitiesResponse.zwave_proxy as of API 1.15.
  uint32 zwave_proxy_feature_flags = 23 [(field_ifdef) = "USE_ZWAVE_PROXY"];
-  // Superseded by DeviceCapabilitiesResponse.zwave_proxy as of API 1.15.
  uint32 zwave_home_id = 24 [(field_ifdef) = "USE_ZWAVE_PROXY"];

  // Serial proxy instance metadata
-  // Superseded by DeviceCapabilitiesResponse.serial_proxies as of API 1.15.
  repeated SerialProxyInfo serial_proxies = 25 [(field_ifdef) = "USE_SERIAL_PROXY", (fixed_array_size_define) = "SERIAL_PROXY_COUNT"];

  // Device is unprovisioned and accepts Noise handshakes with the well-known
@@ -332,63 +317,6 @@ message DeviceInfoResponse {
  bool api_encryption_provisionable = 26 [(field_ifdef) = "USE_API_NOISE"];
 }

-// ==================== DEVICE CAPABILITIES ====================
-
-// Asks the device which optional features it supports.
-//
-// This message exists so that DeviceInfoResponse does not have to keep growing
-// a flat list of feature flags. DeviceInfoResponse is served before
-// authentication, so it is limited to identity information. Capabilities are
-// only served on an authenticated connection (encrypted as well, when
-// encryption is configured).
-//
-// Clients that see api_version >= 1.15 should read these values from
-// DeviceCapabilitiesResponse and ignore the matching DeviceInfoResponse fields.
-// Older clients keep reading DeviceInfoResponse, which still carries the same
-// values, so this is not a breaking change.
-message DeviceCapabilitiesRequest {
-  option (id) = 149;
-  option (source) = SOURCE_CLIENT;
-  // Empty
-}
-
-// Each feature gets its own sub-message so that it can gain fields over time
-// without crowding the top-level field numbering.
-//
-// Note: a sub-message whose fields are all at their default value is not sent
-// at all, so the presence of a sub-message is not a reliable test for "this
-// feature is compiled in". Clients should test a value inside it, for example
-// a non-zero feature_flags, exactly as they do today with DeviceInfoResponse.
-
-message BluetoothProxyCapabilities {
-  // Bitmask of the features this proxy supports
-  uint32 feature_flags = 1;
-  // The Bluetooth mac address of the device. For example "AC:BC:32:89:0E:AA"
-  string mac_address = 2 [(max_data_length) = 17, (force) = true];
-}
-
-message VoiceAssistantCapabilities {
-  // Bitmask of the features this voice assistant supports
-  uint32 feature_flags = 1;
-}
-
-message ZWaveProxyCapabilities {
-  // Bitmask of the features this proxy supports
-  uint32 feature_flags = 1;
-  uint32 home_id = 2;
-}
-
-message DeviceCapabilitiesResponse {
-  option (id) = 150;
-  option (source) = SOURCE_SERVER;
-
-  BluetoothProxyCapabilities bluetooth_proxy = 1 [(field_ifdef) = "USE_BLUETOOTH_PROXY"];
-  VoiceAssistantCapabilities voice_assistant = 2 [(field_ifdef) = "USE_VOICE_ASSISTANT"];
-  ZWaveProxyCapabilities zwave_proxy = 3 [(field_ifdef) = "USE_ZWAVE_PROXY"];
-  repeated SerialProxyInfo serial_proxies = 4
-      [(field_ifdef) = "USE_SERIAL_PROXY", (fixed_array_size_define) = "SERIAL_PROXY_COUNT"];
-}
-
 message ListEntitiesRequest {
  option (id) = 11;
  option (source) = SOURCE_CLIENT;
@@ -1760,7 +1688,7 @@ enum BluetoothDeviceRequestType {
 message BluetoothDeviceRequest {
  option (id) = 68;
  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  BluetoothDeviceRequestType request_type = 2;
@@ -1771,7 +1699,7 @@ message BluetoothDeviceRequest {
 message BluetoothDeviceConnectionResponse {
  option (id) = 69;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  bool connected = 2;
@@ -1782,7 +1710,7 @@ message BluetoothDeviceConnectionResponse {
 message BluetoothGATTGetServicesRequest {
  option (id) = 70;
  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
 }
@@ -1826,7 +1754,7 @@ message BluetoothGATTService {
 message BluetoothGATTGetServicesResponse {
  option (id) = 71;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  repeated BluetoothGATTService services = 2;
@@ -1835,7 +1763,7 @@ message BluetoothGATTGetServicesResponse {
 message BluetoothGATTGetServicesDoneResponse {
  option (id) = 72;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
 }
@@ -1843,7 +1771,7 @@ message BluetoothGATTGetServicesDoneResponse {
 message BluetoothGATTReadRequest {
  option (id) = 73;
  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1852,7 +1780,7 @@ message BluetoothGATTReadRequest {
 message BluetoothGATTReadResponse {
  option (id) = 74;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1864,7 +1792,7 @@ message BluetoothGATTReadResponse {
 message BluetoothGATTWriteRequest {
  option (id) = 75;
  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1876,7 +1804,7 @@ message BluetoothGATTWriteRequest {
 message BluetoothGATTReadDescriptorRequest {
  option (id) = 76;
  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1885,7 +1813,7 @@ message BluetoothGATTReadDescriptorRequest {
 message BluetoothGATTWriteDescriptorRequest {
  option (id) = 77;
  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1896,7 +1824,7 @@ message BluetoothGATTWriteDescriptorRequest {
 message BluetoothGATTNotifyRequest {
  option (id) = 78;
  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1906,7 +1834,7 @@ message BluetoothGATTNotifyRequest {
 message BluetoothGATTNotifyDataResponse {
  option (id) = 79;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1917,13 +1845,13 @@ message BluetoothGATTNotifyDataResponse {
 message SubscribeBluetoothConnectionsFreeRequest {
  option (id) = 80;
  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";
 }

 message BluetoothConnectionsFreeResponse {
  option (id) = 81;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint32 free = 1;
  uint32 limit = 2;
@@ -1936,7 +1864,7 @@ message BluetoothConnectionsFreeResponse {
 message BluetoothGATTErrorResponse {
  option (id) = 82;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1946,7 +1874,7 @@ message BluetoothGATTErrorResponse {
 message BluetoothGATTWriteResponse {
  option (id) = 83;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1955,7 +1883,7 @@ message BluetoothGATTWriteResponse {
 message BluetoothGATTNotifyResponse {
  option (id) = 84;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 handle = 2;
@@ -1964,7 +1892,7 @@ message BluetoothGATTNotifyResponse {
 message BluetoothDevicePairingResponse {
  option (id) = 85;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  bool paired = 2;
@@ -1974,7 +1902,7 @@ message BluetoothDevicePairingResponse {
 message BluetoothDeviceUnpairingResponse {
  option (id) = 86;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  bool success = 2;
@@ -1990,7 +1918,7 @@ message UnsubscribeBluetoothLEAdvertisementsRequest {
 message BluetoothDeviceClearCacheResponse {
  option (id) = 88;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  bool success = 2;
@@ -2807,7 +2735,7 @@ message SerialProxyRequestResponse {
 message BluetoothSetConnectionParamsRequest {
  option (id) = 145;
  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  uint32 min_interval = 2;  // units of 1.25ms
@@ -2819,7 +2747,7 @@ message BluetoothSetConnectionParamsRequest {
 message BluetoothSetConnectionParamsResponse {
  option (id) = 146;
  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BLUETOOTH_PROXY_CONNECTIONS";
+  option (ifdef) = "USE_BLUETOOTH_PROXY";

  uint64 address = 1;
  int32 error = 2;
@@ -23,7 +23,6 @@
 #include "esphome/core/application.h"
 #include "esphome/core/entity_base.h"
 #include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "esphome/core/version.h"
 #ifdef USE_PROVISIONING
@@ -89,13 +88,6 @@ static_assert(ESPHOME_DEVICE_NAME_MAX_LEN <= 31, "Update max_data_length for nam
 static_assert(ESPHOME_FRIENDLY_NAME_MAX_LEN <= 120, "Update max_data_length for friendly_name in api.proto");

 static const char *const TAG = "api.connection";
-
-#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_WARN
-void log_dropped_message(const char *tag, int line, const LogString *what) {
-  esp_log_printf_(ESPHOME_LOG_LEVEL_WARN, tag, line, ESPHOME_LOG_FORMAT("%s dropped, TCP buffer full"),
-                  LOG_STR_ARG(what));
-}
-#endif
 #ifdef USE_CAMERA
 static const int CAMERA_STOP_STREAM = 5000;
 #endif
@@ -160,6 +152,11 @@ APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *pa
 #else
 #error "No frame helper defined"
 #endif
+#ifdef USE_CAMERA
+  if (camera::Camera::instance() != nullptr) {
+    this->image_reader_ = std::unique_ptr<camera::CameraImageReader>{camera::Camera::instance()->create_image_reader()};
+  }
+#endif
 }

 void APIConnection::start() {
@@ -443,7 +440,7 @@ void APIConnection::on_disconnect_response() {
 uint16_t APIConnection::fill_and_encode_entity_state(EntityBase *entity, StateResponseProtoMessage &msg,
                                                     CalculateSizeFn size_fn, MessageEncodeFn encode_fn,
                                                     APIConnection *conn, uint32_t remaining_size) {
-  msg.key = entity->get_object_id_hash();
+  msg.key = entity->get_entity_key();
 #ifdef USE_DEVICES
  msg.device_id = entity->get_device_id();
 #endif
@@ -454,7 +451,7 @@ uint16_t APIConnection::fill_and_encode_entity_info(EntityBase *entity, InfoResp
                                                    CalculateSizeFn size_fn, MessageEncodeFn encode_fn,
                                                    APIConnection *conn, uint32_t remaining_size) {
  // Set common fields that are shared by all entity types
-  msg.key = entity->get_object_id_hash();
+  msg.key = entity->get_entity_key();

  if (entity->has_own_name()) {
    msg.name = entity->get_name();
@@ -1135,7 +1132,6 @@ void APIConnection::try_send_camera_image_() {
  if (!this->image_reader_)
    return;

-  const auto *cam = camera::Camera::instance();
  // Send as many chunks as possible without blocking
  while (this->image_reader_->available()) {
    if (!this->helper_->can_write_without_blocking())
@@ -1145,11 +1141,11 @@ void APIConnection::try_send_camera_image_() {
    bool done = this->image_reader_->available() == to_send;

    CameraImageResponse msg;
-    msg.key = cam->get_object_id_hash();
+    msg.key = camera::Camera::instance()->get_entity_key();
    msg.set_data(this->image_reader_->peek_data_buffer(), to_send);
    msg.done = done;
 #ifdef USE_DEVICES
-    msg.device_id = cam->get_device_id();
+    msg.device_id = camera::Camera::instance()->get_device_id();
 #endif

    if (!this->send_message(msg)) {
@@ -1165,19 +1161,15 @@ void APIConnection::try_send_camera_image_() {
 void APIConnection::set_camera_state(std::shared_ptr<camera::CameraImage> image) {
  if (!this->flags_.state_subscription)
    return;
-  if (this->image_reader_ && this->image_reader_->available())
+  if (!this->image_reader_)
    return;
-  if (!image->was_requested_by(esphome::camera::API_REQUESTER) && !image->was_requested_by(esphome::camera::IDLE))
+  if (this->image_reader_->available())
    return;
-  if (!this->image_reader_) {
-    // Created on the first image this connection will send, so connections
-    // that never receive one never pay for a reader. Only a registered
-    // camera's listener can reach this, so instance() is non-null here.
-    this->image_reader_ = std::unique_ptr<camera::CameraImageReader>{camera::Camera::instance()->create_image_reader()};
+  if (image->was_requested_by(esphome::camera::API_REQUESTER) || image->was_requested_by(esphome::camera::IDLE)) {
+    this->image_reader_->set_image(std::move(image));
+    // Try to send immediately to reduce latency
+    this->try_send_camera_image_();
  }
-  this->image_reader_->set_image(std::move(image));
-  // Try to send immediately to reduce latency
-  this->try_send_camera_image_();
 }
 uint16_t APIConnection::try_send_camera_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size) {
  auto *camera = static_cast<camera::Camera *>(entity);
@@ -1243,7 +1235,6 @@ void APIConnection::on_subscribe_bluetooth_le_advertisements_request(
 void APIConnection::on_unsubscribe_bluetooth_le_advertisements_request() {
  bluetooth_proxy::global_bluetooth_proxy->unsubscribe_api_connection(this);
 }
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
 void APIConnection::on_bluetooth_device_request(const BluetoothDeviceRequest &msg) {
  bluetooth_proxy::global_bluetooth_proxy->bluetooth_device_request(msg);
 }
@@ -1277,15 +1268,13 @@ void APIConnection::on_subscribe_bluetooth_connections_free_request() {
  }
 }

-void APIConnection::on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &msg) {
-  bluetooth_proxy::global_bluetooth_proxy->bluetooth_set_connection_params(msg);
-}
-#endif
-
 void APIConnection::on_bluetooth_scanner_set_mode_request(const BluetoothScannerSetModeRequest &msg) {
  bluetooth_proxy::global_bluetooth_proxy->bluetooth_scanner_set_mode(
      msg.mode == enums::BluetoothScannerMode::BLUETOOTH_SCANNER_MODE_ACTIVE);
 }
+void APIConnection::on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &msg) {
+  bluetooth_proxy::global_bluetooth_proxy->bluetooth_set_connection_params(msg);
+}
 #endif

 #ifdef USE_VOICE_ASSISTANT
@@ -1340,8 +1329,7 @@ void APIConnection::on_voice_assistant_announce_request(const VoiceAssistantAnno
  }
 }

-bool APIConnection::send_voice_assistant_get_configuration_response_(
-    const VoiceAssistantConfigurationRequest & /*msg*/) {
+bool APIConnection::send_voice_assistant_get_configuration_response_(const VoiceAssistantConfigurationRequest &msg) {
  VoiceAssistantConfigurationResponse resp;
  if (!this->check_voice_assistant_api_connection_()) {
    // send_message encodes synchronously, so this stack local outlives the encode
@@ -1350,7 +1338,9 @@ bool APIConnection::send_voice_assistant_get_configuration_response_(
    return this->send_message(resp);
  }

-  auto &config = voice_assistant::global_voice_assistant->get_configuration();
+  // VoiceAssistant::get_configuration merges compiled models with cached external wake words (deduped by id),
+  // so the response is built entirely from config.available_wake_words.
+  auto &config = voice_assistant::global_voice_assistant->get_configuration(msg.external_wake_words);
  for (auto &wake_word : config.available_wake_words) {
    resp.available_wake_words.emplace_back();
    auto &resp_wake_word = resp.available_wake_words.back();
@@ -1543,13 +1533,7 @@ void APIConnection::on_infrared_rf_transmit_raw_timings_request(const InfraredRF
 #endif

 #if defined(USE_IR_RF) || defined(USE_RADIO_FREQUENCY)
-void APIConnection::send_infrared_rf_receive_event(const InfraredRFReceiveEvent &msg) {
-  if (!this->send_message(msg)) {
-    // V: fires per decoded frame with no subscription gate, so a warning
-    // would flood the congested link it reports on.
-    ESP_LOGV(TAG, "IR/RF event dropped, TCP buffer full");
-  }
-}
+void APIConnection::send_infrared_rf_receive_event(const InfraredRFReceiveEvent &msg) { this->send_message(msg); }
 #endif

 #ifdef USE_SERIAL_PROXY
@@ -1591,9 +1575,7 @@ void APIConnection::on_serial_proxy_get_modem_pins_request(const SerialProxyGetM
  SerialProxyGetModemPinsResponse resp{};
  resp.instance = msg.instance;
  resp.line_states = proxies[msg.instance]->get_modem_pins();
-  if (!this->send_message(resp)) {
-    API_LOG_MSG_DROPPED(TAG, "Serial proxy response");
-  }
+  this->send_message(resp);
 }

 void APIConnection::on_serial_proxy_request(const SerialProxyRequest &msg) {
@@ -1625,9 +1607,7 @@ void APIConnection::on_serial_proxy_request(const SerialProxyRequest &msg) {
          resp.status = enums::SERIAL_PROXY_STATUS_ERROR;
          break;
      }
-      if (!this->send_message(resp)) {
-        API_LOG_MSG_DROPPED(TAG, "Serial proxy response");
-      }
+      this->send_message(resp);
      break;
    }
    default:
@@ -1636,11 +1616,7 @@ void APIConnection::on_serial_proxy_request(const SerialProxyRequest &msg) {
  }
 }

-void APIConnection::send_serial_proxy_data(const SerialProxyDataReceived &msg) {
-  if (!this->send_message(msg)) {
-    ESP_LOGV(TAG, "Serial proxy data dropped, TCP buffer full");
-  }
-}
+void APIConnection::send_serial_proxy_data(const SerialProxyDataReceived &msg) { this->send_message(msg); }
 #endif

 #ifdef USE_INFRARED
@@ -1760,7 +1736,7 @@ bool APIConnection::send_hello_response_(const HelloRequest &msg) {

  HelloResponse resp;
  resp.api_version_major = 1;
-  resp.api_version_minor = 15;
+  resp.api_version_minor = 14;
  // Send only the version string - the client only logs this for debugging and doesn't use it otherwise
  resp.server_info = ESPHOME_VERSION_REF;
  resp.name = StringRef(App.get_name());
@@ -1771,9 +1747,7 @@ bool APIConnection::send_hello_response_(const HelloRequest &msg) {
    // Acknowledge the hello so the client can read the server name, then request
    // disconnect with the reason. Authentication is intentionally not completed.
    this->log_client_(ESPHOME_LOG_LEVEL_WARN, LOG_STR("Provisioning closed; rejecting connection"));
-    if (!this->send_message(resp)) {
-      API_LOG_MSG_DROPPED(TAG, "Hello response");
-    }
+    this->send_message(resp);
    DisconnectRequest req;
    req.reason = enums::DISCONNECT_REASON_PROVISIONING_CLOSED;
    return this->send_message(req);
@@ -1798,8 +1772,9 @@ bool APIConnection::send_device_info_response_() {
 #ifdef USE_AREAS
  resp.suggested_area = StringRef(App.get_area());
 #endif
-  char mac_address[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
-  uint8_t mac[MAC_ADDRESS_SIZE];
+  // Stack buffer for MAC address (XX:XX:XX:XX:XX:XX\0 = 18 bytes)
+  char mac_address[18];
+  uint8_t mac[6];
  get_mac_address_raw(mac);
  format_mac_addr_upper(mac, mac_address);
  resp.mac_address = StringRef(mac_address);
@@ -1875,7 +1850,8 @@ bool APIConnection::send_device_info_response_() {
 #endif
 #ifdef USE_BLUETOOTH_PROXY
  resp.bluetooth_proxy_feature_flags = bluetooth_proxy::global_bluetooth_proxy->get_feature_flags();
-  char bluetooth_mac[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
+  // Stack buffer for Bluetooth MAC address (XX:XX:XX:XX:XX:XX\0 = 18 bytes)
+  char bluetooth_mac[18];
  bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_mac_address_pretty(bluetooth_mac);
  resp.bluetooth_mac_address = StringRef(bluetooth_mac);
 #endif
@@ -1929,35 +1905,6 @@ bool APIConnection::send_device_info_response_() {

  return this->send_message(resp);
 }
-bool APIConnection::send_device_capabilities_response_() {
-  // These are the same values DeviceInfoResponse still reports for older clients. Keep the blocks
-  // below in sync with send_device_info_response_() until those copies are removed.
-  DeviceCapabilitiesResponse resp;
-#ifdef USE_BLUETOOTH_PROXY
-  resp.bluetooth_proxy.feature_flags = bluetooth_proxy::global_bluetooth_proxy->get_feature_flags();
-  char bluetooth_mac[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
-  bluetooth_proxy::global_bluetooth_proxy->get_bluetooth_mac_address_pretty(bluetooth_mac);
-  resp.bluetooth_proxy.mac_address = StringRef(bluetooth_mac);
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  resp.voice_assistant.feature_flags = voice_assistant::global_voice_assistant->get_feature_flags();
-#endif
-#ifdef USE_ZWAVE_PROXY
-  resp.zwave_proxy.feature_flags = zwave_proxy::global_zwave_proxy->get_feature_flags();
-  resp.zwave_proxy.home_id = zwave_proxy::global_zwave_proxy->get_home_id();
-#endif
-#ifdef USE_SERIAL_PROXY
-  size_t serial_proxy_index = 0;
-  for (auto const &proxy : App.get_serial_proxies()) {
-    if (serial_proxy_index >= SERIAL_PROXY_COUNT)
-      break;
-    auto &info = resp.serial_proxies[serial_proxy_index++];
-    info.name = StringRef(proxy->get_name());
-    info.port_type = proxy->get_port_type();
-  }
-#endif
-  return this->send_message(resp);
-}
 void APIConnection::on_hello_request(const HelloRequest &msg) {
  if (!this->send_hello_response_(msg)) {
    this->on_fatal_error();
@@ -1979,11 +1926,6 @@ void APIConnection::on_device_info_request() {
    this->on_fatal_error();
  }
 }
-void APIConnection::on_device_capabilities_request() {
-  if (!this->send_device_capabilities_response_()) {
-    this->on_fatal_error();
-  }
-}

 #ifdef USE_API_HOMEASSISTANT_STATES
 void APIConnection::on_home_assistant_state_response(const HomeAssistantStateResponse &msg) {
@@ -2062,9 +2004,7 @@ void APIConnection::send_execute_service_response(uint32_t call_id, bool success
  resp.call_id = call_id;
  resp.success = success;
  resp.error_message = error_message;
-  if (!this->send_message(resp)) {
-    API_LOG_MSG_DROPPED(TAG, "Action response");
-  }
+  this->send_message(resp);
 }
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES_JSON
 void APIConnection::send_execute_service_response(uint32_t call_id, bool success, StringRef error_message,
@@ -2075,34 +2015,12 @@ void APIConnection::send_execute_service_response(uint32_t call_id, bool success
  resp.error_message = error_message;
  resp.response_data = response_data;
  resp.response_data_len = response_data_len;
-  if (!this->send_message(resp)) {
-    API_LOG_MSG_DROPPED(TAG, "Action response");
-  }
+  this->send_message(resp);
 }
 #endif  // USE_API_USER_DEFINED_ACTION_RESPONSES_JSON
 #endif  // USE_API_USER_DEFINED_ACTION_RESPONSES
 #endif

-#ifdef USE_API_HOMEASSISTANT_SERVICES
-bool APIConnection::send_homeassistant_action(const HomeassistantActionRequest &call) {
-  if (!this->flags_.service_call_subscription)
-    return false;
-  if (!this->send_message(call)) {
-    API_LOG_MSG_DROPPED(TAG, "Action request");
-  }
-  return true;
-}
-#endif  // USE_API_HOMEASSISTANT_SERVICES
-
-#ifdef USE_HOMEASSISTANT_TIME
-void APIConnection::send_time_request() {
-  GetTimeRequest req;
-  if (!this->send_message(req)) {
-    API_LOG_MSG_DROPPED(TAG, "Time request");
-  }
-}
-#endif  // USE_HOMEASSISTANT_TIME
-
 #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES
 void APIConnection::on_homeassistant_action_response(const HomeassistantActionResponse &msg) {
 #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES_JSON
@@ -2130,7 +2048,7 @@ bool APIConnection::send_noise_encryption_set_key_response_(const NoiseEncryptio
  }
 #endif

-  noise::psk_t psk{};
+  psk_t psk{};
  if (msg.key_len == 0) {
    if (this->parent_->clear_noise_psk(true)) {
      resp.success = true;
@@ -2139,7 +2057,7 @@ bool APIConnection::send_noise_encryption_set_key_response_(const NoiseEncryptio
    }
  } else if (base64_decode(msg.key, msg.key_len, psk.data(), psk.size()) != psk.size()) {
    ESP_LOGW(TAG, "Invalid encryption key length");
-  } else if (noise::NoiseContext::is_all_zeros(psk)) {
+  } else if (APINoiseContext::is_all_zeros(psk)) {
    // Accepting the reserved provisioning PSK would report success without
    // enabling encryption (or silently clear an existing key)
    ESP_LOGW(TAG, "Rejecting all-zero encryption key");
@@ -2177,10 +2095,7 @@ bool APIConnection::try_to_clear_buffer_slow_(bool log_out_of_space) {
  if (this->helper_->can_write_without_blocking())
    return true;
  if (log_out_of_space) {
-    // VV: refusals are either reported by the sending call site (naming what
-    // was lost) or retried without loss (the deferred batch), so this generic
-    // line only duplicates them.
-    ESP_LOGVV(TAG, "Cannot send message because of TCP buffer space");
+    ESP_LOGV(TAG, "Cannot send message because of TCP buffer space");
  }
  return false;
 }
@@ -25,7 +25,6 @@
 #include "esphome/components/esp8266/crash_handler.h"
 #endif
 #include "esphome/core/entity_base.h"
-#include "esphome/core/log.h"
 #include "esphome/core/string_ref.h"

 #include <functional>
@@ -41,16 +40,6 @@ namespace esphome::api {
 // Forward-declared to break the api_server.h cycle; full-type inlines are in api_connection_buffer.h.
 class APIServer;

-// One shared flash string for every refused-frame warning: send_message()
-// fails as soon as the TCP buffer is full, and each caller only pays for its
-// short name. The guard drops the helper and its arguments below WARN.
-#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_WARN
-void log_dropped_message(const char *tag, int line, const LogString *what);
-#define API_LOG_MSG_DROPPED(tag, what) esphome::api::log_dropped_message(tag, __LINE__, LOG_STR(what))
-#else
-#define API_LOG_MSG_DROPPED(tag, what)
-#endif
-
 // Keepalive timeout in milliseconds
 static constexpr uint32_t KEEPALIVE_TIMEOUT_MS = 60000;
 // Maximum number of entities to process in a single batch during initial state/info sending
@@ -180,7 +169,12 @@ class APIConnection final : public APIServerConnectionBase {
  // Returns whether this client has subscribed to Home Assistant actions; the message
  // is only handed to the send path when subscribed. A true return does not guarantee
  // delivery - it lets the caller warn when no connected client has the subscription.
-  bool send_homeassistant_action(const HomeassistantActionRequest &call);
+  bool send_homeassistant_action(const HomeassistantActionRequest &call) {
+    if (!this->flags_.service_call_subscription)
+      return false;
+    this->send_message(call);
+    return true;
+  }
 #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES
  void on_homeassistant_action_response(const HomeassistantActionResponse &msg);
 #endif  // USE_API_HOMEASSISTANT_ACTION_RESPONSES
@@ -189,7 +183,6 @@ class APIConnection final : public APIServerConnectionBase {
  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg);
  void on_unsubscribe_bluetooth_le_advertisements_request();

-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
  void on_bluetooth_device_request(const BluetoothDeviceRequest &msg);
  void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg);
  void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg);
@@ -198,13 +191,15 @@ class APIConnection final : public APIServerConnectionBase {
  void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg);
  void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg);
  void on_subscribe_bluetooth_connections_free_request();
-  void on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &msg);
-#endif
  void on_bluetooth_scanner_set_mode_request(const BluetoothScannerSetModeRequest &msg);
+  void on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &msg);

 #endif
 #ifdef USE_HOMEASSISTANT_TIME
-  void send_time_request();
+  void send_time_request() {
+    GetTimeRequest req;
+    this->send_message(req);
+  }
 #endif

 #ifdef USE_VOICE_ASSISTANT
@@ -271,7 +266,6 @@ class APIConnection final : public APIServerConnectionBase {
  void on_disconnect_request(const DisconnectRequest &msg);
  void on_ping_request();
  void on_device_info_request();
-  void on_device_capabilities_request();
  void on_list_entities_request() { this->begin_iterator_(ActiveIterator::LIST_ENTITIES); }
  void on_subscribe_states_request() {
    this->flags_.state_subscription = true;
@@ -340,9 +334,7 @@ class APIConnection final : public APIServerConnectionBase {
  // Function pointer type for type-erased size calculation
  using CalculateSizeFn = uint32_t (*)(const void *);

-  /// Returns false as soon as the TCP buffer is full. Marked nodiscard so we
-  /// have no silent failures: every caller must handle (or log) a refusal.
-  template<typename T> [[nodiscard]] bool send_message(const T &msg) {
+  template<typename T> bool send_message(const T &msg) {
    if constexpr (T::ESTIMATED_SIZE == 0) {
      return this->send_message_(0, T::MESSAGE_TYPE, &encode_msg_noop, &msg);
    } else {
@@ -393,11 +385,10 @@ class APIConnection final : public APIServerConnectionBase {
  bool send_disconnect_response_();
  bool send_ping_response_();
  bool send_device_info_response_();
-  bool send_device_capabilities_response_();
 #ifdef USE_API_NOISE
  bool send_noise_encryption_set_key_response_(const NoiseEncryptionSetKeyRequest &msg);
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  bool send_subscribe_bluetooth_connections_free_response_();
 #endif
 #ifdef USE_VOICE_ASSISTANT
@@ -149,7 +149,7 @@ class APIFrameHelper {
  // holding data too long waiting for Nagle's timer causes buffer exhaustion
  // and dropped messages.
  //
-  // ESP32 (TCP_SND_BUF=4×MSS+) / RP2040 (4×MSS) / LibreTiny (4×MSS): 4 logs per cycle
+  // ESP32 (TCP_SND_BUF=4×MSS+) / RP2040 (8×MSS) / LibreTiny (4×MSS): 4 logs per cycle
  // ESP8266 (2×MSS): 3 logs per cycle (tightest buffers)
  //
  // Flow (ESP32/RP2040/LT): Log 1 (Nagle on) -> Log 2 -> Log 3 -> Log 4 (NODELAY, flush)
@@ -312,7 +312,7 @@ class APIFrameHelper {
  // Values 1..LOG_NAGLE_COUNT count log messages in the current Nagle batch.
  // After LOG_NAGLE_COUNT logs, we flush by re-enabling NODELAY and resetting to 0.
  // ESP8266 has the tightest TCP send buffer (2×MSS) and needs conservative batching.
-  // ESP32 (4×MSS+), RP2040 (4×MSS), and LibreTiny (4×MSS) can coalesce more.
+  // ESP32 (4×MSS+), RP2040 (8×MSS), and LibreTiny (4×MSS) can coalesce more.
 #ifdef USE_ESP8266
  static constexpr uint8_t LOG_NAGLE_COUNT = 2;
 #else
@@ -2,9 +2,9 @@
 #ifdef USE_API
 #ifdef USE_API_NOISE
 #include "api_connection.h"  // For ClientInfo struct
-#include "esphome/components/noise/noise.h"
 #include "esphome/core/application.h"
 #include "esphome/core/entity_base.h"
+#include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "proto.h"
@@ -17,14 +17,6 @@

 namespace esphome::api {

-using noise::noise_err_to_logstr;
-
-// api_frame_helper.h keeps its own MAX_HANDSHAKE_SIZE because that header is
-// also compiled in plaintext-only builds without the noise component; keep
-// the two definitions from drifting apart.
-static_assert(MAX_HANDSHAKE_SIZE == noise::MAX_HANDSHAKE_SIZE,
-              "api and noise component handshake size limits must match");
-
 static const char *const TAG = "api.noise";
 #ifdef USE_ESP8266
 static constexpr char PROLOGUE_INIT[] PROGMEM = "NoiseAPIInit";
@@ -59,6 +51,45 @@ static constexpr size_t API_MAX_LOG_BYTES = 168;
 #define LOG_PACKET_RECEIVED(buffer) ((void) 0)
 #endif

+/// Convert a noise error code to a readable error
+const LogString *noise_err_to_logstr(int err) {
+  if (err == NOISE_ERROR_NO_MEMORY)
+    return LOG_STR("NO_MEMORY");
+  if (err == NOISE_ERROR_UNKNOWN_ID)
+    return LOG_STR("UNKNOWN_ID");
+  if (err == NOISE_ERROR_UNKNOWN_NAME)
+    return LOG_STR("UNKNOWN_NAME");
+  if (err == NOISE_ERROR_MAC_FAILURE)
+    return LOG_STR("MAC_FAILURE");
+  if (err == NOISE_ERROR_NOT_APPLICABLE)
+    return LOG_STR("NOT_APPLICABLE");
+  if (err == NOISE_ERROR_SYSTEM)
+    return LOG_STR("SYSTEM");
+  if (err == NOISE_ERROR_REMOTE_KEY_REQUIRED)
+    return LOG_STR("REMOTE_KEY_REQUIRED");
+  if (err == NOISE_ERROR_LOCAL_KEY_REQUIRED)
+    return LOG_STR("LOCAL_KEY_REQUIRED");
+  if (err == NOISE_ERROR_PSK_REQUIRED)
+    return LOG_STR("PSK_REQUIRED");
+  if (err == NOISE_ERROR_INVALID_LENGTH)
+    return LOG_STR("INVALID_LENGTH");
+  if (err == NOISE_ERROR_INVALID_PARAM)
+    return LOG_STR("INVALID_PARAM");
+  if (err == NOISE_ERROR_INVALID_STATE)
+    return LOG_STR("INVALID_STATE");
+  if (err == NOISE_ERROR_INVALID_NONCE)
+    return LOG_STR("INVALID_NONCE");
+  if (err == NOISE_ERROR_INVALID_PRIVATE_KEY)
+    return LOG_STR("INVALID_PRIVATE_KEY");
+  if (err == NOISE_ERROR_INVALID_PUBLIC_KEY)
+    return LOG_STR("INVALID_PUBLIC_KEY");
+  if (err == NOISE_ERROR_INVALID_FORMAT)
+    return LOG_STR("INVALID_FORMAT");
+  if (err == NOISE_ERROR_INVALID_SIGNATURE)
+    return LOG_STR("INVALID_SIGNATURE");
+  return LOG_STR("UNKNOWN");
+}
+
 /// Initialize the frame helper, returns OK if successful.
 APIError APINoiseFrameHelper::init() {
  APIError err = init_common_();
@@ -163,9 +194,9 @@ APIError APINoiseFrameHelper::loop() {
 */
 APIError APINoiseFrameHelper::try_read_frame_() {
  // read header
-  if (rx_header_buf_len_ < noise::FRAME_HEADER_SIZE) {
+  if (rx_header_buf_len_ < 3) {
    // no header information yet
-    uint8_t to_read = static_cast<uint8_t>(noise::FRAME_HEADER_SIZE) - rx_header_buf_len_;
+    uint8_t to_read = 3 - rx_header_buf_len_;
    ssize_t received = this->socket_->read(&rx_header_buf_[rx_header_buf_len_], to_read);
    APIError err = handle_socket_read_result_(received);
    if (err != APIError::OK) {
@@ -177,7 +208,7 @@ APIError APINoiseFrameHelper::try_read_frame_() {
      return APIError::WOULD_BLOCK;
    }

-    if (rx_header_buf_[0] != noise::FRAME_INDICATOR) {
+    if (rx_header_buf_[0] != 0x01) {
      state_ = State::FAILED;
      HELPER_LOG("Bad indicator byte %u", rx_header_buf_[0]);
      return APIError::BAD_INDICATOR;
@@ -317,15 +348,15 @@ APIError APINoiseFrameHelper::state_action_server_hello_() {
  return APIError::OK;
 }
 APIError APINoiseFrameHelper::state_action_handshake_() {
-  noise::NoiseResponderHandshake::Action action = this->handshake_.action();
-  if (action == noise::NoiseResponderHandshake::Action::ACTION_READ) {
+  int action = noise_handshakestate_get_action(this->handshake_);
+  if (action == NOISE_ACTION_READ_MESSAGE) {
    return this->state_action_handshake_read_();
-  } else if (action == noise::NoiseResponderHandshake::Action::ACTION_WRITE) {
+  } else if (action == NOISE_ACTION_WRITE_MESSAGE) {
    return this->state_action_handshake_write_();
  }
  // bad state for action
  this->state_ = State::FAILED;
-  HELPER_LOG("Bad action for handshake: %d", (int) action);
+  HELPER_LOG("Bad action for handshake: %d", action);
  return APIError::HANDSHAKESTATE_BAD_STATE;
 }
 APIError APINoiseFrameHelper::state_action_handshake_read_() {
@@ -337,16 +368,20 @@ APIError APINoiseFrameHelper::state_action_handshake_read_() {
  if (this->rx_buf_.empty()) {
    this->send_explicit_handshake_reject_(LOG_STR("Empty handshake message"));
    return APIError::BAD_HANDSHAKE_ERROR_BYTE;
-  } else if (this->rx_buf_[0] != noise::HANDSHAKE_STATUS_OK) {
+  } else if (this->rx_buf_[0] != 0x00) {
    HELPER_LOG("Bad handshake error byte: %u", this->rx_buf_[0]);
    this->send_explicit_handshake_reject_(LOG_STR("Bad handshake error byte"));
    return APIError::BAD_HANDSHAKE_ERROR_BYTE;
  }

-  int err = this->handshake_.read_message(this->rx_buf_.data() + 1, this->rx_buf_.size() - 1);
+  NoiseBuffer mbuf;
+  noise_buffer_init(mbuf);
+  noise_buffer_set_input(mbuf, this->rx_buf_.data() + 1, this->rx_buf_.size() - 1);
+  int err = noise_handshakestate_read_message(this->handshake_, &mbuf, nullptr);
  if (err != 0) {
    // Special handling for MAC failure
-    this->send_explicit_handshake_reject_(noise::reject_reason_for(err));
+    this->send_explicit_handshake_reject_(err == NOISE_ERROR_MAC_FAILURE ? LOG_STR("Handshake MAC failure")
+                                                                         : LOG_STR("Handshake error"));
    return this->handle_noise_error_(err, LOG_STR("noise_handshakestate_read_message"),
                                     APIError::HANDSHAKESTATE_READ_FAILED);
  }
@@ -355,16 +390,18 @@ APIError APINoiseFrameHelper::state_action_handshake_read_() {
 }
 APIError APINoiseFrameHelper::state_action_handshake_write_() {
  uint8_t buffer[65];
-  size_t msg_len = 0;
+  NoiseBuffer mbuf;
+  noise_buffer_init(mbuf);
+  noise_buffer_set_output(mbuf, buffer + 1, sizeof(buffer) - 1);

-  int err = this->handshake_.write_message(buffer + 1, sizeof(buffer) - 1, msg_len);
+  int err = noise_handshakestate_write_message(this->handshake_, &mbuf, nullptr);
  APIError aerr = this->handle_noise_error_(err, LOG_STR("noise_handshakestate_write_message"),
                                            APIError::HANDSHAKESTATE_WRITE_FAILED);
  if (aerr != APIError::OK)
    return aerr;
-  buffer[0] = noise::HANDSHAKE_STATUS_OK;
+  buffer[0] = 0x00;  // success

-  aerr = this->write_frame_(buffer, msg_len + 1);
+  aerr = this->write_frame_(buffer, mbuf.size + 1);
  if (aerr != APIError::OK)
    return aerr;
  return this->check_handshake_finished_();
@@ -372,22 +409,33 @@ APIError APINoiseFrameHelper::state_action_handshake_write_() {
 void APINoiseFrameHelper::send_explicit_handshake_reject_(const LogString *reason) {
  // Max reject message: "Bad handshake packet len" (24) + 1 (failure byte) = 25 bytes
  uint8_t data[32];
-  static_assert(sizeof(data) >= noise::MAC_FAILURE_PAYLOAD_SIZE,
-                "reject buffer must fit the MAC failure wire contract");
-  size_t data_size = noise::format_reject_payload(data, sizeof(data), reason);
+  data[0] = 0x01;  // failure
+
+#ifdef USE_STORE_LOG_STR_IN_FLASH
+  // On ESP8266 with flash strings, we need to use PROGMEM-aware functions
+  size_t reason_len = strlen_P(reinterpret_cast<PGM_P>(reason));
+  reason_len = std::min(reason_len, sizeof(data) - 1);
+  if (reason_len > 0) {
+    memcpy_P(data + 1, reinterpret_cast<PGM_P>(reason), reason_len);
+  }
+#else
+  // Normal memory access
+  const char *reason_str = LOG_STR_ARG(reason);
+  size_t reason_len = strlen(reason_str);
+  reason_len = std::min(reason_len, sizeof(data) - 1);
+  if (reason_len > 0) {
+    // NOLINTNEXTLINE(bugprone-not-null-terminated-result) - binary protocol, not a C string
+    std::memcpy(data + 1, reason_str, reason_len);
+  }
+#endif
+
+  size_t data_size = reason_len + 1;

  // temporarily remove failed state
  auto orig_state = state_;
  state_ = State::EXPLICIT_REJECT;
-  APIError aerr = write_frame_(data, data_size);
-  if (aerr != APIError::OK) {
-    // Best effort; the reject reason is a diagnosis aid, not a protocol step
-    ESP_LOGW(TAG, "Sending handshake reject failed: %d", (int) aerr);
-  }
-  if (state_ == State::EXPLICIT_REJECT) {
-    // write_frame_ may have moved the state to FAILED; keep that decision
-    state_ = orig_state;
-  }
+  write_frame_(data, data_size);
+  state_ = orig_state;
 }
 APIError APINoiseFrameHelper::read_packet(ReadPacketBuffer *buffer) {
  APIError aerr = this->check_data_state_();
@@ -444,10 +492,12 @@ APIError APINoiseFrameHelper::read_packet(ReadPacketBuffer *buffer) {
 // Returns APIError::OK on success.
 APIError APINoiseFrameHelper::encrypt_noise_message_(uint8_t *buf_start, uint16_t payload_size, uint8_t message_type,
                                                     uint16_t &encrypted_len_out) {
-  // The noise frame header is written after encryption, when the size is known
+  // Write noise header
+  buf_start[0] = 0x01;  // indicator
+  // buf_start[1], buf_start[2] to be set after encryption

  // Write message header (to be encrypted)
-  constexpr uint8_t msg_offset = noise::FRAME_HEADER_SIZE;
+  constexpr uint8_t msg_offset = 3;
  buf_start[msg_offset] = static_cast<uint8_t>(message_type >> 8);      // type high byte
  buf_start[msg_offset + 1] = static_cast<uint8_t>(message_type);       // type low byte
  buf_start[msg_offset + 2] = static_cast<uint8_t>(payload_size >> 8);  // data_len high byte
@@ -465,10 +515,11 @@ APIError APINoiseFrameHelper::encrypt_noise_message_(uint8_t *buf_start, uint16_
  if (aerr != APIError::OK)
    return aerr;

-  // Fill in the frame header now that the encrypted size is known
-  noise::write_frame_header(buf_start, static_cast<uint16_t>(mbuf.size));
+  // Fill in the encrypted size
+  buf_start[1] = static_cast<uint8_t>(mbuf.size >> 8);
+  buf_start[2] = static_cast<uint8_t>(mbuf.size);

-  encrypted_len_out = static_cast<uint16_t>(noise::FRAME_HEADER_SIZE + mbuf.size);
+  encrypted_len_out = static_cast<uint16_t>(3 + mbuf.size);  // indicator + size + encrypted data
  return APIError::OK;
 }

@@ -517,19 +568,21 @@ APIError APINoiseFrameHelper::write_protobuf_messages(ProtoWriteBuffer buffer, s
 }

 APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) {
-  uint8_t header[noise::FRAME_HEADER_SIZE];
-  noise::write_frame_header(header, len);
+  uint8_t header[3];
+  header[0] = 0x01;  // indicator
+  header[1] = (uint8_t) (len >> 8);
+  header[2] = (uint8_t) len;

  if (len == 0) {
-    return this->write_raw_buf_(header, noise::FRAME_HEADER_SIZE);
+    return this->write_raw_buf_(header, 3);
  }
  struct iovec iov[2];
  iov[0].iov_base = header;
-  iov[0].iov_len = noise::FRAME_HEADER_SIZE;
+  iov[0].iov_len = 3;
  iov[1].iov_base = const_cast<uint8_t *>(data);
  iov[1].iov_len = len;

-  return this->write_raw_iov_(iov, 2, noise::FRAME_HEADER_SIZE + len);
+  return this->write_raw_iov_(iov, 2, 3 + len);
 }

 /** Initiate the data structures for the handshake.
@@ -537,12 +590,42 @@ APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) {
 * @return 0 on success, -1 on error (check errno)
 */
 APIError APINoiseFrameHelper::init_handshake_() {
-  int err = this->handshake_.init(this->ctx_.get_psk(), prologue_.data(), prologue_.size());
-  APIError aerr = handle_noise_error_(err, LOG_STR("noise_handshake_init"), APIError::HANDSHAKESTATE_SETUP_FAILED);
+  int err;
+  memset(&nid_, 0, sizeof(nid_));
+  // const char *proto = "Noise_NNpsk0_25519_ChaChaPoly_SHA256";
+  // err = noise_protocol_name_to_id(&nid_, proto, strlen(proto));
+  nid_.pattern_id = NOISE_PATTERN_NN;
+  nid_.cipher_id = NOISE_CIPHER_CHACHAPOLY;
+  nid_.dh_id = NOISE_DH_CURVE25519;
+  nid_.prefix_id = NOISE_PREFIX_STANDARD;
+  nid_.hybrid_id = NOISE_DH_NONE;
+  nid_.hash_id = NOISE_HASH_SHA256;
+  nid_.modifier_ids[0] = NOISE_MODIFIER_PSK0;
+
+  err = noise_handshakestate_new_by_id(&handshake_, &nid_, NOISE_ROLE_RESPONDER);
+  APIError aerr =
+      handle_noise_error_(err, LOG_STR("noise_handshakestate_new_by_id"), APIError::HANDSHAKESTATE_SETUP_FAILED);
  if (aerr != APIError::OK)
    return aerr;
-  // init copies the prologue into the handshakestate, so we can get rid of it now
+
+  const auto &psk = this->ctx_.get_psk();
+  err = noise_handshakestate_set_pre_shared_key(handshake_, psk.data(), psk.size());
+  aerr = handle_noise_error_(err, LOG_STR("noise_handshakestate_set_pre_shared_key"),
+                             APIError::HANDSHAKESTATE_SETUP_FAILED);
+  if (aerr != APIError::OK)
+    return aerr;
+
+  err = noise_handshakestate_set_prologue(handshake_, prologue_.data(), prologue_.size());
+  aerr = handle_noise_error_(err, LOG_STR("noise_handshakestate_set_prologue"), APIError::HANDSHAKESTATE_SETUP_FAILED);
+  if (aerr != APIError::OK)
+    return aerr;
+  // set_prologue copies it into handshakestate, so we can get rid of it now
  prologue_.release();
+
+  err = noise_handshakestate_start(handshake_);
+  aerr = handle_noise_error_(err, LOG_STR("noise_handshakestate_start"), APIError::HANDSHAKESTATE_SETUP_FAILED);
+  if (aerr != APIError::OK)
+    return aerr;
  return APIError::OK;
 }

@@ -551,17 +634,15 @@ APIError APINoiseFrameHelper::check_handshake_finished_() {
  assert(state_ == State::HANDSHAKE);
 #endif

-  noise::NoiseResponderHandshake::Action action = this->handshake_.action();
-  if (action == noise::NoiseResponderHandshake::Action::ACTION_READ ||
-      action == noise::NoiseResponderHandshake::Action::ACTION_WRITE)
+  int action = noise_handshakestate_get_action(handshake_);
+  if (action == NOISE_ACTION_READ_MESSAGE || action == NOISE_ACTION_WRITE_MESSAGE)
    return APIError::OK;
-  if (action != noise::NoiseResponderHandshake::Action::ACTION_SPLIT) {
+  if (action != NOISE_ACTION_SPLIT) {
    state_ = State::FAILED;
-    HELPER_LOG("Bad action for handshake: %d", (int) action);
+    HELPER_LOG("Bad action for handshake: %d", action);
    return APIError::HANDSHAKESTATE_BAD_STATE;
  }
-  // split() also frees the handshake state
-  int err = this->handshake_.split(send_cipher_, recv_cipher_);
+  int err = noise_handshakestate_split(handshake_, &send_cipher_, &recv_cipher_);
  APIError aerr =
      handle_noise_error_(err, LOG_STR("noise_handshakestate_split"), APIError::HANDSHAKESTATE_SPLIT_FAILED);
  if (aerr != APIError::OK)
@@ -570,11 +651,17 @@ APIError APINoiseFrameHelper::check_handshake_finished_() {
  this->frame_footer_size_ = noise_cipherstate_get_mac_length(send_cipher_);

  HELPER_LOG("Handshake complete!");
+  noise_handshakestate_free(handshake_);
+  handshake_ = nullptr;
  state_ = State::DATA;
  return APIError::OK;
 }

 APINoiseFrameHelper::~APINoiseFrameHelper() {
+  if (handshake_ != nullptr) {
+    noise_handshakestate_free(handshake_);
+    handshake_ = nullptr;
+  }
  if (send_cipher_ != nullptr) {
    noise_cipherstate_free(send_cipher_);
    send_cipher_ = nullptr;
@@ -585,6 +672,16 @@ APINoiseFrameHelper::~APINoiseFrameHelper() {
  }
 }

+extern "C" {
+// declare how noise generates random bytes (here with a good HWRNG based on the RF system)
+void noise_rand_bytes(void *output, size_t len) {
+  if (!esphome::random_bytes(reinterpret_cast<uint8_t *>(output), len)) {
+    ESP_LOGE(TAG, "Acquiring random bytes failed; rebooting");
+    arch_restart();
+  }
+}
+}
+
 }  // namespace esphome::api
 #endif  // USE_API_NOISE
 #endif  // USE_API
@@ -3,7 +3,7 @@
 #ifdef USE_API
 #ifdef USE_API_NOISE
 #include "noise/protocol.h"
-#include "esphome/components/noise/noise_handshake.h"
+#include "api_noise_context.h"

 namespace esphome::api {

@@ -14,9 +14,9 @@ class APINoiseFrameHelper final : public APIFrameHelper {
  // Pos 1-2: encrypted payload size (16-bit big-endian)
  // Pos 3-6: encrypted type (16-bit) + data_len (16-bit)
  // Pos 7+: actual payload data
-  static constexpr uint8_t HEADER_PADDING = noise::FRAME_HEADER_SIZE + 2 + 2;  // frame header + type + data_len
+  static constexpr uint8_t HEADER_PADDING = 1 + 2 + 2 + 2;  // indicator + size + type + data_len

-  APINoiseFrameHelper(std::unique_ptr<socket::Socket> socket, noise::NoiseContext &ctx)
+  APINoiseFrameHelper(std::unique_ptr<socket::Socket> socket, APINoiseContext &ctx)
      : APIFrameHelper(std::move(socket)), ctx_(ctx) {
    frame_header_padding_ = HEADER_PADDING;
  }
@@ -52,22 +52,25 @@ class APINoiseFrameHelper final : public APIFrameHelper {
  APIError handle_handshake_frame_error_(APIError aerr);
  APIError handle_noise_error_(int err, const LogString *func_name, APIError api_err);

-  // Pointers first (4 bytes each; the handshake wrapper holds one pointer)
-  noise::NoiseResponderHandshake handshake_;
+  // Pointers first (4 bytes each)
+  NoiseHandshakeState *handshake_{nullptr};
  NoiseCipherState *send_cipher_{nullptr};
  NoiseCipherState *recv_cipher_{nullptr};

  // Reference to noise context (4 bytes on 32-bit)
-  noise::NoiseContext &ctx_;
+  APINoiseContext &ctx_;

  // Buffer for noise handshake prologue (released after handshake)
  APIBuffer prologue_;

+  // NoiseProtocolId (size depends on implementation)
+  NoiseProtocolId nid_;
+
  // Group small types together
  // Fixed-size header buffer for noise protocol:
  // 1 byte for indicator + 2 bytes for message size (16-bit value, not varint)
  // Note: Maximum message size is UINT16_MAX (65535), with a limit of 128 bytes during handshake phase
-  uint8_t rx_header_buf_[noise::FRAME_HEADER_SIZE];
+  uint8_t rx_header_buf_[3];
  uint8_t rx_header_buf_len_ = 0;
  // 4 bytes total, no padding
 };
@@ -0,0 +1,37 @@
+#pragma once
+#include <array>
+#include <cstdint>
+#include "esphome/core/defines.h"
+
+namespace esphome::api {
+
+#ifdef USE_API_NOISE
+using psk_t = std::array<uint8_t, 32>;
+
+class APINoiseContext {
+ public:
+  // The all-zeros PSK is reserved: it marks the device as unprovisioned and
+  // doubles as the well-known provisioning PSK that unprovisioned devices
+  // accept for Noise handshakes (passive-sniffing protection only, no
+  // authentication). It is never a valid real key.
+  static bool is_all_zeros(const psk_t &psk) {
+    uint8_t acc = 0;
+    for (uint8_t b : psk) {
+      acc |= b;
+    }
+    return acc == 0;
+  }
+  void set_psk(psk_t psk) {
+    this->psk_ = psk;
+    this->has_psk_ = !is_all_zeros(psk);
+  }
+  const psk_t &get_psk() const { return this->psk_; }
+  bool has_psk() const { return this->has_psk_; }
+
+ protected:
+  psk_t psk_{};
+  bool has_psk_{false};
+};
+#endif  // USE_API_NOISE
+
+}  // namespace esphome::api
@@ -241,82 +241,6 @@ uint32_t DeviceInfoResponse::calculate_size() const {
 #endif
  return size;
 }
-#ifdef USE_BLUETOOTH_PROXY
-uint8_t *BluetoothProxyCapabilities::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
-  uint8_t *__restrict__ pos = buffer.get_pos();
-  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 1, this->feature_flags);
-  ProtoEncode::encode_short_string_force(pos PROTO_ENCODE_DEBUG_ARG, 18, this->mac_address);
-  return pos;
-}
-uint32_t BluetoothProxyCapabilities::calculate_size() const {
-  uint32_t size = 0;
-  size += ProtoSize::calc_uint32(1, this->feature_flags);
-  size += 2 + this->mac_address.size();
-  return size;
-}
-#endif
-#ifdef USE_VOICE_ASSISTANT
-uint8_t *VoiceAssistantCapabilities::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
-  uint8_t *__restrict__ pos = buffer.get_pos();
-  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 1, this->feature_flags);
-  return pos;
-}
-uint32_t VoiceAssistantCapabilities::calculate_size() const {
-  uint32_t size = 0;
-  size += ProtoSize::calc_uint32(1, this->feature_flags);
-  return size;
-}
-#endif
-#ifdef USE_ZWAVE_PROXY
-uint8_t *ZWaveProxyCapabilities::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
-  uint8_t *__restrict__ pos = buffer.get_pos();
-  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 1, this->feature_flags);
-  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 2, this->home_id);
-  return pos;
-}
-uint32_t ZWaveProxyCapabilities::calculate_size() const {
-  uint32_t size = 0;
-  size += ProtoSize::calc_uint32(1, this->feature_flags);
-  size += ProtoSize::calc_uint32(1, this->home_id);
-  return size;
-}
-#endif
-uint8_t *DeviceCapabilitiesResponse::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
-  uint8_t *__restrict__ pos = buffer.get_pos();
-#ifdef USE_BLUETOOTH_PROXY
-  ProtoEncode::encode_optional_sub_message(pos PROTO_ENCODE_DEBUG_ARG, buffer, 1, this->bluetooth_proxy);
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  ProtoEncode::encode_optional_sub_message(pos PROTO_ENCODE_DEBUG_ARG, buffer, 2, this->voice_assistant);
-#endif
-#ifdef USE_ZWAVE_PROXY
-  ProtoEncode::encode_optional_sub_message(pos PROTO_ENCODE_DEBUG_ARG, buffer, 3, this->zwave_proxy);
-#endif
-#ifdef USE_SERIAL_PROXY
-  for (const auto &it : this->serial_proxies) {
-    ProtoEncode::encode_sub_message(pos PROTO_ENCODE_DEBUG_ARG, buffer, 4, it);
-  }
-#endif
-  return pos;
-}
-uint32_t DeviceCapabilitiesResponse::calculate_size() const {
-  uint32_t size = 0;
-#ifdef USE_BLUETOOTH_PROXY
-  size += ProtoSize::calc_message(1, this->bluetooth_proxy.calculate_size());
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  size += ProtoSize::calc_message(1, this->voice_assistant.calculate_size());
-#endif
-#ifdef USE_ZWAVE_PROXY
-  size += ProtoSize::calc_message(1, this->zwave_proxy.calculate_size());
-#endif
-#ifdef USE_SERIAL_PROXY
-  for (const auto &it : this->serial_proxies) {
-    size += ProtoSize::calc_message_force(1, it.calculate_size());
-  }
-#endif
-  return size;
-}
 #ifdef USE_BINARY_SENSOR
 uint8_t *ListEntitiesBinarySensorResponse::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
  uint8_t *__restrict__ pos = buffer.get_pos();
@@ -2482,8 +2406,6 @@ BluetoothLERawAdvertisementsResponse::calculate_size() const {
  }
  return size;
 }
-#endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
 bool BluetoothDeviceRequest::decode_varint(uint32_t field_id, proto_varint_value_t value) {
  switch (field_id) {
    case 1:
@@ -2860,8 +2782,6 @@ uint32_t BluetoothDeviceClearCacheResponse::calculate_size() const {
  size += ProtoSize::calc_int32(1, this->error);
  return size;
 }
-#endif
-#ifdef USE_BLUETOOTH_PROXY
 uint8_t *BluetoothScannerStateResponse::encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const {
  uint8_t *__restrict__ pos = buffer.get_pos();
  ProtoEncode::encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, 1, static_cast<uint32_t>(this->state));
@@ -4225,7 +4145,7 @@ uint32_t SerialProxyRequestResponse::calculate_size() const {
  return size;
 }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
 bool BluetoothSetConnectionParamsRequest::decode_varint(uint32_t field_id, proto_varint_value_t value) {
  switch (field_id) {
    case 1:
@@ -225,7 +225,7 @@ enum MediaPlayerFormatPurpose : uint32_t {
  MEDIA_PLAYER_FORMAT_PURPOSE_ANNOUNCEMENT = 1,
 };
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
 enum BluetoothDeviceRequestType : uint32_t {
  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT = 0,
  BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT = 1,
@@ -235,8 +235,6 @@ enum BluetoothDeviceRequestType : uint32_t {
  BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE = 5,
  BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE = 6,
 };
-#endif
-#ifdef USE_BLUETOOTH_PROXY
 enum BluetoothScannerState : uint32_t {
  BLUETOOTH_SCANNER_STATE_IDLE = 0,
  BLUETOOTH_SCANNER_STATE_STARTING = 1,
@@ -602,74 +600,6 @@ class DeviceInfoResponse final : public ProtoMessage {

 protected:
 };
-#ifdef USE_BLUETOOTH_PROXY
-class BluetoothProxyCapabilities final : public ProtoMessage {
- public:
-  uint32_t feature_flags{0};
-  StringRef mac_address{};
-  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
-  uint32_t calculate_size() const;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *dump_to(DumpBuffer &out) const override;
-#endif
-
- protected:
-};
-#endif
-#ifdef USE_VOICE_ASSISTANT
-class VoiceAssistantCapabilities final : public ProtoMessage {
- public:
-  uint32_t feature_flags{0};
-  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
-  uint32_t calculate_size() const;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *dump_to(DumpBuffer &out) const override;
-#endif
-
- protected:
-};
-#endif
-#ifdef USE_ZWAVE_PROXY
-class ZWaveProxyCapabilities final : public ProtoMessage {
- public:
-  uint32_t feature_flags{0};
-  uint32_t home_id{0};
-  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
-  uint32_t calculate_size() const;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *dump_to(DumpBuffer &out) const override;
-#endif
-
- protected:
-};
-#endif
-class DeviceCapabilitiesResponse final : public ProtoMessage {
- public:
-  static constexpr uint8_t MESSAGE_TYPE = 150;
-  static constexpr uint8_t ESTIMATED_SIZE = 102;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  const LogString *message_name() const override { return LOG_STR("device_capabilities_response"); }
-#endif
-#ifdef USE_BLUETOOTH_PROXY
-  BluetoothProxyCapabilities bluetooth_proxy{};
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  VoiceAssistantCapabilities voice_assistant{};
-#endif
-#ifdef USE_ZWAVE_PROXY
-  ZWaveProxyCapabilities zwave_proxy{};
-#endif
-#ifdef USE_SERIAL_PROXY
-  std::array<SerialProxyInfo, SERIAL_PROXY_COUNT> serial_proxies{};
-#endif
-  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const;
-  uint32_t calculate_size() const;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *dump_to(DumpBuffer &out) const override;
-#endif
-
- protected:
-};
 class ListEntitiesDoneResponse final : public ProtoMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 19;
@@ -2001,8 +1931,6 @@ class BluetoothLERawAdvertisementsResponse final : public ProtoMessage {

 protected:
 };
-#endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
 class BluetoothDeviceRequest final : public ProtoDecodableMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 68;
@@ -2388,8 +2316,6 @@ class BluetoothDeviceClearCacheResponse final : public ProtoMessage {

 protected:
 };
-#endif
-#ifdef USE_BLUETOOTH_PROXY
 class BluetoothScannerStateResponse final : public ProtoMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 126;
@@ -3364,7 +3290,7 @@ class SerialProxyRequestResponse final : public ProtoMessage {
 protected:
 };
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
 class BluetoothSetConnectionParamsRequest final : public ProtoDecodableMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 145;
@@ -3,7 +3,7 @@
 #pragma once

 #include "esphome/core/defines.h"
-#if defined(USE_BLUETOOTH_PROXY) || defined(USE_BLUETOOTH_PROXY_CONNECTIONS)
+#ifdef USE_BLUETOOTH_PROXY
 #ifndef USE_API_VARINT64
 #define USE_API_VARINT64
 #endif
@@ -584,7 +584,7 @@ template<> const char *proto_enum_to_string<enums::MediaPlayerFormatPurpose>(enu
  }
 }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
 template<>
 const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::BluetoothDeviceRequestType value) {
  switch (value) {
@@ -606,8 +606,6 @@ const char *proto_enum_to_string<enums::BluetoothDeviceRequestType>(enums::Bluet
      return ESPHOME_PSTR("UNKNOWN");
  }
 }
-#endif
-#ifdef USE_BLUETOOTH_PROXY
 template<> const char *proto_enum_to_string<enums::BluetoothScannerState>(enums::BluetoothScannerState value) {
  switch (value) {
    case enums::BLUETOOTH_SCANNER_STATE_IDLE:
@@ -990,55 +988,6 @@ const char *DeviceInfoResponse::dump_to(DumpBuffer &out) const {
 #endif
  return out.c_str();
 }
-#ifdef USE_BLUETOOTH_PROXY
-const char *BluetoothProxyCapabilities::dump_to(DumpBuffer &out) const {
-  MessageDumpHelper helper(out, ESPHOME_PSTR("BluetoothProxyCapabilities"));
-  dump_field(out, ESPHOME_PSTR("feature_flags"), this->feature_flags);
-  dump_field(out, ESPHOME_PSTR("mac_address"), this->mac_address);
-  return out.c_str();
-}
-#endif
-#ifdef USE_VOICE_ASSISTANT
-const char *VoiceAssistantCapabilities::dump_to(DumpBuffer &out) const {
-  MessageDumpHelper helper(out, ESPHOME_PSTR("VoiceAssistantCapabilities"));
-  dump_field(out, ESPHOME_PSTR("feature_flags"), this->feature_flags);
-  return out.c_str();
-}
-#endif
-#ifdef USE_ZWAVE_PROXY
-const char *ZWaveProxyCapabilities::dump_to(DumpBuffer &out) const {
-  MessageDumpHelper helper(out, ESPHOME_PSTR("ZWaveProxyCapabilities"));
-  dump_field(out, ESPHOME_PSTR("feature_flags"), this->feature_flags);
-  dump_field(out, ESPHOME_PSTR("home_id"), this->home_id);
-  return out.c_str();
-}
-#endif
-const char *DeviceCapabilitiesResponse::dump_to(DumpBuffer &out) const {
-  MessageDumpHelper helper(out, ESPHOME_PSTR("DeviceCapabilitiesResponse"));
-#ifdef USE_BLUETOOTH_PROXY
-  out.append(2, ' ').append_p(ESPHOME_PSTR("bluetooth_proxy")).append(": ");
-  this->bluetooth_proxy.dump_to(out);
-  out.append("\n");
-#endif
-#ifdef USE_VOICE_ASSISTANT
-  out.append(2, ' ').append_p(ESPHOME_PSTR("voice_assistant")).append(": ");
-  this->voice_assistant.dump_to(out);
-  out.append("\n");
-#endif
-#ifdef USE_ZWAVE_PROXY
-  out.append(2, ' ').append_p(ESPHOME_PSTR("zwave_proxy")).append(": ");
-  this->zwave_proxy.dump_to(out);
-  out.append("\n");
-#endif
-#ifdef USE_SERIAL_PROXY
-  for (const auto &it : this->serial_proxies) {
-    out.append(4, ' ').append_p(ESPHOME_PSTR("serial_proxies")).append(": ");
-    it.dump_to(out);
-    out.append("\n");
-  }
-#endif
-  return out.c_str();
-}
 const char *ListEntitiesDoneResponse::dump_to(DumpBuffer &out) const {
  out.append_p(ESPHOME_PSTR("ListEntitiesDoneResponse {}"));
  return out.c_str();
@@ -2004,8 +1953,6 @@ const char *BluetoothLERawAdvertisementsResponse::dump_to(DumpBuffer &out) const
  }
  return out.c_str();
 }
-#endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
 const char *BluetoothDeviceRequest::dump_to(DumpBuffer &out) const {
  MessageDumpHelper helper(out, ESPHOME_PSTR("BluetoothDeviceRequest"));
  dump_field(out, ESPHOME_PSTR("address"), this->address);
@@ -2177,8 +2124,6 @@ const char *BluetoothDeviceClearCacheResponse::dump_to(DumpBuffer &out) const {
  dump_field(out, ESPHOME_PSTR("error"), this->error);
  return out.c_str();
 }
-#endif
-#ifdef USE_BLUETOOTH_PROXY
 const char *BluetoothScannerStateResponse::dump_to(DumpBuffer &out) const {
  MessageDumpHelper helper(out, ESPHOME_PSTR("BluetoothScannerStateResponse"));
  dump_field(out, ESPHOME_PSTR("state"), static_cast<enums::BluetoothScannerState>(this->state));
@@ -2770,7 +2715,7 @@ const char *SerialProxyRequestResponse::dump_to(DumpBuffer &out) const {
  return out.c_str();
 }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
 const char *BluetoothSetConnectionParamsRequest::dump_to(DumpBuffer &out) const {
  MessageDumpHelper helper(out, ESPHOME_PSTR("BluetoothSetConnectionParamsRequest"));
  dump_field(out, ESPHOME_PSTR("address"), this->address);
@@ -302,7 +302,7 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
    case BluetoothDeviceRequest::MESSAGE_TYPE: {
      BluetoothDeviceRequest msg;
      msg.decode(msg_data, msg_size);
@@ -313,7 +313,7 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
    case BluetoothGATTGetServicesRequest::MESSAGE_TYPE: {
      BluetoothGATTGetServicesRequest msg;
      msg.decode(msg_data, msg_size);
@@ -324,7 +324,7 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
    case BluetoothGATTReadRequest::MESSAGE_TYPE: {
      BluetoothGATTReadRequest msg;
      msg.decode(msg_data, msg_size);
@@ -335,7 +335,7 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
    case BluetoothGATTWriteRequest::MESSAGE_TYPE: {
      BluetoothGATTWriteRequest msg;
      msg.decode(msg_data, msg_size);
@@ -346,7 +346,7 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
    case BluetoothGATTReadDescriptorRequest::MESSAGE_TYPE: {
      BluetoothGATTReadDescriptorRequest msg;
      msg.decode(msg_data, msg_size);
@@ -357,7 +357,7 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
    case BluetoothGATTWriteDescriptorRequest::MESSAGE_TYPE: {
      BluetoothGATTWriteDescriptorRequest msg;
      msg.decode(msg_data, msg_size);
@@ -368,7 +368,7 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
    case BluetoothGATTNotifyRequest::MESSAGE_TYPE: {
      BluetoothGATTNotifyRequest msg;
      msg.decode(msg_data, msg_size);
@@ -379,7 +379,7 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
    case 80 /* SubscribeBluetoothConnectionsFreeRequest is empty */: {
 #ifdef HAS_PROTO_MESSAGE_DUMP
      this->log_receive_message_(LOG_STR("on_subscribe_bluetooth_connections_free_request"));
@@ -694,7 +694,7 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
    case BluetoothSetConnectionParamsRequest::MESSAGE_TYPE: {
      BluetoothSetConnectionParamsRequest msg;
      msg.decode(msg_data, msg_size);
@@ -705,13 +705,6 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
      break;
    }
 #endif
-    case 149 /* DeviceCapabilitiesRequest is empty */: {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_device_capabilities_request"));
-#endif
-      this->on_device_capabilities_request();
-      break;
-    }
    default:
      break;
  }
@@ -27,8 +27,6 @@ class APIServerConnectionBase {
  void on_ping_response(){};
  void on_device_info_request(){};

-  void on_device_capabilities_request(){};
-
  void on_list_entities_request(){};

  void on_subscribe_states_request(){};
@@ -115,32 +113,32 @@ class APIServerConnectionBase {
  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &value){};
 #endif

-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  void on_bluetooth_device_request(const BluetoothDeviceRequest &value){};
 #endif

-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &value){};
 #endif

-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &value){};
 #endif

-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &value){};
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &value){};
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &value){};
 #endif
-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &value){};
 #endif

-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  void on_subscribe_bluetooth_connections_free_request(){};
 #endif

@@ -235,7 +233,7 @@ class APIServerConnectionBase {
  void on_serial_proxy_request(const SerialProxyRequest &value){};
 #endif

-#ifdef USE_BLUETOOTH_PROXY_CONNECTIONS
+#ifdef USE_BLUETOOTH_PROXY
  void on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &value){};
 #endif
 };
@@ -123,9 +123,7 @@ void APIServer::setup() {
        // Best-effort: if the send buffer is full the reason is dropped, but the
        // client still learns the window is closed when it reconnects (rejected at
        // hello) or via the socket close.
-        if (!c->send_message(req)) {
-          API_LOG_MSG_DROPPED(TAG, "Disconnect request");
-        }
+        c->send_message(req);
      }
    });
  }
@@ -396,11 +394,8 @@ void APIServer::on_update(update::UpdateEntity *obj) {
 void APIServer::on_zwave_proxy_request(const ZWaveProxyRequest &msg) {
  // We could add code to manage a second subscription type, but, since this message type is
  //  very infrequent and small, we simply send it to all clients
-  for (auto &c : this->active_clients()) {
-    if (!c->send_message(msg)) {
-      API_LOG_MSG_DROPPED(TAG, "Home ID notification");
-    }
-  }
+  for (auto &c : this->active_clients())
+    c->send_message(msg);
 }
 #endif

@@ -423,6 +418,12 @@ void APIServer::send_infrared_rf_receive_event([[maybe_unused]] uint32_t device_
 API_DISPATCH_UPDATE(alarm_control_panel::AlarmControlPanel, alarm_control_panel)
 #endif

+float APIServer::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
+
+void APIServer::set_port(uint16_t port) { this->port_ = port; }
+
+void APIServer::set_batch_delay(uint16_t batch_delay) { this->batch_delay_ = batch_delay; }
+
 #ifdef USE_API_HOMEASSISTANT_SERVICES
 void APIServer::send_homeassistant_action(const HomeassistantActionRequest &call) {
  bool has_subscriber = false;
@@ -547,6 +548,10 @@ const std::vector<APIServer::HomeAssistantStateSubscription> &APIServer::get_sta
 }
 #endif

+uint16_t APIServer::get_port() const { return this->port_; }
+
+void APIServer::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }
+
 #ifdef USE_API_NOISE
 bool APIServer::update_noise_psk_(const SavedNoisePsk &new_psk, const LogString *save_log_msg,
                                  const LogString *fail_log_msg, bool make_active) {
@@ -571,9 +576,7 @@ bool APIServer::update_noise_psk_(const SavedNoisePsk &new_psk, const LogString
      ESP_LOGW(TAG, "Disconnecting all clients to reset PSK");
      for (auto &c : this->active_clients()) {
        DisconnectRequest req;
-        if (!c->send_message(req)) {
-          API_LOG_MSG_DROPPED(TAG, "Disconnect request");
-        }
+        c->send_message(req);
      }
    });
  }
@@ -588,7 +591,7 @@ bool APIServer::load_and_apply_noise_psk_() {
  return true;
 }

-bool APIServer::save_noise_psk(noise::psk_t psk, bool make_active) {
+bool APIServer::save_noise_psk(psk_t psk, bool make_active) {
 #ifdef USE_API_NOISE_PSK_FROM_YAML
  // When PSK is set from YAML, this function should never be called
  // but if it is, reject the change
@@ -5,10 +5,7 @@
 #include "api_buffer.h"
 // Must precede clients_ so APIConnection is complete for default_delete (libc++).
 #include "api_connection.h"
-#ifdef USE_API_NOISE
-// Only present in the build when the noise component is loaded
-#include "esphome/components/noise/noise.h"
-#endif
+#include "api_noise_context.h"
 #include "api_pb2.h"
 #include "api_pb2_service.h"
 #include "esphome/components/socket/socket.h"
@@ -40,7 +37,7 @@ class UserServiceDescriptor;

 #ifdef USE_API_NOISE
 struct SavedNoisePsk {
-  noise::psk_t psk;
+  psk_t psk;
 } PACKED;  // NOLINT
 #endif

@@ -54,8 +51,8 @@ class APIServer final : public Component,
 public:
  APIServer();
  void setup() override;
-  uint16_t get_port() const { return this->port_; }
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
+  uint16_t get_port() const;
+  float get_setup_priority() const override;
  void loop() override;
  void dump_config() override;
  void on_shutdown() override;
@@ -66,9 +63,9 @@ class APIServer final : public Component,
 #ifdef USE_CAMERA
  void on_camera_image(const std::shared_ptr<camera::CameraImage> &image) override;
 #endif
-  void set_port(uint16_t port) { this->port_ = port; }
-  void set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }
-  void set_batch_delay(uint16_t batch_delay) { this->batch_delay_ = batch_delay; }
+  void set_port(uint16_t port);
+  void set_reboot_timeout(uint32_t reboot_timeout);
+  void set_batch_delay(uint16_t batch_delay);
  uint16_t get_batch_delay() const { return batch_delay_; }
  void set_listen_backlog(uint8_t listen_backlog) { this->listen_backlog_ = listen_backlog; }

@@ -76,10 +73,10 @@ class APIServer final : public Component,
  APIBuffer &get_shared_buffer_ref() { return shared_write_buffer_; }

 #ifdef USE_API_NOISE
-  bool save_noise_psk(noise::psk_t psk, bool make_active = true);
+  bool save_noise_psk(psk_t psk, bool make_active = true);
  bool clear_noise_psk(bool make_active = true);
-  void set_noise_psk(noise::psk_t psk) { this->noise_ctx_.set_psk(psk); }
-  noise::NoiseContext &get_noise_ctx() { return this->noise_ctx_; }
+  void set_noise_psk(psk_t psk) { this->noise_ctx_.set_psk(psk); }
+  APINoiseContext &get_noise_ctx() { return this->noise_ctx_; }
 #endif  // USE_API_NOISE

  void handle_disconnect(APIConnection *conn);
@@ -357,7 +354,7 @@ class APIServer final : public Component,
 #endif

 #ifdef USE_API_NOISE
-  noise::NoiseContext noise_ctx_;
+  APINoiseContext noise_ctx_;
  ESPPreferenceObject noise_pref_;
 #endif  // USE_API_NOISE
 };
@@ -14,8 +14,6 @@ from esphome.const import (
    CONF_TUNE_ANTENNA,
    CONF_WATCHDOG_THRESHOLD,
 )
-from esphome.cpp_generator import MockObj
-from esphome.types import ConfigType

 MULTI_CONF = True

@@ -44,7 +42,7 @@ AS3935_SCHEMA = cv.Schema(
 )


-async def setup_as3935(var: MockObj, config: ConfigType) -> None:
+async def setup_as3935(var, config):
    await cg.register_component(var, config)

    irq_pin = await cg.gpio_pin_expression(config[CONF_IRQ_PIN])
@@ -1,7 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import binary_sensor
 import esphome.config_validation as cv
-from esphome.types import ConfigType

 from . import AS3935, CONF_AS3935_ID

@@ -14,7 +13,7 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema().extend(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    hub = await cg.get_variable(config[CONF_AS3935_ID])
    var = await binary_sensor.new_binary_sensor(config)
    cg.add(hub.set_thunder_alert_binary_sensor(var))
@@ -9,7 +9,6 @@ from esphome.const import (
    STATE_CLASS_MEASUREMENT,
    UNIT_KILOMETER,
 )
-from esphome.types import ConfigType

 from . import AS3935, CONF_AS3935_ID

@@ -32,7 +31,7 @@ CONFIG_SCHEMA = cv.Schema(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    hub = await cg.get_variable(config[CONF_AS3935_ID])

    if distance_config := config.get(CONF_DISTANCE):
@@ -1,6 +1,3 @@
-from collections.abc import Callable
-from typing import Any
-
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import i2c
@@ -14,7 +11,6 @@ from esphome.const import (
    CONF_RANGE,
    CONF_WATCHDOG,
 )
-from esphome.types import ConfigType

 CODEOWNERS = ["@ammmze"]
 DEPENDENCIES = ["i2c"]
@@ -76,13 +72,13 @@ POSITION_TO_ANGLE = 360 / RESOLUTION
 MIN_RANGE = round(18 * ANGLE_TO_POSITION)


-def angle(min: float = -360, max: float = 360) -> Callable[[Any], Any]:
+def angle(min=-360, max=360):
    return cv.All(
        cv.float_with_unit("angle", "(°|deg)"), cv.float_range(min=min, max=max)
    )


-def angle_to_position(value: Any, min: float = -360, max: float = 360) -> int:
+def angle_to_position(value, min=-360, max=360):
    try:
        value = angle(min=min, max=max)(value)
        return (RESOLUTION + round(value * ANGLE_TO_POSITION)) % RESOLUTION
@@ -90,17 +86,17 @@ def angle_to_position(value: Any, min: float = -360, max: float = 360) -> int:
        raise cv.Invalid(f"When using angle, {e.error_message}") from e


-def percent_to_position(value: Any) -> int:
+def percent_to_position(value):
    value = cv.possibly_negative_percentage(value)
    return (RESOLUTION + round(value * RESOLUTION)) % RESOLUTION


-def position(min: int = -MAX_POSITION, max: int = MAX_POSITION) -> Callable[[Any], Any]:
+def position(min=-MAX_POSITION, max=MAX_POSITION):
    """Validate that the config option is a position.
    Accepts integers, degrees, or percentage (of 360 degrees).
    """

-    def validator(value: Any) -> int:
+    def validator(value):
        if isinstance(value, str) and value.endswith("%"):
            value = percent_to_position(value)

@@ -116,7 +112,7 @@ def position(min: int = -MAX_POSITION, max: int = MAX_POSITION) -> Callable[[Any
    return validator


-def position_range() -> Callable[[Any], Any]:
+def position_range():
    """Validate that value given is a valid range for the device.
    A valid range is one of the following:
    - a value of 0 (meaning full range)
@@ -133,7 +129,7 @@ def position_range() -> Callable[[Any], Any]:
        zero_validator,
    )

-    def validator(value: Any) -> Any:
+    def validator(value):
        is_negative_str = isinstance(value, str) and value.startswith("-")
        is_negative_num = isinstance(value, (float, int)) and value < 0
        if is_negative_str or is_negative_num:
@@ -143,13 +139,13 @@ def position_range() -> Callable[[Any], Any]:
    return validator


-def has_valid_range_config() -> Callable[[ConfigType], ConfigType]:
+def has_valid_range_config():
    """Validate that that the config start + end position results in a valid
    positional range, which must be >= 18degrees
    """
    range_validator = position_range()

-    def validator(config: ConfigType) -> ConfigType:
+    def validator(config):
        # if we don't have an end position, then there is nothing to do
        if CONF_END_POSITION not in config:
            return config
@@ -207,7 +203,7 @@ CONFIG_SCHEMA = cv.All(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await i2c.register_i2c_device(var, config)
@@ -11,7 +11,6 @@ from esphome.const import (
    ICON_ROTATE_RIGHT,
    STATE_CLASS_MEASUREMENT,
 )
-from esphome.types import ConfigType

 from .. import AS5600Component, as5600_ns

@@ -78,7 +77,7 @@ CONFIG_SCHEMA = (
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_parented(var, config[CONF_AS5600_ID])
    await cg.register_component(var, config)
@@ -4,9 +4,6 @@ import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
 from esphome.const import CONF_FREQUENCY, CONF_ID
-from esphome.core import ID
-from esphome.cpp_generator import MockObj, TemplateArgsType
-from esphome.types import ConfigType

 CODEOWNERS = ["@X-Ryl669"]
 DEPENDENCIES = ["i2c"]
@@ -73,7 +70,7 @@ CONFIG_SCHEMA = cv.All(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await i2c.register_i2c_device(var, config)
@@ -94,12 +91,7 @@ AT581XSettingsAction = at581x_ns.class_("AT581XSettingsAction", automation.Actio
    ),
    synchronous=True,
 )
-async def at581x_reset_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def at581x_reset_to_code(config, action_id, template_arg, args):
    var = cg.new_Pvariable(action_id, template_arg)
    await cg.register_parented(var, config[CONF_ID])

@@ -171,12 +163,7 @@ RADAR_SETTINGS_SCHEMA = cv.Schema(
    RADAR_SETTINGS_SCHEMA,
    synchronous=True,
 )
-async def at581x_settings_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def at581x_settings_to_code(config, action_id, template_arg, args):
    var = cg.new_Pvariable(action_id, template_arg)
    await cg.register_parented(var, config[CONF_ID])

@@ -2,7 +2,6 @@ import esphome.codegen as cg
 from esphome.components import switch
 import esphome.config_validation as cv
 from esphome.const import DEVICE_CLASS_SWITCH, ICON_WIFI
-from esphome.types import ConfigType

 from .. import CONF_AT581X_ID, AT581XComponent, at581x_ns

@@ -23,7 +22,7 @@ CONFIG_SCHEMA = switch.switch_schema(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    at581x_component = await cg.get_variable(config[CONF_AT581X_ID])
    s = await switch.new_switch(config)
    await cg.register_parented(s, config[CONF_AT581X_ID])
@@ -2,7 +2,6 @@ import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, ENTITY_CATEGORY_CONFIG, ICON_SCALE
-from esphome.types import ConfigType

 from .. import atm90e32_ns
 from ..sensor import ATM90E32Component
@@ -68,7 +67,7 @@ CONFIG_SCHEMA = {
 }


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    parent = await cg.get_variable(config[CONF_ID])

    if run_gain := config.get(CONF_RUN_GAIN_CALIBRATION):
@@ -15,7 +15,6 @@ from esphome.const import (
    UNIT_AMPERE,
    UNIT_VOLT,
 )
-from esphome.types import ConfigType

 from .. import atm90e32_ns
 from ..sensor import ATM90E32Component
@@ -91,7 +90,7 @@ CONFIG_SCHEMA = cv.Schema(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    parent = await cg.get_variable(config[CONF_ID])

    if voltage_cfg := config.get(CONF_REFERENCE_VOLTAGE):
@@ -41,7 +41,6 @@ from esphome.const import (
    UNIT_WATT,
    UNIT_WATT_HOURS,
 )
-from esphome.types import ConfigType

 from . import atm90e32_ns

@@ -192,7 +191,7 @@ CONFIG_SCHEMA = (
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    cg.add(var.set_instance_id(str(config[CONF_ID])))
    await cg.register_component(var, config)
@@ -2,7 +2,6 @@ import esphome.codegen as cg
 from esphome.components import text_sensor
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PHASE_A, CONF_PHASE_B, CONF_PHASE_C
-from esphome.types import ConfigType

 from ..sensor import ATM90E32Component

@@ -35,7 +34,7 @@ CONFIG_SCHEMA = cv.Schema(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    parent = await cg.get_variable(config[CONF_ID])

    if phase_cfg := config.get(CONF_PHASE_STATUS):
@@ -1,6 +1,4 @@
-from collections.abc import Callable
 from dataclasses import dataclass, field
-from typing import Any

 import esphome.codegen as cg
 from esphome.components.esp32 import (
@@ -17,7 +15,6 @@ from esphome.const import (
 )
 from esphome.core import CORE
 import esphome.final_validate as fv
-from esphome.types import ConfigType

 AUTO_LOAD = ["ring_buffer"]
 CODEOWNERS = ["@kahrendt"]
@@ -128,10 +125,10 @@ CONF_THREADSAFE = "threadsafe"
 _MEMORY_LOCATION_VALIDATOR = cv.one_of(*MEMORY_LOCATIONS, lower=True)


-def _maybe_empty_codec(schema: cv.Schema) -> Callable[[Any], Any]:
+def _maybe_empty_codec(schema):
    """Wrap a codec dict schema so that a bare key (None value) is treated as an empty dict."""

-    def validator(value: Any) -> Any:
+    def validator(value):
        if value is None:
            value = {}
        return schema(value)
@@ -203,14 +200,14 @@ def set_stream_limits(
    max_channels: int = cv.UNDEFINED,
    min_sample_rate: int = cv.UNDEFINED,
    max_sample_rate: int = cv.UNDEFINED,
-) -> Callable[[ConfigType], None]:
+):
    """Sets the limits for the audio stream that audio component can handle

    When the component sinks audio (e.g., a speaker), these indicate the limits to the audio it can receive.
    When the component sources audio (e.g., a microphone), these indicate the limits to the audio it can send.
    """

-    def set_limits_in_config(config: ConfigType) -> None:
+    def set_limits_in_config(config):
        if min_bits_per_sample is not cv.UNDEFINED:
            config[CONF_MIN_BITS_PER_SAMPLE] = min_bits_per_sample
        if max_bits_per_sample is not cv.UNDEFINED:
@@ -236,7 +233,7 @@ def final_validate_audio_schema(
    sample_rate: int = cv.UNDEFINED,
    enabled_channels: list[int] = cv.UNDEFINED,
    audio_device_issue: bool = False,
-) -> cv.Schema:
+):
    """Validates audio compatibility when passed between different components.

    The component derived from ``AUDIO_COMPONENT_SCHEMA`` should call ``set_stream_limits`` in a validator to specify its compatible settings
@@ -254,7 +251,7 @@ def final_validate_audio_schema(
        audio_device_issue (bool, optional): Format the error message to indicate the problem is in the configuration for the ``audio_device`` component. Defaults to False.
    """

-    def validate_audio_compatiblity(audio_config: ConfigType) -> ConfigType:
+    def validate_audio_compatiblity(audio_config):
        audio_schema = {}

        if bits_per_sample is not cv.UNDEFINED:
@@ -332,7 +329,7 @@ def _emit_memory_pair(value: str | None, psram_key: str, internal_key: str) -> N
        add_idf_sdkconfig_option(internal_key, True)


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    # Re-enable ESP-IDF's HTTP client (excluded by default to save compile time)
    include_builtin_idf_component("esp_http_client")

@@ -374,7 +371,7 @@ async def to_code(config: ConfigType) -> None:
            data.wav_support = True

    if data.micro_decoder_support:
-        add_idf_component(name="esphome/micro-decoder", ref="0.4.0")
+        add_idf_component(name="esphome/micro-decoder", ref="0.2.0")

        # All codecs are enabled by default in micro-decoder, so disable the ones that aren't requested to save flash
        if not data.flac_support:
@@ -383,8 +380,6 @@ async def to_code(config: ConfigType) -> None:
            add_idf_sdkconfig_option("CONFIG_MICRO_DECODER_CODEC_MP3", False)
        if not data.opus_support:
            add_idf_sdkconfig_option("CONFIG_MICRO_DECODER_CODEC_OPUS", False)
-        # Vorbis is unsupported in ESPHome, so always disable it
-        add_idf_sdkconfig_option("CONFIG_MICRO_DECODER_CODEC_VORBIS", False)
        if not data.wav_support:
            add_idf_sdkconfig_option("CONFIG_MICRO_DECODER_CODEC_WAV", False)

@@ -86,7 +86,7 @@ AudioFileType detect_audio_file_type(const char *content_type, const char *url)
    // Match "audio/ogg" with a codecs parameter containing "opus"
    // Valid forms: audio/ogg;codecs=opus, audio/ogg; codecs="opus", etc.
    // Plain "audio/ogg" without opus is not matched (almost always Ogg Vorbis)
-    if (strncasecmp(content_type, "audio/ogg", 9) == 0 && str_contains_ignore_case(content_type + 9, "opus")) {
+    if (strncasecmp(content_type, "audio/ogg", 9) == 0 && strcasestr(content_type + 9, "opus") != nullptr) {
      return AudioFileType::OPUS;
    }
 #endif
@@ -2,9 +2,7 @@ from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_MIC_GAIN
-from esphome.core import ID, CoroPriority, coroutine_with_priority
-from esphome.cpp_generator import MockObj, TemplateArgsType
-from esphome.types import ConfigType
+from esphome.core import CoroPriority, coroutine_with_priority

 CODEOWNERS = ["@kbx81"]
 IS_PLATFORM_COMPONENT = True
@@ -30,12 +28,7 @@ SET_MIC_GAIN_ACTION_SCHEMA = cv.maybe_simple_value(
    SET_MIC_GAIN_ACTION_SCHEMA,
    synchronous=True,
 )
-async def audio_adc_set_mic_gain_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def audio_adc_set_mic_gain_to_code(config, action_id, template_arg, args):
    paren = await cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, paren)

@@ -46,6 +39,6 @@ async def audio_adc_set_mic_gain_to_code(


@coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    cg.add_define("USE_AUDIO_ADC")
    cg.add_global(audio_adc_ns.using)
@@ -3,9 +3,7 @@ from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_VOLUME
-from esphome.core import ID, CoroPriority, coroutine_with_priority
-from esphome.cpp_generator import MockObj, TemplateArgsType
-from esphome.types import ConfigType
+from esphome.core import CoroPriority, coroutine_with_priority

 CODEOWNERS = ["@kbx81"]
 IS_PLATFORM_COMPONENT = True
@@ -39,12 +37,7 @@ SET_VOLUME_ACTION_SCHEMA = cv.maybe_simple_value(
@automation.register_action(
    "audio_dac.mute_on", MuteOnAction, MUTE_ACTION_SCHEMA, synchronous=True
 )
-async def audio_dac_mute_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def audio_dac_mute_action_to_code(config, action_id, template_arg, args):
    paren = await cg.get_variable(config[CONF_ID])
    return cg.new_Pvariable(action_id, template_arg, paren)

@@ -55,12 +48,7 @@ async def audio_dac_mute_action_to_code(
    SET_VOLUME_ACTION_SCHEMA,
    synchronous=True,
 )
-async def audio_dac_set_volume_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def audio_dac_set_volume_to_code(config, action_id, template_arg, args):
    paren = await cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, paren)

@@ -71,6 +59,6 @@ async def audio_dac_set_volume_to_code(


@coroutine_with_priority(CoroPriority.CORE)
-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    cg.add_define("USE_AUDIO_DAC")
    cg.add_global(audio_dac_ns.using)
@@ -2,8 +2,6 @@ import esphome.codegen as cg
 from esphome.components import ble_client, time
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_RECEIVE_TIMEOUT, CONF_TIME_ID
-from esphome.cpp_generator import MockObj
-from esphome.types import ConfigType

 CODEOWNERS = ["@jhansche"]
 DEPENDENCIES = ["ble_client"]
@@ -34,12 +32,12 @@ BEDJET_CLIENT_SCHEMA = cv.Schema(
 )


-async def register_bedjet_child(var: MockObj, config: ConfigType) -> None:
+async def register_bedjet_child(var, config):
    parent = await cg.get_variable(config[CONF_BEDJET_ID])
    cg.add(parent.register_child(var))


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await ble_client.register_ble_node(var, config)
@@ -2,7 +2,6 @@ import esphome.codegen as cg
 from esphome.components import climate
 import esphome.config_validation as cv
 from esphome.const import CONF_HEAT_MODE, CONF_TEMPERATURE_SOURCE
-from esphome.types import ConfigType

 from .. import BEDJET_CLIENT_SCHEMA, bedjet_ns, register_bedjet_child

@@ -38,7 +37,7 @@ CONFIG_SCHEMA = (
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = await climate.new_climate(config)
    await cg.register_component(var, config)
    await register_bedjet_child(var, config)
@@ -1,7 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import fan
 import esphome.config_validation as cv
-from esphome.types import ConfigType

 from .. import BEDJET_CLIENT_SCHEMA, bedjet_ns, register_bedjet_child

@@ -17,7 +16,7 @@ CONFIG_SCHEMA = (
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = await fan.new_fan(config)
    await cg.register_component(var, config)
    await register_bedjet_child(var, config)
@@ -9,7 +9,6 @@ from esphome.const import (
    STATE_CLASS_MEASUREMENT,
    UNIT_CELSIUS,
 )
-from esphome.types import ConfigType

 from .. import BEDJET_CLIENT_SCHEMA, bedjet_ns, register_bedjet_child

@@ -39,7 +38,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(BEDJET_CLIENT_SCHEMA)


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await register_bedjet_child(var, config)
@@ -300,12 +300,46 @@ void BekenSPILEDStripLightOutput::write_state(light::LightState *state) {
 }

 light::ESPColorView BekenSPILEDStripLightOutput::get_view_internal(int32_t index) const {
-  const light::ChannelColors &colors = this->channel_colors_;
-  uint8_t *led = this->buf_ + (index * colors.bytes_per_led());
-  return {led + colors.r,
-          led + colors.g,
-          led + colors.b,
-          colors.has_white() ? led + colors.w : nullptr,
+  int32_t r = 0, g = 0, b = 0;
+  switch (this->rgb_order_) {
+    case ORDER_RGB:
+      r = 0;
+      g = 1;
+      b = 2;
+      break;
+    case ORDER_RBG:
+      r = 0;
+      g = 2;
+      b = 1;
+      break;
+    case ORDER_GRB:
+      r = 1;
+      g = 0;
+      b = 2;
+      break;
+    case ORDER_GBR:
+      r = 2;
+      g = 0;
+      b = 1;
+      break;
+    case ORDER_BGR:
+      r = 2;
+      g = 1;
+      b = 0;
+      break;
+    case ORDER_BRG:
+      r = 1;
+      g = 2;
+      b = 0;
+      break;
+  }
+  uint8_t multiplier = this->is_rgbw_ || this->is_wrgb_ ? 4 : 3;
+  uint8_t white = this->is_wrgb_ ? 0 : 3;
+
+  return {this->buf_ + (index * multiplier) + r + this->is_wrgb_,
+          this->buf_ + (index * multiplier) + g + this->is_wrgb_,
+          this->buf_ + (index * multiplier) + b + this->is_wrgb_,
+          this->is_rgbw_ || this->is_wrgb_ ? this->buf_ + (index * multiplier) + white : nullptr,
          &this->effect_data_[index],
          &this->correction_};
 }
@@ -315,12 +349,35 @@ void BekenSPILEDStripLightOutput::dump_config() {
                "Beken SPI LED Strip:\n"
                "  Pin: %u",
                this->pin_);
-  char channel_colors[5];
+  const char *rgb_order;
+  switch (this->rgb_order_) {
+    case ORDER_RGB:
+      rgb_order = "RGB";
+      break;
+    case ORDER_RBG:
+      rgb_order = "RBG";
+      break;
+    case ORDER_GRB:
+      rgb_order = "GRB";
+      break;
+    case ORDER_GBR:
+      rgb_order = "GBR";
+      break;
+    case ORDER_BGR:
+      rgb_order = "BGR";
+      break;
+    case ORDER_BRG:
+      rgb_order = "BRG";
+      break;
+    default:
+      rgb_order = "UNKNOWN";
+      break;
+  }
  ESP_LOGCONFIG(TAG,
-                "  Channel colors: %s\n"
+                "  RGB Order: %s\n"
                "  Max refresh rate: %" PRIu32 "\n"
                "  Number of LEDs: %u",
-                this->channel_colors_.to_string(channel_colors), this->max_refresh_rate_.value_or(0), this->num_leds_);
+                rgb_order, this->max_refresh_rate_.value_or(0), this->num_leds_);
 }

 float BekenSPILEDStripLightOutput::get_setup_priority() const { return setup_priority::HARDWARE; }
@@ -3,7 +3,6 @@
 #ifdef USE_BK72XX

 #include "esphome/components/light/addressable_light.h"
-#include "esphome/components/light/channel_colors.h"
 #include "esphome/components/light/light_output.h"
 #include "esphome/core/color.h"
 #include "esphome/core/component.h"
@@ -11,6 +10,15 @@

 namespace esphome::beken_spi_led_strip {

+enum RGBOrder : uint8_t {
+  ORDER_RGB,
+  ORDER_RBG,
+  ORDER_GRB,
+  ORDER_GBR,
+  ORDER_BGR,
+  ORDER_BRG,
+};
+
 class BekenSPILEDStripLightOutput final : public light::AddressableLight {
 public:
  void setup() override;
@@ -20,7 +28,7 @@ class BekenSPILEDStripLightOutput final : public light::AddressableLight {
  int32_t size() const override { return this->num_leds_; }
  light::LightTraits get_traits() override {
    auto traits = light::LightTraits();
-    if (this->channel_colors_.has_white()) {
+    if (this->is_rgbw_ || this->is_wrgb_) {
      traits.set_supported_color_modes({light::ColorMode::RGB_WHITE, light::ColorMode::WHITE});
    } else {
      traits.set_supported_color_modes({light::ColorMode::RGB});
@@ -30,13 +38,16 @@ class BekenSPILEDStripLightOutput final : public light::AddressableLight {

  void set_pin(uint8_t pin) { this->pin_ = pin; }
  void set_num_leds(uint16_t num_leds) { this->num_leds_ = num_leds; }
-  void set_channel_colors(light::ChannelColors channel_colors) { this->channel_colors_ = channel_colors; }
+  void set_is_rgbw(bool is_rgbw) { this->is_rgbw_ = is_rgbw; }
+  void set_is_wrgb(bool is_wrgb) { this->is_wrgb_ = is_wrgb; }

  /// Set a maximum refresh rate in µs as some lights do not like being updated too often.
  void set_max_refresh_rate(uint32_t interval_us) { this->max_refresh_rate_ = interval_us; }

  void set_led_params(uint8_t bit0, uint8_t bit1, uint32_t spi_frequency);

+  void set_rgb_order(RGBOrder rgb_order) { this->rgb_order_ = rgb_order; }
+
  void clear_effect_data() override {
    for (int i = 0; i < this->size(); i++)
      this->effect_data_[i] = 0;
@@ -47,7 +58,7 @@ class BekenSPILEDStripLightOutput final : public light::AddressableLight {
 protected:
  light::ESPColorView get_view_internal(int32_t index) const override;

-  size_t get_buffer_size_() const { return this->num_leds_ * this->channel_colors_.bytes_per_led(); }
+  size_t get_buffer_size_() const { return this->num_leds_ * (this->is_rgbw_ || this->is_wrgb_ ? 4 : 3); }

  uint8_t *buf_{nullptr};
  uint8_t *effect_data_{nullptr};
@@ -55,11 +66,13 @@ class BekenSPILEDStripLightOutput final : public light::AddressableLight {

  uint8_t pin_;
  uint16_t num_leds_;
+  bool is_rgbw_;
+  bool is_wrgb_;

  uint32_t spi_frequency_{6666666};
  uint8_t bit0_{0xE0};
  uint8_t bit1_{0xFC};
-  light::ChannelColors channel_colors_{0, 1, 2, light::ChannelColors::NO_WHITE};
+  RGBOrder rgb_order_;

  uint32_t last_refresh_{0};
  optional<uint32_t> max_refresh_rate_{};
@@ -3,7 +3,6 @@ from dataclasses import dataclass
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components import libretiny, light
-from esphome.components.const import CONF_CHANNEL_COLORS, CONF_IS_WRGB
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_CHIPSET,
@@ -14,7 +13,6 @@ from esphome.const import (
    CONF_PIN,
    CONF_RGB_ORDER,
 )
-from esphome.types import ConfigType

 CODEOWNERS = ["@Mat931"]
 DEPENDENCIES = ["libretiny"]
@@ -24,6 +22,17 @@ BekenSPILEDStripLightOutput = beken_spi_led_strip_ns.class_(
    "BekenSPILEDStripLightOutput", light.AddressableLight
 )

+RGBOrder = beken_spi_led_strip_ns.enum("RGBOrder")
+
+RGB_ORDERS = {
+    "RGB": RGBOrder.ORDER_RGB,
+    "RBG": RGBOrder.ORDER_RBG,
+    "GRB": RGBOrder.ORDER_GRB,
+    "GBR": RGBOrder.ORDER_GBR,
+    "BGR": RGBOrder.ORDER_BGR,
+    "BRG": RGBOrder.ORDER_BRG,
+}
+

@dataclass
 class LEDStripTimings:
@@ -48,6 +57,8 @@ CHIPSETS = {
 }


+CONF_IS_WRGB = "is_wrgb"
+
 SUPPORTED_PINS = {
    libretiny.const.FAMILY_BK7231N: [16],
    libretiny.const.FAMILY_BK7231T: [16],
@@ -68,9 +79,10 @@ def _validate_pin(value):
    return value


-def _validate_num_leds(value: ConfigType) -> ConfigType:
-    # A white channel makes each LED one byte wider, so fewer of them fit in the DMA buffer.
-    max_num_leds = 123 if "W" in value[CONF_CHANNEL_COLORS] else 165  # 127 / 170
+def _validate_num_leds(value):
+    max_num_leds = 165  # 170
+    if value[CONF_IS_RGBW] or value[CONF_IS_WRGB]:
+        max_num_leds = 123  # 127
    if value[CONF_NUM_LEDS] > max_num_leds:
        raise cv.Invalid(
            f"The maximum number of LEDs for this configuration is {max_num_leds}.",
@@ -87,23 +99,18 @@ CONFIG_SCHEMA = cv.All(
                pins.internal_gpio_output_pin_number, _validate_pin
            ),
            cv.Required(CONF_NUM_LEDS): cv.positive_not_null_int,
-            cv.Optional(CONF_CHANNEL_COLORS): light.validate_channel_colors,
-            # Deprecated in favour of CONF_CHANNEL_COLORS, remove in 2027.3.0
-            cv.Optional(CONF_RGB_ORDER): cv.one_of(*light.RGB_ORDERS, upper=True),
-            cv.Optional(CONF_IS_RGBW): cv.boolean,
-            cv.Optional(CONF_IS_WRGB): cv.boolean,
+            cv.Required(CONF_RGB_ORDER): cv.enum(RGB_ORDERS, upper=True),
            cv.Optional(CONF_MAX_REFRESH_RATE): cv.positive_time_period_microseconds,
            cv.Required(CONF_CHIPSET): cv.one_of(*CHIPSETS, upper=True),
+            cv.Optional(CONF_IS_RGBW, default=False): cv.boolean,
+            cv.Optional(CONF_IS_WRGB, default=False): cv.boolean,
        }
    ),
-    light.migrate_channel_colors(
-        removed_in="2027.3.0", component="beken_spi_led_strip"
-    ),
    _validate_num_leds,
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
    await light.register_light(var, config)
    await cg.register_component(var, config)
@@ -123,6 +130,6 @@ async def to_code(config: ConfigType) -> None:
        )
    )

-    cg.add(
-        var.set_channel_colors(light.channel_colors_struct(config[CONF_CHANNEL_COLORS]))
-    )
+    cg.add(var.set_rgb_order(config[CONF_RGB_ORDER]))
+    cg.add(var.set_is_rgbw(config[CONF_IS_RGBW]))
+    cg.add(var.set_is_wrgb(config[CONF_IS_WRGB]))
@@ -5,7 +5,6 @@ from esphome.automation import Condition, maybe_simple_id
 import esphome.codegen as cg
 from esphome.components import mqtt, web_server, zigbee
 from esphome.components.const import CONF_ON_STATE_CHANGE
-from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_DELAY,
@@ -561,11 +560,6 @@ _CALLBACK_AUTOMATIONS = (
 async def _build_binary_sensor_automations(var, config):
    await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)

-    if config.get(CONF_ON_CLICK) or config.get(CONF_ON_DOUBLE_CLICK):
-        cg.add_define("USE_BINARY_SENSOR_CLICK_TRIGGER")
-    if config.get(CONF_ON_MULTI_CLICK):
-        cg.add_define("USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER")
-
    for conf in config.get(CONF_ON_CLICK, []):
        trigger = cg.new_Pvariable(
            conf[CONF_TRIGGER_ID], var, conf[CONF_MIN_LENGTH], conf[CONF_MAX_LENGTH]
@@ -679,15 +673,3 @@ async def to_code(config):
 async def binary_sensor_invalidate_state_to_code(config, action_id, template_arg, args):
    paren = await cg.get_variable(config[CONF_ID])
    return cg.new_Pvariable(action_id, template_arg, paren)
-
-
-# automation.cpp only implements the click/double_click/multi_click triggers
-FILTER_SOURCE_FILES = filter_source_files_from_defines(
-    {
-        "automation.cpp": (
-            "USE_BINARY_SENSOR_CLICK_TRIGGER",
-            "USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER",
-        ),
-        "filter.cpp": "USE_BINARY_SENSOR_FILTER",
-    }
-)
@@ -1,13 +1,8 @@
-#include "esphome/core/defines.h"
-#if defined(USE_BINARY_SENSOR_CLICK_TRIGGER) || defined(USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER)
-
 #include "automation.h"
 #include "esphome/core/log.h"

 namespace esphome::binary_sensor {

-#ifdef USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER
-
 static const char *const TAG = "binary_sensor.automation";

 // MultiClickTrigger timeout IDs.
@@ -125,9 +120,6 @@ void MultiClickTriggerBase::trigger_() {
  this->trigger();
 }

-#endif  // USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER
-
-#ifdef USE_BINARY_SENSOR_CLICK_TRIGGER
 bool match_interval(uint32_t min_length, uint32_t max_length, uint32_t length) {
  if (max_length == 0) {
    return length >= min_length;
@@ -135,8 +127,4 @@ bool match_interval(uint32_t min_length, uint32_t max_length, uint32_t length) {
    return length >= min_length && length <= max_length;
  }
 }
-#endif  // USE_BINARY_SENSOR_CLICK_TRIGGER
-
 }  // namespace esphome::binary_sensor
-
-#endif  // USE_BINARY_SENSOR_CLICK_TRIGGER || USE_BINARY_SENSOR_MULTI_CLICK_TRIGGER
@@ -4,15 +4,12 @@ The platform analog of esp32_ble / rp2040_ble: owns the Beken BDK BLE stack
 bring-up and the controller BLE address. Consumers (bk72xx_ble_tracker) build
 on this component and contain no SDK calls of their own.

-Supported SoCs (BLE 5.x): BK7231N/BK7236 (BLE 5.1), BK7252N/BK7253 (BLE 5.2),
-and any future BLE-5.x SoC. BK7238 (BLE 5.2) is blocked for now: with BLE
-compiled in, the Beken SDK erases the bootloader flash sector at boot because
-LibreTiny's partition table has no BLE bonding entry (esphome#18646,
-libretiny-eu/libretiny#408). Known non-5.x families and BK7238 are rejected in
-to_code. Unknown families are capability-checked at compile time via
-`__has_include("app_ble.h")`, a header only on the BLE 5.x include path
-(ble_api.h ships for every SoC, so it cannot be the probe). A non-5.x build
-fails with a clear #error.
+Supported SoCs (BLE 5.x): BK7231N/BK7236 (BLE 5.1), BK7238/BK7252N/BK7253
+(BLE 5.2), and any future BLE-5.x SoC. Capability is detected at compile time,
+not by a chip list: the C++ guards on `__has_include("ble_api.h")` — the Beken
+BLE 5.x public API header, which the LibreTiny beken-72xx builder ships only
+for BLE-5.x SoCs. BK7231T/BK7251/BK7271 (BLE 4.2) and BK7231Q (no BLE) fail
+with a clear #error.

 No framework patch is needed: the LibreTiny beken-72xx builder already compiles
 and links the BLE 5.x stack (CFG_SUPPORT_BLE=1 + CFG_BLE_VERSION=BLE_VERSION_5_x;
@@ -24,16 +21,9 @@ import logging

 import esphome.codegen as cg
 from esphome.components import libretiny
-from esphome.components.libretiny.const import (
-    FAMILY_BK7231N,
-    FAMILY_BK7231Q,
-    FAMILY_BK7231T,
-    FAMILY_BK7238,
-    FAMILY_BK7251,
-)
+from esphome.components.libretiny.const import FAMILY_BK7231N, FAMILY_BK7238
 import esphome.config_validation as cv
 from esphome.const import CONF_ENABLE_ON_BOOT, CONF_ID
-from esphome.core import EsphomeError
 from esphome.types import ConfigType

 DEPENDENCIES = ["bk72xx"]
@@ -60,39 +50,7 @@ CONFIG_SCHEMA = cv.Schema(
 request_scan_listener_slot = cg.slot_counter("BK72XX_BLE_SCAN_LISTENER_COUNT")


-def _unsupported_family_message(family: str) -> str | None:
-    if family in (FAMILY_BK7231T, FAMILY_BK7251):
-        return (
-            f"bk72xx_ble does not support {family}: this SoC has the Beken BLE 4.2 "
-            "stack; a BLE 5.x SoC such as BK7231N or BK7238 is required"
-        )
-    if family == FAMILY_BK7231Q:
-        return "bk72xx_ble does not support BK7231Q: this SoC has no BLE"
-    if family == FAMILY_BK7238:
-        return (
-            "bk72xx_ble is disabled on BK7238: with BLE compiled in, the Beken SDK "
-            "erases the bootloader flash sector at boot and the device can no longer "
-            "start (see https://github.com/esphome/esphome/issues/18646); support "
-            "returns once the LibreTiny partition table fix "
-            "(libretiny-eu/libretiny#408) is released"
-        )
-    return None
-
-
-def _final_validate(config: ConfigType) -> None:
-    # Warn only: a hard error here would break the validate-only CI fixtures,
-    # which run on a BLE 4.2 board. The hard error is raised at codegen.
-    if msg := _unsupported_family_message(libretiny.get_libretiny_family()):
-        _LOGGER.warning("%s (this configuration cannot compile)", msg)
-
-
-FINAL_VALIDATE_SCHEMA = _final_validate
-
-
 async def to_code(config: ConfigType) -> None:
-    if msg := _unsupported_family_message(libretiny.get_libretiny_family()):
-        raise EsphomeError(msg)
-
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)

@@ -124,7 +82,18 @@ async def to_code(config: ConfigType) -> None:
    # BK7231N, but NOT on BK7238 (its BLE stack has no such symbol; the address is
    # derived from the WiFi MAC instead — the BDK's own fallback). Tell the C++
    # which path is available so it doesn't reference a missing symbol.
-    if libretiny.get_libretiny_family() == FAMILY_BK7231N:
+    family = libretiny.get_libretiny_family()
+    if family == FAMILY_BK7231N:
        cg.add_define("BK72XX_BLE_HAS_COMMON_BDADDR")
+    elif family == FAMILY_BK7238:
+        # ESPHome's LibreTiny disables BLE on BK7238 because the SDK can hang at
+        # WiFi STA startup when BLE init runs. This component re-enables BLE, so
+        # warn loudly: BK7238 is accepted but not hardware-verified and may be
+        # WiFi-unstable with BLE on.
+        _LOGGER.warning(
+            "bk72xx_ble on BK7238: enabling BLE is known to risk a WiFi STA startup "
+            "hang on this family and is not yet hardware-verified. Expect possible "
+            "instability."
+        )

    cg.add_define("USE_BK72XX_BLE")
@@ -1,119 +0,0 @@
-// Every SDK call the scan reconciler makes. The BDK's own start hardcodes
-// passive (the active bit is commented out in both stacks), so
-// bdk_scan_start() packs the GAPM_ACTIVITY_START_CMD itself, field-for-field
-// the SDK's app_ble_start_scaning() except that prop takes the mode, armed
-// through the SDK's own operation bookkeeping. The component pins
-// beken-bdk 3.0.78; the static asserts catch a layout change on a bump.
-
-#include "bdk_scan.h"
-
-#ifdef USE_BK72XX_BLE
-
-// Same SDK gate as bk72xx_ble.cpp (which carries the explanatory #error).
-#if !defined(CLANG_TIDY) && __has_include("ble_api.h") && __has_include("app_ble.h")
-
-extern "C" {
-#include "app_ble.h"     // app_ble_env, app_ble_run, app_ble_reset, actv_state_t,
-                         // app_ble_actv_state_get, app_ble_env_state_get,
-                         // app_ble_get_idle_actv_idx_handle, UNKNOW_ACT_IDX,
-                         // bk_ble_* (via ble_api_5_x.h)
-#include "kernel_msg.h"  // KERNEL_MSG_ALLOC, kernel_msg_send
-#if __has_include("gapm_msg.h")
-#include "gapm_msg.h"  // BLE 5.2 (BK7238/BK7252N): gapm_activity_start_cmd, GAPM_SCAN_*
-#else
-#include "gapm_task.h"  // BLE 5.1 (BK7231N/BK7236): same declarations, older header name
-#endif
-}
-
-#include "esphome/core/log.h"
-
-namespace esphome::bk72xx_ble {
-
-static const char *const TAG = "bk72xx_ble";
-
-// Pin the SDK surface this file depends on: a beken-bdk bump that moves these
-// must fail the build, not corrupt the kernel message.
-static_assert(GAPM_SCAN_PROP_PHY_1M_BIT == (1 << 0) && GAPM_SCAN_PROP_ACTIVE_1M_BIT == (1 << 2) &&
-                  sizeof(struct gapm_scan_param) == 16 && sizeof(struct gapm_scan_wd_op_param) == 4,
-              "beken-bdk GAPM scan layout changed; revalidate bdk_scan_start() "
-              "against the SDK's app_ble_start_scaning()");
-static_assert(INVALID_ACTIVITY_IDX == UNKNOW_ACT_IDX,
-              "beken-bdk activity sentinel changed; revalidate the scan reconciler");
-static_assert(GAPM_REPORT_TYPE_SCAN_RSP_EXT == 2 && GAPM_REPORT_TYPE_SCAN_RSP_LEG == 3 &&
-                  GAPM_REPORT_INFO_SCAN_ADV_BIT == (1 << 5),
-              "beken-bdk GAPM report info changed; revalidate the tracker's demux constants");
-
-bool bdk_scan_ready() { return app_ble_env_state_get() == APP_BLE_READY; }
-
-BdkActivityState bdk_scan_state(uint8_t activity_idx) {
-  if (activity_idx == INVALID_ACTIVITY_IDX)
-    return BdkActivityState::IDLE;
-  switch (app_ble_actv_state_get(activity_idx)) {
-    case ACTV_IDLE:
-      return BdkActivityState::IDLE;
-    case ACTV_SCAN_CREATED:
-      return BdkActivityState::CREATED;
-    case ACTV_SCAN_STARTED:
-      return BdkActivityState::STARTED;
-    default:
-      return BdkActivityState::OTHER;
-  }
-}
-
-uint8_t bdk_scan_acquire_activity() {
-  uint8_t idx = app_ble_get_idle_actv_idx_handle(SCAN_ACTV);
-  if (idx == INVALID_ACTIVITY_IDX)
-    ESP_LOGE(TAG, "Scan start failed: no idle activity handle");
-  return idx;
-}
-
-BdkOpResult bdk_scan_create(uint8_t activity_idx) {
-  ble_err_t ret = bk_ble_create_scaning(activity_idx, nullptr);
-  if (ret == ERR_SUCCESS)
-    return BdkOpResult::OK;
-  if (ret == ERR_BLE_STATUS)
-    return BdkOpResult::BUSY;
-  ESP_LOGE(TAG, "Scan activity create failed (err %d)", static_cast<int>(ret));
-  return BdkOpResult::FAILED;
-}
-
-BdkOpResult bdk_scan_start(uint8_t activity_idx, uint16_t interval, uint16_t window, bool active) {
-  app_ble_run(activity_idx, BLE_START_SCAN, 1 << BLE_OP_START_SCAN_POS, nullptr);
-  struct gapm_activity_start_cmd *cmd =
-      KERNEL_MSG_ALLOC(GAPM_ACTIVITY_START_CMD, TASK_BLE_GAPM, TASK_BLE_APP, gapm_activity_start_cmd);
-  if (cmd == nullptr) {
-    app_ble_reset();  // the SDK's own failure path for an unsent operation
-    ESP_LOGE(TAG, "Scan start failed: kernel message allocation");
-    return BdkOpResult::FAILED;
-  }
-  cmd->operation = GAPM_START_ACTIVITY;
-  cmd->actv_idx = app_ble_env.actvs[activity_idx].gap_advt_idx;
-  cmd->u_param.scan_param.type = GAPM_SCAN_TYPE_OBSERVER;
-  cmd->u_param.scan_param.prop = GAPM_SCAN_PROP_PHY_1M_BIT | (active ? GAPM_SCAN_PROP_ACTIVE_1M_BIT : 0);
-  cmd->u_param.scan_param.scan_param_1m.scan_intv = interval;
-  cmd->u_param.scan_param.scan_param_1m.scan_wd = window;
-  cmd->u_param.scan_param.scan_param_coded.scan_intv = 0;
-  cmd->u_param.scan_param.scan_param_coded.scan_wd = 0;
-  cmd->u_param.scan_param.dup_filt_pol = 0;
-  cmd->u_param.scan_param.rsvd = 0;
-  cmd->u_param.scan_param.duration = 0;  // scan until stopped
-  cmd->u_param.scan_param.period = 10;   // matches the SDK's passive start
-  kernel_msg_send(cmd);
-  return BdkOpResult::OK;
-}
-
-BdkOpResult bdk_scan_release(uint8_t activity_idx, bool created, int *err_out) {
-  ble_err_t ret = created ? bk_ble_delete_scaning(activity_idx, nullptr) : bk_ble_scan_stop(activity_idx, nullptr);
-  *err_out = static_cast<int>(ret);
-  if (ret == ERR_SUCCESS)
-    return BdkOpResult::OK;
-  // DEBUG on purpose: the reconciler WARNs once per streak and the stuck
-  // ERROR carries this code — a per-retry ERROR would be unbounded.
-  ESP_LOGD(TAG, "Scan release %s (err %d)", ret == ERR_BLE_STATUS ? "rejected" : "failed", static_cast<int>(ret));
-  return ret == ERR_BLE_STATUS ? BdkOpResult::BUSY : BdkOpResult::FAILED;
-}
-
-}  // namespace esphome::bk72xx_ble
-
-#endif  // !CLANG_TIDY && ble_api.h && app_ble.h
-#endif  // USE_BK72XX_BLE
@@ -1,51 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-
-#ifdef USE_BK72XX_BLE
-
-#include <cstdint>
-
-namespace esphome::bk72xx_ble {
-
-/// Activity index value marking "no scan activity", the BDK's own convention
-/// (asserted against its symbol in bdk_scan.cpp).
-inline constexpr uint8_t INVALID_ACTIVITY_IDX = 0xFF;
-
-/// Scan-relevant controller activity states, read live from the SDK.
-enum class BdkActivityState : uint8_t {
-  IDLE,     ///< No activity (or one whose create failed).
-  CREATED,  ///< Created but not started.
-  STARTED,  ///< Scanning.
-  OTHER,    ///< A non-scan or transitional state; settles on a later read.
-};
-
-/// Outcome of a BDK scan operation request.
-enum class BdkOpResult : uint8_t {
-  OK,      ///< Accepted; completion is asynchronous.
-  BUSY,    ///< Another controller operation is in flight; retry later.
-  FAILED,  ///< Rejected.
-};
-
-/// True when no controller operation is in flight (APP_BLE_READY).
-bool bdk_scan_ready();
-/// Live state of the given activity; INVALID_ACTIVITY_IDX reads as IDLE.
-BdkActivityState bdk_scan_state(uint8_t activity_idx);
-/// Claim an idle activity slot; INVALID_ACTIVITY_IDX when none is free.
-uint8_t bdk_scan_acquire_activity();
-/// Create the scan activity (asynchronous); started once CREATED is observed.
-BdkOpResult bdk_scan_create(uint8_t activity_idx);
-/// Start a created activity: the packed GAPM start, taking the scan mode the
-/// BDK's own start path hardcodes away. Fire-and-forget; FAILED when the
-/// kernel message could not be allocated (the armed SDK operation is rolled
-/// back).
-BdkOpResult bdk_scan_start(uint8_t activity_idx, uint16_t interval, uint16_t window, bool active);
-/// Release the activity: delete when never started (a stop would be
-/// rejected), stop otherwise. BUSY on a transient rejection (retry), FAILED
-/// on any other error; err_out receives the SDK code (0 on success).
-/// Teardown is asynchronous — observe IDLE to confirm.
-BdkOpResult bdk_scan_release(uint8_t activity_idx, bool created, int *err_out);
-
-}  // namespace esphome::bk72xx_ble
-
-#endif  // USE_BK72XX_BLE
@@ -5,8 +5,7 @@
 // talks to the Beken BDK BLE stack:
 //   - one-time stack bring-up (ble_set_notice_cb() + ble_entry()),
 //   - the controller BLE address,
-//   - the scan reconciler (request, pacing, bring-up budget) over the
-//     bdk_scan surface,
+//   - the raw controller scan primitives (bk_ble_scan_start/stop),
 //   - the scan-report ring: the BDK notice callback (BLE task) takes a report
 //     from a fixed pool and pushes it on a lock-free SPSC queue; loop() drains,
 //     dispatches on the main task and returns reports to the pool — the same
@@ -21,39 +20,32 @@

 #include "bk72xx_ble.h"  // pulls esphome/core/defines.h for USE_BK72XX_BLE

-#include "bdk_scan.h"  // the raw BDK scan surface (state reads, starts, release)
-
 #ifdef USE_BK72XX_BLE

 #include <cstring>

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

 // ---------------------------------------------------------------------------
 // SDK-capability gate (not a chip allowlist).
-// This component drives the Beken BLE *5.x* controller. `ble_api.h` cannot be
-// the probe: it ships for every SoC (driver/include) and merely switches on
-// CFG_BLE_VERSION internally. `app_ble.h` is on the include path only when the
-// LibreTiny beken-72xx builder selects a 5.x stack, so gating on it supports
-// any BLE-5.x chip — present or future — without a hard-coded list, and a
-// non-5.x build fails here with a clear message instead of a cryptic
-// "app_ble.h: No such file or directory".
+// This component drives the Beken BLE *5.x* controller via its public API,
+// `ble_api.h`, which the LibreTiny beken-72xx builder ships only for the
+// BLE-5.x SoCs (it selects the `ble_pub` 5.x stack from CFG_BLE_VERSION; the
+// 4.2 SoCs build a different, older API with no ble_api.h). Gate on the header
+// itself so any BLE-5.x Beken chip — present or future — is supported without a
+// hard-coded list, and a non-5.x build fails here with a clear message instead
+// of a cryptic "ble_api.h: No such file or directory".
 // ---------------------------------------------------------------------------
 #if defined(CLANG_TIDY)
 // The clang-tidy environment does not carry the full Beken BDK BLE 5.x API
 // (its ble_api.h variant lacks parts of the 5.x surface), so there is nothing
 // accurate to analyze the SDK calls against — skip the file under analysis.
 #define BK72XX_BLE_NO_SDK
-#elif !__has_include("ble_api.h") || !__has_include("app_ble.h")
-// Also skip the SDK body: #error does not stop the preprocessor, and on a 4.2
-// SoC ble_api.h exists, so without the guard the 5.x symbols would fail one by
-// one and bury this message.
-#define BK72XX_BLE_NO_SDK
+#elif !__has_include("ble_api.h")
 #error \
-    "bk72xx_ble requires a BLE 5.x Beken SDK (app_ble.h). Supported SoCs: BK7231N/BK7236 (BLE 5.1) and BK7238/BK7252N/BK7253 (BLE 5.2). BK7231T/BK7251/BK7271 (BLE 4.2) and BK7231Q (no BLE) are not supported."
+    "bk72xx_ble requires a BLE 5.x Beken SDK (ble_api.h). Supported SoCs: BK7231N/BK7236 (BLE 5.1) and BK7238/BK7252N/BK7253 (BLE 5.2). BK7231T/BK7251/BK7271 (BLE 4.2) and BK7231Q (no BLE) are not supported."
 #endif

 #ifndef BK72XX_BLE_NO_SDK
@@ -65,8 +57,9 @@
 // are C headers consumed from C++ (a standard C-header-from-C++ pattern).
 // ---------------------------------------------------------------------------
 extern "C" {
-#include "ble_api.h"  // ble_set_notice_cb, recv_adv_t, ble_notice_t,
-                      // BLE_5_REPORT_ADV (scan primitives live in bdk_scan.cpp)
+#include "ble_api.h"  // bk_ble_scan_start/stop, ble_entry, ble_set_notice_cb,
+                      // app_ble_get_idle_actv_idx_handle, struct scan_param,
+                      // recv_adv_t, ble_notice_t, BLE_5_REPORT_ADV, SCAN_ACTV
 #ifdef BK72XX_BLE_HAS_COMMON_BDADDR
 #include "common_bt_defines.h"  // struct bd_addr
 // The controller's public BLE address, populated by the BDK during ble_entry().
@@ -83,12 +76,6 @@ namespace esphome::bk72xx_ble {

 static const char *const TAG = "bk72xx_ble";

-static constexpr uint32_t RECONCILE_RETRY_MS = 10;              // pump floor for fast loops
-static constexpr uint32_t RECONCILE_REJECTED_RETRY_MS = 500;    // retry gate after a rejected release
-static constexpr uint32_t RECONCILE_PENDING_TIMEOUT_MS = 2000;  // bring-up budget before FAILED
-static constexpr uint32_t SCAN_LIVENESS_CHECK_MS = 1000;        // settled-scan re-check cadence
-static constexpr uint32_t TEARDOWN_STUCK_ERROR_MS = 30000;      // stuck-teardown ERROR (stop also goes FAILED)
-
 // The BDK notice callback is a plain C function pointer with no user argument,
 // so it reaches the (single) component instance through a file-static pointer.
 static BK72xxBLE *s_ble = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -108,22 +95,21 @@ static void ble_notice_callback(ble_notice_t notice, void *param) {
  const recv_adv_t *info = reinterpret_cast<const recv_adv_t *>(param);
  // rssi is a signed dBm carried in a uint8_t; cast through int8_t (standard for
  // a signed dBm value packed in a uint8_t).
-  s_ble->enqueue_scan_report(info->adv_addr, static_cast<int8_t>(info->rssi), info->adv_addr_type,
-                             static_cast<uint8_t>(info->evt_type), info->data, info->data_len);
+  s_ble->enqueue_scan_report(info->adv_addr, static_cast<int8_t>(info->rssi), info->adv_addr_type, info->data,
+                             info->data_len);
 }

-void BK72xxBLE::enqueue_scan_report(const uint8_t *mac, int8_t rssi, uint8_t addr_type, uint8_t evt_type,
-                                    const uint8_t *data, uint16_t data_len) {
+void BK72xxBLE::enqueue_scan_report(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data,
+                                    uint16_t data_len) {
  BLEScanReport *report = this->report_pool_.allocate();
  if (report == nullptr) {
    // Pool exhausted — the queue is full; count and drop.
    this->report_queue_.increment_dropped_count();
    return;
  }
-  memcpy(report->mac, mac, MAC_ADDRESS_SIZE);
+  memcpy(report->mac, mac, 6);
  report->rssi = rssi;
  report->addr_type = addr_type;
-  report->evt_type = evt_type;
  report->data_len =
      (data_len <= sizeof(report->data)) ? static_cast<uint8_t>(data_len) : static_cast<uint8_t>(sizeof(report->data));
  memcpy(report->data, data, report->data_len);
@@ -137,9 +123,6 @@ void BK72xxBLE::enqueue_scan_report(const uint8_t *mac, int8_t rssi, uint8_t add

 void BK72xxBLE::setup() {
  s_ble = this;
-  // The report pool grows lazily on purpose: the BDK notice callback runs in
-  // task context (malloc-safe, unlike rp2040's IRQ path), and typical traffic
-  // stays far below the pool cap, so not warming contains RAM.
  // Resolve the MAC early so get_mac_lsb_first() is valid for consumers before
  // the stack is up (it is re-read once ble_entry() has run).
  this->resolve_mac_();
@@ -190,30 +173,6 @@ void BK72xxBLE::enable() {
 }

 void BK72xxBLE::loop() {
-  // Keep reconciling toward the requested scan state (e.g. complete a stop
-  // that arrived while a controller operation was in flight), and re-check a
-  // settled scan at low frequency: a controller-side drop re-enters the
-  // bring-up, and the budget's FAILED feeds the tracker's recovery.
-  // Keep driving until settled: any PENDING, plus a terminal stop whose slot
-  // must still be freed. A FAILED scan request is the one combination not
-  // re-driven here — that belongs to the tracker's backoff.
-  const uint32_t pump_now = App.get_loop_component_start_time();
-  if (this->last_result_ == ScanOpResult::PENDING ||
-      (!this->scan_wanted_ && this->last_result_ == ScanOpResult::FAILED)) {
-    const uint32_t gate = (this->release_warned_ || this->last_result_ == ScanOpResult::FAILED)
-                              ? RECONCILE_REJECTED_RETRY_MS
-                              : RECONCILE_RETRY_MS;
-    if (pump_now - this->last_advance_ms_ >= gate)
-      this->advance_();
-  } else if (this->scan_wanted_ && this->last_result_ == ScanOpResult::SETTLED &&
-             pump_now - this->last_advance_ms_ >= SCAN_LIVENESS_CHECK_MS) {
-    // Re-check a settled scan; scan_start() refills the bring-up budget.
-    // WARN: the only report of a drop that recovers inside its budget.
-    if (this->scan_start(this->requested_.interval, this->requested_.window, this->requested_.active) !=
-        ScanOpResult::SETTLED)
-      ESP_LOGW(TAG, "Controller dropped the scan; restarting");
-  }
-
  // Drain the lock-free ring filled by the BLE task; all per-report work runs
  // here on the main task, then the report returns to the pool.
  BLEScanReport *report = this->report_queue_.pop();
@@ -234,7 +193,7 @@ void BK72xxBLE::loop() {
    ESP_LOGW(TAG, "Dropped %u scan reports due to queue overflow", dropped);
 }

-void BK72xxBLE::get_mac_lsb_first(uint8_t out[MAC_ADDRESS_SIZE]) const {
+void BK72xxBLE::get_mac_lsb_first(uint8_t out[6]) const {
  for (int i = 0; i < 6; i++)
    out[i] = this->ble_mac_[i];
 }
@@ -267,7 +226,7 @@ void BK72xxBLE::resolve_mac_() {
    }
  }
  if (nonzero) {
-    memcpy(this->ble_mac_, common_default_bdaddr.addr, MAC_ADDRESS_SIZE);
+    memcpy(this->ble_mac_, common_default_bdaddr.addr, 6);
    return;
  }
 #endif
@@ -279,238 +238,54 @@ void BK72xxBLE::resolve_mac_() {
  // (verified against the BK7231N BLE-5.1 and BK7252N/BK7238 BLE-5.2 SDK sources), so it
  // matches on every device, including the last-byte == 0xFF edge that a 24-bit increment
  // would carry differently.
-  uint8_t wifi_mac[MAC_ADDRESS_SIZE];
+  uint8_t wifi_mac[6];
  get_mac_address_raw(wifi_mac);  // MSB-first
-  const uint8_t ble[MAC_ADDRESS_SIZE] = {wifi_mac[0], wifi_mac[1], wifi_mac[2],
-                                         wifi_mac[3], wifi_mac[4], static_cast<uint8_t>(wifi_mac[5] + 1)};
+  const uint8_t ble[6] = {wifi_mac[0], wifi_mac[1], wifi_mac[2],
+                          wifi_mac[3], wifi_mac[4], static_cast<uint8_t>(wifi_mac[5] + 1)};
  // Store LSB-first to match recv_adv_t adv_addr ordering.
  for (int i = 0; i < 6; i++)
    this->ble_mac_[i] = ble[5 - i];
 }

 // ---------------------------------------------------------------------------
-// Scan reconciler
+// Controller scan primitives
 // ---------------------------------------------------------------------------

-// Episode boundary: fresh teardown deadline and error bookkeeping.
-void BK72xxBLE::reset_teardown_episode_() {
-  this->teardown_since_ms_ = 0;
-  this->restarting_ = false;
-  this->last_release_err_ = 0;
-}
-
-ScanOpResult BK72xxBLE::scan_start(uint16_t interval, uint16_t window, bool active) {
+bool BK72xxBLE::scan_start(uint16_t interval, uint16_t window) {
  if (!this->is_active())
    this->enable();

-  const ScanParams params{active, interval, window};
-  // A new episode refills the budget and gets a fresh teardown deadline; a
-  // re-call observing an in-flight bring-up (last result PENDING) must not.
-  if (this->last_result_ != ScanOpResult::PENDING || !this->scan_wanted_ || params != this->requested_) {
-    this->pending_since_ms_ = App.get_loop_component_start_time();
-    this->reset_teardown_episode_();
+  if (this->scan_actv_idx_ != 0xFF) {
+    // Already scanning — stop first so this call cleanly restarts with the new
+    // parameters (the BDK cannot start a second scan on a busy activity).
+    this->scan_stop();
  }
-  this->scan_wanted_ = true;
-  this->requested_ = params;
-  return this->advance_();
-}

-void BK72xxBLE::scan_stop() {
-  if (this->scan_wanted_) {
-    // A stamp inherited from a stuck restart would fail the stop on its
-    // first advance.
-    this->reset_teardown_episode_();
-  }
-  this->scan_wanted_ = false;
-  this->advance_();
-}
+  struct scan_param sp;
+  memset(&sp, 0, sizeof(sp));
+  sp.channel_map = 7;  // advertising channels 37/38/39
+  sp.interval = interval;
+  sp.window = window;

-bool BK72xxBLE::flush_pending_stop(uint32_t timeout_ms) {
-  // millis() on both sides: the loop clock is frozen while this blocks.
-  const uint32_t start = millis();
-  while (!this->scan_wanted_ && this->last_result_ == ScanOpResult::PENDING) {
-    if (millis() - start >= timeout_ms)
-      return false;
-    delay(RECONCILE_RETRY_MS);
-    this->advance_();
-  }
-  return this->last_result_ == ScanOpResult::SETTLED;
-}
-
-// Teardown is asynchronous: the handle is kept until an IDLE observation
-// confirms the radio is idle. A rejection WARNs once per failure streak and
-// widens the pump gate; the epilogue owns the stuck-teardown deadline.
-void BK72xxBLE::release_activity_(BdkActivityState state) {
-  const BdkOpResult result =
-      bdk_scan_release(this->scan_activity_idx_, state == BdkActivityState::CREATED, &this->last_release_err_);
-  if (result == BdkOpResult::OK) {
-    this->release_warned_ = false;
-    return;
-  }
-  if (!this->release_warned_) {
-    // A hard error carries its code immediately; the 30 s stuck ERROR follows
-    // if it persists.
-    if (result == BdkOpResult::FAILED) {
-      ESP_LOGW(TAG, "Scan activity release failed (err %d); retrying", this->last_release_err_);
-    } else {
-      ESP_LOGW(TAG, "Scan activity release rejected; retrying");
-    }
-    this->release_warned_ = true;
-  }
-}
-
-// Stamp/track the teardown episode; once past the deadline, ERROR (re-logged
-// each interval) and report stuck.
-bool BK72xxBLE::teardown_stuck_(uint32_t now) {
-  if (this->teardown_since_ms_ == 0) {
-    this->teardown_since_ms_ = now;
-    this->teardown_stuck_log_ms_ = now;  // first ERROR fires at the deadline
+  this->scan_actv_idx_ = app_ble_get_idle_actv_idx_handle(SCAN_ACTV);
+  if (this->scan_actv_idx_ == 0xFF) {
+    ESP_LOGE(TAG, "Scan start failed: no idle activity handle");
    return false;
  }
-  if (now - this->teardown_since_ms_ < TEARDOWN_STUCK_ERROR_MS)
+  ble_err_t ret = bk_ble_scan_start(this->scan_actv_idx_, &sp, nullptr);
+  if (ret != ERR_SUCCESS) {
+    ESP_LOGE(TAG, "Scan start failed (err %d)", static_cast<int>(ret));
+    this->scan_actv_idx_ = 0xFF;
    return false;
-  if (now - this->teardown_stuck_log_ms_ >= TEARDOWN_STUCK_ERROR_MS) {
-    if (this->last_release_err_ != 0) {
-      ESP_LOGE(TAG, "Scan teardown cannot proceed; scanner is stuck (release err %d)", this->last_release_err_);
-    } else {
-      // No rejected release this episode: stuck waiting on the controller.
-      ESP_LOGE(TAG, "Scan teardown cannot proceed; scanner is stuck (controller busy)");
-    }
-    this->teardown_stuck_log_ms_ = now;
  }
  return true;
 }

-// One SDK operation per call toward the latched request; controller state is
-// read live each time (it changes on the BLE task, so nothing is mirrored).
-// The epilogue owns all deadlines and episode bookkeeping.
-ScanOpResult BK72xxBLE::advance_() {
-  if (!this->scan_wanted_ && this->scan_activity_idx_ == INVALID_ACTIVITY_IDX) {
-    // Nothing to do; also keeps SDK reads off the pre-enable() path.
-    this->last_result_ = ScanOpResult::SETTLED;
-    return ScanOpResult::SETTLED;
+void BK72xxBLE::scan_stop() {
+  if (this->scan_actv_idx_ != 0xFF) {
+    bk_ble_scan_stop(this->scan_actv_idx_, nullptr);
+    this->scan_actv_idx_ = 0xFF;
  }
-  const BdkActivityState state = bdk_scan_state(this->scan_activity_idx_);
-  const bool ready = bdk_scan_ready();
-  ScanOpResult result = this->scan_wanted_ ? this->advance_start_(state, ready) : this->advance_stop_(state, ready);
-
-  const uint32_t now = App.get_loop_component_start_time();
-  this->last_advance_ms_ = now;
-  if (result == ScanOpResult::SETTLED || (state == BdkActivityState::IDLE && ready)) {
-    // Any teardown episode is over (IDLE observed with the controller
-    // settled, or e.g. a mode flip that settled back without ever reaching
-    // IDLE). An IDLE read while an operation is in flight proves nothing —
-    // a stop deferred there must keep its episode running.
-    this->reset_teardown_episode_();
-    this->release_warned_ = false;
-  }
-  if (this->restarting_ && (state == BdkActivityState::IDLE || state == BdkActivityState::CREATED)) {
-    // The mode-change release is observed complete; the rest is a normal
-    // bring-up on a fresh budget.
-    this->restarting_ = false;
-    this->pending_since_ms_ = now;
-  }
-  // Not chained to the clear above: a bring-up waiting at IDLE (create still
-  // in flight) must keep spending its budget.
-  if (result == ScanOpResult::PENDING) {
-    if (this->scan_wanted_ && state != BdkActivityState::STARTED && !this->restarting_) {
-      // A downed radio spends the bring-up budget; exhausting it hands
-      // recovery to the tracker's backoff.
-      if (now - this->pending_since_ms_ >= RECONCILE_PENDING_TIMEOUT_MS) {
-        ESP_LOGE(TAG, "Scan bring-up did not settle; giving up until the next start");
-        result = ScanOpResult::FAILED;
-      }
-    } else {
-      // A teardown is pending: a stop, or a mode-change release still in
-      // flight (restarting_); either way the bring-up budget waits.
-      if (this->scan_wanted_)
-        this->pending_since_ms_ = now;
-      if (this->teardown_stuck_(now)) {
-        // Terminal for stop AND restart: the tracker's backoff owns recovery
-        // (a stop's release keeps re-driving from loop(); a restart is
-        // re-requested through scan_start() with a fresh deadline).
-        result = ScanOpResult::FAILED;
-      }
-    }
-  }
-  this->last_result_ = result;
-  return result;
-}
-
-ScanOpResult BK72xxBLE::advance_stop_(BdkActivityState state, bool ready) {
-  if (state == BdkActivityState::IDLE && ready) {
-    // Fully torn down (or never created): the radio is idle. IDLE is trusted
-    // only when the controller is settled — mid-create the slot still reads
-    // IDLE, and dropping the handle then would leak the activity once the
-    // create lands.
-    this->scan_activity_idx_ = INVALID_ACTIVITY_IDX;
-    return ScanOpResult::SETTLED;
-  }
-  if (!ready) {
-    // Acting mid-operation could delete an activity whose start lands
-    // afterwards, leaking the slot with the radio on; wait.
-    if (this->last_result_ == ScanOpResult::SETTLED)
-      ESP_LOGD(TAG, "Scan stop deferred (controller busy)");
-    return ScanOpResult::PENDING;
-  }
-  // Settled, so CREATED unambiguously means "never started".
-  this->release_activity_(state);
-  return ScanOpResult::PENDING;  // confirmed once IDLE is observed
-}
-
-ScanOpResult BK72xxBLE::advance_start_(BdkActivityState state, bool ready) {
-  if (state == BdkActivityState::STARTED) {
-    if (this->applied_ == this->requested_)
-      return ScanOpResult::SETTLED;
-    // Running with different mode or parameters: tear down (the SDK stop
-    // chain also deletes the activity) and recreate on a later advance.
-    if (ready) {
-      this->release_activity_(state);
-      // Invalidate so a flip back to the old params cannot SETTLE against the
-      // activity being deleted (interval 0 never matches a real request).
-      this->applied_.interval = 0;
-      this->restarting_ = true;
-    }
-    return ScanOpResult::PENDING;
-  }
-  if (!ready) {
-    if (this->last_result_ == ScanOpResult::SETTLED)
-      ESP_LOGD(TAG, "Scan start deferred (controller busy)");
-    return ScanOpResult::PENDING;
-  }
-  if (state == BdkActivityState::CREATED) {
-    // Fire-and-forget: SETTLED only once a later advance observes the scan
-    // running, so a rejected start is retried rather than silently dead. On
-    // failure the created activity is intact; keep the handle.
-    if (bdk_scan_start(this->scan_activity_idx_, this->requested_.interval, this->requested_.window,
-                       this->requested_.active) != BdkOpResult::OK)
-      return ScanOpResult::FAILED;
-    this->applied_ = this->requested_;
-    return ScanOpResult::PENDING;
-  }
-  if (state == BdkActivityState::OTHER)
-    return ScanOpResult::PENDING;  // transitional; settles on a later read
-
-  // IDLE and ready: acquire a slot and create. A kept index is deliberately
-  // reused: SDK delete returns the slot to idle and create requires an idle
-  // slot, so it equals a fresh acquire — while clearing here would orphan a
-  // create still in flight (the BUSY race below).
-  if (this->scan_activity_idx_ == INVALID_ACTIVITY_IDX) {
-    this->scan_activity_idx_ = bdk_scan_acquire_activity();
-    if (this->scan_activity_idx_ == INVALID_ACTIVITY_IDX)
-      return ScanOpResult::FAILED;
-  }
-  switch (bdk_scan_create(this->scan_activity_idx_)) {
-    case BdkOpResult::BUSY:  // raced the BLE task; keep the index, the retry resumes this slot
-    case BdkOpResult::OK:
-      return ScanOpResult::PENDING;
-    case BdkOpResult::FAILED:
-      break;
-  }
-  // Safe to clear (unlike BUSY): acquire is a pure search, so a rejected
-  // create leaves the slot IDLE for re-acquire.
-  this->scan_activity_idx_ = INVALID_ACTIVITY_IDX;
-  return ScanOpResult::FAILED;
 }

 }  // namespace esphome::bk72xx_ble
@@ -11,8 +11,6 @@

 #include <cstdint>

-#include "bdk_scan.h"
-
 namespace esphome::bk72xx_ble {

 enum class BLEComponentState : uint8_t {
@@ -21,32 +19,11 @@ enum class BLEComponentState : uint8_t {
  ACTIVE,
 };

-/// Outcome of one reconciliation step.
-enum class ScanOpResult : uint8_t {
-  SETTLED,  ///< The request is reached: scan observed running, or stopped
-            ///< with the activity fully released.
-  PENDING,  ///< A step is in flight; loop() keeps advancing — call
-            ///< scan_start() again to learn the outcome.
-  FAILED,   ///< The controller rejected a step; retry later.
-};
-
-/// One scan request: mode plus timing, in BLE units (0.625 ms).
-struct ScanParams {
-  bool active;
-  uint16_t interval;
-  uint16_t window;
-  bool operator==(const ScanParams &) const = default;
-};
-
 /// One advertisement report from the controller.
 struct BLEScanReport {
-  uint8_t mac[MAC_ADDRESS_SIZE];  // LSB-first, as the controller delivers it
-  int8_t rssi;                    // signed dBm
+  uint8_t mac[6];  // LSB-first, as the controller delivers it
+  int8_t rssi;     // signed dBm
  uint8_t addr_type;
-  // GAPM report info byte (recv_adv_t.evt_type): bits 0-2 report type
-  // (1 = legacy adv, 3 = legacy scan response), bit 5 scannable — lets the
-  // tracker's merger tell the two frames apart.
-  uint8_t evt_type;
  uint8_t data_len;  // bytes valid in data[]
  uint8_t data[62];  // legacy advertisement (31) + scan response (31)

@@ -83,7 +60,7 @@ class BK72xxBLE final : public Component {
  void set_enable_on_boot(bool enable_on_boot) { this->enable_on_boot_ = enable_on_boot; }

  /// Controller BLE address, least-significant octet first (BLE convention).
-  void get_mac_lsb_first(uint8_t out[MAC_ADDRESS_SIZE]) const;
+  void get_mac_lsb_first(uint8_t out[6]) const;

 #ifdef BK72XX_BLE_SCAN_LISTENER_COUNT
  /// Register a consumer for scan reports (delivered on the main task via loop()).
@@ -92,33 +69,18 @@ class BK72xxBLE final : public Component {
  void register_scan_listener(BLEScanListener *listener) { this->scan_listeners_.push_back(listener); }
 #endif

-  /// Request a scan (interval/window in 0.625 ms BLE units); enables the
-  /// stack first if needed. PENDING until the scan is observed running —
-  /// loop() keeps advancing, call again to learn the outcome.
-  ScanOpResult scan_start(uint16_t interval, uint16_t window, bool active);
-  /// Request the scanner stopped and the activity released; steps that
-  /// cannot run yet are completed from loop().
+  /// Start the controller scan. Interval/window are in BLE units (0.625 ms).
+  /// Enables the stack first if needed. Returns false on controller failure.
+  bool scan_start(uint16_t interval, uint16_t window);
+  /// Stop the controller scan (no-op when not scanning).
  void scan_stop();
-  /// Drive a requested stop until the radio is observed idle, bounded by
-  /// timeout_ms (for OTA). Returns false if it still has not settled.
-  bool flush_pending_stop(uint32_t timeout_ms);
-  /// Last reconciliation outcome; on FAILED the consumer's retry policy owns
-  /// recovery.
-  ScanOpResult last_scan_result() const { return this->last_result_; }

  /// Internal: buffer one controller report (BDK notice callback, BLE task
  /// context — bounded copy under the scheduler lock, nothing else).
-  void enqueue_scan_report(const uint8_t *mac, int8_t rssi, uint8_t addr_type, uint8_t evt_type, const uint8_t *data,
-                           uint16_t data_len);
+  void enqueue_scan_report(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data, uint16_t data_len);

 protected:
  void resolve_mac_();
-  ScanOpResult advance_();
-  ScanOpResult advance_stop_(BdkActivityState state, bool ready);
-  ScanOpResult advance_start_(BdkActivityState state, bool ready);
-  bool teardown_stuck_(uint32_t now);
-  void reset_teardown_episode_();
-  void release_activity_(BdkActivityState state);

 #ifdef BK72XX_BLE_SCAN_LISTENER_COUNT
  // Codegen-sized: no heap allocation, no std::vector template instantiation —
@@ -133,24 +95,10 @@ class BK72xxBLE final : public Component {
  // allocate() returns nullptr before push() can fail. This prevents leaking a
  // pool slot on a failed push and keeps release() off the producer path.
  esphome::EventPool<BLEScanReport, MAX_SCAN_REPORT_QUEUE_SIZE - 1> report_pool_;
-  // Largest-to-smallest: padding only at the tail, absorbed by future byte fields.
-  uint32_t last_advance_ms_{0};
-  uint32_t pending_since_ms_{0};          // bring-up budget anchor; refilled on request change
-  uint32_t teardown_since_ms_{0};         // unfinished teardown episode start; 0 = none
-  uint32_t teardown_stuck_log_ms_{0};     // last stuck-teardown ERROR; re-logged each TEARDOWN_STUCK_ERROR_MS
-  int last_release_err_{0};               // SDK code of the episode's last failed release; 0 = none
-  ScanParams requested_{};                // latched by scan_start()
-  ScanParams applied_{};                  // last params we commanded; mismatch with requested_ restarts
-  uint8_t ble_mac_[MAC_ADDRESS_SIZE]{0};  // LSB-first (BLE convention)
-  uint8_t scan_activity_idx_{INVALID_ACTIVITY_IDX};
-  bool scan_wanted_{false};     // the latched request is to scan (vs stopped)
-  bool release_warned_{false};  // gates the release WARN; widens the pump gate
-  bool restarting_{false};      // mode-change release in flight; teardown deadline governs until released
-  bool enable_on_boot_{false};
-  // PENDING means advance_() has more to do; loop() drives it, paced and
-  // (for a bring-up) bounded.
-  ScanOpResult last_result_{ScanOpResult::SETTLED};
+  uint8_t ble_mac_[6]{0};  // LSB-first (BLE convention)
+  uint8_t scan_actv_idx_{0xFF};
  BLEComponentState state_{BLEComponentState::STATE_OFF};
+  bool enable_on_boot_{false};
 };

 }  // namespace esphome::bk72xx_ble
@@ -25,7 +25,6 @@ from esphome.components.ble_device_base import automation as ble_automation
 from esphome.components.const import CONF_ON_SCAN_END, CONF_SCAN_PARAMETERS, CONF_WINDOW
 import esphome.config_validation as cv
 from esphome.const import (
-    CONF_ACTIVE,
    CONF_CONTINUOUS,
    CONF_DURATION,
    CONF_ID,
@@ -147,9 +146,6 @@ async def stop_scan_action_to_code(
 async def to_code(config: ConfigType) -> None:
    # Selects the BLEHub alias arm in ble_device_base/ble_hub_impl.h.
    cg.add_define("USE_BK72XX_BLE_TRACKER")
-    # Compiles the shared adv + scan-response merge (the BDK delivers the pair
-    # as separate reports).
-    cg.add_define("USE_BLE_SCAN_RESPONSE_MERGER")

    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
@@ -168,7 +164,6 @@ async def to_code(config: ConfigType) -> None:
    cg.add(var.set_scan_window(ble_device_base.to_ble_units(scan[CONF_WINDOW])))
    cg.add(var.set_scan_duration(scan[CONF_DURATION].total_milliseconds))
    cg.add(var.set_configured_continuous(scan[CONF_CONTINUOUS]))
-    cg.add(var.set_scan_active(scan[CONF_ACTIVE]))

    for conf in config.get(CONF_ON_BLE_ADVERTISE, []):
        await ble_automation.advertise_trigger_to_code(conf, var)
@@ -9,9 +9,10 @@

 #include "bk72xx_ble_tracker.h"

+#include <algorithm>
 #include <cinttypes>

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

 namespace esphome::bk72xx_ble_tracker {
@@ -26,15 +27,6 @@ static const char *const TAG = "bk72xx_ble_tracker";
 // a single WARN is emitted when the retry interval first saturates.
 static constexpr uint32_t SCAN_START_RETRY_MS = 1000;
 static constexpr uint8_t SCAN_START_RETRY_MAX_DOUBLINGS = 6;  // 1 s << 6 = 64 s
-// Stable-run time before the failure streak clears; reset-on-start would keep
-// a flapping controller at the 1 s gate.
-static constexpr uint32_t SCAN_STABLE_RESET_MS = 30000;
-
-// Radio-idle deadline for the bounded stop drain at OTA start.
-static constexpr uint32_t OTA_STOP_FLUSH_MS = 100;
-
-// 0.625 ms BLE units; integer math avoids soft-float on this FPU-less part.
-constexpr uint32_t ble_units_to_ms(uint32_t units) { return units * 5 / 8; }

 // ---------------------------------------------------------------------------
 // Component lifecycle
@@ -44,20 +36,11 @@ void BK72xxBLETracker::setup() {
  // Receive the controller's scan reports; the controller queues them from the
  // BLE task and delivers here on the main task.
  this->parent_->register_scan_listener(this);
-  // Merged (and unmerged) frames go to the shared dispatcher; unclaimed
-  // devices are logged only on one-shot scans (continuous would spam).
-  this->merger_.bind(&this->dispatcher_, &this->scan_continuous_, TAG);
 #ifdef USE_OTA_STATE_LISTENER
  // Pause scanning while an OTA update is in flight — on the single-core BK72xx the
  // BLE scan competes with the OTA flash writes. Mirrors esp32_ble_tracker.
  ota::get_global_ota_callback()->add_global_state_listener(this);
 #endif
-  // scan_requested_ check: an on_boot start_scan latched before this setup()
-  // must keep the retry loop running (rp2/ln882h parity).
-  if (!this->scan_continuous_ && !this->scan_requested_) {
-    // Nothing to time until an explicit start_scan(); it re-enables the loop.
-    this->disable_loop();
-  }
 }

 #ifdef USE_OTA_STATE_LISTENER
@@ -67,54 +50,30 @@ void BK72xxBLETracker::on_ota_global_state(ota::OTAState state, float progress,
    this->scan_continuous_before_ota_ = this->scan_continuous_;
    this->scan_requested_before_ota_ = this->scan_requested_;
    this->stop_scan();
-    // The transfer starves the loop; a deferred stop would leave the radio
-    // scanning for the whole update, so drain it here, bounded.
-    if (!this->parent_->flush_pending_stop(OTA_STOP_FLUSH_MS))
-      ESP_LOGE(TAG, "Scan still stopping at OTA start; the radio may contend with the update");
  } else if (state == ota::OTA_ERROR || state == ota::OTA_ABORT) {
    // On success the device reboots, so restore only on a failed/aborted update;
    // loop() restarts the scan on its next iteration (continuous idle branch).
    if (this->scan_continuous_before_ota_) {
      this->scan_continuous_before_ota_ = false;
      this->scan_continuous_ = true;
-      this->enable_loop();  // stop_scan() parked it
    }
    // A one-shot request that was still pending (latched, retrying) when the
    // OTA paused scanning is re-latched, not dropped — loop() resumes the retry.
    if (this->scan_requested_before_ota_) {
      this->scan_requested_before_ota_ = false;
      this->scan_requested_ = true;
-      this->enable_loop();
    }
  }
 }
 #endif  // USE_OTA_STATE_LISTENER

 void BK72xxBLETracker::loop() {
-  const uint32_t now = App.get_loop_component_start_time();
-
-  // Deliver held scannable advertisements whose scan response never arrived —
-  // unmerged after the merger's timeout.
-  if (!this->merger_.empty())
-    this->merger_.sweep(now);
-
-  // Before the drop branch: a drop after a stable run starts a fresh streak.
-  if (this->scan_running_ && this->failed_start_count_ != 0 && now - this->scan_start_time_ >= SCAN_STABLE_RESET_MS)
-    this->failed_start_count_ = 0;
-
-  // A terminal failure while we report running recovers via the normal retry
-  // path; the drop charges the backoff so a flapping controller escalates.
-  if (this->scan_running_ && this->parent_->last_scan_result() == bk72xx_ble::ScanOpResult::FAILED) {
-    ESP_LOGW(TAG, "Controller scan lost; retrying");
-    this->scan_requested_ = true;
-    this->count_failed_start_();
-    this->mark_scan_ended_(now);
-  }
-
+  const uint32_t now = millis();
  if (this->scan_continuous_) {
    if (!this->scan_running_) {
-      // One-iteration deferral; all stamps share this iteration's cached
-      // timestamp, so the period check below cannot underflow.
+      // A start that succeeded re-anchored the period timer from a later millis(),
+      // so the stale `now` below would underflow the comparison and fire
+      // on_scan_end() for a scan that just began. Resume next iteration.
      if (this->try_start_with_backoff_(now))
        return;
    }
@@ -122,7 +81,11 @@ void BK72xxBLETracker::loop() {
    // esp32_ble_tracker::cleanup_scan_state_(). Gated on scan_started_once_ so a scan
    // that never came up (start kept failing) does not fire spurious on_scan_end events.
    if (this->scan_started_once_ && now - this->scan_period_start_ >= this->scan_duration_) {
-      this->fire_scan_end_();
+#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
+      for (auto *listener : this->listeners_)
+        listener->on_scan_end();
+      this->discovered_log_.clear();  // reset per-scan "Found device" dedup (esp32_ble_tracker parity)
+#endif
      this->scan_period_start_ = now;
    }
    return;
@@ -136,14 +99,13 @@ void BK72xxBLETracker::loop() {
  // would be silent: the scan never runs, stop_scan_() is never reached and
  // on_scan_end() never fires, leaving period-keyed consumers waiting forever.
  if (this->scan_requested_ && !this->scan_running_) {
-    // Same one-iteration deferral as the continuous branch.
+    // Same stale-`now` hazard as the continuous branch: start_scan_() stamps
+    // scan_start_time_ from a later millis(), so the duration check below would
+    // underflow and stop the scan in the iteration that started it.
    if (this->try_start_with_backoff_(now))
      return;
  }
  if (this->scan_running_ && now - this->scan_start_time_ >= this->scan_duration_) {
-    // A full-duration run proves the controller healthy even when duration is
-    // shorter than SCAN_STABLE_RESET_MS.
-    this->failed_start_count_ = 0;
    this->stop_scan_();
  }
 }
@@ -160,54 +122,32 @@ bool BK72xxBLETracker::try_start_with_backoff_(uint32_t now, bool force) {
  // even user-initiated attempts respect the backoff, so a start_scan() action
  // on a short cadence cannot hammer a failing controller; the attempt stays
  // inside the failure accounting below either way.
-  // Mid bring-up, observe instead of re-issuing (the hub self-advances). A
-  // SETTLED outcome completes immediately; only fresh attempts after FAILED
-  // are rate-limited.
-  const auto hub = this->parent_->last_scan_result();
-  if (hub == bk72xx_ble::ScanOpResult::PENDING)
+  const uint8_t doublings = std::min<uint8_t>(this->failed_start_count_, SCAN_START_RETRY_MAX_DOUBLINGS);
+  if ((!force || this->failed_start_count_ != 0) &&
+      now - this->last_scan_start_attempt_ < (SCAN_START_RETRY_MS << doublings))
    return false;
-  if (hub == bk72xx_ble::ScanOpResult::FAILED) {
-    if (this->start_attempt_open_) {
-      // Our bring-up gave up asynchronously; charge it to the backoff.
-      this->start_attempt_open_ = false;
-      this->count_failed_start_();
-    }
-    if ((!force || this->failed_start_count_ != 0) &&
-        now - this->last_scan_start_attempt_ < (SCAN_START_RETRY_MS << this->failed_start_count_))
-      return false;
-  }
+  this->last_scan_start_attempt_ = now;
  this->start_scan_();
-  if (!this->scan_running_) {
-    if (this->parent_->last_scan_result() == bk72xx_ble::ScanOpResult::PENDING) {
-      this->start_attempt_open_ = true;
-      return false;  // the controller is still bringing the scan up; not a failure
-    }
-    this->count_failed_start_();
-  }
-  return this->scan_running_;
-}
-
-void BK72xxBLETracker::count_failed_start_() {
-  if (this->failed_start_count_ < SCAN_START_RETRY_MAX_DOUBLINGS) {
+  if (!this->scan_running_ && this->failed_start_count_ < SCAN_START_RETRY_MAX_DOUBLINGS) {
    ++this->failed_start_count_;
    if (this->failed_start_count_ == SCAN_START_RETRY_MAX_DOUBLINGS) {
      ESP_LOGW(TAG, "Scan start keeps failing; retrying every %" PRIu32 " s",
               (SCAN_START_RETRY_MS << SCAN_START_RETRY_MAX_DOUBLINGS) / 1000);
    }
  }
+  return this->scan_running_;
 }

 void BK72xxBLETracker::dump_config() {
  ESP_LOGCONFIG(TAG,
                "BK72xx BLE Tracker:\n"
                "  Scan Duration: %" PRIu32 " s\n"
-                "  Scan Interval: %" PRIu32 " ms (%" PRIu32 " BLE units)\n"
-                "  Scan Window: %" PRIu32 " ms (%" PRIu32 " BLE units)\n"
-                "  Scan Type: %s (configured %s)\n"
+                "  Scan Interval: %.0f ms (%" PRIu32 " BLE units)\n"
+                "  Scan Window: %.0f ms (%" PRIu32 " BLE units)\n"
+                "  Scan Type: PASSIVE\n"
                "  Continuous Scanning: %s",
-                this->scan_duration_ / 1000, ble_units_to_ms(this->scan_interval_), this->scan_interval_,
-                ble_units_to_ms(this->scan_window_), this->scan_window_, this->scan_active_ ? "ACTIVE" : "PASSIVE",
-                this->scan_active_configured_ ? "ACTIVE" : "PASSIVE", YESNO(this->scan_continuous_));
+                this->scan_duration_ / 1000, this->scan_interval_ * 0.625f, this->scan_interval_,
+                this->scan_window_ * 0.625f, this->scan_window_, YESNO(this->scan_continuous_));
 }

 // ---------------------------------------------------------------------------
@@ -216,33 +156,31 @@ void BK72xxBLETracker::dump_config() {
 // listener dispatch run in main-loop context with no cross-task handling here.
 // ---------------------------------------------------------------------------

-// GAPM report info byte (BLEScanReport::evt_type): bits 0-2 report type,
-// bit 5 scannable advertisement. Verified against both BDK stacks (5.1 and
-// 5.2 fill it from gapm_ext_adv_report_ind.info).
-static constexpr uint8_t GAPM_REPORT_TYPE_MASK = 0x07;
-static constexpr uint8_t GAPM_REPORT_TYPE_SCAN_RSP_EXT = 2;
-static constexpr uint8_t GAPM_REPORT_TYPE_SCAN_RSP_LEG = 3;
-static constexpr uint8_t GAPM_REPORT_INFO_SCAN_ADV_BIT = 1 << 5;
-
-// Demux advertisements vs scan responses into the shared merger: the BDK
-// delivers the pair as separate reports; a scannable advertisement is held
-// until its scan response arrives and delivered as one merged frame.
 void BK72xxBLETracker::on_scan_report(const bk72xx_ble::BLEScanReport &report) {
-  const uint8_t rtype = report.evt_type & GAPM_REPORT_TYPE_MASK;
-  if (rtype == GAPM_REPORT_TYPE_SCAN_RSP_LEG || rtype == GAPM_REPORT_TYPE_SCAN_RSP_EXT) {
-    this->merger_.submit_scan_rsp(report.mac, report.rssi, report.addr_type, report.data, report.data_len);
-    return;
+  // Raw callback (the raw-advertisement path).
+  if (this->raw_advertisement_callback_.is_set()) {
+    const ble_device_base::RawAdvertisement adv{.address = ble_device_base::mac_lsb_first_to_uint64(report.mac),
+                                                .data = report.data,
+                                                .data_len = report.data_len,
+                                                .rssi = report.rssi,
+                                                .addr_type = report.addr_type};
+    this->raw_advertisement_callback_.invoke(adv);
  }
-  // Stash only while an active scan runs: a passive scan never gets a
-  // response, and after a stop nothing would sweep the merger, so a late
-  // report would surface minutes later as a fresh advertisement.
-  if (this->scan_running_ && this->scan_active_ && (report.evt_type & GAPM_REPORT_INFO_SCAN_ADV_BIT)) {
-    this->merger_.stash_adv(report.mac, report.rssi, report.addr_type, report.data, report.data_len,
-                            App.get_loop_component_start_time());
-    return;
+
+#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
+  ble_device_base::ESPBTDevice device;
+  device.from_scan_result(report.mac, report.rssi, report.addr_type, report.data, report.data_len);
+  bool found = false;
+  for (auto *listener : this->listeners_) {
+    if (listener->parse_device(device)) {
+      found = true;
+    }
  }
-  this->dispatcher_.dispatch(report.mac, report.rssi, report.addr_type, report.data, report.data_len,
-                             /*raw_only=*/false, this->scan_continuous_ ? nullptr : TAG);
+  // Mirror esp32_ble_tracker: log a newly-seen device only when nothing claimed
+  // it and the scan is one-shot (continuous scans would spam).
+  if (!found && !this->scan_continuous_)
+    this->discovered_log_.log_device(TAG, device);
+#endif  // ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
 }

 // ---------------------------------------------------------------------------
@@ -269,8 +207,7 @@ void BK72xxBLETracker::start_scan() {
  // against a failing controller, repeated start_scan() calls are rate-limited
  // like any other attempt.
  this->scan_requested_ = true;
-  this->enable_loop();  // an idle one-shot tracker parked it in stop_scan_()
-  this->try_start_with_backoff_(App.get_loop_component_start_time(), /* force= */ true);
+  this->try_start_with_backoff_(millis(), /* force= */ true);
 }

 void BK72xxBLETracker::restart_scan_duration() {
@@ -281,7 +218,7 @@ void BK72xxBLETracker::restart_scan_duration() {
  // start_scan action fired more often than scan_duration_ would otherwise
  // suppress on_scan_end indefinitely — and absence detection (ble_rssi's NAN
  // publish) rides on that period.
-  this->scan_start_time_ = App.get_loop_component_start_time();
+  this->scan_start_time_ = millis();
 }

 void BK72xxBLETracker::stop_scan() {
@@ -294,31 +231,24 @@ void BK72xxBLETracker::stop_scan() {
 // Internal scan start / stop
 // ---------------------------------------------------------------------------

-bk72xx_ble::ScanOpResult BK72xxBLETracker::controller_scan_start_() {
-  this->last_scan_start_attempt_ = App.get_loop_component_start_time();
-  return this->parent_->scan_start(static_cast<uint16_t>(this->scan_interval_),
-                                   static_cast<uint16_t>(this->scan_window_), this->scan_active_);
-}
-
 void BK72xxBLETracker::start_scan_() {
  if (this->scan_running_)
    return;

-  if (this->controller_scan_start_() != bk72xx_ble::ScanOpResult::SETTLED)
+  if (!this->parent_->scan_start(static_cast<uint16_t>(this->scan_interval_),
+                                 static_cast<uint16_t>(this->scan_window_)))
    return;

-  const uint32_t now = App.get_loop_component_start_time();
+  const uint32_t now = millis();
  this->scan_running_ = true;
  this->scan_requested_ = false;  // the latched one-shot request is satisfied
-  this->start_attempt_open_ = false;
-  // failed_start_count_ deliberately not reset here; only a stable run clears it (loop()).
+  this->failed_start_count_ = 0;  // reset here so direct starts clear the backoff too
  this->scan_start_time_ = now;
  // Log every explicit start at DEBUG — stop_scan_() logs every stop at DEBUG, and
  // in non-continuous mode each period is an explicit start, so asymmetric logging
  // would read as the scanner failing to come back up.
-  ESP_LOGD(TAG, "Scan started (%s, window=%" PRIu32 "ms, interval=%" PRIu32 "ms)",
-           this->scan_active_ ? "active" : "passive", ble_units_to_ms(this->scan_window_),
-           ble_units_to_ms(this->scan_interval_));
+  ESP_LOGD(TAG, "Scan started (passive, window=%.0fms, interval=%.0fms)", this->scan_window_ * 0.625f,
+           this->scan_interval_ * 0.625f);
  // Re-anchor the on_scan_end period to every successful start — first start (so the
  // period counts from the scan, not from boot) and every restart after a stop (so
  // resuming after longer than scan_duration, e.g. a failed OTA restoring continuous
@@ -328,49 +258,18 @@ void BK72xxBLETracker::start_scan_() {
  this->scan_started_once_ = true;
 }

-// Deliberate logical/physical split: on_scan_end() reports the tracker's
-// intent while the hub winds the radio down asynchronously; OTA is the one
-// path that must wait, and it flushes explicitly.
 void BK72xxBLETracker::stop_scan_() {
-  this->start_attempt_open_ = false;  // an abandoned bring-up is not charged
-  this->parent_->scan_stop();         // idempotent: releases whatever the hub holds
-  if (this->scan_running_) {
-    ESP_LOGD(TAG, "Scan stopped");
-    this->mark_scan_ended_(App.get_loop_component_start_time());
-  }
-  // Park when idle (the hub drives its own teardown); re-check because an
-  // on_scan_end automation may have restarted the scan.
-  if (!this->scan_continuous_ && !this->scan_running_ && !this->scan_requested_)
-    this->disable_loop();
-}
-
-// The period re-anchor keeps on_scan_end from double-firing in one iteration.
-void BK72xxBLETracker::mark_scan_ended_(uint32_t now) {
+  if (!this->scan_running_)
+    return;
+  this->parent_->scan_stop();
  this->scan_running_ = false;
-  this->fire_scan_end_();
-  this->scan_period_start_ = now;
-}
-
-void BK72xxBLETracker::fire_scan_end_() {
-  // Deliver held advertisements whose scan response never came (unmerged)
-  // BEFORE on_scan_end fires.
-  this->merger_.flush();
-  this->dispatcher_.on_scan_end();
-}
-
-// true = request latched, not applied: the reconciler applies it
-// asynchronously and loop() recovers a failed re-arm (ln882h parity).
-bool BK72xxBLETracker::request_scan_mode(bool active) {
-  if (this->scan_active_ == active)
-    return true;
-  this->scan_active_ = active;
-  // V: the proxy's "Setting scanner mode" line already narrates this at D.
-  ESP_LOGV(TAG, "Scan mode %s", active ? "active" : "passive");
-  // The controller reconciler restarts a running scan itself; the scan stays
-  // logically running. An idle scanner picks the mode up on its next start.
-  if (this->scan_running_)
-    this->controller_scan_start_();
-  return true;
+  ESP_LOGD(TAG, "Scan stopped");
+#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
+  for (auto *listener : this->listeners_)
+    listener->on_scan_end();
+  this->discovered_log_.clear();  // reset per-scan "Found device" dedup (esp32_ble_tracker parity)
+#endif
+  this->scan_period_start_ = millis();  // reset period clock so on_scan_end does not double-fire
 }

 }  // namespace esphome::bk72xx_ble_tracker
@@ -21,7 +21,6 @@
 //       window:      30ms
 //       duration:    5min
 //       continuous:  true
-//       active:      true

 #pragma once

@@ -30,7 +29,6 @@
 #include "esphome/components/bk72xx_ble/bk72xx_ble.h"
 #include "esphome/components/ble_device_base/ble_device.h"
 #include "esphome/components/ble_device_base/ble_hub.h"
-#include "esphome/components/ble_device_base/scan_response_merger.h"
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"

@@ -71,12 +69,6 @@ class BK72xxBLETracker : public Component,
  void set_scan_interval(uint32_t scan_interval) { this->scan_interval_ = scan_interval; }
  void set_scan_window(uint32_t scan_window) { this->scan_window_ = scan_window; }
  void set_scan_duration(uint32_t scan_duration) { this->scan_duration_ = scan_duration; }
-  /// Set from YAML (scan_parameters.active); runtime mode requests change
-  /// only the resolved mode.
-  void set_scan_active(bool scan_active) {
-    this->scan_active_ = scan_active;
-    this->scan_active_configured_ = scan_active;
-  }
  /// Set from YAML (scan_parameters.continuous); also the value
  /// configured_continuous() reports and a bare start_scan action restores.
  void set_configured_continuous(bool scan_continuous) {
@@ -101,29 +93,37 @@ class BK72xxBLETracker : public Component,

  // ---- ble_device_base::BLEHub contract ----
  void register_listener(ble_device_base::ESPBTDeviceListener *listener) {
-    this->dispatcher_.register_listener(listener);
+#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
+    this->listeners_.push_back(listener);
+#endif
  }
  void set_raw_advertisement_callback(ble_device_base::RawAdvertisementCallback callback) {
-    this->dispatcher_.set_raw_advertisement_callback(callback);
+    this->raw_advertisement_callback_ = callback;
  }
  static constexpr ble_device_base::HubCapabilities get_capabilities() {
-    // Active scanning is driven through bk72xx_ble's reconciler because the BDK
-    // API itself is passive-only. The controller delivers scan responses as
-    // separate reports; this tracker merges the pair before delivery (shared
-    // ScanResponseMerger, Bluedroid semantics). No GATT client.
-    return {.active_scan = true, .merges_scan_response = true, .gatt = false, .scan_mode_switch = true};
+    // The Beken BDK exposes no active-scan path (passive scanning only), so the
+    // controller never solicits scan responses and never merges them; consumers
+    // relying on scan-response fields (device names) get them only where the
+    // receiver merges per address (Home Assistant does). No GATT client either.
+    // scan_mode_switch stays false for the same reason: with no active-scan
+    // path there is no mode to switch to.
+    return {.active_scan = false, .merges_scan_response = false, .gatt = false, .scan_mode_switch = false};
+  }
+  bool request_scan_mode(bool active) {
+    // Passive-only controller: a passive request is already honored, an active
+    // one cannot be.
+    return !active;
  }
-  bool request_scan_mode(bool active);
  // The controller stores the address LSB-first (BLE convention); the contract
  // wants printable (MSB-first) order.
-  void get_adapter_mac(uint8_t out[MAC_ADDRESS_SIZE]) {
-    uint8_t mac[MAC_ADDRESS_SIZE];
+  void get_adapter_mac(uint8_t out[6]) {
+    uint8_t mac[6];
    this->parent_->get_mac_lsb_first(mac);
    for (int i = 0; i < 6; i++)
      out[i] = mac[5 - i];
  }
  bool scan_running() { return this->scan_running_; }
-  bool scan_active() { return this->scan_active_; }
+  bool scan_active() { return false; }  // BK72xx scan is passive-only

  // ---- bk72xx_ble::BLEScanListener ----
  // Delivered by the controller's loop() on the ESPHome main task — the
@@ -133,20 +133,15 @@ class BK72xxBLETracker : public Component,
 protected:
  void start_scan_();
  void stop_scan_();
-  void fire_scan_end_();
-  void mark_scan_ended_(uint32_t now);
-  /// Stamp-and-start for every controller scan attempt, so the retry rate
-  /// limit covers all callers.
-  bk72xx_ble::ScanOpResult controller_scan_start_();
-  /// Rate-limited (re)start; true when the scan is running (the caller must
-  /// not reuse a `now` older than the stamps this refreshed). Force and
-  /// backoff rules are documented at the definition.
+  /// Attempt a rate-limited (re)start; returns true when the scan is running,
+  /// which means the caller must not compare its cached millis() against the
+  /// timestamps start_scan_() just refreshed. force bypasses the rate gate for
+  /// an explicit user start only while the failure streak is clean; a failing
+  /// controller rate-limits forced attempts too. Failure accounting always runs.
  bool try_start_with_backoff_(uint32_t now, bool force = false);
-  void count_failed_start_();

  bool scan_running_{false};
-  bool scan_requested_{false};      // latched start_scan() request not yet running; loop() retries with backoff
-  bool start_attempt_open_{false};  // charge a later FAILED observation to the backoff exactly once
+  bool scan_requested_{false};  // latched start_scan() request not yet running; loop() retries with backoff
  // Defaults: the BK reference — 30 % duty cycle
  // (interval 100 ms / window 30 ms), in 0.625 ms BLE units.
  uint32_t scan_interval_{160};  // 160 × 0.625 ms = 100 ms
@@ -154,27 +149,30 @@ class BK72xxBLETracker : public Component,
  uint32_t scan_duration_{300000};
  bool scan_continuous_{true};
  bool scan_continuous_configured_{true};  // YAML value; stop_scan() must not lose it
-  bool scan_active_{true};                 // resolved mode; see scan_parameters.active
-  bool scan_active_configured_{true};      // YAML value; runtime requests must not lose it
 #ifdef USE_OTA_STATE_LISTENER
  bool scan_continuous_before_ota_{false};  // continuous mode saved at OTA start, restored on OTA failure
  bool scan_requested_before_ota_{false};   // pending one-shot latch saved at OTA start, re-latched on OTA failure
 #endif
  uint32_t scan_start_time_{0};

-  uint32_t last_scan_start_attempt_{0};  // last controller start attempt, any caller; rate-limits retries
-  uint8_t failed_start_count_{0};        // failed starts AND drops; backoff shift, cleared after a stable run (loop())
-  uint32_t scan_period_start_{0};        // loop-clock start of the scan period; rate-limits on_scan_end()
+  uint32_t last_scan_start_attempt_{0};  // millis() of last start_scan_() attempt; rate-limits retries
+  uint8_t failed_start_count_{0};        // consecutive failed starts; drives the retry backoff (reset on success)
+  uint32_t scan_period_start_{0};        // millis() at start of current scan period; used to rate-limit on_scan_end()
  bool scan_started_once_{false};        // true after first successful scan start; gates the period timer

-  // Shared adv + scan-response merge and frame dispatch (ble_device_base).
-  // All calls run on the main task (the controller queue already crossed
-  // tasks). Merger clock: stash_adv() reads the PARENT's cached loop time
-  // (on_scan_report runs inside bk72xx_ble's queue drain), sweep() this
-  // component's — same App.loop() pass, so the delta stays non-negative and
-  // the 300 ms timeout holds.
-  ble_device_base::ScanResponseMerger merger_;
-  ble_device_base::AdvDispatcher dispatcher_;
+  ble_device_base::RawAdvertisementCallback raw_advertisement_callback_{};
+#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
+  // Parsed-advertisement consumers registered through ble_device_base.
+  // Codegen-sized: no heap allocation, no std::vector template instantiations.
+  StaticVector<ble_device_base::ESPBTDeviceListener *, ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT> listeners_;
+#endif
+
+#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
+  // Per-period "Found device" DEBUG log with MAC dedup — shared implementation
+  // in ble_device_base, identical output on every tracker backend. Guarded like
+  // its only writer so a no-listener build does not carry an unused vector.
+  ble_device_base::DiscoveredDeviceLog discovered_log_{};
+#endif
 };

 }  // namespace esphome::bk72xx_ble_tracker
@@ -32,9 +32,6 @@ from esphome.const import (
    UNIT_VOLT,
    UNIT_WATT,
 )
-from esphome.core import ID
-from esphome.cpp_generator import MockObj, TemplateArgsType
-from esphome.types import ConfigType

 # Import ICONS not included in esphome's const.py, from the local components const.py
 from .const import ICON_ENERGY, ICON_FREQUENCY, ICON_VOLTAGE
@@ -148,18 +145,13 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
    ),
    synchronous=True,
 )
-async def reset_energy_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def reset_energy_to_code(config, action_id, template_arg, args):
    var = cg.new_Pvariable(action_id, template_arg)
    await cg.register_parented(var, config[CONF_ID])
    return var


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await uart.register_uart_device(var, config)
@@ -2,7 +2,6 @@ import esphome.codegen as cg
 from esphome.components import button
 import esphome.config_validation as cv
 from esphome.const import ENTITY_CATEGORY_CONFIG, ICON_RESTART
-from esphome.types import ConfigType

 from .. import CONF_BL0940_ID, bl0940_ns
 from ..sensor import BL0940
@@ -22,7 +21,7 @@ CONFIG_SCHEMA = cv.All(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = await button.new_button(config)
    await cg.register_component(var, config)
    await cg.register_parented(var, config[CONF_BL0940_ID])
@@ -10,7 +10,6 @@ from esphome.const import (
    ENTITY_CATEGORY_CONFIG,
    UNIT_PERCENT,
 )
-from esphome.types import ConfigType

 from .. import CONF_BL0940_ID, bl0940_ns
 from ..sensor import BL0940
@@ -28,7 +27,7 @@ CalibrationNumber = bl0940_ns.class_(
 )


-def validate_min_max(config: ConfigType) -> ConfigType:
+def validate_min_max(config):
    if config[CONF_MAX_VALUE] <= config[CONF_MIN_VALUE]:
        raise cv.Invalid("max_value must be greater than min_value")
    return config
@@ -70,7 +69,7 @@ CONFIG_SCHEMA = cv.Schema(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    # Get the BL0940 component instance
    bl0940 = await cg.get_variable(config[CONF_BL0940_ID])

@@ -23,7 +23,6 @@ from esphome.const import (
    UNIT_VOLT,
    UNIT_WATT,
 )
-from esphome.types import ConfigType

 from . import bl0940_ns

@@ -70,29 +69,27 @@ DEFAULT_BL0940_LEGACY_EREF = 3.6e6 / 297


 # methods to calculate voltage and current reference values
-def calculate_voltage_reference(vref: float, r_one: float, r_two: float) -> float:
+def calculate_voltage_reference(vref, r_one, r_two):
    # formula: 79931 / Vref * (R1 * 1000) / (R1 + R2)
    return 79931 / vref * (r_one * 1000) / (r_one + r_two)


-def calculate_current_reference(vref: float, r_shunt: float) -> float:
+def calculate_current_reference(vref, r_shunt):
    # formula: 324004 * RL / Vref
    return 324004 * r_shunt / vref


-def calculate_power_reference(
-    voltage_reference: float, current_reference: float
-) -> float:
+def calculate_power_reference(voltage_reference, current_reference):
    # calculate power reference based on voltage and current reference
    return voltage_reference * current_reference * 4046 / 324004 / 79931


-def calculate_energy_reference(power_reference: float) -> float:
+def calculate_energy_reference(power_reference):
    # formula: power_reference * 3600000 / (1638.4 * 256)
    return power_reference * 3600000 / (1638.4 * 256)


-def validate_legacy_mode(config: ConfigType) -> ConfigType:
+def validate_legacy_mode(config):
    # Only allow schematic calibration options if legacy_mode is False
    if config.get(CONF_LEGACY_MODE, True):
        forbidden = [
@@ -109,7 +106,7 @@ def validate_legacy_mode(config: ConfigType) -> ConfigType:
    return config


-def set_command_defaults(config: ConfigType) -> ConfigType:
+def set_command_defaults(config):
    # Set defaults for read_command and write_command based on legacy_mode
    legacy = config.get(CONF_LEGACY_MODE, True)
    if legacy:
@@ -121,7 +118,7 @@ def set_command_defaults(config: ConfigType) -> ConfigType:
    return config


-def set_reference_values(config: ConfigType) -> ConfigType:
+def set_reference_values(config):
    # Set default reference values based on legacy_mode
    if config.get(CONF_LEGACY_MODE, True):
        config.setdefault(CONF_VOLTAGE_REFERENCE, DEFAULT_BL0940_LEGACY_UREF)
@@ -226,7 +223,7 @@ FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
 )


-async def to_code(config: ConfigType) -> None:
+async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
    await uart.register_uart_device(var, config)
@@ -37,7 +37,7 @@ from esphome.const import (
    CONF_INTERVAL,
    KEY_TARGET_PLATFORM,
 )
-from esphome.core import CORE, ID, KEY_CORE, TimePeriod
+from esphome.core import CORE, ID, KEY_CORE
 from esphome.types import ConfigType

 CODEOWNERS = ["@Bl00d-B0b"]
@@ -163,9 +163,8 @@ _request_gatt_connection_slot = cg.slot_counter(GATT_CLIENT_COUNT_DEFINE)

 def request_gatt_client() -> None:
    """Compile in the neutral GATT client contract (ble_gatt_client.h) and
-    claim one compiled-in client slot (sizes ESPHOME_BLE_GATT_CLIENT_COUNT;
-    distinct from the proxy's validated connection budget). Called by
-    bluetooth_connection.new_gatt_backend() once per backend instance."""
+    claim one connection slot. Called by bluetooth_proxy once per connection
+    it instantiates on a hub platform."""
    cg.add_define("USE_BLE_GATT_CLIENT")
    _request_gatt_connection_slot()

@@ -243,35 +242,28 @@ def validate_scan_parameters(config: ConfigType) -> ConfigType:
    return config


-# The historical scan window default shared by the trackers that do not pin
-# their own; also the fallback for esp32's conditional default.
-DEFAULT_SCAN_WINDOW = "30ms"
-
-
 def scan_parameters_schema(
    interval_default: str,
    *,
-    window_default: str | Callable[[], TimePeriod] = DEFAULT_SCAN_WINDOW,
+    window_default: str = "30ms",
+    supports_active: bool = False,
 ) -> cv.All:
    """Build the scan_parameters value schema shared by all BLE trackers.

    interval_default and window_default are per chip (e.g. esp32 320/30 ms,
    bk72xx/rp2 100/30 ms — the reference scan rates of the respective stacks;
-    LN882H's SDK recommends 100/50 ms). window_default may also be a zero-arg
-    callable evaluated per validation when the user omits the key (esp32 uses
-    this to record that the window was defaulted, so a later validation step
-    can adjust it once sibling keys are resolved). The `active` option
-    (default on) is unconditional: active scanning is part of the tracker
-    contract — every current proxy client assumes it, so a passive-only
-    tracker must not share this schema.
+    LN882H's SDK recommends 100/50 ms). Pass supports_active=True only when
+    the tracker supports active scanning; it exposes the `active` option
+    (whose own default is on, esp32_ble_tracker behavior).
    """
    schema = {
        cv.Optional(CONF_DURATION, default="5min"): cv.positive_time_period_seconds,
        cv.Optional(CONF_INTERVAL, default=interval_default): cv.positive_time_period,
        cv.Optional(CONF_WINDOW, default=window_default): cv.positive_time_period,
        cv.Optional(CONF_CONTINUOUS, default=True): cv.boolean,
-        cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
    }
+    if supports_active:
+        schema[cv.Optional(CONF_ACTIVE, default=True)] = cv.boolean
    return cv.All(cv.Schema(schema), validate_scan_parameters)


@@ -17,16 +17,6 @@ namespace esphome::ble_device_base {
 /// client backend.
 static constexpr int GATT_ERR_NOT_CONNECTED = -1;
 static constexpr int GATT_ERR_NO_MEMORY = -2;
-/// ATT "Unlikely Error" (spec 0x0E): a client-side internal inconsistency,
-/// e.g. a service table failing its own bounds checks.
-static constexpr int GATT_ERR_UNLIKELY = 0x0E;
-
-/// Safety net shared by every GATT backend: force IDLE when the stack never
-/// delivers its disconnect completion.
-static constexpr uint32_t GATT_DISCONNECT_TIMEOUT_MS = 10000;
-
-/// ATT MTU before negotiation completes (Bluetooth spec default).
-static constexpr uint16_t DEFAULT_ATT_MTU = 23;

 // Preferred connection parameters shared by every platform's GATT client so
 // the backends cannot drift (units: interval 1.25 ms, timeout 10 ms; latency
@@ -137,7 +137,7 @@ void ESPBTDevice::parse_scan_rst(const esp32_ble::BLEScanResult &scan_result) {
  // BLEScanResult's bda is most-significant octet first; the neutral ingest
  // takes the BLE controller (LSB-first) order, so reverse — address_uint64()/
  // address_str_to() then produce exactly the historical esp32 values.
-  uint8_t mac_lsb_first[MAC_ADDRESS_SIZE];
+  uint8_t mac_lsb_first[6];
  for (uint8_t i = 0; i < 6; i++)
    mac_lsb_first[i] = scan_result.bda[5 - i];
  this->from_scan_result(mac_lsb_first, scan_result.rssi, scan_result.ble_addr_type, scan_result.ble_adv,
@@ -241,7 +241,7 @@ class ESPBTDevice {
  // the 2-byte element header); every in-tree tracker scans legacy PDUs only.
  static constexpr uint8_t MAX_ADV_NAME_LEN = 29;

-  uint8_t address_[MAC_ADDRESS_SIZE]{0};
+  uint8_t address_[6]{0};
  uint8_t address_type_{0};
  int rssi_{0};
  // Fixed buffer instead of std::string: no per-advertisement heap churn on
@@ -5,11 +5,10 @@
 // Exactly one GATT backend exists per build, so BLEGattConnection is a
 // compile-time alias (bluetooth_connection_gatt_backend.h), not an abstract
 // interface.
-// A consumer - the hub wrapper streaming the raw database, or a direct
-// consumer owning a dedicated backend and resolving handles by UUID -
-// drives it and receives completions through the GattClientListener
-// interface. All listener calls are delivered on the ESPHome main loop;
-// borrowed data pointers are valid only for the duration of the call.
+// The hub BluetoothConnection wrapper drives it and receives completions
+// through its event-sink methods, which the backend calls directly. All sink
+// calls are delivered on the ESPHome main loop; borrowed data pointers are
+// valid only for the duration of the call.
 //
 // Error domain (plain int, forwarded to the API without translation):
 //   0            success
@@ -79,55 +78,27 @@ struct GattServiceTable {
  uint16_t descriptor_count{0};
 };

-/// The event surface a backend delivers completions through - the one place
-/// with genuine runtime polymorphism (several consumer types, one non-virtual
-/// backend). Methods default to no-ops; consumers override what they consume.
-/// No destructor: components are never destroyed.
-/// on_connection_state carries the negotiated MTU and an HCI status/reason.
-/// Codegen wires the listener before setup(), so backends skip null checks.
-class GattClientListener {
- public:
-  virtual void on_connection_state(bool connected, uint16_t mtu, int error) {}
-  virtual void on_service_discovery_done(int error) {}
-  virtual void on_read_result(uint16_t handle, const uint8_t *data, uint16_t len, int error) {}
-  virtual void on_write_result(uint16_t handle, int error) {}
-  virtual void on_notify_state(uint16_t handle, bool enabled, int error) {}
-  virtual void on_notify_data(uint16_t handle, const uint8_t *data, uint16_t len) {}
-  virtual void on_pairing_result(int status) {}
-};
-
 // The BLEGattConnection op surface, asserted where the alias binds
 // (bluetooth_connection_gatt_backend.h). Operations return 0 when accepted (completion arrives
-// through the listener) or a synchronous error (busy, not connected, stack
+// through the sink) or a synchronous error (busy, not connected, stack
 // rejection); one operation may be outstanding at a time. Semantics beyond
 // the signatures:
 // - connect: addr_type is a BLE_ADDR_TYPE_* constant (ble_device.h).
-// - gatt_disconnect: also cancels a connect in progress (named to coexist
-//   with a platform stack's own void disconnect() on one backend class).
-//   Nonzero means nothing to tear down and no completion will follow; an
-//   accepted teardown (0) always reaches a terminal on_connection_state.
-// - cancel_gatt_disconnect: true cancels a scheduled teardown that has not
-//   started closing - the in-flight connect resumes and completes normally.
-//   False once the teardown owns the link (or nothing was scheduled).
+// - disconnect: also cancels a connect in progress.
 // - notify_characteristic: local registration only; the CCCD write is the
 //   API client's responsibility (a plain write_descriptor).
 // - get_service_table/release_services: backend-owned transient storage,
-//   released after streaming (release is idempotent). A backend may
-//   additionally provide its own service streamer (stream_service_batch on
-//   the concrete type, detected by the consumer at compile time) for
-//   arbitrary-size databases; the table then materializes only for consumers
-//   that ask for it.
-// - completions: connect and gatt_disconnect land in on_connection_state,
+//   released after streaming (release is idempotent).
+// - completions: connect and disconnect land in on_connection_state,
 //   discover_services in on_service_discovery_done, pair in
 //   on_pairing_result, reads in on_read_result, notify_characteristic in
-//   on_notify_state, characteristic writes (with and without response) and
-//   descriptor writes in on_write_result.
-template<typename T>
-concept BLEGattConnectionContract = requires(T conn, GattClientListener *listener, const uint8_t *data) {
-  conn.set_listener(listener);
+//   on_notify_state, characteristic writes with response and descriptor
+//   writes in on_write_result.
+template<typename T, typename Sink>
+concept BLEGattConnectionContract = requires(T conn, Sink *sink, const uint8_t *data) {
+  conn.set_listener(sink);
  { conn.connect(uint64_t{}, uint8_t{}) } -> std::same_as<int>;
-  { conn.gatt_disconnect() } -> std::same_as<int>;
-  { conn.cancel_gatt_disconnect() } -> std::same_as<bool>;
+  { conn.disconnect() } -> std::same_as<int>;
  { conn.discover_services() } -> std::same_as<int>;
  { conn.read_characteristic(uint16_t{}) } -> std::same_as<int>;
  { conn.write_characteristic(uint16_t{}, data, uint16_t{}, true) } -> std::same_as<int>;
@@ -138,9 +109,22 @@ concept BLEGattConnectionContract = requires(T conn, GattClientListener *listene
  { conn.update_connection_params(uint16_t{}, uint16_t{}, uint16_t{}, uint16_t{}) } -> std::same_as<int>;
  { conn.get_service_table() } -> std::same_as<GattServiceTable>;
  { conn.release_services() } -> std::same_as<void>;
-  // Connection-type hint for backends that tune parameters by it; others
-  // carry an inline no-op.
-  { conn.set_connection_type(ConnectionType{}) } -> std::same_as<void>;
+};
+
+// The event sink the backend calls directly (the hub BluetoothConnection
+// wrapper), asserted where the wrapper is defined: on_connection_state
+// carries the negotiated MTU and an HCI status/disconnect reason. The
+// requirements check call validity, not exact parameter types; keep sink
+// parameters at the documented widths (uint16_t handles and lengths).
+template<typename S>
+concept GattClientEventSinkContract = requires(S sink, const uint8_t *data) {
+  { sink.on_connection_state(true, uint16_t{}, int{}) } -> std::same_as<void>;
+  { sink.on_service_discovery_done(int{}) } -> std::same_as<void>;
+  { sink.on_read_result(uint16_t{}, data, uint16_t{}, int{}) } -> std::same_as<void>;
+  { sink.on_write_result(uint16_t{}, int{}) } -> std::same_as<void>;
+  { sink.on_notify_state(uint16_t{}, true, int{}) } -> std::same_as<void>;
+  { sink.on_notify_data(uint16_t{}, data, uint16_t{}) } -> std::same_as<void>;
+  { sink.on_pairing_result(int{}) } -> std::same_as<void>;
 };

 }  // namespace esphome::ble_device_base
@@ -83,9 +83,9 @@ struct HubCapabilities {
  /// Today: esp32 and rp2.
  bool gatt;
  /// request_scan_mode() is honored at runtime. Distinct from active_scan:
-  /// a passive-only controller can never switch, and a hub may support
-  /// active scanning yet still refuse the runtime switch (esp32_ble_tracker
-  /// drives its mode through its own tracker API).
+  /// a passive-only controller (bk72xx) can never switch, and a hub may
+  /// support active scanning yet still refuse the runtime switch
+  /// (esp32_ble_tracker drives its mode through its own tracker API).
  bool scan_mode_switch;
 };

@@ -1,153 +0,0 @@
-#include "scan_response_merger.h"
-
-#ifdef USE_BLE_SCAN_RESPONSE_MERGER
-
-#include "esphome/core/helpers.h"
-
-#include <cstring>
-
-namespace esphome::ble_device_base {
-
-void ScanResponseMerger::deliver_(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data,
-                                  uint8_t data_len, bool raw_only) {
-  // A partial bind is treated as unbound; never dereference half a binding.
-  if (this->dispatcher_ == nullptr || this->scan_continuous_ == nullptr)
-    return;
-  this->dispatcher_->dispatch(mac, rssi, addr_type, data, data_len, raw_only,
-                              *this->scan_continuous_ ? nullptr : this->log_tag_);
-}
-
-void ScanResponseMerger::stash_adv(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data,
-                                   uint8_t data_len, uint32_t now) {
-  // One pass: find a same-device entry (deliver + reuse) while remembering the
-  // first free slot as the fallback.
-  PendingAdv *slot = nullptr;
-  PendingAdv *free_slot = nullptr;
-  for (auto &p : this->pending_adv_) {
-    if (!p.used) {
-      if (free_slot == nullptr)
-        free_slot = &p;
-      continue;
-    }
-    if (p.addr_type == addr_type && memcmp(p.mac, mac, MAC_ADDRESS_SIZE) == 0) {
-      // Same device advertised again before its scan response arrived — deliver
-      // the previous advertisement (its scan response is not coming) and reuse
-      // the slot, so no frame is ever lost.
-      p.used = false;
-      this->pending_count_--;
-      this->deliver_(p.mac, p.rssi, p.addr_type, p.data, p.data_len, /*raw_only=*/false);
-      slot = &p;
-      break;
-    }
-  }
-  if (slot == nullptr)
-    slot = free_slot;
-  if (slot == nullptr) {
-    // Table full — degrade gracefully: deliver the advertisement unmerged.
-    this->deliver_(mac, rssi, addr_type, data, data_len, /*raw_only=*/false);
-    return;
-  }
-  slot->used = true;
-  this->pending_count_++;
-  memcpy(slot->mac, mac, MAC_ADDRESS_SIZE);
-  slot->addr_type = addr_type;
-  slot->rssi = rssi;
-  slot->data_len = (data_len <= sizeof(slot->data)) ? data_len : sizeof(slot->data);
-  memcpy(slot->data, data, slot->data_len);
-  slot->stored_ms = now;
-}
-
-void ScanResponseMerger::submit_scan_rsp(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data,
-                                         uint8_t data_len) {
-  // Fast-out on the empty table (sweep/flush use the same guard); this is the
-  // hottest caller.
-  if (this->pending_count_ != 0) {
-    for (auto &p : this->pending_adv_) {
-      if (p.used && p.addr_type == addr_type && memcmp(p.mac, mac, MAC_ADDRESS_SIZE) == 0) {
-        // Append in place: the slot is released on delivery, so its 62-byte
-        // buffer (legacy adv + scan response) holds the merged frame directly.
-        const uint8_t room = sizeof(p.data) - p.data_len;
-        const uint8_t add = (data_len <= room) ? data_len : room;
-        memcpy(p.data + p.data_len, data, add);
-        p.used = false;
-        this->pending_count_--;
-        // The advertisement's RSSI, not the scan response's (header contract).
-        this->deliver_(mac, p.rssi, addr_type, p.data, p.data_len + add, /*raw_only=*/false);
-        return;
-      }
-    }
-  }
-  // Unmatched scan-response: goes out on the raw callback only (HA merges per
-  // address); local listeners/triggers receive each advertisement exactly once
-  // via the merged/plain path above.
-  this->deliver_(mac, rssi, addr_type, data, data_len, /*raw_only=*/true);
-}
-
-void ScanResponseMerger::sweep(uint32_t now) {
-  if (this->pending_count_ == 0)
-    return;
-  for (auto &p : this->pending_adv_) {
-    if (p.used && now - p.stored_ms > PENDING_ADV_TIMEOUT_MS) {
-      p.used = false;
-      this->pending_count_--;
-      this->deliver_(p.mac, p.rssi, p.addr_type, p.data, p.data_len, /*raw_only=*/false);
-    }
-  }
-}
-
-void ScanResponseMerger::flush() {
-  if (this->pending_count_ == 0)
-    return;
-  for (auto &p : this->pending_adv_) {
-    if (p.used) {
-      p.used = false;
-      this->pending_count_--;
-      this->deliver_(p.mac, p.rssi, p.addr_type, p.data, p.data_len, /*raw_only=*/false);
-    }
-  }
-}
-
-void AdvDispatcher::dispatch(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data, uint8_t data_len,
-                             bool raw_only, const char *log_unclaimed_tag) {
-  // Raw callback (the raw-advertisement path). Both full advertisements and
-  // unmatched scan responses (raw_only) are forwarded.
-  if (this->raw_callback_.is_set()) {
-    const RawAdvertisement adv{.address = mac_lsb_first_to_uint64(mac),
-                               .data = data,
-                               .data_len = data_len,
-                               .rssi = rssi,
-                               .addr_type = addr_type};
-    this->raw_callback_.invoke(adv);
-  }
-
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  // Scan-response-only frames are never parsed for local sensors/triggers.
-  if (raw_only)
-    return;
-  ESPBTDevice device;
-  device.from_scan_result(mac, rssi, addr_type, data, data_len);
-  // The listener list holds sensors AND the tracker's automation triggers
-  // (the triggers are listeners, exactly like esp32_ble_tracker), so one
-  // loop feeds both and ORs into `found`.
-  bool found = false;
-  for (auto *listener : this->listeners_) {
-    if (listener->parse_device(device)) {
-      found = true;
-    }
-  }
-  if (!found && log_unclaimed_tag != nullptr)
-    this->discovered_log_.log_device(log_unclaimed_tag, device);
-#endif  // ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-}
-
-void AdvDispatcher::on_scan_end() {
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  for (auto *listener : this->listeners_)
-    listener->on_scan_end();
-  this->discovered_log_.clear();  // reset per-scan "Found device" dedup (esp32_ble_tracker parity)
-#endif
-}
-
-}  // namespace esphome::ble_device_base
-
-#endif  // USE_BLE_SCAN_RESPONSE_MERGER
@@ -1,152 +0,0 @@
-// Shared support for trackers whose controller delivers advertisement and
-// scan response as SEPARATE reports (ln882h, rp2, bk72xx; ESP-IDF concatenates
-// both into one result before ESPHome sees it):
-//
-//   ScanResponseMerger — Bluedroid-style merge: a scannable advertisement is
-//   held briefly, its scan response is appended on arrival and the pair is
-//   delivered as ONE merged frame. Merged delivery is what the receiving side
-//   is built around: Home Assistant keeps the latest raw frame per device and
-//   skips re-parsing when it is unchanged — split delivery alternates two raw
-//   frames per device and defeats both.
-//
-//   AdvDispatcher — the delivery half every such tracker repeats: raw
-//   callback, listener parsing, discovered-device log. Trackers delegate
-//   their BLEHub register_listener / set_raw_advertisement_callback here.
-//
-// The merger delivers straight into the tracker's AdvDispatcher — bind() wires
-// the pair once in setup(). Single-task use only (every tracker calls this on
-// the ESPHome main task). The clock is caller-provided: pass the same clock to
-// stash_adv() and sweep() (millis() or App.get_loop_component_start_time(),
-// never mixed).
-
-#pragma once
-
-#include "esphome/core/defines.h"
-
-// Emitted (cg.add_define) by each tracker that adopts the merger, so builds
-// whose tracker merges in-stack (esp32) never compile this code.
-#ifdef USE_BLE_SCAN_RESPONSE_MERGER
-
-#include "ble_device.h"
-#include "ble_hub.h"
-#include "esphome/core/helpers.h"
-
-#include <cstdint>
-
-namespace esphome::ble_device_base {
-
-/// The delivery half of a split-report tracker, shared so the dispatch
-/// contract (raw-callback ordering, raw_only gate, discovered-log policy)
-/// lives in one place. Owns the members every tracker otherwise duplicates;
-/// the tracker's BLEHub methods delegate here.
-class AdvDispatcher {
- public:
-  void register_listener(ESPBTDeviceListener *listener) {
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-    this->listeners_.push_back(listener);
-#endif
-  }
-  void set_raw_advertisement_callback(RawAdvertisementCallback callback) { this->raw_callback_ = callback; }
-  /// Dispatch one (possibly merged) advertisement: the raw callback, and —
-  /// unless raw_only — parsing for listeners/triggers. raw_only marks
-  /// unmatched scan-response frames: forwarded on the raw callback only, never
-  /// parsed for local sensors/triggers (Home Assistant merges per address).
-  /// log_unclaimed_tag: when non-null, a device no listener claimed is logged
-  /// under this tag (esp32_ble_tracker parity: pass the tracker TAG on
-  /// one-shot scans, nullptr on continuous scans, which would spam).
-  void dispatch(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data, uint8_t data_len,
-                bool raw_only, const char *log_unclaimed_tag);
-  /// Fire listeners' on_scan_end and reset the per-scan discovered-log dedup.
-  void on_scan_end();
-
- protected:
-  RawAdvertisementCallback raw_callback_{};
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  // Parsed-advertisement consumers registered through ble_device_base.
-  // Codegen-sized: no heap allocation, no std::vector template instantiations.
-  StaticVector<ESPBTDeviceListener *, ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT> listeners_;
-  // Per-period "Found device" DEBUG log with MAC dedup. Guarded like its only
-  // writer so a no-listener build does not carry an unused vector.
-  DiscoveredDeviceLog discovered_log_{};
-#endif
-};
-
-class ScanResponseMerger {
- public:
-  /// Wire the merger's output; call once in the tracker's setup(). Every
-  /// delivered frame goes to dispatcher->dispatch(); scan_continuous is read
-  /// at each delivery (runtime continuous flips are honored) to decide the
-  /// unclaimed-device log tag, so both pointers must outlive the merger —
-  /// tracker members always do.
-  void bind(AdvDispatcher *dispatcher, const bool *scan_continuous, const char *log_tag) {
-    this->dispatcher_ = dispatcher;
-    this->scan_continuous_ = scan_continuous;
-    this->log_tag_ = log_tag;
-  }
-  /// Hold a scannable advertisement, waiting for its scan response. The
-  /// tracker calls this only when it wants the merge (scannable advertisement
-  /// while an active scan runs) and delivers everything else directly. A
-  /// same-device re-advertisement delivers the held frame (its scan response
-  /// is not coming) and reuses the slot; a full table degrades gracefully to
-  /// unmerged delivery.
-  void stash_adv(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data, uint8_t data_len,
-                 uint32_t now);
-  /// A scan response arrived: append it to the held advertisement from the
-  /// same device and deliver the pair as one frame. The merged frame reports
-  /// the ADVERTISEMENT's RSSI — every unmerged path reports the
-  /// advertisement's measurement, so a device's RSSI must not jump between two
-  /// measurements depending on merge timing. Unmatched responses are delivered
-  /// raw_only.
-  void submit_scan_rsp(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data, uint8_t data_len);
-  /// Timeout flush (call from loop() with the stash_adv() clock): deliver
-  /// held advertisements whose scan response never arrived (device didn't
-  /// answer / frame lost) — unmerged, past PENDING_ADV_TIMEOUT_MS.
-  void sweep(uint32_t now);
-  /// Deliver every held advertisement now (scan period/scan is ending, before
-  /// on_scan_end fires): unmerged delivery, same as the timeout path.
-  void flush();
-  /// Lets loop() skip the cross-TU sweep() call in the common case (empty:
-  /// passive scan, or every pair already matched).
-  bool empty() const { return this->pending_count_ == 0; }
-
- private:
-  /// All delivery funnels through here: an unbound merger (bind() not called)
-  /// drops the frame instead of jumping through a null pointer, mirroring the
-  /// guard-before-invoke convention of the ble_hub.h callback slots.
-  void deliver_(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data, uint8_t data_len,
-                bool raw_only);
-
-  // 62 bytes = legacy adv (31) + scan response (31), the same merged maximum
-  // as ESP-IDF delivers on ESP32.
-  struct PendingAdv {
-    bool used{false};
-    uint8_t mac[MAC_ADDRESS_SIZE];
-    uint8_t addr_type;
-    int8_t rssi;
-    uint8_t data_len;  // <= sizeof(data)
-    uint8_t data[62];
-    uint32_t stored_ms;
-  };
-  // Sized for the unanswered case: a pair that IS answered normally matches
-  // within one report-queue drain, so a slot is held for the full timeout only
-  // by scannable devices that never reply. 8 concurrent such advertisers
-  // before the merge degrades (frames still delivered, just unmerged) at
-  // ~80 B each.
-  static constexpr size_t MAX_PENDING_ADV = 8;
-  // On air a scan response follows its advertisement by T_IFS (150 µs) — the
-  // timeout only covers HOST-side report queuing under WiFi/BLE coexistence,
-  // measured on-device (ln882h) at up to ~136 ms. 300 ms = >2x that margin,
-  // while staying below any device's re-advertising period.
-  static constexpr uint32_t PENDING_ADV_TIMEOUT_MS = 300;
-  AdvDispatcher *dispatcher_{nullptr};
-  const bool *scan_continuous_{nullptr};  // read at delivery; see bind()
-  const char *log_tag_{nullptr};
-  // pending_count_ mirrors the number of set `used` flags; both are updated
-  // together on every transition.
-  PendingAdv pending_adv_[MAX_PENDING_ADV];
-  uint8_t pending_count_{0};
-};
-
-}  // namespace esphome::ble_device_base
-
-#endif  // USE_BLE_SCAN_RESPONSE_MERGER
@@ -1,35 +1,23 @@
-"""Per-platform GATT connection backends and the helpers to embed one.
+"""Per-platform GATT connection backends the Bluetooth proxy drives.

-Backends: esp32 Bluedroid, rp2 BTstack. No user-facing configuration; the
-Bluetooth proxy's codegen declares and registers the backend instances
-through gatt_client_schema()/hub_connection_schema() + new_gatt_backend().
+Backends: esp32 Bluedroid, rp2 BTstack. Auto-loaded by bluetooth_proxy, no
+user-facing configuration; the proxy's codegen declares and registers the
+connection instances.
 """

-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
+import functools

 import esphome.codegen as cg
-from esphome.components import rp2040_ble
-from esphome.config_helpers import (
-    filter_source_files_from_platform,
-    frameworks_for_platforms,
-)
-import esphome.config_validation as cv
-from esphome.const import PLATFORM_ESP32, PLATFORM_RP2, PlatformFramework
+from esphome.config_helpers import filter_source_files_from_platform
+from esphome.const import PLATFORM_RP2, PlatformFramework
 from esphome.core import CORE
-from esphome.types import ConfigType


 def AUTO_LOAD() -> list[str]:
-    """ble_device_base plus the platform BLE stack the build's backend
-    registers with (the Bluedroid header includes the tracker's), so
-    consumers need not know. The platform-less arm serves manifest tooling."""
-    if CORE.is_esp32:
-        return ["ble_device_base", "esp32_ble_tracker"]
-    if CORE.is_rp2:
-        return ["ble_device_base", "rp2040_ble"]
-    if CORE.target_platform is None:
-        return ["ble_device_base", "esp32_ble_tracker", "rp2040_ble"]
+    """The esp32 connection header includes esp32_ble_client, so the closure
+    must be self-satisfying; no target platform (tooling) gets the union."""
+    if CORE.is_esp32 or CORE.target_platform is None:
+        return ["ble_device_base", "esp32_ble_client"]
    return ["ble_device_base"]


@@ -37,167 +25,43 @@ CODEOWNERS = ["@bdraco", "@jesserockz"]

 bluetooth_connection_ns = cg.esphome_ns.namespace("bluetooth_connection")

-# arduino-pico's prebuilt BTstack is compiled with MAX_NR_GATT_CLIENTS 1 and
-# MAX_NR_HCI_CONNECTIONS 2; for more than one backend, rp2040_ble's
-# btstack_memory.cpp replaces those pools via linker --wrap (requested by
-# _rp2_register), sized from ESPHOME_BLE_GATT_CLIENT_COUNT. The cap itself
-# belongs to the platform stack that owns the pools.
-RP2_MAX_CONNECTIONS = rp2040_ble.MAX_CONNECTIONS
+# arduino-pico's prebuilt BTstack is compiled with MAX_NR_GATT_CLIENTS 1;
+# raising this needs an upstream change (the layer itself supports N).
+RP2_MAX_CONNECTIONS = 1

-# Slot limits for the hub platforms running the connection-capable proxy;
-# the backend registry itself is _PLATFORM_BACKENDS below.
+# Hub platforms with a GATT backend, mapped to their slot limit — the single
+# registry of which hub platforms run the connection-capable proxy.
 HUB_MAX_CONNECTIONS: dict[str, int] = {PLATFORM_RP2: RP2_MAX_CONNECTIONS}

-# The hub-platform wrapper and the backend codegen classes.
+# The hub-platform wrapper and the rp2 BTstack backend codegen classes.
 HubBluetoothConnection = bluetooth_connection_ns.class_("BluetoothConnection")
 RP2GattClient = bluetooth_connection_ns.class_("RP2GattClient", cg.Component)
-BluedroidGattClient = bluetooth_connection_ns.class_(
-    "BluedroidGattClient", cg.Component
+
+
+@functools.cache
+def esp32_connection_class() -> cg.MockObjClass:
+    """Lazy: importing esp32_ble_client registers esp32-only automations as
+    an import side effect, which must not leak into other platforms."""
+    from esphome.components import esp32_ble_client
+
+    return bluetooth_connection_ns.class_(
+        "BluetoothConnection", esp32_ble_client.BLEClientBase
+    )
+
+
+FILTER_SOURCE_FILES = filter_source_files_from_platform(
+    {
+        "bluetooth_connection_esp32.cpp": {
+            PlatformFramework.ESP32_ARDUINO,
+            PlatformFramework.ESP32_IDF,
+        },
+        # Every hub platform the proxy admits (the file compiles empty where
+        # USE_BLE_GATT_CLIENT is not defined), so a platform gaining a backend
+        # cannot hit a missing-symbol trap here.
+        "bluetooth_connection_hub.cpp": {
+            PlatformFramework.RP2_ARDUINO,
+            PlatformFramework.LN882X_ARDUINO,
+        },
+        "bluetooth_connection_rp2.cpp": {PlatformFramework.RP2_ARDUINO},
+    }
 )
-
-CONF_BACKEND_ID = "backend_id"
-
-DOMAIN = "bluetooth_connection"
-
-
-@dataclass
-class _ConnectionData:
-    rp2_backend_count: int = 0
-
-
-def _get_data() -> _ConnectionData:
-    if DOMAIN not in CORE.data:
-        CORE.data[DOMAIN] = _ConnectionData()
-    return CORE.data[DOMAIN]
-
-
-def _esp32_schema_fragment() -> cv.Schema:
-    from esphome.components import esp32_ble_tracker
-
-    return esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA
-
-
-def _rp2_schema_fragment() -> cv.Schema:
-    return cv.Schema(
-        {cv.GenerateID(rp2040_ble.CONF_RP2040_BLE_ID): cv.use_id(rp2040_ble.RP2040BLE)}
-    )
-
-
-async def _esp32_register(backend: cg.MockObj, config: ConfigType) -> None:
-    from esphome.components import esp32_ble_tracker
-
-    # The tracker's promote loop owns connect timing; the backend registers
-    # as a raw client (it is the tracker's ESPBTClient).
-    await esp32_ble_tracker.register_raw_client(backend, config)
-
-
-async def _rp2_register(backend: cg.MockObj, config: ConfigType) -> None:
-    from esphome.components import ota
-
-    # The backend drops its link when an OTA starts (esp32 tracker parity).
-    ota.request_ota_state_listeners()
-    # More than one backend outgrows the prebuilt BTstack pools: swap them for
-    # the ESPHOME_BLE_GATT_CLIENT_COUNT-sized ones in rp2040_ble's
-    # btstack_memory.cpp. Keyed to backend registrations (the same event that
-    # grows the count that sizes the pools), so single-backend builds emit no
-    # flags and stay byte-identical to previous releases.
-    data = _get_data()
-    data.rp2_backend_count += 1
-    if data.rp2_backend_count == 2:
-        rp2040_ble.add_btstack_pool_overrides()
-    await cg.register_parented(backend, config[rp2040_ble.CONF_RP2040_BLE_ID])
-
-
-@dataclass(frozen=True)
-class _PlatformBackend:
-    """One platform's backend: codegen class, extra schema keys, and stack
-    registration. The esp32 fragments import their stack lazily because those
-    imports register esp32-only automations as a side effect; rp2040_ble is
-    side-effect-free, so it is imported at module scope (the cap constant
-    needs it there anyway)."""
-
-    backend_class: cg.MockObjClass
-    schema_fragment: Callable[[], cv.Schema]
-    register: Callable[[cg.MockObj, ConfigType], Awaitable[None]]
-
-
-# The single registry of platforms with a GATT client backend; a platform
-# missing here fails loudly everywhere instead of falling into another
-# platform's arm.
-_PLATFORM_BACKENDS: dict[str, _PlatformBackend] = {
-    PLATFORM_ESP32: _PlatformBackend(
-        BluedroidGattClient, _esp32_schema_fragment, _esp32_register
-    ),
-    PLATFORM_RP2: _PlatformBackend(RP2GattClient, _rp2_schema_fragment, _rp2_register),
-}
-
-
-def _backend_entry(platform: str | None = None) -> _PlatformBackend:
-    key = platform if platform is not None else CORE.target_platform
-    if (entry := _PLATFORM_BACKENDS.get(key)) is None:
-        raise cv.Invalid(f"no GATT client backend is registered for {key}")
-    return entry
-
-
-def gatt_client_schema(platform: str | None = None) -> cv.Schema:
-    """Schema fragment for one GATT backend instance: its generated id plus
-    the platform-stack reference new_gatt_backend() resolves.
-
-    Defaults to the platform being validated; pass `platform` explicitly when
-    building a schema outside validation (the language-schema dumper calls
-    per-platform builders under arbitrary CORE platforms).
-    """
-    entry = _backend_entry(platform)
-    return entry.schema_fragment().extend(
-        {cv.GenerateID(CONF_BACKEND_ID): cv.declare_id(entry.backend_class)}
-    )
-
-
-def hub_connection_schema(platform: str | None = None) -> cv.Schema:
-    """Per-slot schema for the proxy's connection wrappers: the wrapper id on
-    top of the backend fragment, plus the component keys (setup_priority and
-    friends now apply to the backend, the slot's real Component). Same
-    platform rules as gatt_client_schema()."""
-    return (
-        gatt_client_schema(platform)
-        .extend({cv.GenerateID(): cv.declare_id(HubBluetoothConnection)})
-        .extend(cv.COMPONENT_SCHEMA)
-    )
-
-
-async def new_gatt_backend(config: ConfigType) -> cg.MockObj:
-    """Instantiate the backend declared by gatt_client_schema() and register
-    it with its platform stack. The connection slot is claimed at validation
-    (the proxy's slot validators), not here.
-    """
-    from esphome.components import ble_device_base
-
-    ble_device_base.request_gatt_client()
-    backend = cg.new_Pvariable(config[CONF_BACKEND_ID])
-    # The backend is the slot's real Component: component keys from the
-    # connection entry (setup_priority, ...) apply to it. Consumers whose own
-    # schema carries keys that register_component would misapply to the
-    # backend (e.g. a polling interval) must not put them in this config.
-    await cg.register_component(backend, config)
-    await _backend_entry().register(backend, config)
-    return backend
-
-
-# Named so tests can pin the hub entry against bluetooth_proxy's platform
-# list (this module cannot import bluetooth_proxy to derive it).
-SOURCE_FILE_FRAMEWORKS: dict[str, set[PlatformFramework]] = {
-    "bluetooth_connection_bluedroid.cpp": frameworks_for_platforms([PLATFORM_ESP32]),
-    # Every hub platform the proxy admits (the file compiles empty where
-    # USE_BLE_GATT_CLIENT is not defined), so a platform gaining a backend
-    # cannot hit a missing-symbol trap here.
-    "bluetooth_connection_hub.cpp": {
-        PlatformFramework.RP2_ARDUINO,
-        PlatformFramework.LN882X_ARDUINO,
-        PlatformFramework.BK72XX_ARDUINO,
-        PlatformFramework.ESP32_ARDUINO,
-        PlatformFramework.ESP32_IDF,
-    },
-    "bluetooth_connection_rp2.cpp": {PlatformFramework.RP2_ARDUINO},
-}
-
-FILTER_SOURCE_FILES = filter_source_files_from_platform(SOURCE_FILE_FRAMEWORKS)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kevin Ahrendt	b7b607ad69	[voice_assistant] Note the background task exception in the threading comment model_load_task is declared below the comment and runs off the main loop, so the blanket main-loop-only claim was wrong for it.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	e5b425bc6a	[voice_assistant] Add unit tests for runtime model config handling Covers the two Python behaviours a build YAML cannot: the conditional AUTO_LOAD that keeps sha256 and json out of builds that do not download models, and the validator rejecting http_request_id without micro_wake_word.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	757f7aee4f	[micro_wake_word] Own the enabled-state preference key voice_assistant derived the same fnv1_hash(id) key independently to restore downloaded models, with nothing tying the two together. Expose the derivation as WakeWordModel::enabled_preference_key so the component that owns the persistence format owns the key too.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	398f29dced	[voice_assistant] Reject external wake words without a usable model hash equals_hex needs exactly 64 hex characters, so an empty or truncated model_hash downloaded the whole model and then failed with a hash mismatch, which points at a corrupt download rather than a missing field. Skip the entry when it is cached instead.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	2b01e48d1b	[voice_assistant] Do not enable internal-only wake words on request The disable-all loop iterates get_wake_words(), which filters out internal-only models, but the enable path uses get_model_by_id(), which does not. Enabling one from a set_configuration request left it active with no way to turn it off short of a reboot.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	68aa3b87aa	[voice_assistant] Read the enabled preference without allocating a backend make_preference allocates a backend that ESPPreferenceObject never frees, and restore_runtime_models_ runs for every advertised model on every configuration request Home Assistant sends. Use load_from_key for the read instead.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	2c3867dbdb	[voice_assistant] Check for an already loaded model before building one A WakeWordModel claims a preference backend that is never released, so a model built only to be rejected by add_runtime_model() costs internal RAM that never comes back. The duplicate case is expected here, since a config change can re-queue a download that is already in flight. Move the check above the construction. The id was free a moment earlier and this runs on the main loop, so a failed add is now always a genuine failure.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	b26f6e79e1	[voice_assistant] Prepend the model URL prefix in place clang-tidy's performance-inefficient-string-concatenation flags building the absolute URL with operator+, which allocates a temporary for the prefix and another for the result. Insert the prefix instead.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	aedc5f2f28	[voice_assistant] Handle downloads without a content length A chunked response reports no usable content length, 0 on ESP-IDF and SIZE_MAX on Arduino, so both the manifest and the model were rejected. Bound the model read by the size Home Assistant advertised, falling back to the content length when it advertised none, and read a manifest of unknown length up to the existing cap. The read still has to deliver the expected number of bytes, and the SHA256 check is unchanged. Also move http_request_ out of the block documented as main loop only, since the download task uses it.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	6b180f7be9	[voice_assistant] Use starts_with for the model URL check clang-tidy's modernize-use-starts-ends-with flags the compare calls.	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	5a429696c0	Remove non-existant external wake words feature flags	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	be2b2920c8	Clean up comments - Remove unnecessary ones that are self-explanaied by the code - Reduce verbosity	2026-08-10 08:11:47 -04:00
Kevin Ahrendt	046d030d36	[voice_assistant] Download wake word models advertised by Home Assistant Home Assistant sends the list of external wake words it knows about with every configuration request. This picks up the ones micro_wake_word can run, downloads them on demand, and hands them to micro_wake_word so they can be activated like a compiled-in model. Set the new http_request option to turn this on. It requires micro_wake_word to be configured, and pulls in the sha256 and json components used to verify a download and read its manifest. How it works: - The advertised wake words are cached on each configuration request, so entries Home Assistant stops sending drop out and their models are unloaded. - When Home Assistant activates a wake word whose model is not loaded yet, the model is queued and fetched by a background task. The wake word is reported as active straight away so the UI reflects the request while the download runs. - Downloads are checked against the size and hash from the manifest, and the model has to use the same feature step size as the frontend. - A model that fails to load is stored as disabled so it is not retried on every boot. - Loaded models are restored after a reboot. The configuration response now comes entirely from voice_assistant, which merges the compiled-in models with the cached external wake words, so the API no longer needs to append them itself.	2026-08-10 08:11:47 -04:00