[core] Move the JSON string escape helper into core and share it with ble_scanner

2026-08-23 14:46:20 +00:00 · 2026-07-27 08:56:09 -10:00
1578 changed files with 14720 additions and 72353 deletions
@@ -8,7 +8,7 @@ contact_links:
    url: https://github.com/esphome/esphome-webserver/issues/new/choose
    about: Report an issue with the ESPHome web server.
  - name: Report an issue with the ESPHome Builder / Dashboard
-    url: https://github.com/esphome/device-builder/issues/new/choose
+    url: https://github.com/esphome/dashboard/issues/new/choose
    about: Report an issue with the ESPHome Builder / Dashboard.
  - name: Report an issue with the ESPHome API client
    url: https://github.com/esphome/aioesphomeapi/issues/new/choose
@@ -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 .
@@ -13,7 +13,6 @@ module.exports = {
    'merging-to-release',
    'merging-to-beta',
    'chained-pr',
-    'stacked-pr',
    'core',
    'small-pr',
    'medium-pr',
@@ -33,54 +33,16 @@ async function fetchPrFileContent(github, context, path) {
  }
 }

-// Check whether a pull request is part of a GitHub stack.
-//
-// GitHub's stacked pull request feature adds a `stack` object to the pull
-// request resource. It is present on every pull request in the stack -
-// including the bottom one, whose base is already `dev` - and is absent
-// entirely on standalone pull requests.
-//
-// The `pull_request_target` webhook payload is not guaranteed to carry this
-// field, so fall back to asking the API when it is missing. Guessing wrong
-// here is costly: a stacked pull request mistaken for a manually chained one
-// gets a label that blocks merging.
-async function isStackedPr(github, context) {
-  const pr = context.payload.pull_request;
-  if (pr.stack != null) {
-    return true;
-  }
-
-  try {
-    const { owner, repo } = context.repo;
-    const { data } = await github.rest.pulls.get({
-      owner,
-      repo,
-      pull_number: pr.number,
-    });
-    return data.stack != null;
-  } catch (error) {
-    // Treat an API failure as "not stacked" so a chained pull request still
-    // gets its blocking label rather than silently slipping through.
-    console.log('Failed to check stack membership:', error.message);
-    return false;
-  }
-}
-
 // Strategy: Merge branch detection
-async function detectMergeBranch(github, context) {
+async function detectMergeBranch(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');
  } else if (baseRef === 'beta') {
    labels.add('merging-to-beta');
-  } 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) {
-    // A chain built by hand: it must not merge until its base branch does.
+  } else if (baseRef !== 'dev') {
    labels.add('chained-pr');
  }

@@ -88,7 +88,7 @@ module.exports = async ({ github, context }) => {

  // Early exit for release and beta branches only
  if (baseRef === 'release' || baseRef === 'beta') {
-    const branchLabels = await detectMergeBranch(github, context);
+    const branchLabels = await detectMergeBranch(context);
    const finalLabels = Array.from(branchLabels);

    console.log('Computed labels (merge branch only):', finalLabels.join(', '));
@@ -118,7 +118,7 @@ module.exports = async ({ github, context }) => {
    deprecatedResult,
    maintainerAccess
  ] = await Promise.all([
-    detectMergeBranch(github, context),
+    detectMergeBranch(context),
    detectComponentPlatforms(changedFiles, apiData),
    detectNewComponents(github, context, prFiles),
    detectNewPlatforms(github, context, prFiles, apiData),
@@ -1,7 +1,6 @@
 const { describe, it } = require('node:test');
 const assert = require('node:assert/strict');
 const {
-  detectMergeBranch,
  detectNewPlatforms,
  detectNewComponents,
  detectPRSize,
@@ -37,122 +36,6 @@ const API_DATA = {
 const WITH_SCHEMA = 'CONFIG_SCHEMA = cv.Schema({})';
 const WITHOUT_SCHEMA = 'CODEOWNERS = ["@esphome/core"]';

-// ---------------------------------------------------------------------------
-// detectMergeBranch
-// ---------------------------------------------------------------------------
-
-// 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' } = {}) {
-  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 } }
-  };
-}
-
-// A GitHub API mock exposing only rest.pulls.get, with a call counter so
-// tests can assert whether the API fallback was actually invoked.
-function makeStackGithub({ stack = null, error = null } = {}) {
-  const state = { calls: 0 };
-  const github = {
-    rest: {
-      pulls: {
-        get: async () => {
-          state.calls++;
-          if (error) throw error;
-          return { data: { stack } };
-        }
-      }
-    }
-  };
-  return { github, state };
-}
-
-const STACK_INFO = { base: { ref: 'dev' }, id: 71540, number: 17978, position: 3, size: 3 };
-
-describe('detectMergeBranch', () => {
-  it('base ref release adds merging-to-release only and never checks the stack', async () => {
-    const { github, state } = makeStackGithub({ stack: STACK_INFO });
-    const context = makeMergeContext('release', { stack: STACK_INFO });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['merging-to-release']);
-    assert.equal(state.calls, 0);
-  });
-
-  it('base ref beta adds merging-to-beta only and never checks the stack', async () => {
-    const { github, state } = makeStackGithub({ stack: STACK_INFO });
-    const context = makeMergeContext('beta', { stack: STACK_INFO });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['merging-to-beta']);
-    assert.equal(state.calls, 0);
-  });
-
-  it('stack present on the webhook payload adds stacked-pr without calling the API', async () => {
-    const { github, state } = makeStackGithub();
-    const context = makeMergeContext('feature-branch', { stack: STACK_INFO });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['stacked-pr']);
-    assert.equal(state.calls, 0);
-  });
-
-  it('stack absent from payload falls back to the API and adds stacked-pr', async () => {
-    const { github, state } = makeStackGithub({ stack: STACK_INFO });
-    const context = makeMergeContext('feature-branch');
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['stacked-pr']);
-    assert.equal(state.calls, 1);
-  });
-
-  it('bottom of a stack (base ref dev, stack present) still adds stacked-pr', async () => {
-    const { github, state } = makeStackGithub();
-    const context = makeMergeContext('dev', { stack: STACK_INFO });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['stacked-pr']);
-    assert.equal(state.calls, 0);
-  });
-
-  it('not stacked, base ref not dev adds chained-pr', async () => {
-    const { github } = makeStackGithub({ stack: null });
-    const context = makeMergeContext('feature-branch');
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['chained-pr']);
-  });
-
-  it('not stacked, base ref dev adds no labels', async () => {
-    const { github } = makeStackGithub({ stack: null });
-    const context = makeMergeContext('dev');
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), []);
-  });
-
-  it('a failed stack lookup falls back to not-stacked, so a feature-branch base adds chained-pr', async () => {
-    const { github, state } = makeStackGithub({ error: new Error('API unavailable') });
-    const context = makeMergeContext('feature-branch');
-    const labels = await detectMergeBranch(github, context);
-    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']);
-  });
-
-});
-
 // ---------------------------------------------------------------------------
 // detectNewPlatforms
 // ---------------------------------------------------------------------------
@@ -35,7 +35,7 @@ jobs:
          # Scope the minted App token to the minimum needed by auto-label-pr/*.js.
          permission-contents: read       # repos.getContent for CODEOWNERS and file lookups in detectors.js
          permission-issues: write        # listLabelsOnIssue, addLabels, removeLabel, list/createComment
-          permission-pull-requests: write  # pulls.get, pulls.listFiles, list/create/update/dismissReview
+          permission-pull-requests: write  # pulls.listFiles, list/create/update/dismissReview

      - name: Auto Label PR
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
@@ -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,17 +67,15 @@ 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
-        env:
-          HEAD_REF: ${{ github.head_ref || github.ref_name }}
        run: |
          # Sanitize the branch name into a valid docker tag: replace invalid
          # characters, ensure the first character is valid (tags must start
          # with [A-Za-z0-9_]), and cap the length at 128 characters.
-          branch="$HEAD_REF"
+          branch="${{ github.head_ref || github.ref_name }}"
          tag="${branch//[^a-zA-Z0-9_.-]/-}"
          case "$tag" in
            [a-zA-Z0-9_]*) ;;
@@ -98,7 +96,7 @@ jobs:

      - name: Log in to the GitHub container registry
        if: steps.tag.outputs.push == 'true'
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -153,10 +151,10 @@ 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
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -182,8 +180,8 @@ jobs:
      contents: read  # actions/checkout to load the test configs
    strategy:
      fail-fast: false
-      # Modest cap so this smoke test leaves room on the shared runner pool.
-      max-parallel: 8
+      # Cap concurrency so this smoke test doesn't hog all the shared runners.
+      max-parallel: 2
      matrix:
        # One entry per distinct toolchain. ESP32 variants (c3/c6/s2/s3/p4)
        # share a toolchain bundle, so esp32 is exercised on the base variant
@@ -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
@@ -65,24 +65,202 @@ jobs:
          python -m venv venv
          . 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_dev.txt -r requirements_test.txt pre-commit
          uv pip install -e .

-  seed-apt-cache:
-    name: Seed apt package cache
+  pylint:
+    name: Check pylint
    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
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.python-linters == 'true'
    steps:
-      - name: Install apt packages (cached)
-        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
+      - name: Check out code from GitHub
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
        with:
-          packages: libsdl2-dev ccache
-          version: 1.1
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Run pylint
+        run: |
+          . venv/bin/activate
+          pylint -f parseable --persistent=n esphome
+      - name: Suggested changes
+        run: script/ci-suggest-changes
+        if: always()
+
+  ci-custom:
+    name: Run script/ci-custom
+    runs-on: ubuntu-24.04
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.core-ci == 'true'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Register matcher
+        run: echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
+      - name: Run script/ci-custom
+        run: |
+          . venv/bin/activate
+          script/ci-custom.py
+          script/build_codeowners.py --check
+          script/build_language_schema.py --check
+          script/generate-esp32-boards.py --check
+          script/generate-rp2-boards.py --check
+          script/ci_check_duplicate_test_ids.py
+          script/ci_check_test_fixture_list_form.py
+
+  import-time:
+    name: Check import esphome.__main__ time
+    runs-on: ubuntu-24.04
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.import-time == 'true'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Check import time against budget and write waterfall HAR
+        run: |
+          . venv/bin/activate
+          script/check_import_time.py --check --har importtime.har
+      - name: Upload waterfall HAR
+        if: always()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: import-time-waterfall
+          path: importtime.har
+          if-no-files-found: ignore
+          retention-days: 14
+
+  device-builder:
+    name: Test downstream esphome/device-builder
+    runs-on: ubuntu-24.04
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.device-builder == 'true'
+    steps:
+      - name: Check out esphome (this PR)
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          path: esphome
+      - name: Check out esphome/device-builder
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          repository: esphome/device-builder
+          ref: main
+          path: device-builder
+      - name: Set up Python
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        with:
+          python-version: "3.13"
+      - name: Set up uv
+        # Mirrors the install shape device-builder's own CI uses
+        # (esphome/device-builder#192): uv replaces pip for the
+        # 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@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        with:
+          enable-cache: true
+          # Pull request saves land in per-PR scopes nothing else can
+          # reuse; dev pushes seed the shared copy instead.
+          save-cache: ${{ github.event_name != 'pull_request' }}
+          # Pin uv version so the action does not have to fetch the
+          # manifest from raw.githubusercontent.com on every cache
+          # miss; that fetch flakes on Windows runners.
+          version: "0.11.15"
+      - name: Install device-builder + esphome from PR
+        # Install device-builder with its esphome + test extras
+        # first so its pinned versions of pytest/etc. land, then
+        # overlay the PR's esphome so the downstream tests run
+        # against this PR's Python code. ``--system`` installs into
+        # the runner's Python instead of a venv.
+        run: |
+          uv pip install --system -e './device-builder[esphome,test]'
+          uv pip install --system -e ./esphome
+      - name: Run device-builder pytest
+        # ``-n auto`` runs under pytest-xdist (matches device-builder's
+        # own CI). No ``--cov`` here -- this is purely a downstream
+        # smoke check against this PR's esphome code. ``tests/e2e/slow``
+        # is excluded: those are real multi-minute toolchain compiles
+        # (LibreTiny SDK clone, native ESP-IDF install) that device-builder
+        # runs in its own dedicated jobs, not this smoke check.
+        working-directory: device-builder
+        run: pytest -q -n auto --maxfail=5 --durations=30 --no-cov --ignore=tests/benchmarks --ignore=tests/e2e/slow
+
+  pytest:
+    name: Run pytest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.12"
+          - "3.13"
+          - "3.14"
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+        exclude:
+          # Minimize CI resource usage
+          # by only running the Python version
+          # version used for docker images on Windows and macOS
+          - python-version: "3.13"
+            os: windows-latest
+          - python-version: "3.13"
+            os: macOS-latest
+    runs-on: ${{ matrix.os }}
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.core-ci == 'true'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Restore Python
+        id: restore-python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Register matcher
+        run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
+      - name: Run pytest
+        if: matrix.os == 'windows-latest'
+        run: |
+          . ./venv/Scripts/activate.ps1
+          pytest -vv --cov-report=xml --tb=native --durations=30 -n auto tests --ignore=tests/integration/
+      - name: Run pytest
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
+        run: |
+          . venv/bin/activate
+          pytest -vv --cov-report=xml --tb=native --durations=30 -n auto tests --ignore=tests/integration/
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+      - name: Save Python virtual environment cache
+        if: github.ref == 'refs/heads/dev'
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: venv
+          key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}

  determine-jobs:
    name: Determine which jobs to run
@@ -173,174 +351,9 @@ jobs:
          path: .temp/components_graph.json
          key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}

-  ci-custom:
-    name: Run script/ci-custom
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.core-ci == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
-      - name: Run script/ci-custom
-        run: |
-          . 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
-          script/ci_check_duplicate_test_ids.py
-          script/ci_check_test_fixture_list_form.py
-
-  pylint:
-    name: Check pylint
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.python-linters == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Run pylint
-        run: |
-          . venv/bin/activate
-          pylint -f parseable --persistent=n esphome
-      - name: Suggested changes
-        run: script/ci-suggest-changes
-        if: always()
-
-  lint-format:
-    name: Check lint and formatting
-    runs-on: ubuntu-latest
-    needs:
-      - determine-jobs
-    if: github.event_name == 'pull_request' && !startsWith(github.base_ref, 'beta') && !startsWith(github.base_ref, 'release') && needs.determine-jobs.outputs.core-ci == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Run prek
-        uses: j178/prek-action@4e14d07f9231acabce116ccfca13b13dd9755ece # v3.0.0
-        with:
-          # Keep in sync with requirements_test.txt.
-          prek-version: "0.4.11"
-          # This job only runs on pull requests, so nothing ever populates
-          # the cache on dev. Every run would miss and then write a per-pull
-          # request copy, which is what the old seed-cache job existed to
-          # avoid. Building the hooks from scratch takes seconds, so skip it.
-          cache: false
-        env:
-          PREK_SKIP: pylint,ci-custom
-      # Pushes any fixes the hooks made back to the pull request. This step
-      # must keep its default name: the GitHub App that performs the push
-      # locates the workflow run by that name.
-      - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
-        if: always()
-        with:
-          msg: apply automatic formatting fixes
-
-  pytest:
-    name: Run pytest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.12"
-          - "3.13"
-          - "3.14"
-        os:
-          - ubuntu-latest
-          - macOS-latest
-          - windows-latest
-        exclude:
-          # Minimize CI resource usage
-          # by only running the Python version
-          # version used for docker images on Windows and macOS
-          - python-version: "3.13"
-            os: windows-latest
-          - python-version: "3.13"
-            os: macOS-latest
-    runs-on: ${{ matrix.os }}
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.core-ci == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Restore Python
-        id: restore-python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
-      - name: Run pytest
-        if: matrix.os == 'windows-latest'
-        run: |
-          . ./venv/Scripts/activate.ps1
-          pytest -vv --cov-report=xml --tb=native --durations=30 -n auto tests --ignore=tests/integration/
-      - name: Run pytest
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
-        run: |
-          . venv/bin/activate
-          pytest -vv --cov-report=xml --tb=native --durations=30 -n auto tests --ignore=tests/integration/
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
-      - name: Save Python virtual environment cache
-        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: venv
-          key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
-
-  codecov-empty-upload:
-    name: Report no coverage to Codecov
-    runs-on: ubuntu-24.04
-    needs:
-      - determine-jobs
-    # ``pytest`` is the only job that uploads coverage, and it is skipped when
-    # every changed file is CI-irrelevant (see ``should_run_core_ci`` in
-    # ``script/determine-jobs.py``). With no upload Codecov never reports a
-    # result, so the required ``codecov/patch`` status stays pending forever and
-    # the pull request can never be merged. Tell Codecov up front that this
-    # commit has nothing to cover so it publishes a passing status instead.
-    #
-    # ``force`` skips Codecov's own check that every changed file is ignorable;
-    # ``determine-jobs`` has already decided none of these files can affect
-    # coverage, and Codecov would otherwise fail the status for paths it does
-    # not recognise as non-testable (``docker/**``, ``.yamllint``).
-    if: needs.determine-jobs.outputs.core-ci == 'false'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Report empty upload to Codecov
-        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
-        with:
-          run_command: empty-upload
-          force: true
-          fail_ci_if_error: true
-
  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 +365,6 @@ 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
-        with:
-          packages: libsdl2-dev ccache
-          version: 1.1
      - name: Set up Python 3.13
        id: python
        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
@@ -376,7 +379,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
@@ -406,126 +409,6 @@ jobs:
          mapfile -t test_files < <(echo "$BUCKET_TESTS" | jq -r '.[]')
          echo "Bucket ${{ matrix.bucket.name }}: running ${#test_files[@]} integration tests"
          pytest -vv --no-cov --tb=native --durations=30 -n auto "${test_files[@]}"
-      - name: Print ccache statistics
-        # esphome stores the PlatformIO ccache under the machine-global cache
-        # dir (see _ccache_env() in esphome/platformio/toolchain.py).
-        run: CCACHE_DIR="$HOME/.cache/esphome/platformio-ccache" ccache -s
-
-  import-time:
-    name: Check import esphome.__main__ time
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.import-time == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Check import time against budget and write waterfall HAR
-        run: |
-          . venv/bin/activate
-          script/check_import_time.py --check --har importtime.har
-      - name: Upload waterfall HAR
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: import-time-waterfall
-          path: importtime.har
-          if-no-files-found: ignore
-          retention-days: 14
-
-  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.
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-
-      - name: 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
-          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
-        with:
-          run: |
-            . venv/bin/activate
-            ${{ steps.build.outputs.binary }}
-            pytest tests/benchmarks/python/ --codspeed --no-cov
-          mode: simulation

  cpp-unit-tests:
    name: Run C++ unit tests
@@ -554,6 +437,43 @@ jobs:
            script/cpp_unit_test.py $ARGS
          fi

+  benchmarks:
+    name: Run CodSpeed benchmarks
+    runs-on: ubuntu-24.04
+    needs:
+      - common
+      - determine-jobs
+    if: >-
+      (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
+
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+
+      - name: Build benchmarks
+        id: build
+        run: |
+          . venv/bin/activate
+          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: Run CodSpeed benchmarks
+        uses: CodSpeedHQ/action@f99becdce5e5d51fd556489ebef684f4ecfd6286 # v4.18.5
+        with:
+          run: |
+            . venv/bin/activate
+            ${{ steps.build.outputs.binary }}
+            pytest tests/benchmarks/python/ --codspeed --no-cov
+          mode: simulation
+
  clang-tidy-single:
    name: ${{ matrix.name }}
    runs-on: ubuntu-24.04
@@ -569,6 +489,7 @@ jobs:
      ESPHOME_SDK_NRF_PREFIX: ~/.esphome-sdk-nrf
    strategy:
      fail-fast: false
+      max-parallel: 2
      matrix:
        include:
          - id: clang-tidy
@@ -602,29 +523,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
@@ -764,6 +680,7 @@ jobs:
      ESPHOME_ESP_IDF_PREFIX: ~/.esphome-idf
    strategy:
      fail-fast: false
+      max-parallel: 3
      matrix:
        include:
          - id: clang-tidy
@@ -843,6 +760,7 @@ jobs:
      ESPHOME_ESP_IDF_PREFIX: ~/.esphome-idf
    strategy:
      fail-fast: false
+      max-parallel: 3
      matrix:
        include:
          - id: clang-tidy
@@ -929,7 +847,7 @@ jobs:
      ESPHOME_SDK_NRF_PREFIX: ~/.esphome-sdk-nrf
    strategy:
      fail-fast: false
-      max-parallel: ${{ (startsWith(github.base_ref, 'beta') || startsWith(github.base_ref, 'release')) && 32 || 16 }}
+      max-parallel: ${{ (startsWith(github.base_ref, 'beta') || startsWith(github.base_ref, 'release')) && 8 || 4 }}
      matrix:
        batch: ${{ fromJson(needs.determine-jobs.outputs.component-test-batches) }}
    steps:
@@ -941,17 +859,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
@@ -1125,62 +1038,69 @@ jobs:
          # Arduino framework via PlatformIO (only components with an esp32-ard test are built):
          python3 script/test_build_components.py -e compile -t esp32-ard -c "$TEST_COMPONENTS" -f --toolchain platformio

-  device-builder:
-    name: Test downstream esphome/device-builder
-    runs-on: ubuntu-24.04
+  pre-commit-seed-cache:
+    name: Seed pre-commit cache
+    runs-on: ubuntu-latest
+    needs:
+      - common
+    # Saves a dev-scoped pre-commit cache that pull request runs can
+    # restore, since pre-commit.ci lite itself never runs on dev pushes.
+    if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Cache pre-commit environments
+        id: cache-pre-commit
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.cache/pre-commit
+          # Must match the restore key in pre-commit-ci-lite
+          # yamllint disable-line rule:line-length
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Install pre-commit hook environments
+        if: steps.cache-pre-commit.outputs.cache-hit != 'true'
+        run: |
+          python -m pip install pre-commit
+          pre-commit install-hooks
+
+  pre-commit-ci-lite:
+    name: pre-commit.ci lite
+    runs-on: ubuntu-latest
    needs:
      - common
      - determine-jobs
-    if: needs.determine-jobs.outputs.device-builder == 'true'
+    if: github.event_name == 'pull_request' && !startsWith(github.base_ref, 'beta') && !startsWith(github.base_ref, 'release') && needs.determine-jobs.outputs.core-ci == 'true'
    steps:
-      - name: Check out esphome (this PR)
+      - name: Check out code from GitHub
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
        with:
-          path: esphome
-      - name: Check out esphome/device-builder
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      # Inlined from esphome/pre-commit-action with a restore-only cache
+      # step: the pre-commit-seed-cache job owns saving this cache, so
+      # pull request runs never write per-PR copies.
+      - name: Restore pre-commit cache
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
        with:
-          repository: esphome/device-builder
-          ref: main
-          path: device-builder
-      - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
-        with:
-          python-version: "3.13"
-      - name: Set up uv
-        # Mirrors the install shape device-builder's own CI uses
-        # (esphome/device-builder#192): uv replaces pip for the
-        # 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
-        with:
-          enable-cache: true
-          # Pull request saves land in per-PR scopes nothing else can
-          # reuse; dev pushes seed the shared copy instead.
-          save-cache: ${{ github.event_name != 'pull_request' }}
-          # Pin uv version so the action does not have to fetch the
-          # manifest from raw.githubusercontent.com on every cache
-          # miss; that fetch flakes on Windows runners.
-          version: "0.11.15"
-      - name: Install device-builder + esphome from PR
-        # Install device-builder with its esphome + test extras
-        # first so its pinned versions of pytest/etc. land, then
-        # overlay the PR's esphome so the downstream tests run
-        # against this PR's Python code. ``--system`` installs into
-        # the runner's Python instead of a venv.
+          path: ~/.cache/pre-commit
+          # Must match the key pre-commit-seed-cache saves
+          # yamllint disable-line rule:line-length
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Run pre-commit
+        env:
+          SKIP: pylint,ci-custom
        run: |
-          uv pip install --system -e './device-builder[esphome,test]'
-          uv pip install --system -e ./esphome
-      - name: Run device-builder pytest
-        # ``-n auto`` runs under pytest-xdist (matches device-builder's
-        # own CI). No ``--cov`` here -- this is purely a downstream
-        # smoke check against this PR's esphome code. ``tests/e2e/slow``
-        # is excluded: those are real multi-minute toolchain compiles
-        # (LibreTiny SDK clone, native ESP-IDF install) that device-builder
-        # runs in its own dedicated jobs, not this smoke check.
-        working-directory: device-builder
-        run: pytest -q -n auto --maxfail=5 --durations=30 --no-cov --ignore=tests/benchmarks --ignore=tests/e2e/slow
+          python -m pip install pre-commit
+          pre-commit run --show-diff-on-failure --color=always --all-files
+      - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
+        if: always()

  memory-impact-target-branch:
    name: Build target branch for memory impact
@@ -1481,28 +1401,21 @@ jobs:
  ci-status:
    name: CI Status
    runs-on: ubuntu-24.04
-    # Listed in the same order the jobs are defined above. One job is
-    # deliberately left out: "benchmarks" reports through CodSpeed rather than
-    # this check.
    needs:
      - common
-      - seed-apt-cache
-      - determine-jobs
      - ci-custom
      - pylint
-      - lint-format
      - pytest
-      - codecov-empty-upload
      - integration-tests
-      - import-time
-      - cpp-unit-tests
      - clang-tidy-single
      - clang-tidy-nosplit
      - clang-tidy-split
      - clang-tidy-esp32-variants
+      - determine-jobs
+      - device-builder
      - test-build-components-split
      - test-esp32-platformio
-      - device-builder
+      - pre-commit-ci-lite
      - memory-impact-target-branch
      - memory-impact-pr-branch
      - memory-impact-comment
@@ -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@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
        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@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
        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
@@ -1,38 +0,0 @@
---
-name: Nightly Dev Release
-
-# Works out the dated dev tag and starts the release workflow with it, so that
-# the release run is named after the tag it builds. A workflow run name is
-# fixed when the run starts and cannot read a file or the current date.
-
-on:
-  schedule:
-    - cron: "0 2 * * *"
-
-permissions:
-  contents: read  # actions/checkout to read the version from esphome/const.py
-
-jobs:
-  trigger:
-    name: Start release build
-    if: github.repository == 'esphome/esphome'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read  # actions/checkout to read the version from esphome/const.py
-      actions: write  # gh workflow run starts release.yml
-    steps:
-      - name: Check out the repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Start the release workflow
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          VERSION=$(sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p" esphome/const.py)
-          if [[ -z "$VERSION" ]]; then
-            echo "::error::Could not read __version__ from esphome/const.py"
-            exit 1
-          fi
-          TAG="${VERSION}$(date --utc '+%Y%m%d')"
-          echo "Starting release build for ${TAG}"
-          gh workflow run release.yml --ref "${GITHUB_REF_NAME}" --field tag="${TAG}"
@@ -1,23 +1,12 @@
 ---
 name: Publish Release

-# Releases (production and beta) are named after the version they publish.
-# Dev builds are named after the dated dev tag, which is passed in by the
-# nightly workflow because a run name cannot compute it itself.
-run-name: ${{ github.event.inputs.tag || github.event.release.tag_name || format('Manual build ({0})', github.ref_name) }}
-
 on:
  workflow_dispatch:
-    inputs:
-      tag:
-        description: >-
-          Tag to build. Only supported on dev, where the nightly workflow
-          uses it. Leave empty to build the version from esphome/const.py
-          with today's date appended.
-        required: false
-        default: ""
  release:
    types: [published]
+  schedule:
+    - cron: "0 2 * * *"

 permissions:
  contents: read  # actions/checkout for all jobs; deploy jobs add their own scopes when they need to write
@@ -34,8 +23,6 @@ jobs:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
      - name: Get tag
        id: tag
-        env:
-          INPUT_TAG: ${{ github.event.inputs.tag }}
        # yamllint disable rule:line-length
        run: |
          if [[ "${{ github.event_name }}" = "release" ]]; then
@@ -47,23 +34,12 @@ jobs:
              ENVIRONMENT="production"
            fi
          else
+            TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p")
+            today="$(date --utc '+%Y%m%d')"
+            TAG="${TAG}${today}"
            BRANCH=${GITHUB_REF#refs/heads/}
-            # The nightly workflow passes the finished tag so that the run name
-            # matches what is built. Without it, work it out here.
-            TAG="${INPUT_TAG}"
-            if [[ -n "$TAG" && "$BRANCH" != "dev" ]]; then
-              echo "::error::The tag input is only supported on dev. A build from ${BRANCH} has to use the tag worked out here, which carries the branch name, so that it cannot publish over the dev, beta, latest or stable images."
-              exit 1
-            fi
-            if [[ -z "$TAG" ]]; then
-              TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p")
-              today="$(date --utc '+%Y%m%d')"
-              TAG="${TAG}${today}"
-              if [[ "$BRANCH" != "dev" ]]; then
-                TAG="${TAG}-${BRANCH}"
-              fi
-            fi
            if [[ "$BRANCH" != "dev" ]]; then
+              TAG="${TAG}-${BRANCH}"
              BRANCH_BUILD="true"
              ENVIRONMENT=""
            else
@@ -94,7 +70,7 @@ jobs:
          pip3 install build
          python3 -m build
      - name: Publish
-        uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
+        uses: pypa/gh-action-pypi-publish@ba38be9e461d3875417946c167d0b5f3d385a247 # v1.14.1
        with:
          skip-existing: true

@@ -123,15 +99,15 @@ 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
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -202,17 +178,17 @@ 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'
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
        if: matrix.registry == 'ghcr'
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -6,46 +6,61 @@ on:
    - cron: "30 0 * * *"
  workflow_dispatch:

-# The reusable workflow authenticates as the ESPHome GitHub App, so GITHUB_TOKEN
-# needs no permissions at all.
-permissions: {}
+permissions:
+  issues: write         # actions/stale labels, comments on, and closes stale issues
+  pull-requests: write  # actions/stale labels, comments on, and closes stale pull requests
+
+concurrency:
+  group: lock

 jobs:
  stale:
    if: github.repository_owner == 'esphome'
-    # 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
-    secrets:
-      ESPHOME_GITHUB_APP_PRIVATE_KEY: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
-    with:
-      # Live only on dev: a workflow_dispatch from any other branch is a dry run
-      dry-run: ${{ github.ref != 'refs/heads/dev' }}
-      days-before-stale: 90
-      days-before-close: 7
-      stale-label: stale
-      exempt-label: not-stale
-      ignored-users: esphbot,codecov-commenter
-      stale-pr-message: >
-        There hasn't been any activity on this pull request recently. This
-        pull request has been automatically marked as stale because of that
-        and will be closed if no further activity occurs within 7 days.
+    runs-on: ubuntu-latest
+    steps:
+      - name: Stale
+        uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
+        with:
+          debug-only: ${{ github.ref != 'refs/heads/dev' }} # Dry-run when not run on dev branch
+          remove-stale-when-updated: true
+          operations-per-run: 400

-        If you are the author of this PR, please leave a comment if you want
-        to keep it open. Also, please rebase your PR onto the latest dev
-        branch to ensure that it's up to date with the latest changes.
+          # The 90 day stale policy for PRs
+          # - PRs
+          # - No PRs marked as "not-stale"
+          # - No Issues (see below)
+          days-before-pr-stale: 90
+          days-before-pr-close: 7
+          stale-pr-label: "stale"
+          exempt-pr-labels: "not-stale"
+          stale-pr-message: >
+            There hasn't been any activity on this pull request recently. This
+            pull request has been automatically marked as stale because of that
+            and will be closed if no further activity occurs within 7 days.

-        Thank you for your contribution!
-      stale-issue-message: >
-        There hasn't been any activity on this issue recently. Due to the
-        high number of incoming GitHub notifications, we have to clean some
-        of the old issues, as many of them have already been resolved with
-        the latest updates.
+            If you are the author of this PR, please leave a comment if you want
+            to keep it open. Also, please rebase your PR onto the latest dev
+            branch to ensure that it's up to date with the latest changes.

-        Please make sure to update to the latest ESPHome version and
-        check if that solves the issue. Let us know if that works for you by
-        adding a comment 👍
+            Thank you for your contribution!

-        This issue has now been marked as stale and will be closed if no
-        further activity occurs. Thank you for your contributions.
+          # The 90 day stale policy for Issues
+          # - Issues
+          # - No Issues marked as "not-stale"
+          # - No PRs (see above)
+          days-before-issue-stale: 90
+          days-before-issue-close: 7
+          stale-issue-label: "stale"
+          exempt-issue-labels: "not-stale"
+          stale-issue-message: >
+            There hasn't been any activity on this issue recently. Due to the
+            high number of incoming GitHub notifications, we have to clean some
+            of the old issues, as many of them have already been resolved with
+            the latest updates.
+
+            Please make sure to update to the latest ESPHome version and
+            check if that solves the issue. Let us know if that works for you by
+            adding a comment 👍
+
+            This issue has now been marked as stale and will be closed if no
+            further activity occurs. Thank you for your contributions.
@@ -44,10 +44,10 @@ jobs:
      - name: Set up uv
        # An order of magnitude faster than pip on cold boots, with its
        # own wheel cache. ``--system`` (below) installs into the
-        # setup-python interpreter so subsequent ``prek`` /
+        # setup-python interpreter so subsequent ``pre-commit`` /
        # ``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
@@ -58,19 +58,19 @@ jobs:
      - name: Install Home Assistant
        run: |
          uv pip install --system -e lib/home-assistant
-          uv pip install --system -r requirements.txt -r requirements_test.txt
+          uv pip install --system -r requirements.txt -r requirements_test.txt pre-commit

      - name: Sync
        run: |
          python ./script/sync-device_class.py

-      - name: Apply prek auto-fixes
+      - name: Apply pre-commit auto-fixes
        # First pass: let formatters (ruff, end-of-file-fixer, etc.) modify
-        # files. prek exits non-zero whenever a hook touches anything,
+        # files. pre-commit exits non-zero whenever a hook touches anything,
        # which would otherwise abort the workflow before the auto-fixes
        # can flow into the sync PR.
        #
-        # PREK_SKIP:
+        # SKIP:
        #   - no-commit-to-branch is a local guard against committing on
        #     dev/release/beta; CI runs on dev by definition, and
        #     peter-evans/create-pull-request creates the branch itself.
@@ -79,25 +79,25 @@ jobs:
        #     the runtime deps (HA + requirements*.txt); main CI already
        #     gates pylint on real PRs.
        env:
-          PREK_SKIP: pylint,no-commit-to-branch
-        run: python script/run-in-env.py prek run --all-files || true
+          SKIP: pylint,no-commit-to-branch
+        run: python script/run-in-env.py pre-commit run --all-files || true

-      - name: Verify prek clean
+      - name: Verify pre-commit clean
        # Second pass: re-run all hooks against the now-fixed tree.
        # Auto-fixers exit 0 (nothing to change); any remaining failure
        # from a check-only hook (flake8 / yamllint / ci-custom) is a
-        # real issue and fails the workflow loudly. Same PREK_SKIP list as
+        # real issue and fails the workflow loudly. Same SKIP list as
        # above for the same reasons.
        env:
-          PREK_SKIP: pylint,no-commit-to-branch
-        run: python script/run-in-env.py prek run --all-files
+          SKIP: pylint,no-commit-to-branch
+        run: python script/run-in-env.py pre-commit run --all-files

      - name: Commit changes
        uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
        with:
          commit-message: "Synchronise Device Classes from Home Assistant"
-          committer: esphome[bot] <115708604+esphome[bot]@users.noreply.github.com>
-          author: esphome[bot] <115708604+esphome[bot]@users.noreply.github.com>
+          committer: esphomebot <esphome@openhomefoundation.org>
+          author: esphomebot <esphome@openhomefoundation.org>
          branch: sync/device-classes
          delete-branch: true
          title: "Synchronise Device Classes from Home Assistant"
@@ -133,8 +133,6 @@ CTestTestfile.cmake
 .gcc-flags.json

 config/
-# Test fixture config/ directories are tracked (the rule above is the dashboard dir)
-!tests/component_tests/**/config/
 tests/build/
 tests/.esphome/
 /.temp-clang-tidy.cpp
@@ -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:
@@ -394,10 +388,7 @@ This document provides essential context for AI models interacting with this pro
        ```
        Register with `@automation.register_condition("my_component.is_active", MyCondition, schema)`.

-*   **Type Hints:** Type-hint all function signatures, including test functions and config validators (e.g. `def validate_x(config: ConfigType) -> ConfigType:`, `def test_x() -> None:`). Import `ConfigType` from `esphome.types`.
-
 *   **Configuration Validation:**
-    *   **Reuse existing validators:** Before writing a custom validator, check for an existing one in `config_validation.py` and compose it in `cv.All(...)` rather than duplicating logic across components. For example, rename a config key with `cv.rename_key(CONF_OLD, CONF_NEW, removed_in="2026.6.0")`, and reject mutually-exclusive keys with `cv.has_at_most_one_key(...)` / `cv.has_exactly_one_key(...)`. See how `api` composes `cv.has_exactly_one_key` + `cv.rename_key`.
    *   **Common Validators:** `cv.int_`, `cv.float_`, `cv.string`, `cv.boolean`, `cv.int_range(min=0, max=100)`, `cv.positive_int`, `cv.percentage`.
    *   **Complex Validation:** `cv.All(cv.string, cv.Length(min=1, max=50))`, `cv.Any(cv.int_, cv.string)`.
    *   **Platform-Specific:** `cv.only_on(["esp32", "esp8266"])`, `esp32.only_on_variant(...)`, `cv.only_on_esp32`, `cv.only_on_esp8266`, `cv.only_on_rp2040`.
@@ -410,7 +401,6 @@ This document provides essential context for AI models interacting with this pro
         .extend(i2c.i2c_device_schema(0x48))
         .extend(spi.spi_device_schema(cs_pin_required=True))
        ```
-    *   **Constants:** `esphome/const.py` is frozen — do not add new `CONF_` constants there. Define a component-local constant in the component's own `.py` (as with `CONF_PARAM` above); for a constant shared by multiple components, add it to `esphome/components/const/__init__.py`. CI (`lint_constants_usage`) fails if the same constant is defined in three or more component files. Constants used in core files (i.e. those not under `esphome/components`) may be added to `esphome/const.py` but will require adjustment to the CI validation check.

 ## 5. Key Files & Entrypoints

@@ -418,7 +408,7 @@ This document provides essential context for AI models interacting with this pro
 *   **Configuration:**
    *   `pyproject.toml`: Defines the Python project metadata and dependencies.
    *   `platformio.ini`: Configures the PlatformIO build environments for different microcontrollers.
-    *   `.pre-commit-config.yaml`: Configures the lint and format hooks, run by `prek`.
+    *   `.pre-commit-config.yaml`: Configures the pre-commit hooks for linting and formatting.
 *   **CI/CD Pipeline:** Defined in `.github/workflows`.
 *   **Static Analysis & Development:**
    *   `esphome/core/defines.h`: A comprehensive header file containing all `#define` directives that can be added by components using `cg.add_define()` in Python. This file is used exclusively for development, static analysis tools, and CI testing - it is not used during runtime compilation. When developing components that add new defines, they must be added to this file to ensure proper IDE support and static analysis coverage. The file includes feature flags, build configurations, and platform-specific defines that help static analyzers understand the complete codebase without needing to compile for specific platforms.
@@ -426,7 +416,7 @@ This document provides essential context for AI models interacting with this pro
 ## 6. Development & Testing Workflow

 *   **Local Development Environment:** Use the provided Docker container or create a Python virtual environment and install dependencies from `requirements_dev.txt`.
-*   **Running Commands:** Use the `script/run-in-env.py` script to execute commands within the project's virtual environment. For example, to run the linter: `python3 script/run-in-env.py prek run`.
+*   **Running Commands:** Use the `script/run-in-env.py` script to execute commands within the project's virtual environment. For example, to run the linter: `python3 script/run-in-env.py pre-commit run`.
 *   **Testing:**
    *   **Python:** Run unit tests with `pytest`.
    *   **C++:** Use `clang-tidy` for static analysis.
@@ -499,9 +489,9 @@ This document provides essential context for AI models interacting with this pro
    1.  **Fork & Branch:** Create a new branch based on the `dev` branch (always use `git checkout -b <branch-name> dev` to ensure you're branching from `dev`, not the currently checked out branch).
    2.  **Make Changes:** Adhere to all coding conventions and patterns.
    3.  **Test:** Create component tests for all supported platforms and run the full test suite locally.
-    4.  **Lint:** Run `prek` to ensure code is compliant.
+    4.  **Lint:** Run `pre-commit` to ensure code is compliant.
    5.  **Commit:** Commit your changes. There is no strict format for commit messages.
-    6.  **Pull Request:** Submit a PR against the `dev` branch. The Pull Request title must start with a `[tag]` prefix. For component work, use the component name (e.g., `[display] Fix bug`, `[abc123] Add new component`); for changes to shared/core code that isn't tied to a single component, use `[core]` (e.g., `[core] Add validator`). Update documentation, examples, and add `CODEOWNERS` entries as needed. Pull requests should always be made using the `.github/PULL_REQUEST_TEMPLATE.md` template - fill out all sections completely without removing any parts of the template.
+    6.  **Pull Request:** Submit a PR against the `dev` branch. The Pull Request title should have a prefix of the component being worked on (e.g., `[display] Fix bug`, `[abc123] Add new component`). Update documentation, examples, and add `CODEOWNERS` entries as needed. Pull requests should always be made using the `.github/PULL_REQUEST_TEMPLATE.md` template - fill out all sections completely without removing any parts of the template.

 *   **Documentation Contributions:**
    *   Documentation is hosted in the separate `esphome/esphome.io` repository.
@@ -739,16 +729,6 @@ This document provides essential context for AI models interacting with this pro
    ```

 *   **Deprecation Pattern (Python):**
-    For a renamed config key, use the shared `cv.rename_key` validator with `removed_in` (and `component` for context) — it warns and auto-migrates:
-    ```python
-    CONFIG_SCHEMA = cv.All(
-        cv.rename_key(
-            CONF_OLD_KEY, CONF_NEW_KEY, removed_in="2026.6.0", component="my_component"
-        ),
-        cv.Schema({ ... }),
-    )
-    ```
-    For other deprecations, warn manually during validation:
    ```python
    # Remove before 2026.6.0
    if CONF_OLD_KEY in config:
@@ -763,13 +743,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.
@@ -70,7 +70,6 @@ esphome/components/bh1900nux/* @B48D81EFCC
 esphome/components/binary_sensor/* @esphome/core
 esphome/components/bk72xx/* @kuba2k2
 esphome/components/bk72xx_ble/* @Bl00d-B0b
-esphome/components/bk72xx_ble_tracker/* @Bl00d-B0b
 esphome/components/bl0906/* @athom-tech @jesserockz @tarontop
 esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @dan-s-github @tobias-
@@ -78,7 +77,6 @@ esphome/components/bl0942/* @dbuezas @dwmw2
 esphome/components/ble_client/* @buxtronix @clydebarrow
 esphome/components/ble_device_base/* @Bl00d-B0b
 esphome/components/ble_nus/* @tomaszduda23
-esphome/components/bluetooth_connection/* @bdraco @jesserockz
 esphome/components/bluetooth_proxy/* @bdraco @jesserockz
 esphome/components/bm8563/* @abmantis
 esphome/components/bme280_base/* @esphome/core
@@ -238,7 +236,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
@@ -290,7 +287,6 @@ esphome/components/ld2412/* @Rihan9
 esphome/components/ld2420/* @descipher
 esphome/components/ld2450/* @hareeshmu
 esphome/components/ld24xx/* @kbx81
-esphome/components/ld6002b/* @hepter
 esphome/components/ledc/* @OttoWinter
 esphome/components/libretiny/* @kuba2k2
 esphome/components/libretiny_pwm/* @kuba2k2
@@ -298,8 +294,6 @@ esphome/components/light/* @esphome/core
 esphome/components/lightwaverf/* @max246
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lm75b/* @beormund
-esphome/components/ln882h_ble/* @Bl00d-B0b
-esphome/components/ln882h_ble_tracker/* @Bl00d-B0b
 esphome/components/ln882x/* @lamauny
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
@@ -354,7 +348,6 @@ esphome/components/mlx90393/* @functionpointer
 esphome/components/mlx90614/* @jesserockz
 esphome/components/mmc5603/* @benhoff
 esphome/components/mmc5983/* @agoode
-esphome/components/modbus_client/* @exciton
 esphome/components/modbus_controller/* @martgras
 esphome/components/modbus_controller/binary_sensor/* @martgras
 esphome/components/modbus_controller/number/* @martgras
@@ -443,7 +436,6 @@ esphome/components/rp2/* @jesserockz
 esphome/components/rp2040_ble/* @bdraco
 esphome/components/rp2040_pio_led_strip/* @Papa-DMan
 esphome/components/rp2040_pwm/* @jesserockz
-esphome/components/rp2_ble_tracker/* @bdraco
 esphome/components/rpi_dpi_rgb/* @clydebarrow
 esphome/components/rtl87xx/* @kuba2k2
 esphome/components/rtttl/* @glmnet @ximex
@@ -466,7 +458,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
@@ -635,7 +626,6 @@ esphome/components/xpt2046/touchscreen/* @nielsnl68 @numo68
 esphome/components/xxtea/* @clydebarrow
 esphome/components/zephyr/* @tomaszduda23
 esphome/components/zephyr_mcumgr/ota/* @tomaszduda23
-esphome/components/zephyr_pwm/* @wiomoc
 esphome/components/zhlt01/* @cfeenstra1024
 esphome/components/zigbee/* @luar123 @tomaszduda23
 esphome/components/zio_ultrasonic/* @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.3
+RUN uv pip install --no-cache-dir esphome-device-builder==1.7.0

 RUN \
    platformio settings set enable_telemetry No \
@@ -2,33 +2,35 @@
 import argparse
 from collections.abc import Callable
 from contextlib import suppress
+from datetime import datetime
 import functools
+import getpass
 import importlib
 import logging
 import os
 from pathlib import Path
 import re
+import shutil
+import subprocess
 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
 # in the built-in version being used instead of the external component one.
-from esphome import const, platform_hooks
+from esphome import const
 from esphome.const import (
    ALLOWED_NAME_CHARS,
    ARGUMENT_HELP_DEVICE,
-    BUNDLE_EXTENSION,
    CONF_API,
+    CONF_AUTH,
    CONF_BAUD_RATE,
    CONF_BROKER,
    CONF_DEASSERT_RTS_DTR,
    CONF_DISABLED,
-    CONF_DISCOVER_IP,
    CONF_ESPHOME,
    CONF_LEVEL,
-    CONF_LOG,
    CONF_LOG_TOPIC,
    CONF_LOGGER,
    CONF_MDNS,
@@ -42,12 +44,10 @@ from esphome.const import (
    CONF_PORT,
    CONF_SUBSTITUTIONS,
    CONF_TOPIC,
-    CONF_VERSION,
+    CONF_USERNAME,
    CONF_WEB_SERVER,
    CONF_WIFI,
    ENV_NOGITIGNORE,
-    KEY_ESP32,
-    KEY_VARIANT,
    SECRETS_FILES,
    Toolchain,
 )
@@ -55,7 +55,6 @@ from esphome.core import CORE, EsphomeError, coroutine
 from esphome.enum import StrEnum
 from esphome.helpers import get_bool_env, indent, is_ip_address
 from esphome.log import AnsiFore, color, setup_log
-from esphome.stacktrace import LogLineProcessor
 from esphome.types import ConfigType
 from esphome.upload_targets import PortType, get_port_type
 from esphome.util import (
@@ -71,9 +70,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 +272,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 +313,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 +327,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 +389,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,23 +482,10 @@ 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."""
+    from esphome.components.mqtt import CONF_DISCOVER_IP
+
    if CONF_MQTT not in CORE.config:
        return False
    # Default Enabled
@@ -570,48 +546,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,47 +583,41 @@ 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
-
    from aioesphomeapi import LogParser
    import serial

@@ -697,9 +630,18 @@ def run_miniterm(config: ConfigType, port: str, args) -> int:
        return 1
    _LOGGER.info("Starting log output from %s with baud rate %s", port, baud_rate)

-    # Decoder resolution, crash isolation, and disable-after-failure
-    # all live in LogLineProcessor, shared with the API log path.
-    processor = LogLineProcessor(config, CORE.target_platform)
+    process_stacktrace = None
+
+    try:
+        module = importlib.import_module("esphome.components." + CORE.target_platform)
+        process_stacktrace = module.process_stacktrace
+    except (AttributeError, ImportError):
+        _LOGGER.info(
+            'Stacktrace analysis is unavailable: no compatible analyzer found for target platform "%s".',
+            CORE.target_platform,
+        )
+
+    backtrace_state = False
    ser = serial.Serial()
    ser.baudrate = baud_rate
    ser.port = port
@@ -739,7 +681,11 @@ def run_miniterm(config: ConfigType, port: str, args) -> int:
                                "utf8", "backslashreplace"
                            )
                            safe_print(parser.parse_line(line, time_str))
-                            processor.process_line(line)
+
+                            if process_stacktrace is not None:
+                                backtrace_state = process_stacktrace(
+                                    config, line, backtrace_state
+                                )
                    except serial.SerialException:
                        _LOGGER.error("Serial port closed!")
                        return 0
@@ -984,10 +930,9 @@ def upload_using_esptool(

    mcu = "esp8266"
    if CORE.is_esp32:
-        # Same lookup as esp32.get_esp32_variant(), read directly so the
-        # serial upload path does not import the esp32 package; both the
-        # validator and the warm-cache apply_to_core populate this key.
-        mcu = CORE.data[KEY_ESP32][KEY_VARIANT].lower()
+        from esphome.components.esp32 import get_esp32_variant
+
+        mcu = get_esp32_variant().lower()

    line_callbacks: list[Callable[[str], str | None]] = []
    if (
@@ -1041,8 +986,6 @@ def upload_using_esptool(


 def upload_using_platformio(config: ConfigType, port: str) -> int:
-    import shutil
-
    from esphome.platformio import toolchain

    # RP2040 platform-raspberrypi build recipe expects firmware.bin.signed for
@@ -1080,8 +1023,6 @@ def upload_using_picotool(config: ConfigType) -> int:
    the mass storage copy approach that causes "disk not ejected properly"
    warnings on macOS.
    """
-    import subprocess
-
    from esphome.platformio import toolchain

    idedata = toolchain.get_idedata(config)
@@ -1188,8 +1129,6 @@ def check_permissions(port: str):
                "the USB cable can be used for data and is not a power-only cable."
            )
        if not (os.access(port, os.R_OK | os.W_OK)):
-            import getpass
-
            raise EsphomeError(
                "You do not have read or write permission on the selected serial port. "
                "To resolve this issue, you can add your user to the dialout group "
@@ -1202,11 +1141,12 @@ def upload_program(
    config: ConfigType, args: ArgsProtocol, devices: list[str]
 ) -> tuple[int, str | None]:
    host = devices[0]
-    platform_upload = platform_hooks.get_platform_hook(
-        CORE.target_platform, "upload_program"
-    )
-    if platform_upload is not None and platform_upload(config, args, host):
-        return 0, host
+    try:
+        module = importlib.import_module("esphome.components." + CORE.target_platform)
+        if module.upload_program(config, args, host):
+            return 0, host
+    except AttributeError:
+        pass

    port_type = get_port_type(host)

@@ -1357,23 +1297,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
@@ -1464,11 +1406,12 @@ def _should_subscribe_states(args: ArgsProtocol) -> bool:


 def show_logs(config: ConfigType, args: ArgsProtocol, devices: list[str]) -> int | None:
-    platform_show_logs = platform_hooks.get_platform_hook(
-        CORE.target_platform, "show_logs"
-    )
-    if platform_show_logs is not None and platform_show_logs(config, args, devices):
-        return 0
+    try:
+        module = importlib.import_module("esphome.components." + CORE.target_platform)
+        if module.show_logs(config, args, devices):
+            return 0
+    except AttributeError:
+        pass

    if "logger" not in config:
        raise EsphomeError("Logger is not configured!")
@@ -1482,37 +1425,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.components.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
@@ -1521,13 +1444,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)")


@@ -1797,7 +1713,7 @@ def command_clean(args: ArgsProtocol, config: ConfigType) -> int | None:


 def command_bundle(args: ArgsProtocol, config: ConfigType) -> int | None:
-    from esphome.bundle import ConfigBundleCreator
+    from esphome.bundle import BUNDLE_EXTENSION, ConfigBundleCreator

    creator = ConfigBundleCreator(config)

@@ -2032,7 +1948,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: "
@@ -2045,7 +1961,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."
            )
@@ -2092,9 +2008,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(
@@ -2112,7 +2026,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.",
@@ -2122,7 +2036,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.",
@@ -2130,7 +2044,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. "
@@ -2138,7 +2052,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()
@@ -2147,7 +2061,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

@@ -2173,7 +2087,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

@@ -2600,49 +2514,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

@@ -2661,7 +2532,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:
@@ -2693,11 +2563,10 @@ def run_esphome(argv):
        return 0

    # Bundle support: if the configuration is a .esphomebundle, extract it
-    # and rewrite conf_path to the extracted YAML config. The suffix check
-    # stays inline so the ordinary run never imports esphome.bundle.
-    if conf_path.name.lower().endswith(BUNDLE_EXTENSION):
-        from esphome.bundle import prepare_bundle_for_compile
+    # and rewrite conf_path to the extracted YAML config.
+    from esphome.bundle import is_bundle_path, prepare_bundle_for_compile

+    if is_bundle_path(conf_path):
        _LOGGER.info("Extracting config bundle %s...", conf_path)
        conf_path = prepare_bundle_for_compile(conf_path)
        # Update the argument so downstream code sees the extracted path
@@ -2732,35 +2601,33 @@ 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(
            command_line_substitutions,
            skip_external_update=skip_external,
-            # 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
@@ -1,198 +0,0 @@
-from __future__ import annotations
-
-import asyncio
-from contextlib import suppress
-import logging
-import threading
-from typing import TYPE_CHECKING, Any
-import warnings
-
-# Suppress protobuf version warnings
-with warnings.catch_warnings():
-    warnings.filterwarnings(
-        "ignore", category=UserWarning, message=".*Protobuf gencode version.*"
-    )
-    from aioesphomeapi import APIClient, parse_log_message
-    from aioesphomeapi.log_runner import async_run
-
-from esphome.const import CONF_ENCRYPTION, CONF_KEY, CONF_PORT, __version__
-from esphome.core import CORE
-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
-    )
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-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.
-    """
-    from datetime import datetime
-
-    conf = config["api"]
-    name = config["esphome"]["name"]
-    port: int = int(conf[CONF_PORT])
-    noise_psk: str | None = None
-    if (encryption := conf.get(CONF_ENCRYPTION)) and (key := encryption.get(CONF_KEY)):
-        noise_psk = key
-
-    _LOGGER.info(
-        "Starting log output from %s using esphome API", " or ".join(addresses)
-    )
-
-    cli = APIClient(
-        addresses[0],  # Primary address for compatibility
-        port,
-        "",  # Password auth removed in 2026.1.0
-        client_info=f"ESPHome Logs {__version__}",
-        noise_psk=noise_psk,
-        addresses=addresses,  # Pass all addresses for automatic retry
-        provide_time=False,
-    )
-
-    # 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()
-        message: bytes = msg.message
-        text = message.decode("utf8", "backslashreplace")
-        nanoseconds = time_.microsecond // 1000
-        timestamp = (
-            f"[{time_.hour:02}:{time_.minute:02}:{time_.second:02}.{nanoseconds:03}]"
-        )
-        for parsed_msg in parse_log_message(text, timestamp):
-            # safe_print handles the dashboard \033 escaping and falls back
-            # to backslashreplace encoding on stdouts that can't represent
-            # the wifi signal-bar block characters (Windows redirected
-            # cp1252 pipe).
-            safe_print(parsed_msg)
-        for raw_line in text.splitlines():
-            processor.process_line(raw_line)
-
-    # Safe to fall back to plaintext here only for this diagnostics use
-    # case: the stream is one-way from device to client, and this code
-    # never accepts commands or acts on any message the device sends.
-    # An on-path attacker could still both inject fabricated log lines
-    # and passively read the device's log output (and any state data
-    # delivered when subscribe_states is enabled), so this does lose
-    # confidentiality as well as authentication/integrity. That tradeoff
-    # is acceptable for operator-visible logs, which aioesphomeapi also
-    # warns may come from an unverified device. Never mirror this opt-in
-    # for any connection that sends data to the device or uses Home
-    # Assistant actions.
-    stop = await async_run(
-        cli,
-        on_log,
-        name=name,
-        subscribe_states=subscribe_states,
-        allow_plaintext_fallback=True,
-        # 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()
-
-
-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,
-            )
-        )
@@ -11,136 +11,43 @@ from __future__ import annotations

 import asyncio
 from collections.abc import Awaitable, Callable
-from itertools import count
-import logging
 import threading
-from typing import cast
-
-_LOGGER = logging.getLogger(__name__)
-
-# How long the orphan watcher waits for an abandoned coroutine before giving
-# up, so a hung operation does not park a watcher thread forever.
-ORPHAN_WAIT_TIMEOUT = 300.0
-
-
-_runner_ids = count(1)
-
-
-class AsyncDispatchTimeout(TimeoutError):
-    """The caller stopped waiting; the coroutine was abandoned.
-
-    A subclass so callers can tell the dispatcher's own expiry apart from a
-    ``TimeoutError`` raised inside the coroutine, while existing
-    ``except TimeoutError`` handlers keep working.
-    """


 class AsyncThreadRunner[T](threading.Thread):
    """Run an async coroutine in a daemon thread and expose its result.

-    ``event`` is always set, even when the coroutine crashes, so waiters
-    never hang; ``completed`` distinguishes a delivered result (even a
-    legitimate ``None``) from a coroutine that never finished. Prefer
-    :func:`run_async`; use this class directly only when a failure should
-    degrade to a default value instead of raising.
+    The runner catches all exceptions from the coroutine and stores them in
+    ``exception`` so ``event`` is always set — this prevents callers waiting
+    on ``event`` from hanging forever when the coroutine crashes.
+
+    Typical usage::
+
+        runner = AsyncThreadRunner(lambda: my_coro(arg))
+        runner.start()
+        if not runner.event.wait(timeout=5.0):
+            ...  # timed out
+        if runner.exception is not None:
+            raise runner.exception
+        result = runner.result
    """

    def __init__(self, coro_factory: Callable[[], Awaitable[T]]) -> None:
-        super().__init__(daemon=True, name=f"async-thread-runner-{next(_runner_ids)}")
+        super().__init__(daemon=True)
        self._coro_factory = coro_factory
        self.result: T | None = None
        self.exception: BaseException | None = None
-        self.completed = False
        self.event = threading.Event()

    async def _runner(self) -> None:
        try:
            self.result = await self._coro_factory()
-            # Distinguishes a delivered result from "never ran", since None
-            # is a valid result value.
-            self.completed = True
-        except BaseException as exc:  # noqa: BLE001  # pylint: disable=broad-except
-            # Capture everything, including BaseException — otherwise a
-            # cancellation or SystemExit would leave ``exception`` unset and
-            # waiters would mistake the empty ``result`` for success.
+        except Exception as exc:  # noqa: BLE001  # pylint: disable=broad-except
+            # Capture all exceptions so ``event`` is always set — otherwise a
+            # crash would hang the waiter forever.
            self.exception = exc
        finally:
            self.event.set()

    def run(self) -> None:
-        try:
-            asyncio.run(self._runner())
-        except BaseException as exc:  # noqa: BLE001  # pylint: disable=broad-except
-            # asyncio.run itself can fail before _runner executes (e.g. loop
-            # creation under fd exhaustion); record it so waiters never hang.
-            # A failure during loop cleanup after the coroutine completed
-            # must not clobber the delivered result, hence the guard.
-            if self.exception is None and not self.completed:
-                self.exception = exc
-            else:
-                _LOGGER.debug(
-                    "Event loop teardown failed after outcome recorded",
-                    exc_info=True,
-                )
-        finally:
-            self.event.set()
-
-
-def run_async[T](
-    coro_factory: Callable[[], Awaitable[T]],
-    timeout: float | None = None,
-    on_orphan: Callable[[T], None] | None = None,
-) -> T:
-    """Run a coroutine in a daemon-thread event loop and return its result.
-
-    Raises :class:`AsyncDispatchTimeout` if the coroutine does not finish
-    within ``timeout`` seconds; the thread is abandoned and exits with the
-    interpreter. If the abandoned coroutine later produces a result,
-    ``on_orphan`` (if given) is called with it so resources such as a
-    connected socket can be released; delivery is best effort and bounded
-    by ``ORPHAN_WAIT_TIMEOUT``.
-    """
-    runner: AsyncThreadRunner[T] = AsyncThreadRunner(coro_factory)
-    runner.start()
-    if not runner.event.wait(timeout):
-
-        def _cleanup() -> None:
-            if not runner.event.wait(ORPHAN_WAIT_TIMEOUT):
-                # The one state where a resource can genuinely leak; leave
-                # a trace so a recurring hang is attributable.
-                _LOGGER.info(
-                    "Orphan watcher gave up after %.0fs; a late result may leak",
-                    ORPHAN_WAIT_TIMEOUT,
-                )
-                return
-            if not runner.completed:
-                # The only place an abandoned thread's real error surfaces;
-                # without it a late failure hides behind the TimeoutError.
-                # INFO, not DEBUG: it fires at most once per abandoned
-                # operation and the cause may not reproduce on a rerun.
-                _LOGGER.info(
-                    "Abandoned async operation failed",
-                    exc_info=runner.exception,
-                )
-                return
-            if (result := runner.result) is None:
-                return
-            if on_orphan is None:
-                _LOGGER.debug("Discarding late result; no on_orphan handler")
-                return
-            try:
-                on_orphan(result)
-            except Exception:  # pylint: disable=broad-except
-                # INFO, not DEBUG: a failed release means a real leak, and
-                # it fires at most once per abandoned operation.
-                _LOGGER.info("Error releasing orphaned result", exc_info=True)
-
-        threading.Thread(
-            target=_cleanup, daemon=True, name="async-orphan-cleanup"
-        ).start()
-        raise AsyncDispatchTimeout("Timed out waiting for async operation")
-    if (exc := runner.exception) is not None:
-        raise exc
-    if not runner.completed:
-        raise RuntimeError("Async operation finished without a result or an exception")
-    return cast("T", runner.result)
+        asyncio.run(self._runner())
@@ -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"

@@ -20,7 +20,6 @@ from typing import Any

 from esphome import const, yaml_util
 from esphome.const import (
-    BUNDLE_EXTENSION,
    CONF_ESPHOME,
    CONF_EXTERNAL_COMPONENTS,
    CONF_INCLUDES,
@@ -30,12 +29,12 @@ from esphome.const import (
    CONF_TYPE,
 )
 from esphome.core import CORE, EsphomeError
-from esphome.util import filter_yaml_files

 _LOGGER = logging.getLogger(__name__)

 DOMAIN = "bundle"

+BUNDLE_EXTENSION = ".esphomebundle.tar.gz"
 MANIFEST_FILENAME = "manifest.json"
 CURRENT_MANIFEST_VERSION = 1
 MAX_DECOMPRESSED_SIZE = 500 * 1024 * 1024  # 500 MB
@@ -129,9 +128,6 @@ class BundleData:
    """Files components asked to include, keyed under DOMAIN in CORE.data."""

    extra_files: list[Path] = field(default_factory=list)
-    # Directories whose YAML files are scanned for !secret references but
-    # never bundled, e.g. git package checkouts the builder re-fetches.
-    secret_scan_dirs: set[Path] = field(default_factory=set)
    # Original config dir parsed from an extracted bundle's manifest.json,
    # kept in the path flavor of the machine the bundle was created on.
    # The checked flag makes the manifest lookup happen at most once per run;
@@ -159,30 +155,6 @@ def add_bundle_file(path: Path) -> None:
    _get_data().extra_files.append(CORE.relative_config_path(path))


-def add_secret_scan_dir(path: Path) -> None:
-    """Register a directory to scan for ``!secret`` references when bundling.
-
-    The directory's files are not added to the bundle. Components call this
-    for YAML the build consumes without bundling it — such as git-fetched
-    packages, which the builder re-fetches — so the secrets those files
-    reference are still shipped in the filtered secrets file.
-
-    A relative path is taken as relative to the config directory.
-    """
-    if not path.is_absolute():
-        path = CORE.relative_config_path(path)
-    _get_data().secret_scan_dirs.add(path)
-
-
-def _secret_scan_yaml_files() -> list[Path]:
-    """Return the YAML files inside registered secret-scan directories."""
-    return filter_yaml_files(
-        f
-        for scan_dir in _get_data().secret_scan_dirs
-        for f in yaml_util.find_files(scan_dir, "*")
-    )
-
-
 # Windows paths start with a drive letter or contain backslashes; POSIX
 # paths do neither in practice, so this is how the flavor of a recorded
 # path string is recognized on any host.
@@ -338,7 +310,6 @@ class ConfigBundleCreator:
        yaml_sources = [
            bf.source for bf in files if bf.source.suffix in (".yaml", ".yml")
        ]
-        yaml_sources.extend(_secret_scan_yaml_files())
        used_secret_keys = _find_used_secret_keys(yaml_sources)
        filtered_secrets = self._build_filtered_secrets(used_secret_keys)

@@ -423,13 +394,6 @@ class ConfigBundleCreator:
        """
        discovered = yaml_util.discover_user_yaml_files(self._config_path)
        self._secrets_paths.update(discovered.secrets)
-        # A !secret inside a file this re-parse does not reach (for example
-        # a git-fetched package the builder re-fetches) still resolves
-        # against the config-dir secrets.yaml at build time, so always
-        # consider that file; filtering no-ops when no key matches.
-        default_secrets = self._config_dir / yaml_util.SECRET_YAML
-        if default_secrets.is_file():
-            self._secrets_paths.add(default_secrets.resolve())
        config_resolved = self._config_path.resolve()
        for fpath in discovered.files:
            if fpath == config_resolved:
@@ -755,6 +719,11 @@ def _validate_tar_members(tar: tarfile.TarFile, target_dir: Path) -> None:
            )


+def is_bundle_path(path: Path) -> bool:
+    """Check if a path looks like a bundle file."""
+    return path.name.lower().endswith(BUNDLE_EXTENSION)
+
+
 def _add_bytes_to_tar(tar: tarfile.TarFile, name: str, data: bytes) -> None:
    """Add in-memory bytes to a tar archive with deterministic metadata."""
    info = tarfile.TarInfo(name=name)
@@ -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,
@@ -50,13 +49,11 @@ from esphome.cpp_helpers import (  # noqa: F401
    build_registry_entry,
    build_registry_list,
    extract_registry_entry_config,
-    get_slot_count,
    gpio_pin_expression,
    past_safe_mode,
    register_component,
    register_parented,
    set_setup_priority,
-    slot_counter,
 )
 from esphome.cpp_types import (  # noqa: F401
    NAN,
@@ -1,178 +1,26 @@
 """Validated-config cache for the upload/logs fast path.

-compile dumps the validated config to <data_dir>/storage/<file>.validated.json;
+compile dumps the validated config to <data_dir>/storage/<file>.validated.yaml;
 the next upload/logs for that YAML reuses it instead of running the full
-read_config pipeline. The cache is deliberately lossy: only ``!lambda``
-bodies survive typed (``Lambda``); IDs, time periods, MAC/IP addresses,
-paths, UUIDs and enums store the same string form the YAML dumper
-produced for them. JSON additionally coerces non-str dict keys to
-strings; validated configs only use string keys (every schema key
-validator is ``cv.string``). mtime gates staleness.
+read_config pipeline. YAML round-trip (yaml_util.dump/load_yaml) keeps
+!lambda/!include/IDs/paths intact; mtime gates staleness.
 """

 from __future__ import annotations

-import json
 import logging
 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
 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__)

-# Bump when the on-disk shape changes; a mismatched version falls back
-# to read_config. The envelope also stamps the writing esphome version:
-# after an upgrade the cache holds the previous release's validation, so
-# it falls back once and the re-save self-heals.
-_CACHE_VERSION = 1
-_LAMBDA_KEY = "__esphome_lambda__"
-

 def compiled_config_path(config_filename: str) -> Path:
    """Path to the cached validated config alongside the storage sidecar."""
-    return CORE.data_dir / "storage" / f"{config_filename}.validated.json"
-
-
-def save_compiled_config(config: ConfigType) -> None:
-    """Write the validated-config cache. Always-write so mtime stays fresh.
-
-    Mode 0600 because config validation resolved !secret inline.
-    Failures are non-fatal: the fast path falls back to read_config.
-    """
-    try:
-        # The legacy YAML cache holds inline-resolved secrets and nothing
-        # reads it anymore; drop it even when the write below fails. A
-        # failed removal leaves resolved secrets on disk, so it warns.
-        try:
-            _legacy_compiled_config_path(CORE.config_filename).unlink(missing_ok=True)
-        except OSError as err:
-            _LOGGER.warning(
-                "Could not remove the legacy validated-config cache: %s", err
-            )
-        rendered = json.dumps(
-            {"v": _CACHE_VERSION, "esphome": ESPHOME_VERSION, "config": config},
-            separators=(",", ":"),
-            default=_json_default,
-        )
-        write_file(compiled_config_path(CORE.config_filename), rendered, private=True)
-    except TypeError as err:
-        # Structural, not transient: this config can never cache (e.g. a
-        # 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
-
-
-def load_compiled_config(conf_path: Path) -> ConfigType | None:
-    """Load the cached validated config and apply storage metadata to CORE.
-
-    Returns None (caller falls back to read_config) when the cache is
-    missing, older than the source YAML, unparseable, a different cache
-    version, or the sidecar is incomplete. The loaded config carries no
-    source ranges; callers must not feed it into read_config/write_cpp.
-    """
-    cache_path = compiled_config_path(conf_path.name)
-    if not _cache_is_fresh(cache_path, conf_path):
-        return None
-
-    try:
-        envelope = json.loads(
-            cache_path.read_text(encoding="utf-8"), object_hook=_decode_object
-        )
-    except (OSError, ValueError) as err:
-        _LOGGER.debug("Ignoring unreadable compiled config cache: %s", err)
-        return None
-
-    if (
-        not isinstance(envelope, dict)
-        or envelope.get("v") != _CACHE_VERSION
-        or envelope.get("esphome") != ESPHOME_VERSION
-        or not isinstance(config := envelope.get("config"), dict)
-    ):
-        _LOGGER.debug("Ignoring compiled config cache with a foreign envelope")
-        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")
-        return None
-    storage.apply_to_core()
-    return config
-
-
-# Remove before 2027.8: by then every maintained install has saved the
-# JSON cache at least once and dropped its legacy YAML file.
-def _legacy_compiled_config_path(config_filename: str) -> Path:
-    """Path of the pre-JSON YAML cache; only ever removed."""
    return CORE.data_dir / "storage" / f"{config_filename}.validated.yaml"


@@ -184,21 +32,45 @@ def _cache_is_fresh(cache_path: Path, source_path: Path) -> bool:
        return False


-def _json_default(value: Any) -> Any:
-    """Mirror ESPHomeDumper's representers: Lambda stays typed, the rest
-    stringify (IDs, time periods, MAC/IP addresses, paths, UUIDs, enums).
+def save_compiled_config(config: ConfigType) -> None:
+    """Write the validated-config cache. Always-write so mtime stays fresh.

-    IncludeFile/Extend/Remove have no JSON mirror and would stringify
-    wrong, but none survive validation (config.py's packages merge and
-    the substitution pass consume them) so no guard is spent on them.
+    Mode 0600 because show_secrets=True resolves !secret inline.
+    Failures are non-fatal: the fast path falls back to read_config.
    """
-    if isinstance(value, Lambda):
-        return {_LAMBDA_KEY: value.value}
-    return str(value)
+    from esphome import yaml_util
+
+    try:
+        rendered = yaml_util.dump(config, show_secrets=True)
+        write_file(compiled_config_path(CORE.config_filename), rendered, private=True)
+    except Exception as err:  # noqa: BLE001  # pylint: disable=broad-except
+        _LOGGER.debug("Skipping compiled config cache write: %s", err)


-def _decode_object(obj: dict[str, Any]) -> Any:
-    """Revive the Lambda sentinel; every other mapping passes through."""
-    if len(obj) == 1 and isinstance(value := obj.get(_LAMBDA_KEY), str):
-        return Lambda(value)
-    return obj
+def load_compiled_config(conf_path: Path) -> ConfigType | None:
+    """Load the cached validated config and apply storage metadata to CORE.
+
+    Returns None (caller falls back to read_config) when the cache is
+    missing, older than the source YAML, unparseable, or the sidecar
+    is incomplete.
+    """
+    cache_path = compiled_config_path(conf_path.name)
+    if not _cache_is_fresh(cache_path, conf_path):
+        return None
+
+    from esphome import yaml_util
+
+    try:
+        config = yaml_util.load_yaml(cache_path, clear_secrets=False)
+    except Exception:  # noqa: BLE001  # pylint: disable=broad-except
+        return None
+
+    storage = StorageJSON.load(ext_storage_path(conf_path.name))
+    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
@@ -231,7 +231,6 @@ def validate_adc_pin(value):
            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_)) {
@@ -10,8 +10,8 @@ from esphome.components.esp32 import (
 from esphome.components.nrf52.const import AIN_TO_GPIO, EXTRA_ADC
 from esphome.components.zephyr import (
    zephyr_add_overlay,
-    zephyr_add_overlay_builder,
    zephyr_add_prj_conf,
+    zephyr_add_user,
 )
 from esphome.config_helpers import filter_source_files_from_platform
 import esphome.config_validation as cv
@@ -67,13 +67,6 @@ def validate_config(config):
        # 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,18 +113,6 @@ CONFIG_SCHEMA = cv.All(
 CONF_ADC_CHANNEL_ID = "adc_channel_id"


-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"""
-            / {{
-                zephyr,user {{
-                    io-channels = {entries};
-                }};
-            }};
-            """
-
-
 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
@@ -140,7 +121,6 @@ async def to_code(config):
    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])
@@ -193,8 +173,9 @@ async def to_code(config):
        if isinstance(pin_number, int):
            GPIO_TO_AIN = {v: k for k, v in AIN_TO_GPIO.items()}
            pin_number = GPIO_TO_AIN[pin_number]
-        zephyr_add_overlay_builder(_overlay_io_channels)
-        zephyr_add_overlay(f"""
+        zephyr_add_user("io-channels", f"<&adc {channel_id}>")
+        zephyr_add_overlay(
+            f"""
                &adc {{
                    #address-cells = <1>;
                    #size-cells = <0>;
@@ -209,7 +190,8 @@ async def to_code(config):
                        zephyr,oversampling = <8>;
                    }};
                }};
-            """)
+            """
+        )


 FILTER_SOURCE_FILES = filter_source_files_from_platform(
@@ -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)
@@ -1,26 +1,23 @@
 import esphome.codegen as cg
-from esphome.components import ble_device_base
+from esphome.components import esp32_ble_tracker
 import esphome.config_validation as cv
 from esphome.const import CONF_ID

-AUTO_LOAD = ["ble_device_base"]
+DEPENDENCIES = ["esp32_ble_tracker"]
 CODEOWNERS = ["@jeromelaban"]

 airthings_ble_ns = cg.esphome_ns.namespace("airthings_ble")
 AirthingsListener = airthings_ble_ns.class_(
-    "AirthingsListener", ble_device_base.ESPBTDeviceListener
+    "AirthingsListener", esp32_ble_tracker.ESPBTDeviceListener
 )

-CONFIG_SCHEMA = cv.All(
-    ble_device_base.rename_legacy_hub_id("airthings_ble"),
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(AirthingsListener),
-        }
-    ).extend(ble_device_base.BLE_DEVICE_SCHEMA),
-)
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(AirthingsListener),
+    }
+).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)


 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
-    await ble_device_base.register_ble_device(var, config)
+    await esp32_ble_tracker.register_ble_device(var, config)
@@ -2,13 +2,15 @@
 #include "esphome/core/log.h"
 #include <cinttypes>

+#ifdef USE_ESP32
+
 namespace esphome::airthings_ble {

 static const char *const TAG = "airthings_ble";

-bool AirthingsListener::parse_device(const ble_device_base::ESPBTDevice &device) {
+bool AirthingsListener::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
  for (auto &it : device.get_manufacturer_datas()) {
-    if (it.uuid == ble_device_base::ESPBTUUID::from_uint32(0x0334)) {
+    if (it.uuid == esp32_ble_tracker::ESPBTUUID::from_uint32(0x0334)) {
      if (it.data.size() < 4)
        continue;

@@ -27,3 +29,5 @@ bool AirthingsListener::parse_device(const ble_device_base::ESPBTDevice &device)
 }

 }  // namespace esphome::airthings_ble
+
+#endif
@@ -1,13 +1,17 @@
 #pragma once

+#ifdef USE_ESP32
+
 #include "esphome/core/component.h"
-#include "esphome/components/ble_device_base/ble_device.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"

 namespace esphome::airthings_ble {

-class AirthingsListener final : public ble_device_base::ESPBTDeviceListener {
+class AirthingsListener final : public esp32_ble_tracker::ESPBTDeviceListener {
 public:
-  bool parse_device(const ble_device_base::ESPBTDevice &device) override;
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
 };

 }  // namespace esphome::airthings_ble
+
+#endif
@@ -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")
@@ -13,7 +13,6 @@ from esphome.const import (
    CONF_CAPTURE_RESPONSE,
    CONF_DATA,
    CONF_DATA_TEMPLATE,
-    CONF_ENCRYPTION,
    CONF_EVENT,
    CONF_ID,
    CONF_KEY,
@@ -103,6 +102,7 @@ SERVICE_ARG_FALLBACK_TYPES: dict[str, MockObj] = {
        for name, t in _SERVICE_ARG_SCALAR_TYPES.items()
    },
 }
+CONF_ENCRYPTION = "encryption"
 CONF_BATCH_DELAY = "batch_delay"
 CONF_CUSTOM_SERVICES = "custom_services"
 CONF_HOMEASSISTANT_SERVICES = "homeassistant_services"
@@ -497,7 +497,7 @@ async def to_code(config: ConfigType) -> None:
            # and plaintext disabled. Only a factory reset can remove it.
            cg.add_define("USE_API_PLAINTEXT")
        cg.add_define("USE_API_NOISE")
-        cg.add_library("esphome/noise-c", "0.1.21")
+        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")
@@ -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() {
@@ -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_object_id_hash();
    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
@@ -1361,6 +1349,22 @@ bool APIConnection::send_voice_assistant_get_configuration_response_(
    }
  }

+  // Filter external wake words
+  for (auto &wake_word : msg.external_wake_words) {
+    if (wake_word.model_type != "micro") {
+      // microWakeWord only
+      continue;
+    }
+
+    resp.available_wake_words.emplace_back();
+    auto &resp_wake_word = resp.available_wake_words.back();
+    resp_wake_word.id = StringRef(wake_word.id);
+    resp_wake_word.wake_word = StringRef(wake_word.wake_word);
+    for (const auto &lang : wake_word.trained_languages) {
+      resp_wake_word.trained_languages.push_back(lang);
+    }
+  }
+
  resp.active_wake_words = &config.active_wake_words;
  resp.max_active_wake_words = config.max_active_wake_words;
  return this->send_message(resp);
@@ -1543,13 +1547,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
@@ -1560,8 +1558,8 @@ void APIConnection::on_serial_proxy_configure_request(const SerialProxyConfigure
             static_cast<uint32_t>(proxies.size()));
    return;
  }
-  proxies[msg.instance]->configure(this, msg.baudrate, msg.flow_control, static_cast<uint8_t>(msg.parity),
-                                   msg.stop_bits, msg.data_size);
+  proxies[msg.instance]->configure(msg.baudrate, msg.flow_control, static_cast<uint8_t>(msg.parity), msg.stop_bits,
+                                   msg.data_size);
 }

 void APIConnection::on_serial_proxy_write_request(const SerialProxyWriteRequest &msg) {
@@ -1570,7 +1568,7 @@ void APIConnection::on_serial_proxy_write_request(const SerialProxyWriteRequest
    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
    return;
  }
-  proxies[msg.instance]->write_from_client(this, msg.data, msg.data_len);
+  proxies[msg.instance]->write_from_client(msg.data, msg.data_len);
 }

 void APIConnection::on_serial_proxy_set_modem_pins_request(const SerialProxySetModemPinsRequest &msg) {
@@ -1579,7 +1577,7 @@ void APIConnection::on_serial_proxy_set_modem_pins_request(const SerialProxySetM
    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
    return;
  }
-  proxies[msg.instance]->set_modem_pins(this, msg.line_states);
+  proxies[msg.instance]->set_modem_pins(msg.line_states);
 }

 void APIConnection::on_serial_proxy_get_modem_pins_request(const SerialProxyGetModemPinsRequest &msg) {
@@ -1591,9 +1589,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 +1621,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 +1630,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 +1750,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 +1761,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 +1786,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 +1864,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 +1919,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 +1940,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 +2018,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 +2029,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
@@ -2177,10 +2109,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
@@ -591,21 +591,18 @@ APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) {
 */
 APIError APINoiseFrameHelper::init_handshake_() {
  int err;
-  // Noise_NNpsk0_25519_ChaChaPoly_SHA256, built on the stack:
-  // noise_handshakestate_new_by_id copies it, so a member would waste
-  // 104 bytes per connection, and a static const would sit in RAM on
-  // ESP8266 (.rodata is DRAM there).
-  const NoiseProtocolId nid = {
-      .prefix_id = NOISE_PREFIX_STANDARD,
-      .pattern_id = NOISE_PATTERN_NN,
-      .modifier_ids = {NOISE_MODIFIER_PSK0},
-      .dh_id = NOISE_DH_CURVE25519,
-      .cipher_id = NOISE_CIPHER_CHACHAPOLY,
-      .hash_id = NOISE_HASH_SHA256,
-      .hybrid_id = NOISE_DH_NONE,
-  };
+  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);
+  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)
@@ -63,6 +63,9 @@ class APINoiseFrameHelper final : public APIFrameHelper {
  // 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)
@@ -12,22 +12,6 @@ APIOverflowBuffer::~APIOverflowBuffer() {
 }

 ssize_t APIOverflowBuffer::try_drain(socket::Socket *socket) {
-  // socket->write() can re-enter this function: a log message emitted from an
-  // lwip callback during the write goes out over the API and lands back in the
-  // frame helper's write/drain path. If a nested drain ran here it would send
-  // and free the entry the outer drain is still holding, causing a double free.
-  // Report "no progress" instead; the outer drain keeps draining, and the
-  // nested send is enqueued behind the existing backlog.
-  if (this->draining_)
-    return 0;
-
-  // RAII so the flag is cleared on every return path
-  struct DrainGuard {
-    explicit DrainGuard(bool &flag) : flag_(flag) { flag_ = true; }
-    ~DrainGuard() { this->flag_ = false; }
-    bool &flag_;
-  } guard(this->draining_);
-
  while (this->count_ > 0) {
    Entry *front = this->queue_[this->head_];

@@ -45,12 +29,11 @@ ssize_t APIOverflowBuffer::try_drain(socket::Socket *socket) {
      return sent;
    }

-    // Entry fully sent — unlink it before freeing so a freed pointer is never
-    // reachable from the queue
+    // Entry fully sent — free it and advance
+    Entry::destroy(front);
    this->queue_[this->head_] = nullptr;
    this->head_ = (this->head_ + 1) % API_MAX_SEND_QUEUE;
    this->count_--;
-    Entry::destroy(front);
  }

  return 0;  // All drained
@@ -69,10 +69,6 @@ class APIOverflowBuffer {
  uint8_t head_{0};
  uint8_t tail_{0};
  uint8_t count_{0};
-  // Guards against re-entrant drains: socket->write() can re-enter the API
-  // send path (e.g. a log message emitted from an lwip callback), and a nested
-  // drain would free the entry the outer drain is still holding.
-  bool draining_{false};
 };

 }  // 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

@@ -581,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);
      }
    });
  }
@@ -1,10 +1,177 @@
-"""Backward-compatibility shim; the log client lives in esphome.api_client.
+from __future__ import annotations

-Importing this module executes the whole api component package, which pulls
-in the validation stack. CLI code paths should import esphome.api_client
-directly so the logs fast path stays light.
-"""
+import asyncio
+from datetime import datetime
+import importlib
+import logging
+from typing import TYPE_CHECKING, Any
+import warnings

-from esphome.api_client import async_run_logs, run_logs
+# Suppress protobuf version warnings
+with warnings.catch_warnings():
+    warnings.filterwarnings(
+        "ignore", category=UserWarning, message=".*Protobuf gencode version.*"
+    )
+    from aioesphomeapi import APIClient, parse_log_message
+    from aioesphomeapi.log_runner import async_run

-__all__ = ["async_run_logs", "run_logs"]
+import contextlib
+
+from esphome.const import CONF_KEY, CONF_PORT, __version__
+from esphome.core import CORE
+from esphome.util import safe_print
+
+from . import CONF_ENCRYPTION
+
+if TYPE_CHECKING:
+    from aioesphomeapi.api_pb2 import (
+        SubscribeLogsResponse,  # pylint: disable=no-name-in-module
+    )
+
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class _LogLineProcessor:
+    """Feeds incoming log lines to the stack-trace decoder.
+
+    Two responsibilities beyond just calling the decoder:
+    1. Catch everything the decoder can raise. aioesphomeapi isolates
+       exceptions raised by log handlers, so an escaping one no longer
+       kills the session, but it does log a full traceback per line. A
+       crash dump carries a PC line plus one per backtrace frame, so the
+       tracebacks bury the dump the user is trying to read. Decoding is a
+       diagnostic nicety; nothing it raises is worth that noise.
+    2. Disable decoding after the first failure. _decode_pc shells out to
+       the toolchain to resolve addr2line, which is expensive; a single
+       crash dump can contain many PC/BT lines and we don't want to retry
+       the failing subprocess for each one. This only works if every
+       failure is caught, which is why 1 is not narrowed to EsphomeError.
+    """
+
+    def __init__(self, config: dict[str, Any], platform_handler: Any | None) -> None:
+        self._config = config
+        self._platform_handler = platform_handler
+        self._decode_enabled = True
+        self.backtrace_state = False
+
+    def process_line(self, raw_line: str) -> None:
+        if not self._decode_enabled:
+            return
+        try:
+            if self._platform_handler is not None:
+                self.backtrace_state = self._platform_handler(
+                    self._config, raw_line, self.backtrace_state
+                )
+        except Exception as exc:  # noqa: BLE001  # pylint: disable=broad-except
+            self._decode_enabled = False
+            self.backtrace_state = False
+            # _run_idedata raises EsphomeError with no message; fall back
+            # to a generic explanation when str(exc) is empty.
+            detail = str(exc) or "build artifacts not found locally"
+            _LOGGER.debug("Stack-trace decoding failed", exc_info=True)
+            _LOGGER.warning(
+                "Crash trace decoding unavailable: %s. "
+                "Run 'esphome compile' for this device to enable PC decoding.",
+                detail,
+            )
+
+
+async def async_run_logs(
+    config: dict[str, Any],
+    addresses: list[str],
+    subscribe_states: bool = True,
+) -> None:
+    """Run the logs command in the event loop."""
+    conf = config["api"]
+    name = config["esphome"]["name"]
+    port: int = int(conf[CONF_PORT])
+    noise_psk: str | None = None
+    if (encryption := conf.get(CONF_ENCRYPTION)) and (key := encryption.get(CONF_KEY)):
+        noise_psk = key
+
+    if len(addresses) == 1:
+        _LOGGER.info("Starting log output from %s using esphome API", addresses[0])
+    else:
+        _LOGGER.info(
+            "Starting log output from %s using esphome API", " or ".join(addresses)
+        )
+
+    cli = APIClient(
+        addresses[0],  # Primary address for compatibility
+        port,
+        "",  # Password auth removed in 2026.1.0
+        client_info=f"ESPHome Logs {__version__}",
+        noise_psk=noise_psk,
+        addresses=addresses,  # Pass all addresses for automatic retry
+        provide_time=False,
+    )
+
+    # Try platform-specific stacktrace handler first, fall back to generic
+    platform_process_stacktrace = None
+    try:
+        module = importlib.import_module("esphome.components." + CORE.target_platform)
+        platform_process_stacktrace = module.process_stacktrace
+    except (AttributeError, ImportError):
+        _LOGGER.info(
+            'Stacktrace analysis is unavailable: no compatible analyzer found for target platform "%s".',
+            CORE.target_platform,
+        )
+
+    processor = _LogLineProcessor(config, platform_process_stacktrace)
+
+    def on_log(msg: SubscribeLogsResponse) -> None:
+        """Handle a new log message."""
+        time_ = datetime.now().astimezone()
+        message: bytes = msg.message
+        text = message.decode("utf8", "backslashreplace")
+        nanoseconds = time_.microsecond // 1000
+        timestamp = (
+            f"[{time_.hour:02}:{time_.minute:02}:{time_.second:02}.{nanoseconds:03}]"
+        )
+        for parsed_msg in parse_log_message(text, timestamp):
+            # safe_print handles the dashboard \033 escaping and falls back
+            # to backslashreplace encoding on stdouts that can't represent
+            # the wifi signal-bar block characters (Windows redirected
+            # cp1252 pipe).
+            safe_print(parsed_msg)
+        for raw_line in text.splitlines():
+            processor.process_line(raw_line)
+
+    # Safe to fall back to plaintext here only for this diagnostics use
+    # case: the stream is one-way from device to client, and this code
+    # never accepts commands or acts on any message the device sends.
+    # An on-path attacker could still both inject fabricated log lines
+    # and passively read the device's log output (and any state data
+    # delivered when subscribe_states is enabled), so this does lose
+    # confidentiality as well as authentication/integrity. That tradeoff
+    # is acceptable for operator-visible logs, which aioesphomeapi also
+    # warns may come from an unverified device. Never mirror this opt-in
+    # for any connection that sends data to the device or uses Home
+    # Assistant actions.
+    stop = await async_run(
+        cli,
+        on_log,
+        name=name,
+        subscribe_states=subscribe_states,
+        allow_plaintext_fallback=True,
+        # 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,
+    )
+    try:
+        await asyncio.Event().wait()
+    finally:
+        await stop()
+
+
+def run_logs(
+    config: dict[str, Any],
+    addresses: list[str],
+    subscribe_states: bool = True,
+) -> None:
+    """Run the logs command."""
+    with contextlib.suppress(KeyboardInterrupt):
+        asyncio.run(
+            async_run_logs(config, addresses, subscribe_states=subscribe_states)
+        )
@@ -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])
@@ -1,6 +1,8 @@
 #include "atc_mithermometer.h"
 #include "esphome/core/log.h"

+#ifdef USE_ESP32
+
 namespace esphome::atc_mithermometer {

 static const char *const TAG = "atc_mithermometer";
@@ -13,7 +15,7 @@ void ATCMiThermometer::dump_config() {
  LOG_SENSOR("  ", "Battery Voltage", this->battery_voltage_);
 }

-bool ATCMiThermometer::parse_device(const ble_device_base::ESPBTDevice &device) {
+bool ATCMiThermometer::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
  if (device.address_uint64() != this->address_) {
    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
    return false;
@@ -50,7 +52,7 @@ bool ATCMiThermometer::parse_device(const ble_device_base::ESPBTDevice &device)
  return success;
 }

-optional<ParseResult> ATCMiThermometer::parse_header_(const ble_device_base::ServiceData &service_data) {
+optional<ParseResult> ATCMiThermometer::parse_header_(const esp32_ble_tracker::ServiceData &service_data) {
  ParseResult result;
  if (!service_data.uuid.contains(0x1A, 0x18)) {
    ESP_LOGVV(TAG, "parse_header(): no service data UUID magic bytes.");
@@ -130,3 +132,5 @@ bool ATCMiThermometer::report_results_(const optional<ParseResult> &result, cons
 }

 }  // namespace esphome::atc_mithermometer
+
+#endif
@@ -2,10 +2,12 @@

 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
-#include "esphome/components/ble_device_base/ble_device.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"

 #include <vector>

+#ifdef USE_ESP32
+
 namespace esphome::atc_mithermometer {

 struct ParseResult {
@@ -16,11 +18,11 @@ struct ParseResult {
  int raw_offset;
 };

-class ATCMiThermometer final : public Component, public ble_device_base::ESPBTDeviceListener {
+class ATCMiThermometer final : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
 public:
  void set_address(uint64_t address) { address_ = address; };

-  bool parse_device(const ble_device_base::ESPBTDevice &device) override;
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
  void dump_config() override;
  void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }
  void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; }
@@ -38,9 +40,11 @@ class ATCMiThermometer final : public Component, public ble_device_base::ESPBTDe

  uint8_t last_frame_count_{0};

-  optional<ParseResult> parse_header_(const ble_device_base::ServiceData &service_data);
+  optional<ParseResult> parse_header_(const esp32_ble_tracker::ServiceData &service_data);
  bool parse_message_(const std::vector<uint8_t> &message, ParseResult &result);
  bool report_results_(const optional<ParseResult> &result, const char *address);
 };

 }  // namespace esphome::atc_mithermometer
+
+#endif
@@ -1,5 +1,5 @@
 import esphome.codegen as cg
-from esphome.components import ble_device_base, sensor
+from esphome.components import esp32_ble_tracker, sensor
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_BATTERY_LEVEL,
@@ -24,15 +24,14 @@ from esphome.const import (

 CODEOWNERS = ["@ahpohl"]

-AUTO_LOAD = ["ble_device_base"]
+DEPENDENCIES = ["esp32_ble_tracker"]

 atc_mithermometer_ns = cg.esphome_ns.namespace("atc_mithermometer")
 ATCMiThermometer = atc_mithermometer_ns.class_(
-    "ATCMiThermometer", ble_device_base.ESPBTDeviceListener, cg.Component
+    "ATCMiThermometer", esp32_ble_tracker.ESPBTDeviceListener, cg.Component
 )

-CONFIG_SCHEMA = cv.All(
-    ble_device_base.rename_legacy_hub_id("atc_mithermometer"),
+CONFIG_SCHEMA = (
    cv.Schema(
        {
            cv.GenerateID(): cv.declare_id(ATCMiThermometer),
@@ -72,15 +71,15 @@ CONFIG_SCHEMA = cv.All(
            ),
        }
    )
+    .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
    .extend(cv.COMPONENT_SCHEMA)
-    .extend(ble_device_base.BLE_DEVICE_SCHEMA),
 )


 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
-    await ble_device_base.register_ble_device(var, config)
+    await esp32_ble_tracker.register_ble_device(var, config)

    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))

@@ -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)
@@ -1,6 +1,8 @@
 #include "b_parasite.h"
 #include "esphome/core/log.h"

+#ifdef USE_ESP32
+
 namespace esphome::b_parasite {

 static const char *const TAG = "b_parasite";
@@ -14,7 +16,7 @@ void BParasite::dump_config() {
  LOG_SENSOR("  ", "Illuminance", this->illuminance_);
 }

-bool BParasite::parse_device(const ble_device_base::ESPBTDevice &device) {
+bool BParasite::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
  if (device.address_uint64() != address_) {
    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
    return false;
@@ -111,3 +113,5 @@ bool BParasite::parse_device(const ble_device_base::ESPBTDevice &device) {
 }

 }  // namespace esphome::b_parasite
+
+#endif  // USE_ESP32
@@ -2,16 +2,18 @@

 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
-#include "esphome/components/ble_device_base/ble_device.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+#ifdef USE_ESP32

 namespace esphome::b_parasite {

-class BParasite final : public Component, public ble_device_base::ESPBTDeviceListener {
+class BParasite final : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
 public:
  void set_address(uint64_t address) { address_ = address; };
  void set_bindkey(const std::string &bindkey);

-  bool parse_device(const ble_device_base::ESPBTDevice &device) override;
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
  void dump_config() override;

  void set_battery_voltage(sensor::Sensor *battery_voltage) { battery_voltage_ = battery_voltage; }
@@ -33,3 +35,5 @@ class BParasite final : public Component, public ble_device_base::ESPBTDeviceLis
 };

 }  // namespace esphome::b_parasite
+
+#endif  // USE_ESP32
@@ -1,5 +1,5 @@
 import esphome.codegen as cg
-from esphome.components import ble_device_base, sensor
+from esphome.components import esp32_ble_tracker, sensor
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_BATTERY_VOLTAGE,
@@ -23,15 +23,14 @@ from esphome.const import (

 CODEOWNERS = ["@rbaron"]

-AUTO_LOAD = ["ble_device_base"]
+DEPENDENCIES = ["esp32_ble_tracker"]

 b_parasite_ns = cg.esphome_ns.namespace("b_parasite")
 BParasite = b_parasite_ns.class_(
-    "BParasite", ble_device_base.ESPBTDeviceListener, cg.Component
+    "BParasite", esp32_ble_tracker.ESPBTDeviceListener, cg.Component
 )

-CONFIG_SCHEMA = cv.All(
-    ble_device_base.rename_legacy_hub_id("b_parasite"),
+CONFIG_SCHEMA = (
    cv.Schema(
        {
            cv.GenerateID(): cv.declare_id(BParasite),
@@ -69,15 +68,15 @@ CONFIG_SCHEMA = cv.All(
            ),
        }
    )
+    .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
    .extend(cv.COMPONENT_SCHEMA)
-    .extend(ble_device_base.BLE_DEVICE_SCHEMA),
 )


 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    await cg.register_component(var, config)
-    await ble_device_base.register_ble_device(var, config)
+    await esp32_ble_tracker.register_ble_device(var, config)

    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))

@@ -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]))
@@ -51,11 +51,7 @@ def _set_core_data(config):
    return config


-# extend({}) makes this platform's own schema instance: BASE_SCHEMA is shared
-# by every LibreTiny platform, and prepending this platform's _set_core_data
-# onto the shared object would run it for every platform's validation once two
-# platform modules are imported in one process (device-builder, tests).
-CONFIG_SCHEMA = libretiny.BASE_SCHEMA.extend({})
+CONFIG_SCHEMA = libretiny.BASE_SCHEMA

 PIN_SCHEMA = libretiny.gpio.BASE_PIN_SCHEMA

@@ -5,11 +5,11 @@ bring-up and the controller BLE address. Consumers (bk72xx_ble_tracker) build
 on this component and contain no SDK calls of their own.

 Supported SoCs (BLE 5.x): BK7231N/BK7236 (BLE 5.1), BK7238/BK7252N/BK7253
-(BLE 5.2), and any future BLE-5.x SoC. Known non-5.x families are rejected in
-to_code; unknown families are capability-checked at compile time via
-`__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.
+(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;
@@ -21,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"]
@@ -52,36 +45,7 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)


-# Once per registered scan listener; sizes the controller's StaticVector
-# listener storage.
-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"
-    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)

@@ -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,40 +173,14 @@ 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();
  if (report == nullptr)
    return;
  do {
-#ifdef BK72XX_BLE_SCAN_LISTENER_COUNT
    for (auto *listener : this->scan_listeners_)
      listener->on_scan_report(*report);
-#endif
    this->report_pool_.release(report);
  } while ((report = this->report_queue_.pop()) != nullptr);

@@ -234,7 +191,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 +224,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 +236,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
--- a/Show More
+++ b/Show More