idf only

[epdiy] ePaper display(s)
2026-01-27 15:02:05 -07:00 · 2025-09-13 10:12:49 +12:00 · 2025-09-13 10:01:42 +12:00
424 changed files with 5679 additions and 17438 deletions
--- a/.clang-tidy.hash
+++ b/.clang-tidy.hash
@@ -1 +1 @@
-499db61c1aa55b98b6629df603a56a1ba7aff5a9a7c781a5c1552a9dcd186c08
+4368db58e8f884aff245996b1e8b644cc0796c0bb2fa706d5740d40b823d3ac9
--- a/.github/actions/build-image/action.yaml
+++ b/.github/actions/build-image/action.yaml
@@ -47,7 +47,7 @@ runs:

    - name: Build and push to ghcr by digest
      id: build-ghcr
-      uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+      uses: docker/build-push-action@v6.18.0
      env:
        DOCKER_BUILD_SUMMARY: false
        DOCKER_BUILD_RECORD_UPLOAD: false
@@ -73,7 +73,7 @@ runs:

    - name: Build and push to dockerhub by digest
      id: build-dockerhub
-      uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+      uses: docker/build-push-action@v6.18.0
      env:
        DOCKER_BUILD_SUMMARY: false
        DOCKER_BUILD_RECORD_UPLOAD: false
--- a/.github/actions/restore-python/action.yml
+++ b/.github/actions/restore-python/action.yml
@@ -17,12 +17,12 @@ runs:
  steps:
    - name: Set up Python ${{ inputs.python-version }}
      id: python
-      uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+      uses: actions/setup-python@v6.0.0
      with:
        python-version: ${{ inputs.python-version }}
    - name: Restore Python virtual environment
      id: cache-venv
-      uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      uses: actions/cache/restore@v4.2.4
      with:
        path: venv
        # yamllint disable-line rule:line-length
--- a/.github/workflows/auto-label-pr.yml
+++ b/.github/workflows/auto-label-pr.yml
@@ -22,17 +22,17 @@ jobs:
    if: github.event.action != 'labeled' || github.event.sender.type != 'Bot'
    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Generate a token
        id: generate-token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2
+        uses: actions/create-github-app-token@v2
        with:
          app-id: ${{ secrets.ESPHOME_GITHUB_APP_ID }}
          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}

      - name: Auto Label PR
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          github-token: ${{ steps.generate-token.outputs.token }}
          script: |
--- a/.github/workflows/ci-api-proto.yml
+++ b/.github/workflows/ci-api-proto.yml
@@ -21,9 +21,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v6.0.0
        with:
          python-version: "3.11"

@@ -47,7 +47,7 @@ jobs:
          fi
      - if: failure()
        name: Review PR
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            await github.rest.pulls.createReview({
@@ -62,7 +62,7 @@ jobs:
        run: git diff
      - if: failure()
        name: Archive artifacts
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: generated-proto-files
          path: |
@@ -70,7 +70,7 @@ jobs:
            esphome/components/api/api_pb2_service.*
      - if: success()
        name: Dismiss review
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            let reviews = await github.rest.pulls.listReviews({
--- a/.github/workflows/ci-clang-tidy-hash.yml
+++ b/.github/workflows/ci-clang-tidy-hash.yml
@@ -20,10 +20,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v6.0.0
        with:
          python-version: "3.11"

@@ -41,7 +41,7 @@ jobs:

      - if: failure()
        name: Request changes
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            await github.rest.pulls.createReview({
@@ -54,7 +54,7 @@ jobs:

      - if: success()
        name: Dismiss review
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            let reviews = await github.rest.pulls.listReviews({
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -43,13 +43,13 @@ jobs:
          - "docker"
          # - "lint"
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v5.0.0
      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v6.0.0
        with:
          python-version: "3.11"
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@v3.11.1

      - name: Set TAG
        run: |
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,18 +36,18 @@ jobs:
      cache-key: ${{ steps.cache-key.outputs.key }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Generate cache-key
        id: cache-key
        run: echo key="${{ hashFiles('requirements.txt', 'requirements_test.txt', '.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v6.0.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore Python virtual environment
        id: cache-venv
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          # yamllint disable-line rule:line-length
@@ -70,7 +70,7 @@ jobs:
    if: needs.determine-jobs.outputs.python-linters == 'true'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -91,7 +91,7 @@ jobs:
      - common
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -105,7 +105,6 @@ jobs:
          script/ci-custom.py
          script/build_codeowners.py --check
          script/build_language_schema.py --check
-          script/generate-esp32-boards.py --check

  pytest:
    name: Run pytest
@@ -137,7 +136,7 @@ jobs:
      - common
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        id: restore-python
        uses: ./.github/actions/restore-python
@@ -157,12 +156,12 @@ jobs:
          . venv/bin/activate
          pytest -vv --cov-report=xml --tb=native -n auto tests --ignore=tests/integration/
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@v5.5.1
        with:
          token: ${{ secrets.CODECOV_TOKEN }}
      - name: Save Python virtual environment cache
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/save@v4.2.4
        with:
          path: venv
          key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -180,7 +179,7 @@ jobs:
      component-test-count: ${{ steps.determine.outputs.component-test-count }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
        with:
          # Fetch enough history to find the merge base
          fetch-depth: 2
@@ -215,15 +214,15 @@ jobs:
    if: needs.determine-jobs.outputs.integration-tests == 'true'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python 3.13
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v6.0.0
        with:
          python-version: "3.13"
      - name: Restore Python virtual environment
        id: cache-venv
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -288,7 +287,7 @@ jobs:

    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
        with:
          # Need history for HEAD~1 to work for checking changed files
          fetch-depth: 2
@@ -301,14 +300,14 @@ jobs:

      - name: Cache platformio
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache@v4.2.4
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}

      - name: Cache platformio
        if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
@@ -375,7 +374,7 @@ jobs:
          sudo apt-get install libsdl2-dev

      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -401,7 +400,7 @@ jobs:
      matrix: ${{ steps.split.outputs.components }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Split components into 20 groups
        id: split
        run: |
@@ -431,7 +430,7 @@ jobs:
          sudo apt-get install libsdl2-dev

      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
@@ -460,16 +459,16 @@ jobs:
    if: github.event_name == 'pull_request' && github.base_ref != 'beta' && github.base_ref != 'release'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
-      - uses: esphome/action@43cd1109c09c544d97196f7730ee5b2e0cc6d81e # v3.0.1 fork with pinned actions/cache
+      - uses: pre-commit/action@v3.0.1
        env:
          SKIP: pylint,clang-tidy-hash
-      - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
+      - uses: pre-commit-ci/lite-action@v1.1.0
        if: always()

  ci-status:
--- a/.github/workflows/codeowner-review-request.yml
+++ b/.github/workflows/codeowner-review-request.yml
@@ -25,7 +25,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Request reviews from component codeowners
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            const owner = context.repo.owner;
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -54,11 +54,11 @@ jobs:
            # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
    steps:
      - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+        uses: github/codeql-action/init@v3
        with:
          languages: ${{ matrix.language }}
          build-mode: ${{ matrix.build-mode }}
@@ -86,6 +86,6 @@ jobs:
          exit 1

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+        uses: github/codeql-action/analyze@v3
        with:
          category: "/language:${{matrix.language}}"
--- a/.github/workflows/external-component-bot.yml
+++ b/.github/workflows/external-component-bot.yml
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Add external component comment
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
--- a/.github/workflows/issue-codeowner-notify.yml
+++ b/.github/workflows/issue-codeowner-notify.yml
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Notify codeowners for component issues
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            const owner = context.repo.owner;
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
      branch_build: ${{ steps.tag.outputs.branch_build }}
      deploy_env: ${{ steps.tag.outputs.deploy_env }}
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v5.0.0
      - name: Get tag
        id: tag
        # yamllint disable rule:line-length
@@ -60,9 +60,9 @@ jobs:
      contents: read
      id-token: write
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v5.0.0
      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v6.0.0
        with:
          python-version: "3.x"
      - name: Build
@@ -70,7 +70,7 @@ jobs:
          pip3 install build
          python3 -m build
      - name: Publish
-        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.13.0
        with:
          skip-existing: true

@@ -92,22 +92,22 @@ jobs:
            os: "ubuntu-24.04-arm"

    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v5.0.0
      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v6.0.0
        with:
          python-version: "3.11"

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@v3.11.1

      - name: Log in to docker hub
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@v3.5.0
        with:
          username: ${{ secrets.DOCKER_USER }}
          password: ${{ secrets.DOCKER_PASSWORD }}
      - name: Log in to the GitHub container registry
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -138,7 +138,7 @@ jobs:
      #     version: ${{ needs.init.outputs.tag }}

      - name: Upload digests
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: digests-${{ matrix.platform.arch }}
          path: /tmp/digests
@@ -168,27 +168,27 @@ jobs:
          - ghcr
          - dockerhub
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v5.0.0

      - name: Download digests
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: digests-*
          path: /tmp/digests
          merge-multiple: true

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@v3.11.1

      - name: Log in to docker hub
        if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@v3.5.0
        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@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -220,7 +220,7 @@ jobs:
      - deploy-manifest
    steps:
      - name: Trigger Workflow
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          github-token: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
          script: |
@@ -246,7 +246,7 @@ jobs:
    environment: ${{ needs.init.outputs.deploy_env }}
    steps:
      - name: Trigger Workflow
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          github-token: ${{ secrets.DEPLOY_ESPHOME_SCHEMA_REPO_TOKEN }}
          script: |
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -15,52 +15,36 @@ concurrency:

 jobs:
  stale:
-    if: github.repository_owner == 'esphome'
    runs-on: ubuntu-latest
    steps:
-      - name: Stale
-        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+      - uses: actions/stale@v10.0.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: 150
-
-          # 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
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          remove-stale-when-updated: true
          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 contributions.

-            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.
-
-            Thank you for your contribution!
-
-          # 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
+  # Use stale to automatically close issues with a
+  # reference to the issue tracker
+  close-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v10.0.0
+        with:
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          days-before-issue-stale: 1
+          days-before-issue-close: 1
+          remove-stale-when-updated: true
          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.
+            https://github.com/esphome/esphome/issues/430
--- a/.github/workflows/status-check-labels.yml
+++ b/.github/workflows/status-check-labels.yml
@@ -16,7 +16,7 @@ jobs:
          - merge-after-release
    steps:
      - name: Check for ${{ matrix.label }} label
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v8.0.0
        with:
          script: |
            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
--- a/.github/workflows/sync-device-classes.yml
+++ b/.github/workflows/sync-device-classes.yml
@@ -13,16 +13,16 @@ jobs:
    if: github.repository == 'esphome/esphome'
    steps:
      - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Checkout Home Assistant
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
        with:
          repository: home-assistant/core
          path: lib/home-assistant

      - name: Setup Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v6.0.0
        with:
          python-version: 3.13

@@ -30,18 +30,13 @@ jobs:
        run: |
          python -m pip install --upgrade pip
          pip install -e lib/home-assistant
-          pip install -r requirements_test.txt pre-commit

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

-      - name: Run pre-commit hooks
-        run: |
-          python script/run-in-env.py pre-commit run --all-files
-
      - name: Commit changes
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@v7.0.8
        with:
          commit-message: "Synchronise Device Classes from Home Assistant"
          committer: esphomebot <esphome@openhomefoundation.org>
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ ci:
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.13.2
+    rev: v0.13.0
    hooks:
      # Run the linter.
      - id: ruff
--- a/5
+++ b/5
@@ -139,6 +139,7 @@ esphome/components/ens160_base/* @latonita @vincentscode
 esphome/components/ens160_i2c/* @latonita
 esphome/components/ens160_spi/* @latonita
 esphome/components/ens210/* @itn3rd77
+esphome/components/epdiy/* @jesserockz
 esphome/components/es7210/* @kahrendt
 esphome/components/es7243e/* @kbx81
 esphome/components/es8156/* @kbx81
@@ -160,6 +161,7 @@ esphome/components/esp_ldo/* @clydebarrow
 esphome/components/espnow/* @jesserockz
 esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/event/* @nohat
+esphome/components/event_emitter/* @Rapsssito
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
 esphome/components/ezo_pmp/* @carlos-sarmiento
@@ -406,7 +408,6 @@ esphome/components/sensor/* @esphome/core
 esphome/components/sfa30/* @ghsensdev
 esphome/components/sgp40/* @SenexCrenshaw
 esphome/components/sgp4x/* @martgras @SenexCrenshaw
-esphome/components/sha256/* @esphome/core
 esphome/components/shelly_dimmer/* @edge90 @rnauber
 esphome/components/sht3xd/* @mrtoy-me
 esphome/components/sht4x/* @sjtrny
@@ -533,7 +534,6 @@ esphome/components/wk2204_spi/* @DrCoolZic
 esphome/components/wk2212_i2c/* @DrCoolZic
 esphome/components/wk2212_spi/* @DrCoolZic
 esphome/components/wl_134/* @hobbypunk90
-esphome/components/wts01/* @alepee
 esphome/components/x9c/* @EtienneMD
 esphome/components/xgzp68xx/* @gcormier
 esphome/components/xiaomi_hhccjcy10/* @fariouche
@@ -549,4 +549,3 @@ esphome/components/xxtea/* @clydebarrow
 esphome/components/zephyr/* @tomaszduda23
 esphome/components/zhlt01/* @cfeenstra1024
 esphome/components/zio_ultrasonic/* @kahrendt
-esphome/components/zwave_proxy/* @kbx81
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -6,7 +6,6 @@ import getpass
 import importlib
 import logging
 import os
-from pathlib import Path
 import re
 import sys
 import time
@@ -115,14 +114,6 @@ class Purpose(StrEnum):
    LOGGING = "logging"


-def _resolve_with_cache(address: str, purpose: Purpose) -> list[str]:
-    """Resolve an address using cache if available, otherwise return the address itself."""
-    if CORE.address_cache and (cached := CORE.address_cache.get_addresses(address)):
-        _LOGGER.debug("Using cached addresses for %s: %s", purpose.value, cached)
-        return cached
-    return [address]
-
-
 def choose_upload_log_host(
    default: list[str] | str | None,
    check_default: str | None,
@@ -151,7 +142,7 @@ def choose_upload_log_host(
                    (purpose == Purpose.LOGGING and has_api())
                    or (purpose == Purpose.UPLOADING and has_ota())
                ):
-                    resolved.extend(_resolve_with_cache(CORE.address, purpose))
+                    resolved.append(CORE.address)

                if purpose == Purpose.LOGGING:
                    if has_api() and has_mqtt_ip_lookup():
@@ -161,14 +152,15 @@ def choose_upload_log_host(
                        resolved.append("MQTT")

                    if has_api() and has_non_ip_address():
-                        resolved.extend(_resolve_with_cache(CORE.address, purpose))
+                        resolved.append(CORE.address)

                elif purpose == Purpose.UPLOADING:
                    if has_ota() and has_mqtt_ip_lookup():
                        resolved.append("MQTTIP")

                    if has_ota() and has_non_ip_address():
-                        resolved.extend(_resolve_with_cache(CORE.address, purpose))
+                        resolved.append(CORE.address)
+
            else:
                resolved.append(device)
        if not resolved:
@@ -220,7 +212,7 @@ def has_mqtt_logging() -> bool:
    if CONF_TOPIC not in log_topic:
        return False

-    return log_topic.get(CONF_LEVEL, None) != "NONE"
+    return log_topic[CONF_LEVEL] != "NONE"


 def has_mqtt() -> bool:
@@ -453,7 +445,7 @@ def upload_using_esptool(
            "detect",
        ]
        for img in flash_images:
-            cmd += [img.offset, str(img.path)]
+            cmd += [img.offset, img.path]

        if os.environ.get("ESPHOME_USE_SUBPROCESS") is None:
            import esptool
@@ -539,10 +531,7 @@ def upload_program(

    remote_port = int(ota_conf[CONF_PORT])
    password = ota_conf.get(CONF_PASSWORD, "")
-    if getattr(args, "file", None) is not None:
-        binary = Path(args.file)
-    else:
-        binary = CORE.firmware_bin
+    binary = args.file if getattr(args, "file", None) is not None else CORE.firmware_bin

    # MQTT address resolution
    if get_port_type(host) in ("MQTT", "MQTTIP"):
@@ -609,7 +598,7 @@ def clean_mqtt(config: ConfigType, args: ArgsProtocol) -> int | None:
 def command_wizard(args: ArgsProtocol) -> int | None:
    from esphome import wizard

-    return wizard.wizard(Path(args.configuration))
+    return wizard.wizard(args.configuration)


 def command_config(args: ArgsProtocol, config: ConfigType) -> int | None:
@@ -636,13 +625,6 @@ def command_vscode(args: ArgsProtocol) -> int | None:


 def command_compile(args: ArgsProtocol, config: ConfigType) -> int | None:
-    # Set memory analysis options in config
-    if args.analyze_memory:
-        config.setdefault(CONF_ESPHOME, {})["analyze_memory"] = True
-
-    if args.memory_report:
-        config.setdefault(CONF_ESPHOME, {})["memory_report_file"] = args.memory_report
-
    exit_code = write_cpp(config)
    if exit_code != 0:
        return exit_code
@@ -738,16 +720,6 @@ def command_clean_mqtt(args: ArgsProtocol, config: ConfigType) -> int | None:
    return clean_mqtt(config, args)


-def command_clean_all(args: ArgsProtocol) -> int | None:
-    try:
-        writer.clean_all(args.configuration)
-    except OSError as err:
-        _LOGGER.error("Error cleaning all files: %s", err)
-        return 1
-    _LOGGER.info("Done!")
-    return 0
-
-
 def command_mqtt_fingerprint(args: ArgsProtocol, config: ConfigType) -> int | None:
    from esphome import mqtt

@@ -789,7 +761,7 @@ def command_update_all(args: ArgsProtocol) -> int | None:
        safe_print(f"{half_line}{middle_text}{half_line}")

    for f in files:
-        safe_print(f"Updating {color(AnsiFore.CYAN, str(f))}")
+        safe_print(f"Updating {color(AnsiFore.CYAN, f)}")
        safe_print("-" * twidth)
        safe_print()
        if CORE.dashboard:
@@ -801,10 +773,10 @@ def command_update_all(args: ArgsProtocol) -> int | None:
                "esphome", "run", f, "--no-logs", "--device", "OTA"
            )
        if rc == 0:
-            print_bar(f"[{color(AnsiFore.BOLD_GREEN, 'SUCCESS')}] {str(f)}")
+            print_bar(f"[{color(AnsiFore.BOLD_GREEN, 'SUCCESS')}] {f}")
            success[f] = True
        else:
-            print_bar(f"[{color(AnsiFore.BOLD_RED, 'ERROR')}] {str(f)}")
+            print_bar(f"[{color(AnsiFore.BOLD_RED, 'ERROR')}] {f}")
            success[f] = False

        safe_print()
@@ -815,9 +787,9 @@ def command_update_all(args: ArgsProtocol) -> int | None:
    failed = 0
    for f in files:
        if success[f]:
-            safe_print(f"  - {str(f)}: {color(AnsiFore.GREEN, 'SUCCESS')}")
+            safe_print(f"  - {f}: {color(AnsiFore.GREEN, 'SUCCESS')}")
        else:
-            safe_print(f"  - {str(f)}: {color(AnsiFore.BOLD_RED, 'FAILED')}")
+            safe_print(f"  - {f}: {color(AnsiFore.BOLD_RED, 'FAILED')}")
            failed += 1
    return failed

@@ -839,8 +811,7 @@ def command_idedata(args: ArgsProtocol, config: ConfigType) -> int:


 def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
-    new_name = args.name
-    for c in new_name:
+    for c in args.name:
        if c not in ALLOWED_NAME_CHARS:
            print(
                color(
@@ -851,7 +822,8 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
            )
            return 1
    # Load existing yaml file
-    raw_contents = CORE.config_path.read_text(encoding="utf-8")
+    with open(CORE.config_path, mode="r+", encoding="utf-8") as raw_file:
+        raw_contents = raw_file.read()

    yaml = yaml_util.load_yaml(CORE.config_path)
    if CONF_ESPHOME not in yaml or CONF_NAME not in yaml[CONF_ESPHOME]:
@@ -866,7 +838,7 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
    if match is None:
        new_raw = re.sub(
            rf"name:\s+[\"']?{old_name}[\"']?",
-            f'name: "{new_name}"',
+            f'name: "{args.name}"',
            raw_contents,
        )
    else:
@@ -886,28 +858,29 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:

        new_raw = re.sub(
            rf"^(\s+{match.group(1)}):\s+[\"']?{old_name}[\"']?",
-            f'\\1: "{new_name}"',
+            f'\\1: "{args.name}"',
            raw_contents,
            flags=re.MULTILINE,
        )

-    new_path: Path = CORE.config_dir / (new_name + ".yaml")
+    new_path = os.path.join(CORE.config_dir, args.name + ".yaml")
    print(
-        f"Updating {color(AnsiFore.CYAN, str(CORE.config_path))} to {color(AnsiFore.CYAN, str(new_path))}"
+        f"Updating {color(AnsiFore.CYAN, CORE.config_path)} to {color(AnsiFore.CYAN, new_path)}"
    )
    print()

-    new_path.write_text(new_raw, encoding="utf-8")
+    with open(new_path, mode="w", encoding="utf-8") as new_file:
+        new_file.write(new_raw)

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

    cli_args = [
        "run",
-        str(new_path),
+        new_path,
        "--no-logs",
        "--device",
        CORE.address,
@@ -921,11 +894,11 @@ def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
    except KeyboardInterrupt:
        rc = 1
    if rc != 0:
-        new_path.unlink()
+        os.remove(new_path)
        return 1

    if CORE.config_path != new_path:
-        CORE.config_path.unlink()
+        os.remove(CORE.config_path)

    print(color(AnsiFore.BOLD_GREEN, "SUCCESS"))
    print()
@@ -938,7 +911,6 @@ PRE_CONFIG_ACTIONS = {
    "dashboard": command_dashboard,
    "vscode": command_vscode,
    "update-all": command_update_all,
-    "clean-all": command_clean_all,
 }

 POST_CONFIG_ACTIONS = {
@@ -947,9 +919,9 @@ POST_CONFIG_ACTIONS = {
    "upload": command_upload,
    "logs": command_logs,
    "run": command_run,
-    "clean": command_clean,
    "clean-mqtt": command_clean_mqtt,
    "mqtt-fingerprint": command_mqtt_fingerprint,
+    "clean": command_clean,
    "idedata": command_idedata,
    "rename": command_rename,
    "discover": command_discover,
@@ -993,18 +965,6 @@ def parse_args(argv):
        help="Add a substitution",
        metavar=("key", "value"),
    )
-    options_parser.add_argument(
-        "--mdns-address-cache",
-        help="mDNS address cache mapping in format 'hostname=ip1,ip2'",
-        action="append",
-        default=[],
-    )
-    options_parser.add_argument(
-        "--dns-address-cache",
-        help="DNS address cache mapping in format 'hostname=ip1,ip2'",
-        action="append",
-        default=[],
-    )

    parser = argparse.ArgumentParser(
        description=f"ESPHome {const.__version__}", parents=[options_parser]
@@ -1049,17 +1009,6 @@ def parse_args(argv):
        help="Only generate source code, do not compile.",
        action="store_true",
    )
-    parser_compile.add_argument(
-        "--analyze-memory",
-        help="Analyze and display memory usage by component after compilation.",
-        action="store_true",
-    )
-    parser_compile.add_argument(
-        "--memory-report",
-        help="Save memory analysis report to a file (supports .json or .txt).",
-        type=str,
-        metavar="FILE",
-    )

    parser_upload = subparsers.add_parser(
        "upload",
@@ -1173,13 +1122,6 @@ def parse_args(argv):
        "configuration", help="Your YAML configuration file(s).", nargs="+"
    )

-    parser_clean_all = subparsers.add_parser(
-        "clean-all", help="Clean all build and platform files."
-    )
-    parser_clean_all.add_argument(
-        "configuration", help="Your YAML configuration directory.", nargs="*"
-    )
-
    parser_dashboard = subparsers.add_parser(
        "dashboard", help="Create a simple web server for a dashboard."
    )
@@ -1226,7 +1168,7 @@ def parse_args(argv):

    parser_update = subparsers.add_parser("update-all")
    parser_update.add_argument(
-        "configuration", help="Your YAML configuration file or directory.", nargs="+"
+        "configuration", help="Your YAML configuration file directories.", nargs="+"
    )

    parser_idedata = subparsers.add_parser("idedata")
@@ -1270,15 +1212,9 @@ def parse_args(argv):


 def run_esphome(argv):
-    from esphome.address_cache import AddressCache
-
    args = parse_args(argv)
    CORE.dashboard = args.dashboard

-    # Create address cache from command-line arguments
-    CORE.address_cache = AddressCache.from_cli_args(
-        args.mdns_address_cache, args.dns_address_cache
-    )
    # Override log level if verbose is set
    if args.verbose:
        args.log_level = "DEBUG"
@@ -1301,20 +1237,14 @@ def run_esphome(argv):
    _LOGGER.info("ESPHome %s", const.__version__)

    for conf_path in args.configuration:
-        conf_path = Path(conf_path)
-        if any(conf_path.name == x for x in SECRETS_FILES):
+        if any(os.path.basename(conf_path) == x for x in SECRETS_FILES):
            _LOGGER.warning("Skipping secrets file %s", conf_path)
            continue

        CORE.config_path = conf_path
        CORE.dashboard = args.dashboard

-        # For logs command, skip updating external components
-        skip_external = args.command == "logs"
-        config = read_config(
-            dict(args.substitution) if args.substitution else {},
-            skip_external_update=skip_external,
-        )
+        config = read_config(dict(args.substitution) if args.substitution else {})
        if config is None:
            return 2
        CORE.config = config
--- a/esphome/address_cache.py
+++ b/esphome/address_cache.py
@@ -1,142 +0,0 @@
-"""Address cache for DNS and mDNS lookups."""
-
-from __future__ import annotations
-
-import logging
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from collections.abc import Iterable
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def normalize_hostname(hostname: str) -> str:
-    """Normalize hostname for cache lookups.
-
-    Removes trailing dots and converts to lowercase.
-    """
-    return hostname.rstrip(".").lower()
-
-
-class AddressCache:
-    """Cache for DNS and mDNS address lookups.
-
-    This cache stores pre-resolved addresses from command-line arguments
-    to avoid slow DNS/mDNS lookups during builds.
-    """
-
-    def __init__(
-        self,
-        mdns_cache: dict[str, list[str]] | None = None,
-        dns_cache: dict[str, list[str]] | None = None,
-    ) -> None:
-        """Initialize the address cache.
-
-        Args:
-            mdns_cache: Pre-populated mDNS addresses (hostname -> IPs)
-            dns_cache: Pre-populated DNS addresses (hostname -> IPs)
-        """
-        self.mdns_cache = mdns_cache or {}
-        self.dns_cache = dns_cache or {}
-
-    def _get_cached_addresses(
-        self, hostname: str, cache: dict[str, list[str]], cache_type: str
-    ) -> list[str] | None:
-        """Get cached addresses from a specific cache.
-
-        Args:
-            hostname: The hostname to look up
-            cache: The cache dictionary to check
-            cache_type: Type of cache for logging ("mDNS" or "DNS")
-
-        Returns:
-            List of IP addresses if found in cache, None otherwise
-        """
-        normalized = normalize_hostname(hostname)
-        if addresses := cache.get(normalized):
-            _LOGGER.debug("Using %s cache for %s: %s", cache_type, hostname, addresses)
-            return addresses
-        return None
-
-    def get_mdns_addresses(self, hostname: str) -> list[str] | None:
-        """Get cached mDNS addresses for a hostname.
-
-        Args:
-            hostname: The hostname to look up (should end with .local)
-
-        Returns:
-            List of IP addresses if found in cache, None otherwise
-        """
-        return self._get_cached_addresses(hostname, self.mdns_cache, "mDNS")
-
-    def get_dns_addresses(self, hostname: str) -> list[str] | None:
-        """Get cached DNS addresses for a hostname.
-
-        Args:
-            hostname: The hostname to look up
-
-        Returns:
-            List of IP addresses if found in cache, None otherwise
-        """
-        return self._get_cached_addresses(hostname, self.dns_cache, "DNS")
-
-    def get_addresses(self, hostname: str) -> list[str] | None:
-        """Get cached addresses for a hostname.
-
-        Checks mDNS cache for .local domains, DNS cache otherwise.
-
-        Args:
-            hostname: The hostname to look up
-
-        Returns:
-            List of IP addresses if found in cache, None otherwise
-        """
-        normalized = normalize_hostname(hostname)
-        if normalized.endswith(".local"):
-            return self.get_mdns_addresses(hostname)
-        return self.get_dns_addresses(hostname)
-
-    def has_cache(self) -> bool:
-        """Check if any cache entries exist."""
-        return bool(self.mdns_cache or self.dns_cache)
-
-    @classmethod
-    def from_cli_args(
-        cls, mdns_args: Iterable[str], dns_args: Iterable[str]
-    ) -> AddressCache:
-        """Create cache from command-line arguments.
-
-        Args:
-            mdns_args: List of mDNS cache entries like ['host=ip1,ip2']
-            dns_args: List of DNS cache entries like ['host=ip1,ip2']
-
-        Returns:
-            Configured AddressCache instance
-        """
-        mdns_cache = cls._parse_cache_args(mdns_args)
-        dns_cache = cls._parse_cache_args(dns_args)
-        return cls(mdns_cache=mdns_cache, dns_cache=dns_cache)
-
-    @staticmethod
-    def _parse_cache_args(cache_args: Iterable[str]) -> dict[str, list[str]]:
-        """Parse cache arguments into a dictionary.
-
-        Args:
-            cache_args: List of cache mappings like ['host1=ip1,ip2', 'host2=ip3']
-
-        Returns:
-            Dictionary mapping normalized hostnames to list of IP addresses
-        """
-        cache: dict[str, list[str]] = {}
-        for arg in cache_args:
-            if "=" not in arg:
-                _LOGGER.warning(
-                    "Invalid cache format: %s (expected 'hostname=ip1,ip2')", arg
-                )
-                continue
-            hostname, ips = arg.split("=", 1)
-            # Normalize hostname for consistent lookups
-            normalized = normalize_hostname(hostname)
-            cache[normalized] = [ip.strip() for ip in ips.split(",")]
-        return cache
--- a/esphome/analyze_memory.py
+++ b/esphome/analyze_memory.py
--- a/esphome/automation.py
+++ b/esphome/automation.py
@@ -15,10 +15,7 @@ from esphome.const import (
    CONF_TYPE_ID,
    CONF_UPDATE_INTERVAL,
 )
-from esphome.core import ID
-from esphome.cpp_generator import MockObj, MockObjClass, TemplateArgsType
 from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
-from esphome.types import ConfigType
 from esphome.util import Registry


@@ -52,11 +49,11 @@ def maybe_conf(conf, *validators):
    return validate


-def register_action(name: str, action_type: MockObjClass, schema: cv.Schema):
+def register_action(name, action_type, schema):
    return ACTION_REGISTRY.register(name, action_type, schema)


-def register_condition(name: str, condition_type: MockObjClass, schema: cv.Schema):
+def register_condition(name, condition_type, schema):
    return CONDITION_REGISTRY.register(name, condition_type, schema)


@@ -167,78 +164,43 @@ XorCondition = cg.esphome_ns.class_("XorCondition", Condition)


@register_condition("and", AndCondition, validate_condition_list)
-async def and_condition_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def and_condition_to_code(config, condition_id, template_arg, args):
    conditions = await build_condition_list(config, template_arg, args)
    return cg.new_Pvariable(condition_id, template_arg, conditions)


@register_condition("or", OrCondition, validate_condition_list)
-async def or_condition_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def or_condition_to_code(config, condition_id, template_arg, args):
    conditions = await build_condition_list(config, template_arg, args)
    return cg.new_Pvariable(condition_id, template_arg, conditions)


@register_condition("all", AndCondition, validate_condition_list)
-async def all_condition_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def all_condition_to_code(config, condition_id, template_arg, args):
    conditions = await build_condition_list(config, template_arg, args)
    return cg.new_Pvariable(condition_id, template_arg, conditions)


@register_condition("any", OrCondition, validate_condition_list)
-async def any_condition_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def any_condition_to_code(config, condition_id, template_arg, args):
    conditions = await build_condition_list(config, template_arg, args)
    return cg.new_Pvariable(condition_id, template_arg, conditions)


@register_condition("not", NotCondition, validate_potentially_and_condition)
-async def not_condition_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def not_condition_to_code(config, condition_id, template_arg, args):
    condition = await build_condition(config, template_arg, args)
    return cg.new_Pvariable(condition_id, template_arg, condition)


@register_condition("xor", XorCondition, validate_condition_list)
-async def xor_condition_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def xor_condition_to_code(config, condition_id, template_arg, args):
    conditions = await build_condition_list(config, template_arg, args)
    return cg.new_Pvariable(condition_id, template_arg, conditions)


@register_condition("lambda", LambdaCondition, cv.returning_lambda)
-async def lambda_condition_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def lambda_condition_to_code(config, condition_id, template_arg, args):
    lambda_ = await cg.process_lambda(config, args, return_type=bool)
    return cg.new_Pvariable(condition_id, template_arg, lambda_)

@@ -255,12 +217,7 @@ async def lambda_condition_to_code(
        }
    ).extend(cv.COMPONENT_SCHEMA),
 )
-async def for_condition_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def for_condition_to_code(config, condition_id, template_arg, args):
    condition = await build_condition(
        config[CONF_CONDITION], cg.TemplateArguments(), []
    )
@@ -274,12 +231,7 @@ async def for_condition_to_code(
@register_action(
    "delay", DelayAction, cv.templatable(cv.positive_time_period_milliseconds)
 )
-async def delay_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def delay_action_to_code(config, action_id, template_arg, args):
    var = cg.new_Pvariable(action_id, template_arg)
    await cg.register_component(var, {})
    template_ = await cg.templatable(config, args, cg.uint32)
@@ -304,15 +256,10 @@ async def delay_action_to_code(
        cv.has_at_least_one_key(CONF_CONDITION, CONF_ANY, CONF_ALL),
    ),
 )
-async def if_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def if_action_to_code(config, action_id, template_arg, args):
    cond_conf = next(el for el in config if el in (CONF_ANY, CONF_ALL, CONF_CONDITION))
-    condition = await build_condition(config[cond_conf], template_arg, args)
-    var = cg.new_Pvariable(action_id, template_arg, condition)
+    conditions = await build_condition(config[cond_conf], template_arg, args)
+    var = cg.new_Pvariable(action_id, template_arg, conditions)
    if CONF_THEN in config:
        actions = await build_action_list(config[CONF_THEN], template_arg, args)
        cg.add(var.add_then(actions))
@@ -332,14 +279,9 @@ async def if_action_to_code(
        }
    ),
 )
-async def while_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    condition = await build_condition(config[CONF_CONDITION], template_arg, args)
-    var = cg.new_Pvariable(action_id, template_arg, condition)
+async def while_action_to_code(config, action_id, template_arg, args):
+    conditions = await build_condition(config[CONF_CONDITION], template_arg, args)
+    var = cg.new_Pvariable(action_id, template_arg, conditions)
    actions = await build_action_list(config[CONF_THEN], template_arg, args)
    cg.add(var.add_then(actions))
    return var
@@ -355,12 +297,7 @@ async def while_action_to_code(
        }
    ),
 )
-async def repeat_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def repeat_action_to_code(config, action_id, template_arg, args):
    var = cg.new_Pvariable(action_id, template_arg)
    count_template = await cg.templatable(config[CONF_COUNT], args, cg.uint32)
    cg.add(var.set_count(count_template))
@@ -383,14 +320,9 @@ _validate_wait_until = cv.maybe_simple_value(


@register_action("wait_until", WaitUntilAction, _validate_wait_until)
-async def wait_until_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    condition = await build_condition(config[CONF_CONDITION], template_arg, args)
-    var = cg.new_Pvariable(action_id, template_arg, condition)
+async def wait_until_action_to_code(config, action_id, template_arg, args):
+    conditions = await build_condition(config[CONF_CONDITION], template_arg, args)
+    var = cg.new_Pvariable(action_id, template_arg, conditions)
    if CONF_TIMEOUT in config:
        template_ = await cg.templatable(config[CONF_TIMEOUT], args, cg.uint32)
        cg.add(var.set_timeout_value(template_))
@@ -399,12 +331,7 @@ async def wait_until_action_to_code(


@register_action("lambda", LambdaAction, cv.lambda_)
-async def lambda_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def lambda_action_to_code(config, action_id, template_arg, args):
    lambda_ = await cg.process_lambda(config, args, return_type=cg.void)
    return cg.new_Pvariable(action_id, template_arg, lambda_)

@@ -418,12 +345,7 @@ async def lambda_action_to_code(
        }
    ),
 )
-async def component_update_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def component_update_action_to_code(config, action_id, template_arg, args):
    comp = await cg.get_variable(config[CONF_ID])
    return cg.new_Pvariable(action_id, template_arg, comp)

@@ -437,12 +359,7 @@ async def component_update_action_to_code(
        }
    ),
 )
-async def component_suspend_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def component_suspend_action_to_code(config, action_id, template_arg, args):
    comp = await cg.get_variable(config[CONF_ID])
    return cg.new_Pvariable(action_id, template_arg, comp)

@@ -459,12 +376,7 @@ async def component_suspend_action_to_code(
        }
    ),
 )
-async def component_resume_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
+async def component_resume_action_to_code(config, action_id, template_arg, args):
    comp = await cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, comp)
    if CONF_UPDATE_INTERVAL in config:
@@ -473,9 +385,7 @@ async def component_resume_action_to_code(
    return var


-async def build_action(
-    full_config: ConfigType, template_arg: cg.TemplateArguments, args: TemplateArgsType
-) -> MockObj:
+async def build_action(full_config, template_arg, args):
    registry_entry, config = cg.extract_registry_entry_config(
        ACTION_REGISTRY, full_config
    )
@@ -484,19 +394,15 @@ async def build_action(
    return await builder(config, action_id, template_arg, args)


-async def build_action_list(
-    config: list[ConfigType], templ: cg.TemplateArguments, arg_type: TemplateArgsType
-) -> list[MockObj]:
-    actions: list[MockObj] = []
+async def build_action_list(config, templ, arg_type):
+    actions = []
    for conf in config:
        action = await build_action(conf, templ, arg_type)
        actions.append(action)
    return actions


-async def build_condition(
-    full_config: ConfigType, template_arg: cg.TemplateArguments, args: TemplateArgsType
-) -> MockObj:
+async def build_condition(full_config, template_arg, args):
    registry_entry, config = cg.extract_registry_entry_config(
        CONDITION_REGISTRY, full_config
    )
@@ -505,19 +411,15 @@ async def build_condition(
    return await builder(config, action_id, template_arg, args)


-async def build_condition_list(
-    config: ConfigType, templ: cg.TemplateArguments, args: TemplateArgsType
-) -> list[MockObj]:
-    conditions: list[MockObj] = []
+async def build_condition_list(config, templ, args):
+    conditions = []
    for conf in config:
        condition = await build_condition(conf, templ, args)
        conditions.append(condition)
    return conditions


-async def build_automation(
-    trigger: MockObj, args: TemplateArgsType, config: ConfigType
-) -> MockObj:
+async def build_automation(trigger, args, config):
    arg_types = [arg[0] for arg in args]
    templ = cg.TemplateArguments(*arg_types)
    obj = cg.new_Pvariable(config[CONF_AUTOMATION_ID], templ, trigger)
--- a/esphome/build_gen/platformio.py
+++ b/esphome/build_gen/platformio.py
@@ -1,3 +1,5 @@
+import os
+
 from esphome.const import __version__
 from esphome.core import CORE
 from esphome.helpers import mkdir_p, read_file, write_file_if_changed
@@ -61,7 +63,7 @@ def write_ini(content):
    update_storage_json()
    path = CORE.relative_build_path("platformio.ini")

-    if path.is_file():
+    if os.path.isfile(path):
        text = read_file(path)
        content_format = find_begin_end(
            text, INI_AUTO_GENERATE_BEGIN, INI_AUTO_GENERATE_END
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -12,7 +12,6 @@ from esphome.cpp_generator import (  # noqa: F401
    ArrayInitializer,
    Expression,
    LineComment,
-    LogStringLiteral,
    MockObj,
    MockObjClass,
    Pvariable,
--- a/esphome/components/ade7880/ade7880.cpp
+++ b/esphome/components/ade7880/ade7880.cpp
@@ -113,7 +113,7 @@ void ADE7880::update() {
  if (this->channel_a_ != nullptr) {
    auto *chan = this->channel_a_;
    this->update_sensor_from_s24zp_register16_(chan->current, AIRMS, [](float val) { return val / 100000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->voltage, AVRMS, [](float val) { return val / 10000.0f; });
+    this->update_sensor_from_s24zp_register16_(chan->voltage, BVRMS, [](float val) { return val / 10000.0f; });
    this->update_sensor_from_s24zp_register16_(chan->active_power, AWATT, [](float val) { return val / 100.0f; });
    this->update_sensor_from_s24zp_register16_(chan->apparent_power, AVA, [](float val) { return val / 100.0f; });
    this->update_sensor_from_s16_register16_(chan->power_factor, APF,
--- a/esphome/components/api/init.py
+++ b/esphome/components/api/init.py
@@ -1,5 +1,4 @@
 import base64
-import logging

 from esphome import automation
 from esphome.automation import Condition
@@ -26,9 +25,6 @@ from esphome.const import (
    CONF_VARIABLES,
 )
 from esphome.core import CORE, CoroPriority, coroutine_with_priority
-from esphome.types import ConfigType
-
-_LOGGER = logging.getLogger(__name__)

 DOMAIN = "api"
 DEPENDENCIES = ["network"]
@@ -59,9 +55,6 @@ CONF_BATCH_DELAY = "batch_delay"
 CONF_CUSTOM_SERVICES = "custom_services"
 CONF_HOMEASSISTANT_SERVICES = "homeassistant_services"
 CONF_HOMEASSISTANT_STATES = "homeassistant_states"
-CONF_LISTEN_BACKLOG = "listen_backlog"
-CONF_MAX_CONNECTIONS = "max_connections"
-CONF_MAX_SEND_QUEUE = "max_send_queue"


 def validate_encryption_key(value):
@@ -108,32 +101,6 @@ def _encryption_schema(config):
    return ENCRYPTION_SCHEMA(config)


-def _validate_api_config(config: ConfigType) -> ConfigType:
-    """Validate API configuration with mutual exclusivity check and deprecation warning."""
-    # Check if both password and encryption are configured
-    has_password = CONF_PASSWORD in config and config[CONF_PASSWORD]
-    has_encryption = CONF_ENCRYPTION in config
-
-    if has_password and has_encryption:
-        raise cv.Invalid(
-            "The 'password' and 'encryption' options are mutually exclusive. "
-            "The API client only supports one authentication method at a time. "
-            "Please remove one of them. "
-            "Note: 'password' authentication is deprecated and will be removed in version 2026.1.0. "
-            "We strongly recommend using 'encryption' instead for better security."
-        )
-
-    # Warn about password deprecation
-    if has_password:
-        _LOGGER.warning(
-            "API 'password' authentication has been deprecated since May 2022 and will be removed in version 2026.1.0. "
-            "Please migrate to the 'encryption' configuration. "
-            "See https://esphome.io/components/api.html#configuration-variables"
-        )
-
-    return config
-
-
 CONFIG_SCHEMA = cv.All(
    cv.Schema(
        {
@@ -161,46 +128,9 @@ CONFIG_SCHEMA = cv.All(
            cv.Optional(CONF_ON_CLIENT_DISCONNECTED): automation.validate_automation(
                single=True
            ),
-            # Connection limits to prevent memory exhaustion on resource-constrained devices
-            # Each connection uses ~500-1000 bytes of RAM plus system resources
-            # Platform defaults based on available RAM and network stack implementation:
-            cv.SplitDefault(
-                CONF_LISTEN_BACKLOG,
-                esp8266=1,  # Limited RAM (~40KB free), LWIP raw sockets
-                esp32=4,  # More RAM (520KB), BSD sockets
-                rp2040=1,  # Limited RAM (264KB), LWIP raw sockets like ESP8266
-                bk72xx=4,  # Moderate RAM, BSD-style sockets
-                rtl87xx=4,  # Moderate RAM, BSD-style sockets
-                host=4,  # Abundant resources
-                ln882x=4,  # Moderate RAM
-            ): cv.int_range(min=1, max=10),
-            cv.SplitDefault(
-                CONF_MAX_CONNECTIONS,
-                esp8266=4,  # ~40KB free RAM, each connection uses ~500-1000 bytes
-                esp32=8,  # 520KB RAM available
-                rp2040=4,  # 264KB RAM but LWIP constraints
-                bk72xx=8,  # Moderate RAM
-                rtl87xx=8,  # Moderate RAM
-                host=8,  # Abundant resources
-                ln882x=8,  # Moderate RAM
-            ): cv.int_range(min=1, max=20),
-            # Maximum queued send buffers per connection before dropping connection
-            # Each buffer uses ~8-12 bytes overhead plus actual message size
-            # Platform defaults based on available RAM and typical message rates:
-            cv.SplitDefault(
-                CONF_MAX_SEND_QUEUE,
-                esp8266=5,  # Limited RAM, need to fail fast
-                esp32=8,  # More RAM, can buffer more
-                rp2040=5,  # Limited RAM
-                bk72xx=8,  # Moderate RAM
-                rtl87xx=8,  # Moderate RAM
-                host=16,  # Abundant resources
-                ln882x=8,  # Moderate RAM
-            ): cv.int_range(min=1, max=64),
        }
    ).extend(cv.COMPONENT_SCHEMA),
    cv.rename_key(CONF_SERVICES, CONF_ACTIONS),
-    _validate_api_config,
 )


@@ -215,11 +145,6 @@ async def to_code(config):
        cg.add(var.set_password(config[CONF_PASSWORD]))
    cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
    cg.add(var.set_batch_delay(config[CONF_BATCH_DELAY]))
-    if CONF_LISTEN_BACKLOG in config:
-        cg.add(var.set_listen_backlog(config[CONF_LISTEN_BACKLOG]))
-    if CONF_MAX_CONNECTIONS in config:
-        cg.add(var.set_max_connections(config[CONF_MAX_CONNECTIONS]))
-    cg.add_define("API_MAX_SEND_QUEUE", config[CONF_MAX_SEND_QUEUE])

    # Set USE_API_SERVICES if any services are enabled
    if config.get(CONF_ACTIONS) or config[CONF_CUSTOM_SERVICES]:
@@ -268,7 +193,6 @@ async def to_code(config):
        if key := encryption_config.get(CONF_KEY):
            decoded = base64.b64decode(key)
            cg.add(var.set_noise_psk(list(decoded)))
-            cg.add_define("USE_API_NOISE_PSK_FROM_YAML")
        else:
            # No key provided, but encryption desired
            # This will allow a plaintext client to provide a noise key,
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -7,7 +7,7 @@ service APIConnection {
    option (needs_setup_connection) = false;
    option (needs_authentication) = false;
  }
-  rpc authenticate (AuthenticationRequest) returns (AuthenticationResponse) {
+  rpc connect (ConnectRequest) returns (ConnectResponse) {
    option (needs_setup_connection) = false;
    option (needs_authentication) = false;
  }
@@ -27,6 +27,9 @@ service APIConnection {
  rpc subscribe_logs (SubscribeLogsRequest) returns (void) {}
  rpc subscribe_homeassistant_services (SubscribeHomeassistantServicesRequest) returns (void) {}
  rpc subscribe_home_assistant_states (SubscribeHomeAssistantStatesRequest) returns (void) {}
+  rpc get_time (GetTimeRequest) returns (GetTimeResponse) {
+    option (needs_authentication) = false;
+  }
  rpc execute_service (ExecuteServiceRequest) returns (void) {}
  rpc noise_encryption_set_key (NoiseEncryptionSetKeyRequest) returns (NoiseEncryptionSetKeyResponse) {}

@@ -66,9 +69,6 @@ service APIConnection {
  rpc voice_assistant_set_configuration(VoiceAssistantSetConfiguration) returns (void) {}

  rpc alarm_control_panel_command (AlarmControlPanelCommandRequest) returns (void) {}
-
-  rpc zwave_proxy_frame(ZWaveProxyFrame) returns (void) {}
-  rpc zwave_proxy_request(ZWaveProxyRequest) returns (void) {}
 }


@@ -102,7 +102,7 @@ message HelloRequest {
  // For example "Home Assistant"
  // Not strictly necessary to send but nice for debugging
  // purposes.
-  string client_info = 1 [(pointer_to_buffer) = true];
+  string client_info = 1;
  uint32 api_version_major = 2;
  uint32 api_version_minor = 3;
 }
@@ -132,23 +132,21 @@ message HelloResponse {

 // Message sent at the beginning of each connection to authenticate the client
 // Can only be sent by the client and only at the beginning of the connection
-message AuthenticationRequest {
+message ConnectRequest {
  option (id) = 3;
  option (source) = SOURCE_CLIENT;
  option (no_delay) = true;
-  option (ifdef) = "USE_API_PASSWORD";

  // The password to log in with
-  string password = 1 [(pointer_to_buffer) = true];
+  string password = 1;
 }

 // Confirmation of successful connection. After this the connection is available for all traffic.
 // Can only be sent by the server and only at the beginning of the connection
-message AuthenticationResponse {
+message ConnectResponse {
  option (id) = 4;
  option (source) = SOURCE_SERVER;
  option (no_delay) = true;
-  option (ifdef) = "USE_API_PASSWORD";

  bool invalid_password = 1;
 }
@@ -257,10 +255,6 @@ message DeviceInfoResponse {

  // Top-level area info to phase out suggested_area
  AreaInfo area = 22 [(field_ifdef) = "USE_AREAS"];
-
-  // Indicates if Z-Wave proxy support is available and features supported
-  uint32 zwave_proxy_feature_flags = 23 [(field_ifdef) = "USE_ZWAVE_PROXY"];
-  uint32 zwave_home_id = 24 [(field_ifdef) = "USE_ZWAVE_PROXY"];
 }

 message ListEntitiesRequest {
@@ -769,7 +763,7 @@ message HomeassistantServiceMap {
  string value = 2 [(no_zero_copy) = true];
 }

-message HomeassistantActionRequest {
+message HomeassistantServiceResponse {
  option (id) = 35;
  option (source) = SOURCE_SERVER;
  option (no_delay) = true;
@@ -815,16 +809,16 @@ message HomeAssistantStateResponse {
 // ==================== IMPORT TIME ====================
 message GetTimeRequest {
  option (id) = 36;
-  option (source) = SOURCE_SERVER;
+  option (source) = SOURCE_BOTH;
 }

 message GetTimeResponse {
  option (id) = 37;
-  option (source) = SOURCE_CLIENT;
+  option (source) = SOURCE_BOTH;
  option (no_delay) = true;

  fixed32 epoch_seconds = 1;
-  string timezone = 2 [(pointer_to_buffer) = true];
+  string timezone = 2;
 }

 // ==================== USER-DEFINES SERVICES ====================
@@ -1465,7 +1459,7 @@ message BluetoothDeviceRequest {

  uint64 address = 1;
  BluetoothDeviceRequestType request_type = 2;
-  bool has_address_type = 3;  // Deprecated, should be removed in 2027.8 - https://github.com/esphome/esphome/pull/10318
+  bool has_address_type = 3;
  uint32 address_type = 4;
 }

@@ -1571,7 +1565,7 @@ message BluetoothGATTWriteRequest {
  uint32 handle = 2;
  bool response = 3;

-  bytes data = 4 [(pointer_to_buffer) = true];
+  bytes data = 4;
 }

 message BluetoothGATTReadDescriptorRequest {
@@ -1591,7 +1585,7 @@ message BluetoothGATTWriteDescriptorRequest {
  uint64 address = 1;
  uint32 handle = 2;

-  bytes data = 3 [(pointer_to_buffer) = true];
+  bytes data = 3;
 }

 message BluetoothGATTNotifyRequest {
@@ -1865,22 +1859,10 @@ message VoiceAssistantWakeWord {
  repeated string trained_languages = 3;
 }

-message VoiceAssistantExternalWakeWord {
-  string id = 1;
-  string wake_word = 2;
-  repeated string trained_languages = 3;
-  string model_type = 4;
-  uint32 model_size = 5;
-  string model_hash = 6;
-  string url = 7;
-}
-
 message VoiceAssistantConfigurationRequest {
  option (id) = 121;
  option (source) = SOURCE_CLIENT;
  option (ifdef) = "USE_VOICE_ASSISTANT";
-
-  repeated VoiceAssistantExternalWakeWord external_wake_words = 1;
 }

 message VoiceAssistantConfigurationResponse {
@@ -2295,28 +2277,3 @@ message UpdateCommandRequest {
  UpdateCommand command = 2;
  uint32 device_id = 3 [(field_ifdef) = "USE_DEVICES"];
 }
-
-// ==================== Z-WAVE ====================
-
-message ZWaveProxyFrame {
-  option (id) = 128;
-  option (source) = SOURCE_BOTH;
-  option (ifdef) = "USE_ZWAVE_PROXY";
-  option (no_delay) = true;
-
-  bytes data = 1 [(pointer_to_buffer) = true];
-}
-
-enum ZWaveProxyRequestType {
-  ZWAVE_PROXY_REQUEST_TYPE_SUBSCRIBE = 0;
-  ZWAVE_PROXY_REQUEST_TYPE_UNSUBSCRIBE = 1;
-  ZWAVE_PROXY_REQUEST_TYPE_HOME_ID_CHANGE = 2;
-}
-message ZWaveProxyRequest {
-  option (id) = 129;
-  option (source) = SOURCE_BOTH;
-  option (ifdef) = "USE_ZWAVE_PROXY";
-
-  ZWaveProxyRequestType type = 1;
-  bytes data = 2 [(pointer_to_buffer) = true];
-}
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -30,9 +30,6 @@
 #ifdef USE_VOICE_ASSISTANT
 #include "esphome/components/voice_assistant/voice_assistant.h"
 #endif
-#ifdef USE_ZWAVE_PROXY
-#include "esphome/components/zwave_proxy/zwave_proxy.h"
-#endif

 namespace esphome::api {

@@ -45,8 +42,6 @@ static constexpr uint8_t MAX_PING_RETRIES = 60;
 static constexpr uint16_t PING_RETRY_INTERVAL = 1000;
 static constexpr uint32_t KEEPALIVE_DISCONNECT_TIMEOUT = (KEEPALIVE_TIMEOUT_MS * 5) / 2;

-static constexpr auto ESPHOME_VERSION_REF = StringRef::from_lit(ESPHOME_VERSION);
-
 static const char *const TAG = "api.connection";
 #ifdef USE_CAMERA
 static const int CAMERA_STOP_STREAM = 5000;
@@ -205,8 +200,7 @@ void APIConnection::loop() {
    // Disconnect if not responded within 2.5*keepalive
    if (now - this->last_traffic_ > KEEPALIVE_DISCONNECT_TIMEOUT) {
      on_fatal_error();
-      ESP_LOGW(TAG, "%s (%s) is unresponsive; disconnecting", this->client_info_.name.c_str(),
-               this->client_info_.peername.c_str());
+      ESP_LOGW(TAG, "%s is unresponsive; disconnecting", this->get_client_combined_info().c_str());
    }
  } else if (now - this->last_traffic_ > KEEPALIVE_TIMEOUT_MS && !this->flags_.remove) {
    // Only send ping if we're not disconnecting
@@ -256,7 +250,7 @@ bool APIConnection::send_disconnect_response(const DisconnectRequest &msg) {
  // remote initiated disconnect_client
  // don't close yet, we still need to send the disconnect response
  // close will happen on next loop
-  ESP_LOGD(TAG, "%s (%s) disconnected", this->client_info_.name.c_str(), this->client_info_.peername.c_str());
+  ESP_LOGD(TAG, "%s disconnected", this->get_client_combined_info().c_str());
  this->flags_.next_close = true;
  DisconnectResponse resp;
  return this->send_message(resp, DisconnectResponse::MESSAGE_TYPE);
@@ -1079,20 +1073,20 @@ void APIConnection::on_get_time_response(const GetTimeResponse &value) {
  if (homeassistant::global_homeassistant_time != nullptr) {
    homeassistant::global_homeassistant_time->set_epoch_time(value.epoch_seconds);
 #ifdef USE_TIME_TIMEZONE
-    if (value.timezone_len > 0) {
-      const std::string &current_tz = homeassistant::global_homeassistant_time->get_timezone();
-      // Compare without allocating a string
-      if (current_tz.length() != value.timezone_len ||
-          memcmp(current_tz.c_str(), value.timezone, value.timezone_len) != 0) {
-        homeassistant::global_homeassistant_time->set_timezone(
-            std::string(reinterpret_cast<const char *>(value.timezone), value.timezone_len));
-      }
+    if (!value.timezone.empty() && value.timezone != homeassistant::global_homeassistant_time->get_timezone()) {
+      homeassistant::global_homeassistant_time->set_timezone(value.timezone);
    }
 #endif
  }
 }
 #endif

+bool APIConnection::send_get_time_response(const GetTimeRequest &msg) {
+  GetTimeResponse resp;
+  resp.epoch_seconds = ::time(nullptr);
+  return this->send_message(resp, GetTimeResponse::MESSAGE_TYPE);
+}
+
 #ifdef USE_BLUETOOTH_PROXY
 void APIConnection::subscribe_bluetooth_le_advertisements(const SubscribeBluetoothLEAdvertisementsRequest &msg) {
  bluetooth_proxy::global_bluetooth_proxy->subscribe_api_connection(this, msg.flags);
@@ -1203,23 +1197,6 @@ bool APIConnection::send_voice_assistant_get_configuration_response(const VoiceA
      resp_wake_word.trained_languages.push_back(lang);
    }
  }
-
-  // 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.set_id(StringRef(wake_word.id));
-    resp_wake_word.set_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, VoiceAssistantConfigurationResponse::MESSAGE_TYPE);
@@ -1230,16 +1207,7 @@ void APIConnection::voice_assistant_set_configuration(const VoiceAssistantSetCon
    voice_assistant::global_voice_assistant->on_set_configuration(msg.active_wake_words);
  }
 }
-#endif

-#ifdef USE_ZWAVE_PROXY
-void APIConnection::zwave_proxy_frame(const ZWaveProxyFrame &msg) {
-  zwave_proxy::global_zwave_proxy->send_frame(msg.data, msg.data_len);
-}
-
-void APIConnection::zwave_proxy_request(const ZWaveProxyRequest &msg) {
-  zwave_proxy::global_zwave_proxy->zwave_proxy_request(this, msg.type);
-}
 #endif

 #ifdef USE_ALARM_CONTROL_PANEL
@@ -1386,7 +1354,7 @@ void APIConnection::complete_authentication_() {
  }

  this->flags_.connection_state = static_cast<uint8_t>(ConnectionState::AUTHENTICATED);
-  ESP_LOGD(TAG, "%s (%s) connected", this->client_info_.name.c_str(), this->client_info_.peername.c_str());
+  ESP_LOGD(TAG, "%s connected", this->get_client_combined_info().c_str());
 #ifdef USE_API_CLIENT_CONNECTED_TRIGGER
  this->parent_->get_client_connected_trigger()->trigger(this->client_info_.name, this->client_info_.peername);
 #endif
@@ -1398,7 +1366,7 @@ void APIConnection::complete_authentication_() {
 }

 bool APIConnection::send_hello_response(const HelloRequest &msg) {
-  this->client_info_.name.assign(reinterpret_cast<const char *>(msg.client_info), msg.client_info_len);
+  this->client_info_.name = msg.client_info;
  this->client_info_.peername = this->helper_->getpeername();
  this->client_api_version_major_ = msg.api_version_major;
  this->client_api_version_minor_ = msg.api_version_minor;
@@ -1408,8 +1376,9 @@ bool APIConnection::send_hello_response(const HelloRequest &msg) {
  HelloResponse resp;
  resp.api_version_major = 1;
  resp.api_version_minor = 12;
-  // Send only the version string - the client only logs this for debugging and doesn't use it otherwise
-  resp.set_server_info(ESPHOME_VERSION_REF);
+  // Temporary string for concatenation - will be valid during send_message call
+  std::string server_info = App.get_name() + " (esphome v" ESPHOME_VERSION ")";
+  resp.set_server_info(StringRef(server_info));
  resp.set_name(StringRef(App.get_name()));

 #ifdef USE_API_PASSWORD
@@ -1422,17 +1391,20 @@ bool APIConnection::send_hello_response(const HelloRequest &msg) {

  return this->send_message(resp, HelloResponse::MESSAGE_TYPE);
 }
+bool APIConnection::send_connect_response(const ConnectRequest &msg) {
+  bool correct = true;
 #ifdef USE_API_PASSWORD
-bool APIConnection::send_authenticate_response(const AuthenticationRequest &msg) {
-  AuthenticationResponse resp;
+  correct = this->parent_->check_password(msg.password);
+#endif
+
+  ConnectResponse resp;
  // bool invalid_password = 1;
-  resp.invalid_password = !this->parent_->check_password(msg.password, msg.password_len);
-  if (!resp.invalid_password) {
+  resp.invalid_password = !correct;
+  if (correct) {
    this->complete_authentication_();
  }
-  return this->send_message(resp, AuthenticationResponse::MESSAGE_TYPE);
+  return this->send_message(resp, ConnectResponse::MESSAGE_TYPE);
 }
-#endif  // USE_API_PASSWORD

 bool APIConnection::send_ping_response(const PingRequest &msg) {
  PingResponse resp;
@@ -1453,6 +1425,8 @@ bool APIConnection::send_device_info_response(const DeviceInfoRequest &msg) {
  std::string mac_address = get_mac_address_pretty();
  resp.set_mac_address(StringRef(mac_address));

+  // Compile-time StringRef constants
+  static constexpr auto ESPHOME_VERSION_REF = StringRef::from_lit(ESPHOME_VERSION);
  resp.set_esphome_version(ESPHOME_VERSION_REF);

  resp.set_compilation_time(App.get_compilation_time_ref());
@@ -1496,10 +1470,6 @@ bool APIConnection::send_device_info_response(const DeviceInfoRequest &msg) {
 #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_home_id = zwave_proxy::global_zwave_proxy->get_home_id();
-#endif
 #ifdef USE_API_NOISE
  resp.api_encryption_supported = true;
 #endif
@@ -1610,12 +1580,12 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) {
 #ifdef USE_API_PASSWORD
 void APIConnection::on_unauthenticated_access() {
  this->on_fatal_error();
-  ESP_LOGD(TAG, "%s (%s) no authentication", this->client_info_.name.c_str(), this->client_info_.peername.c_str());
+  ESP_LOGD(TAG, "%s access without authentication", this->get_client_combined_info().c_str());
 }
 #endif
 void APIConnection::on_no_setup_connection() {
  this->on_fatal_error();
-  ESP_LOGD(TAG, "%s (%s) no connection setup", this->client_info_.name.c_str(), this->client_info_.peername.c_str());
+  ESP_LOGD(TAG, "%s access without full connection", this->get_client_combined_info().c_str());
 }
 void APIConnection::on_fatal_error() {
  this->helper_->close();
@@ -1867,8 +1837,8 @@ void APIConnection::process_state_subscriptions_() {
 #endif  // USE_API_HOMEASSISTANT_STATES

 void APIConnection::log_warning_(const LogString *message, APIError err) {
-  ESP_LOGW(TAG, "%s (%s): %s %s errno=%d", this->client_info_.name.c_str(), this->client_info_.peername.c_str(),
-           LOG_STR_ARG(message), LOG_STR_ARG(api_error_to_logstr(err)), errno);
+  ESP_LOGW(TAG, "%s: %s %s errno=%d", this->get_client_combined_info().c_str(), LOG_STR_ARG(message),
+           LOG_STR_ARG(api_error_to_logstr(err)), errno);
 }

 void APIConnection::log_socket_operation_failed_(APIError err) {
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -10,8 +10,8 @@
 #include "esphome/core/component.h"
 #include "esphome/core/entity_base.h"

-#include <functional>
 #include <vector>
+#include <functional>

 namespace esphome::api {

@@ -19,6 +19,14 @@ namespace esphome::api {
 struct ClientInfo {
  std::string name;      // Client name from Hello message
  std::string peername;  // IP:port from socket
+
+  std::string get_combined_info() const {
+    if (name == peername) {
+      // Before Hello message, both are the same
+      return name;
+    }
+    return name + " (" + peername + ")";
+  }
 };

 // Keepalive timeout in milliseconds
@@ -124,10 +132,10 @@ class APIConnection final : public APIServerConnection {
 #endif
  bool try_send_log_message(int level, const char *tag, const char *line, size_t message_len);
 #ifdef USE_API_HOMEASSISTANT_SERVICES
-  void send_homeassistant_action(const HomeassistantActionRequest &call) {
+  void send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
    if (!this->flags_.service_call_subscription)
      return;
-    this->send_message(call, HomeassistantActionRequest::MESSAGE_TYPE);
+    this->send_message(call, HomeassistantServiceResponse::MESSAGE_TYPE);
  }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
@@ -163,11 +171,6 @@ class APIConnection final : public APIServerConnection {
  void voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
 #endif

-#ifdef USE_ZWAVE_PROXY
-  void zwave_proxy_frame(const ZWaveProxyFrame &msg) override;
-  void zwave_proxy_request(const ZWaveProxyRequest &msg) override;
-#endif
-
 #ifdef USE_ALARM_CONTROL_PANEL
  bool send_alarm_control_panel_state(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
  void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) override;
@@ -194,9 +197,7 @@ class APIConnection final : public APIServerConnection {
  void on_get_time_response(const GetTimeResponse &value) override;
 #endif
  bool send_hello_response(const HelloRequest &msg) override;
-#ifdef USE_API_PASSWORD
-  bool send_authenticate_response(const AuthenticationRequest &msg) override;
-#endif
+  bool send_connect_response(const ConnectRequest &msg) override;
  bool send_disconnect_response(const DisconnectRequest &msg) override;
  bool send_ping_response(const PingRequest &msg) override;
  bool send_device_info_response(const DeviceInfoRequest &msg) override;
@@ -218,6 +219,7 @@ class APIConnection final : public APIServerConnection {
 #ifdef USE_API_HOMEASSISTANT_STATES
  void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) override;
 #endif
+  bool send_get_time_response(const GetTimeRequest &msg) override;
 #ifdef USE_API_SERVICES
  void execute_service(const ExecuteServiceRequest &msg) override;
 #endif
@@ -270,8 +272,7 @@ class APIConnection final : public APIServerConnection {
  bool try_to_clear_buffer(bool log_out_of_space);
  bool send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) override;

-  const std::string &get_name() const { return this->client_info_.name; }
-  const std::string &get_peername() const { return this->client_info_.peername; }
+  std::string get_client_combined_info() const { return this->client_info_.get_combined_info(); }

 protected:
  // Helper function to handle authentication completion
--- a/esphome/components/api/api_frame_helper.cpp
+++ b/esphome/components/api/api_frame_helper.cpp
@@ -13,8 +13,7 @@ namespace esphome::api {

 static const char *const TAG = "api.frame_helper";

-#define HELPER_LOG(msg, ...) \
-  ESP_LOGVV(TAG, "%s (%s): " msg, this->client_info_->name.c_str(), this->client_info_->peername.c_str(), ##__VA_ARGS__)
+#define HELPER_LOG(msg, ...) ESP_LOGVV(TAG, "%s: " msg, this->client_info_->get_combined_info().c_str(), ##__VA_ARGS__)

 #ifdef HELPER_LOG_PACKETS
 #define LOG_PACKET_RECEIVED(buffer) ESP_LOGVV(TAG, "Received frame: %s", format_hex_pretty(buffer).c_str())
@@ -81,7 +80,7 @@ const LogString *api_error_to_logstr(APIError err) {

 // Default implementation for loop - handles sending buffered data
 APIError APIFrameHelper::loop() {
-  if (this->tx_buf_count_ > 0) {
+  if (!this->tx_buf_.empty()) {
    APIError err = try_send_tx_buf_();
    if (err != APIError::OK && err != APIError::WOULD_BLOCK) {
      return err;
@@ -103,20 +102,9 @@ APIError APIFrameHelper::handle_socket_write_error_() {
 // Helper method to buffer data from IOVs
 void APIFrameHelper::buffer_data_from_iov_(const struct iovec *iov, int iovcnt, uint16_t total_write_len,
                                           uint16_t offset) {
-  // Check if queue is full
-  if (this->tx_buf_count_ >= API_MAX_SEND_QUEUE) {
-    HELPER_LOG("Send queue full (%u buffers), dropping connection", this->tx_buf_count_);
-    this->state_ = State::FAILED;
-    return;
-  }
-
-  uint16_t buffer_size = total_write_len - offset;
-  auto &buffer = this->tx_buf_[this->tx_buf_tail_];
-  buffer = std::make_unique<SendBuffer>(SendBuffer{
-      .data = std::make_unique<uint8_t[]>(buffer_size),
-      .size = buffer_size,
-      .offset = 0,
-  });
+  SendBuffer buffer;
+  buffer.size = total_write_len - offset;
+  buffer.data = std::make_unique<uint8_t[]>(buffer.size);

  uint16_t to_skip = offset;
  uint16_t write_pos = 0;
@@ -129,15 +117,12 @@ void APIFrameHelper::buffer_data_from_iov_(const struct iovec *iov, int iovcnt,
      // Include this segment (partially or fully)
      const uint8_t *src = reinterpret_cast<uint8_t *>(iov[i].iov_base) + to_skip;
      uint16_t len = static_cast<uint16_t>(iov[i].iov_len) - to_skip;
-      std::memcpy(buffer->data.get() + write_pos, src, len);
+      std::memcpy(buffer.data.get() + write_pos, src, len);
      write_pos += len;
      to_skip = 0;
    }
  }
-
-  // Update circular buffer tracking
-  this->tx_buf_tail_ = (this->tx_buf_tail_ + 1) % API_MAX_SEND_QUEUE;
-  this->tx_buf_count_++;
+  this->tx_buf_.push_back(std::move(buffer));
 }

 // This method writes data to socket or buffers it
@@ -155,7 +140,7 @@ APIError APIFrameHelper::write_raw_(const struct iovec *iov, int iovcnt, uint16_
 #endif

  // Try to send any existing buffered data first if there is any
-  if (this->tx_buf_count_ > 0) {
+  if (!this->tx_buf_.empty()) {
    APIError send_result = try_send_tx_buf_();
    // If real error occurred (not just WOULD_BLOCK), return it
    if (send_result != APIError::OK && send_result != APIError::WOULD_BLOCK) {
@@ -164,7 +149,7 @@ APIError APIFrameHelper::write_raw_(const struct iovec *iov, int iovcnt, uint16_

    // If there is still data in the buffer, we can't send, buffer
    // the new data and return
-    if (this->tx_buf_count_ > 0) {
+    if (!this->tx_buf_.empty()) {
      this->buffer_data_from_iov_(iov, iovcnt, total_write_len, 0);
      return APIError::OK;  // Success, data buffered
    }
@@ -192,31 +177,32 @@ APIError APIFrameHelper::write_raw_(const struct iovec *iov, int iovcnt, uint16_
 }

 // Common implementation for trying to send buffered data
-// IMPORTANT: Caller MUST ensure tx_buf_count_ > 0 before calling this method
+// IMPORTANT: Caller MUST ensure tx_buf_ is not empty before calling this method
 APIError APIFrameHelper::try_send_tx_buf_() {
  // Try to send from tx_buf - we assume it's not empty as it's the caller's responsibility to check
-  while (this->tx_buf_count_ > 0) {
+  bool tx_buf_empty = false;
+  while (!tx_buf_empty) {
    // Get the first buffer in the queue
-    SendBuffer *front_buffer = this->tx_buf_[this->tx_buf_head_].get();
+    SendBuffer &front_buffer = this->tx_buf_.front();

    // Try to send the remaining data in this buffer
-    ssize_t sent = this->socket_->write(front_buffer->current_data(), front_buffer->remaining());
+    ssize_t sent = this->socket_->write(front_buffer.current_data(), front_buffer.remaining());

    if (sent == -1) {
      return this->handle_socket_write_error_();
    } else if (sent == 0) {
      // Nothing sent but not an error
      return APIError::WOULD_BLOCK;
-    } else if (static_cast<uint16_t>(sent) < front_buffer->remaining()) {
+    } else if (static_cast<uint16_t>(sent) < front_buffer.remaining()) {
      // Partially sent, update offset
      // Cast to ensure no overflow issues with uint16_t
-      front_buffer->offset += static_cast<uint16_t>(sent);
+      front_buffer.offset += static_cast<uint16_t>(sent);
      return APIError::WOULD_BLOCK;  // Stop processing more buffers if we couldn't send a complete buffer
    } else {
      // Buffer completely sent, remove it from the queue
-      this->tx_buf_[this->tx_buf_head_].reset();
-      this->tx_buf_head_ = (this->tx_buf_head_ + 1) % API_MAX_SEND_QUEUE;
-      this->tx_buf_count_--;
+      this->tx_buf_.pop_front();
+      // Update empty status for the loop condition
+      tx_buf_empty = this->tx_buf_.empty();
      // Continue loop to try sending the next buffer
    }
  }
--- a/esphome/components/api/api_frame_helper.h
+++ b/esphome/components/api/api_frame_helper.h
@@ -1,8 +1,7 @@
 #pragma once
-#include <array>
 #include <cstdint>
+#include <deque>
 #include <limits>
-#include <memory>
 #include <span>
 #include <utility>
 #include <vector>
@@ -18,16 +17,6 @@ namespace esphome::api {
 // uncomment to log raw packets
 //#define HELPER_LOG_PACKETS

-// Maximum message size limits to prevent OOM on constrained devices
-// Voice Assistant is our largest user at 1024 bytes per audio chunk
-// Using 2048 + 256 bytes overhead = 2304 bytes total to support voice and future needs
-// ESP8266 has very limited RAM and cannot support voice assistant
-#ifdef USE_ESP8266
-static constexpr uint16_t MAX_MESSAGE_SIZE = 512;  // Keep small for memory constrained ESP8266
-#else
-static constexpr uint16_t MAX_MESSAGE_SIZE = 2304;  // Support voice (1024) + headroom for larger messages
-#endif
-
 // Forward declaration
 struct ClientInfo;

@@ -90,7 +79,7 @@ class APIFrameHelper {
  virtual APIError init() = 0;
  virtual APIError loop();
  virtual APIError read_packet(ReadPacketBuffer *buffer) = 0;
-  bool can_write_without_blocking() { return this->state_ == State::DATA && this->tx_buf_count_ == 0; }
+  bool can_write_without_blocking() { return state_ == State::DATA && tx_buf_.empty(); }
  std::string getpeername() { return socket_->getpeername(); }
  int getpeername(struct sockaddr *addr, socklen_t *addrlen) { return socket_->getpeername(addr, addrlen); }
  APIError close() {
@@ -172,7 +161,7 @@ class APIFrameHelper {
  };

  // Containers (size varies, but typically 12+ bytes on 32-bit)
-  std::array<std::unique_ptr<SendBuffer>, API_MAX_SEND_QUEUE> tx_buf_;
+  std::deque<SendBuffer> tx_buf_;
  std::vector<struct iovec> reusable_iovs_;
  std::vector<uint8_t> rx_buf_;

@@ -185,10 +174,7 @@ class APIFrameHelper {
  State state_{State::INITIALIZE};
  uint8_t frame_header_padding_{0};
  uint8_t frame_footer_size_{0};
-  uint8_t tx_buf_head_{0};
-  uint8_t tx_buf_tail_{0};
-  uint8_t tx_buf_count_{0};
-  // 8 bytes total, 0 bytes padding
+  // 5 bytes total, 3 bytes padding

  // Common initialization for both plaintext and noise protocols
  APIError init_common_();
--- a/esphome/components/api/api_frame_helper_noise.cpp
+++ b/esphome/components/api/api_frame_helper_noise.cpp
@@ -24,8 +24,7 @@ static const char *const PROLOGUE_INIT = "NoiseAPIInit";
 #endif
 static constexpr size_t PROLOGUE_INIT_LEN = 12;  // strlen("NoiseAPIInit")

-#define HELPER_LOG(msg, ...) \
-  ESP_LOGVV(TAG, "%s (%s): " msg, this->client_info_->name.c_str(), this->client_info_->peername.c_str(), ##__VA_ARGS__)
+#define HELPER_LOG(msg, ...) ESP_LOGVV(TAG, "%s: " msg, this->client_info_->get_combined_info().c_str(), ##__VA_ARGS__)

 #ifdef HELPER_LOG_PACKETS
 #define LOG_PACKET_RECEIVED(buffer) ESP_LOGVV(TAG, "Received frame: %s", format_hex_pretty(buffer).c_str())
@@ -185,13 +184,6 @@ APIError APINoiseFrameHelper::try_read_frame_(std::vector<uint8_t> *frame) {
    return APIError::BAD_HANDSHAKE_PACKET_LEN;
  }

-  // Check against maximum message size to prevent OOM
-  if (msg_size > MAX_MESSAGE_SIZE) {
-    state_ = State::FAILED;
-    HELPER_LOG("Bad packet: message size %u exceeds maximum %u", msg_size, MAX_MESSAGE_SIZE);
-    return APIError::BAD_DATA_PACKET;
-  }
-
  // reserve space for body
  if (rx_buf_.size() != msg_size) {
    rx_buf_.resize(msg_size);
--- a/esphome/components/api/api_frame_helper_plaintext.cpp
+++ b/esphome/components/api/api_frame_helper_plaintext.cpp
@@ -18,8 +18,7 @@ namespace esphome::api {

 static const char *const TAG = "api.plaintext";

-#define HELPER_LOG(msg, ...) \
-  ESP_LOGVV(TAG, "%s (%s): " msg, this->client_info_->name.c_str(), this->client_info_->peername.c_str(), ##__VA_ARGS__)
+#define HELPER_LOG(msg, ...) ESP_LOGVV(TAG, "%s: " msg, this->client_info_->get_combined_info().c_str(), ##__VA_ARGS__)

 #ifdef HELPER_LOG_PACKETS
 #define LOG_PACKET_RECEIVED(buffer) ESP_LOGVV(TAG, "Received frame: %s", format_hex_pretty(buffer).c_str())
@@ -123,10 +122,10 @@ APIError APIPlaintextFrameHelper::try_read_frame_(std::vector<uint8_t> *frame) {
      continue;
    }

-    if (msg_size_varint->as_uint32() > MAX_MESSAGE_SIZE) {
+    if (msg_size_varint->as_uint32() > std::numeric_limits<uint16_t>::max()) {
      state_ = State::FAILED;
      HELPER_LOG("Bad packet: message size %" PRIu32 " exceeds maximum %u", msg_size_varint->as_uint32(),
-                 MAX_MESSAGE_SIZE);
+                 std::numeric_limits<uint16_t>::max());
      return APIError::BAD_DATA_PACKET;
    }
    rx_header_parsed_len_ = msg_size_varint->as_uint16();
--- a/esphome/components/api/api_options.proto
+++ b/esphome/components/api/api_options.proto
@@ -32,13 +32,6 @@ extend google.protobuf.FieldOptions {
    optional string fixed_array_size_define = 50010;
    optional string fixed_array_with_length_define = 50011;

-    // pointer_to_buffer: Use pointer instead of array for fixed-size byte fields
-    // When set, the field will be declared as a pointer (const uint8_t *data)
-    // instead of an array (uint8_t data[N]). This allows zero-copy on decode
-    // by pointing directly to the protobuf buffer. The buffer must remain valid
-    // until the message is processed (which is guaranteed for stack-allocated messages).
-    optional bool pointer_to_buffer = 50012 [default=false];
-
    // container_pointer: Zero-copy optimization for repeated fields.
    //
    // When container_pointer is set on a repeated field, the generated message will
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -22,12 +22,9 @@ bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
 }
 bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
  switch (field_id) {
-    case 1: {
-      // Use raw data directly to avoid allocation
-      this->client_info = value.data();
-      this->client_info_len = value.size();
+    case 1:
+      this->client_info = value.as_string();
      break;
-    }
    default:
      return false;
  }
@@ -45,23 +42,18 @@ void HelloResponse::calculate_size(ProtoSize &size) const {
  size.add_length(1, this->server_info_ref_.size());
  size.add_length(1, this->name_ref_.size());
 }
-#ifdef USE_API_PASSWORD
-bool AuthenticationRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+bool ConnectRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
  switch (field_id) {
-    case 1: {
-      // Use raw data directly to avoid allocation
-      this->password = value.data();
-      this->password_len = value.size();
+    case 1:
+      this->password = value.as_string();
      break;
-    }
    default:
      return false;
  }
  return true;
 }
-void AuthenticationResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->invalid_password); }
-void AuthenticationResponse::calculate_size(ProtoSize &size) const { size.add_bool(1, this->invalid_password); }
-#endif
+void ConnectResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->invalid_password); }
+void ConnectResponse::calculate_size(ProtoSize &size) const { size.add_bool(1, this->invalid_password); }
 #ifdef USE_AREAS
 void AreaInfo::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_uint32(1, this->area_id);
@@ -135,12 +127,6 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
 #ifdef USE_AREAS
  buffer.encode_message(22, this->area);
 #endif
-#ifdef USE_ZWAVE_PROXY
-  buffer.encode_uint32(23, this->zwave_proxy_feature_flags);
-#endif
-#ifdef USE_ZWAVE_PROXY
-  buffer.encode_uint32(24, this->zwave_home_id);
-#endif
 }
 void DeviceInfoResponse::calculate_size(ProtoSize &size) const {
 #ifdef USE_API_PASSWORD
@@ -193,12 +179,6 @@ void DeviceInfoResponse::calculate_size(ProtoSize &size) const {
 #ifdef USE_AREAS
  size.add_message_object(2, this->area);
 #endif
-#ifdef USE_ZWAVE_PROXY
-  size.add_uint32(2, this->zwave_proxy_feature_flags);
-#endif
-#ifdef USE_ZWAVE_PROXY
-  size.add_uint32(2, this->zwave_home_id);
-#endif
 }
 #ifdef USE_BINARY_SENSOR
 void ListEntitiesBinarySensorResponse::encode(ProtoWriteBuffer buffer) const {
@@ -872,7 +852,7 @@ void HomeassistantServiceMap::calculate_size(ProtoSize &size) const {
  size.add_length(1, this->key_ref_.size());
  size.add_length(1, this->value.size());
 }
-void HomeassistantActionRequest::encode(ProtoWriteBuffer buffer) const {
+void HomeassistantServiceResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->service_ref_);
  for (auto &it : this->data) {
    buffer.encode_message(2, it, true);
@@ -885,7 +865,7 @@ void HomeassistantActionRequest::encode(ProtoWriteBuffer buffer) const {
  }
  buffer.encode_bool(5, this->is_event);
 }
-void HomeassistantActionRequest::calculate_size(ProtoSize &size) const {
+void HomeassistantServiceResponse::calculate_size(ProtoSize &size) const {
  size.add_length(1, this->service_ref_.size());
  size.add_repeated_message(1, this->data);
  size.add_repeated_message(1, this->data_template);
@@ -923,12 +903,9 @@ bool HomeAssistantStateResponse::decode_length(uint32_t field_id, ProtoLengthDel
 #endif
 bool GetTimeResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
  switch (field_id) {
-    case 2: {
-      // Use raw data directly to avoid allocation
-      this->timezone = value.data();
-      this->timezone_len = value.size();
+    case 2:
+      this->timezone = value.as_string();
      break;
-    }
    default:
      return false;
  }
@@ -944,6 +921,14 @@ bool GetTimeResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
  }
  return true;
 }
+void GetTimeResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_fixed32(1, this->epoch_seconds);
+  buffer.encode_string(2, this->timezone_ref_);
+}
+void GetTimeResponse::calculate_size(ProtoSize &size) const {
+  size.add_fixed32(1, this->epoch_seconds);
+  size.add_length(1, this->timezone_ref_.size());
+}
 #ifdef USE_API_SERVICES
 void ListEntitiesServicesArgument::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(1, this->name_ref_);
@@ -2037,12 +2022,9 @@ bool BluetoothGATTWriteRequest::decode_varint(uint32_t field_id, ProtoVarInt val
 }
 bool BluetoothGATTWriteRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
  switch (field_id) {
-    case 4: {
-      // Use raw data directly to avoid allocation
-      this->data = value.data();
-      this->data_len = value.size();
+    case 4:
+      this->data = value.as_string();
      break;
-    }
    default:
      return false;
  }
@@ -2076,12 +2058,9 @@ bool BluetoothGATTWriteDescriptorRequest::decode_varint(uint32_t field_id, Proto
 }
 bool BluetoothGATTWriteDescriptorRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
  switch (field_id) {
-    case 3: {
-      // Use raw data directly to avoid allocation
-      this->data = value.data();
-      this->data_len = value.size();
+    case 3:
+      this->data = value.as_string();
      break;
-    }
    default:
      return false;
  }
@@ -2397,52 +2376,6 @@ void VoiceAssistantWakeWord::calculate_size(ProtoSize &size) const {
    }
  }
 }
-bool VoiceAssistantExternalWakeWord::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 5:
-      this->model_size = value.as_uint32();
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
-bool VoiceAssistantExternalWakeWord::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1:
-      this->id = value.as_string();
-      break;
-    case 2:
-      this->wake_word = value.as_string();
-      break;
-    case 3:
-      this->trained_languages.push_back(value.as_string());
-      break;
-    case 4:
-      this->model_type = value.as_string();
-      break;
-    case 6:
-      this->model_hash = value.as_string();
-      break;
-    case 7:
-      this->url = value.as_string();
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
-bool VoiceAssistantConfigurationRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1:
-      this->external_wake_words.emplace_back();
-      value.decode_to_message(this->external_wake_words.back());
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
 void VoiceAssistantConfigurationResponse::encode(ProtoWriteBuffer buffer) const {
  for (auto &it : this->available_wake_words) {
    buffer.encode_message(1, it, true);
@@ -3086,53 +3019,5 @@ bool UpdateCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
  return true;
 }
 #endif
-#ifdef USE_ZWAVE_PROXY
-bool ZWaveProxyFrame::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      // Use raw data directly to avoid allocation
-      this->data = value.data();
-      this->data_len = value.size();
-      break;
-    }
-    default:
-      return false;
-  }
-  return true;
-}
-void ZWaveProxyFrame::encode(ProtoWriteBuffer buffer) const { buffer.encode_bytes(1, this->data, this->data_len); }
-void ZWaveProxyFrame::calculate_size(ProtoSize &size) const { size.add_length(1, this->data_len); }
-bool ZWaveProxyRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 1:
-      this->type = static_cast<enums::ZWaveProxyRequestType>(value.as_uint32());
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
-bool ZWaveProxyRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 2: {
-      // Use raw data directly to avoid allocation
-      this->data = value.data();
-      this->data_len = value.size();
-      break;
-    }
-    default:
-      return false;
-  }
-  return true;
-}
-void ZWaveProxyRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_uint32(1, static_cast<uint32_t>(this->type));
-  buffer.encode_bytes(2, this->data, this->data_len);
-}
-void ZWaveProxyRequest::calculate_size(ProtoSize &size) const {
-  size.add_uint32(1, static_cast<uint32_t>(this->type));
-  size.add_length(2, this->data_len);
-}
-#endif

 }  // namespace esphome::api
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -276,13 +276,6 @@ enum UpdateCommand : uint32_t {
  UPDATE_COMMAND_CHECK = 2,
 };
 #endif
-#ifdef USE_ZWAVE_PROXY
-enum ZWaveProxyRequestType : uint32_t {
-  ZWAVE_PROXY_REQUEST_TYPE_SUBSCRIBE = 0,
-  ZWAVE_PROXY_REQUEST_TYPE_UNSUBSCRIBE = 1,
-  ZWAVE_PROXY_REQUEST_TYPE_HOME_ID_CHANGE = 2,
-};
-#endif

 }  // namespace enums

@@ -331,12 +324,11 @@ class CommandProtoMessage : public ProtoDecodableMessage {
 class HelloRequest final : public ProtoDecodableMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 1;
-  static constexpr uint8_t ESTIMATED_SIZE = 27;
+  static constexpr uint8_t ESTIMATED_SIZE = 17;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *message_name() const override { return "hello_request"; }
 #endif
-  const uint8_t *client_info{nullptr};
-  uint16_t client_info_len{0};
+  std::string client_info{};
  uint32_t api_version_major{0};
  uint32_t api_version_minor{0};
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -368,16 +360,14 @@ class HelloResponse final : public ProtoMessage {

 protected:
 };
-#ifdef USE_API_PASSWORD
-class AuthenticationRequest final : public ProtoDecodableMessage {
+class ConnectRequest final : public ProtoDecodableMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 3;
-  static constexpr uint8_t ESTIMATED_SIZE = 19;
+  static constexpr uint8_t ESTIMATED_SIZE = 9;
 #ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *message_name() const override { return "authentication_request"; }
+  const char *message_name() const override { return "connect_request"; }
 #endif
-  const uint8_t *password{nullptr};
-  uint16_t password_len{0};
+  std::string password{};
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
 #endif
@@ -385,12 +375,12 @@ class AuthenticationRequest final : public ProtoDecodableMessage {
 protected:
  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-class AuthenticationResponse final : public ProtoMessage {
+class ConnectResponse final : public ProtoMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 4;
  static constexpr uint8_t ESTIMATED_SIZE = 2;
 #ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *message_name() const override { return "authentication_response"; }
+  const char *message_name() const override { return "connect_response"; }
 #endif
  bool invalid_password{false};
  void encode(ProtoWriteBuffer buffer) const override;
@@ -401,7 +391,6 @@ class AuthenticationResponse final : public ProtoMessage {

 protected:
 };
-#endif
 class DisconnectRequest final : public ProtoMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 5;
@@ -501,7 +490,7 @@ class DeviceInfo final : public ProtoMessage {
 class DeviceInfoResponse final : public ProtoMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 10;
-  static constexpr uint16_t ESTIMATED_SIZE = 257;
+  static constexpr uint8_t ESTIMATED_SIZE = 247;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *message_name() const override { return "device_info_response"; }
 #endif
@@ -561,12 +550,6 @@ class DeviceInfoResponse final : public ProtoMessage {
 #endif
 #ifdef USE_AREAS
  AreaInfo area{};
-#endif
-#ifdef USE_ZWAVE_PROXY
-  uint32_t zwave_proxy_feature_flags{0};
-#endif
-#ifdef USE_ZWAVE_PROXY
-  uint32_t zwave_home_id{0};
 #endif
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(ProtoSize &size) const override;
@@ -1101,12 +1084,12 @@ class HomeassistantServiceMap final : public ProtoMessage {

 protected:
 };
-class HomeassistantActionRequest final : public ProtoMessage {
+class HomeassistantServiceResponse final : public ProtoMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 35;
  static constexpr uint8_t ESTIMATED_SIZE = 113;
 #ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *message_name() const override { return "homeassistant_action_request"; }
+  const char *message_name() const override { return "homeassistant_service_response"; }
 #endif
  StringRef service_ref_{};
  void set_service(const StringRef &ref) { this->service_ref_ = ref; }
@@ -1191,13 +1174,16 @@ class GetTimeRequest final : public ProtoMessage {
 class GetTimeResponse final : public ProtoDecodableMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 37;
-  static constexpr uint8_t ESTIMATED_SIZE = 24;
+  static constexpr uint8_t ESTIMATED_SIZE = 14;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *message_name() const override { return "get_time_response"; }
 #endif
  uint32_t epoch_seconds{0};
-  const uint8_t *timezone{nullptr};
-  uint16_t timezone_len{0};
+  std::string timezone{};
+  StringRef timezone_ref_{};
+  void set_timezone(const StringRef &ref) { this->timezone_ref_ = ref; }
+  void encode(ProtoWriteBuffer buffer) const override;
+  void calculate_size(ProtoSize &size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
 #endif
@@ -1989,15 +1975,14 @@ class BluetoothGATTReadResponse final : public ProtoMessage {
 class BluetoothGATTWriteRequest final : public ProtoDecodableMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 75;
-  static constexpr uint8_t ESTIMATED_SIZE = 29;
+  static constexpr uint8_t ESTIMATED_SIZE = 19;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *message_name() const override { return "bluetooth_gatt_write_request"; }
 #endif
  uint64_t address{0};
  uint32_t handle{0};
  bool response{false};
-  const uint8_t *data{nullptr};
-  uint16_t data_len{0};
+  std::string data{};
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
 #endif
@@ -2025,14 +2010,13 @@ class BluetoothGATTReadDescriptorRequest final : public ProtoDecodableMessage {
 class BluetoothGATTWriteDescriptorRequest final : public ProtoDecodableMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 77;
-  static constexpr uint8_t ESTIMATED_SIZE = 27;
+  static constexpr uint8_t ESTIMATED_SIZE = 17;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *message_name() const override { return "bluetooth_gatt_write_descriptor_request"; }
 #endif
  uint64_t address{0};
  uint32_t handle{0};
-  const uint8_t *data{nullptr};
-  uint16_t data_len{0};
+  std::string data{};
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
 #endif
@@ -2457,37 +2441,18 @@ class VoiceAssistantWakeWord final : public ProtoMessage {

 protected:
 };
-class VoiceAssistantExternalWakeWord final : public ProtoDecodableMessage {
- public:
-  std::string id{};
-  std::string wake_word{};
-  std::vector<std::string> trained_languages{};
-  std::string model_type{};
-  uint32_t model_size{0};
-  std::string model_hash{};
-  std::string url{};
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class VoiceAssistantConfigurationRequest final : public ProtoDecodableMessage {
+class VoiceAssistantConfigurationRequest final : public ProtoMessage {
 public:
  static constexpr uint8_t MESSAGE_TYPE = 121;
-  static constexpr uint8_t ESTIMATED_SIZE = 34;
+  static constexpr uint8_t ESTIMATED_SIZE = 0;
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *message_name() const override { return "voice_assistant_configuration_request"; }
 #endif
-  std::vector<VoiceAssistantExternalWakeWord> external_wake_words{};
 #ifdef HAS_PROTO_MESSAGE_DUMP
  void dump_to(std::string &out) const override;
 #endif

 protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
 class VoiceAssistantConfigurationResponse final : public ProtoMessage {
 public:
@@ -2950,45 +2915,5 @@ class UpdateCommandRequest final : public CommandProtoMessage {
  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 #endif
-#ifdef USE_ZWAVE_PROXY
-class ZWaveProxyFrame final : public ProtoDecodableMessage {
- public:
-  static constexpr uint8_t MESSAGE_TYPE = 128;
-  static constexpr uint8_t ESTIMATED_SIZE = 19;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *message_name() const override { return "z_wave_proxy_frame"; }
-#endif
-  const uint8_t *data{nullptr};
-  uint16_t data_len{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-  void calculate_size(ProtoSize &size) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-};
-class ZWaveProxyRequest final : public ProtoDecodableMessage {
- public:
-  static constexpr uint8_t MESSAGE_TYPE = 129;
-  static constexpr uint8_t ESTIMATED_SIZE = 21;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  const char *message_name() const override { return "z_wave_proxy_request"; }
-#endif
-  enums::ZWaveProxyRequestType type{};
-  const uint8_t *data{nullptr};
-  uint16_t data_len{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-  void calculate_size(ProtoSize &size) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-#endif

 }  // namespace esphome::api
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -655,26 +655,10 @@ template<> const char *proto_enum_to_string<enums::UpdateCommand>(enums::UpdateC
  }
 }
 #endif
-#ifdef USE_ZWAVE_PROXY
-template<> const char *proto_enum_to_string<enums::ZWaveProxyRequestType>(enums::ZWaveProxyRequestType value) {
-  switch (value) {
-    case enums::ZWAVE_PROXY_REQUEST_TYPE_SUBSCRIBE:
-      return "ZWAVE_PROXY_REQUEST_TYPE_SUBSCRIBE";
-    case enums::ZWAVE_PROXY_REQUEST_TYPE_UNSUBSCRIBE:
-      return "ZWAVE_PROXY_REQUEST_TYPE_UNSUBSCRIBE";
-    case enums::ZWAVE_PROXY_REQUEST_TYPE_HOME_ID_CHANGE:
-      return "ZWAVE_PROXY_REQUEST_TYPE_HOME_ID_CHANGE";
-    default:
-      return "UNKNOWN";
-  }
-}
-#endif

 void HelloRequest::dump_to(std::string &out) const {
  MessageDumpHelper helper(out, "HelloRequest");
-  out.append("  client_info: ");
-  out.append(format_hex_pretty(this->client_info, this->client_info_len));
-  out.append("\n");
+  dump_field(out, "client_info", this->client_info);
  dump_field(out, "api_version_major", this->api_version_major);
  dump_field(out, "api_version_minor", this->api_version_minor);
 }
@@ -685,18 +669,8 @@ void HelloResponse::dump_to(std::string &out) const {
  dump_field(out, "server_info", this->server_info_ref_);
  dump_field(out, "name", this->name_ref_);
 }
-#ifdef USE_API_PASSWORD
-void AuthenticationRequest::dump_to(std::string &out) const {
-  MessageDumpHelper helper(out, "AuthenticationRequest");
-  out.append("  password: ");
-  out.append(format_hex_pretty(this->password, this->password_len));
-  out.append("\n");
-}
-void AuthenticationResponse::dump_to(std::string &out) const {
-  MessageDumpHelper helper(out, "AuthenticationResponse");
-  dump_field(out, "invalid_password", this->invalid_password);
-}
-#endif
+void ConnectRequest::dump_to(std::string &out) const { dump_field(out, "password", this->password); }
+void ConnectResponse::dump_to(std::string &out) const { dump_field(out, "invalid_password", this->invalid_password); }
 void DisconnectRequest::dump_to(std::string &out) const { out.append("DisconnectRequest {}"); }
 void DisconnectResponse::dump_to(std::string &out) const { out.append("DisconnectResponse {}"); }
 void PingRequest::dump_to(std::string &out) const { out.append("PingRequest {}"); }
@@ -775,12 +749,6 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
  this->area.dump_to(out);
  out.append("\n");
 #endif
-#ifdef USE_ZWAVE_PROXY
-  dump_field(out, "zwave_proxy_feature_flags", this->zwave_proxy_feature_flags);
-#endif
-#ifdef USE_ZWAVE_PROXY
-  dump_field(out, "zwave_home_id", this->zwave_home_id);
-#endif
 }
 void ListEntitiesRequest::dump_to(std::string &out) const { out.append("ListEntitiesRequest {}"); }
 void ListEntitiesDoneResponse::dump_to(std::string &out) const { out.append("ListEntitiesDoneResponse {}"); }
@@ -1103,8 +1071,8 @@ void HomeassistantServiceMap::dump_to(std::string &out) const {
  dump_field(out, "key", this->key_ref_);
  dump_field(out, "value", this->value);
 }
-void HomeassistantActionRequest::dump_to(std::string &out) const {
-  MessageDumpHelper helper(out, "HomeassistantActionRequest");
+void HomeassistantServiceResponse::dump_to(std::string &out) const {
+  MessageDumpHelper helper(out, "HomeassistantServiceResponse");
  dump_field(out, "service", this->service_ref_);
  for (const auto &it : this->data) {
    out.append("  data: ");
@@ -1146,7 +1114,11 @@ void GetTimeResponse::dump_to(std::string &out) const {
  MessageDumpHelper helper(out, "GetTimeResponse");
  dump_field(out, "epoch_seconds", this->epoch_seconds);
  out.append("  timezone: ");
-  out.append(format_hex_pretty(this->timezone, this->timezone_len));
+  if (!this->timezone_ref_.empty()) {
+    out.append("'").append(this->timezone_ref_.c_str()).append("'");
+  } else {
+    out.append("'").append(this->timezone).append("'");
+  }
  out.append("\n");
 }
 #ifdef USE_API_SERVICES
@@ -1660,7 +1632,7 @@ void BluetoothGATTWriteRequest::dump_to(std::string &out) const {
  dump_field(out, "handle", this->handle);
  dump_field(out, "response", this->response);
  out.append("  data: ");
-  out.append(format_hex_pretty(this->data, this->data_len));
+  out.append(format_hex_pretty(reinterpret_cast<const uint8_t *>(this->data.data()), this->data.size()));
  out.append("\n");
 }
 void BluetoothGATTReadDescriptorRequest::dump_to(std::string &out) const {
@@ -1673,7 +1645,7 @@ void BluetoothGATTWriteDescriptorRequest::dump_to(std::string &out) const {
  dump_field(out, "address", this->address);
  dump_field(out, "handle", this->handle);
  out.append("  data: ");
-  out.append(format_hex_pretty(this->data, this->data_len));
+  out.append(format_hex_pretty(reinterpret_cast<const uint8_t *>(this->data.data()), this->data.size()));
  out.append("\n");
 }
 void BluetoothGATTNotifyRequest::dump_to(std::string &out) const {
@@ -1826,25 +1798,8 @@ void VoiceAssistantWakeWord::dump_to(std::string &out) const {
    dump_field(out, "trained_languages", it, 4);
  }
 }
-void VoiceAssistantExternalWakeWord::dump_to(std::string &out) const {
-  MessageDumpHelper helper(out, "VoiceAssistantExternalWakeWord");
-  dump_field(out, "id", this->id);
-  dump_field(out, "wake_word", this->wake_word);
-  for (const auto &it : this->trained_languages) {
-    dump_field(out, "trained_languages", it, 4);
-  }
-  dump_field(out, "model_type", this->model_type);
-  dump_field(out, "model_size", this->model_size);
-  dump_field(out, "model_hash", this->model_hash);
-  dump_field(out, "url", this->url);
-}
 void VoiceAssistantConfigurationRequest::dump_to(std::string &out) const {
-  MessageDumpHelper helper(out, "VoiceAssistantConfigurationRequest");
-  for (const auto &it : this->external_wake_words) {
-    out.append("  external_wake_words: ");
-    it.dump_to(out);
-    out.append("\n");
-  }
+  out.append("VoiceAssistantConfigurationRequest {}");
 }
 void VoiceAssistantConfigurationResponse::dump_to(std::string &out) const {
  MessageDumpHelper helper(out, "VoiceAssistantConfigurationResponse");
@@ -2153,21 +2108,6 @@ void UpdateCommandRequest::dump_to(std::string &out) const {
 #endif
 }
 #endif
-#ifdef USE_ZWAVE_PROXY
-void ZWaveProxyFrame::dump_to(std::string &out) const {
-  MessageDumpHelper helper(out, "ZWaveProxyFrame");
-  out.append("  data: ");
-  out.append(format_hex_pretty(this->data, this->data_len));
-  out.append("\n");
-}
-void ZWaveProxyRequest::dump_to(std::string &out) const {
-  MessageDumpHelper helper(out, "ZWaveProxyRequest");
-  dump_field(out, "type", static_cast<enums::ZWaveProxyRequestType>(this->type));
-  out.append("  data: ");
-  out.append(format_hex_pretty(this->data, this->data_len));
-  out.append("\n");
-}
-#endif

 }  // namespace esphome::api

--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -24,17 +24,15 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      this->on_hello_request(msg);
      break;
    }
-#ifdef USE_API_PASSWORD
-    case AuthenticationRequest::MESSAGE_TYPE: {
-      AuthenticationRequest msg;
+    case ConnectRequest::MESSAGE_TYPE: {
+      ConnectRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_authentication_request: %s", msg.dump().c_str());
+      ESP_LOGVV(TAG, "on_connect_request: %s", msg.dump().c_str());
 #endif
-      this->on_authentication_request(msg);
+      this->on_connect_request(msg);
      break;
    }
-#endif
    case DisconnectRequest::MESSAGE_TYPE: {
      DisconnectRequest msg;
      // Empty message: no decode needed
@@ -162,6 +160,15 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      break;
    }
 #endif
+    case GetTimeRequest::MESSAGE_TYPE: {
+      GetTimeRequest msg;
+      // Empty message: no decode needed
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_get_time_request: %s", msg.dump().c_str());
+#endif
+      this->on_get_time_request(msg);
+      break;
+    }
    case GetTimeResponse::MESSAGE_TYPE: {
      GetTimeResponse msg;
      msg.decode(msg_data, msg_size);
@@ -548,7 +555,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
 #ifdef USE_VOICE_ASSISTANT
    case VoiceAssistantConfigurationRequest::MESSAGE_TYPE: {
      VoiceAssistantConfigurationRequest msg;
-      msg.decode(msg_data, msg_size);
+      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
      ESP_LOGVV(TAG, "on_voice_assistant_configuration_request: %s", msg.dump().c_str());
 #endif
@@ -588,28 +595,6 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      this->on_bluetooth_scanner_set_mode_request(msg);
      break;
    }
-#endif
-#ifdef USE_ZWAVE_PROXY
-    case ZWaveProxyFrame::MESSAGE_TYPE: {
-      ZWaveProxyFrame msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_z_wave_proxy_frame: %s", msg.dump().c_str());
-#endif
-      this->on_z_wave_proxy_frame(msg);
-      break;
-    }
-#endif
-#ifdef USE_ZWAVE_PROXY
-    case ZWaveProxyRequest::MESSAGE_TYPE: {
-      ZWaveProxyRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_z_wave_proxy_request: %s", msg.dump().c_str());
-#endif
-      this->on_z_wave_proxy_request(msg);
-      break;
-    }
 #endif
    default:
      break;
@@ -621,13 +606,11 @@ void APIServerConnection::on_hello_request(const HelloRequest &msg) {
    this->on_fatal_error();
  }
 }
-#ifdef USE_API_PASSWORD
-void APIServerConnection::on_authentication_request(const AuthenticationRequest &msg) {
-  if (!this->send_authenticate_response(msg)) {
+void APIServerConnection::on_connect_request(const ConnectRequest &msg) {
+  if (!this->send_connect_response(msg)) {
    this->on_fatal_error();
  }
 }
-#endif
 void APIServerConnection::on_disconnect_request(const DisconnectRequest &msg) {
  if (!this->send_disconnect_response(msg)) {
    this->on_fatal_error();
@@ -639,139 +622,246 @@ void APIServerConnection::on_ping_request(const PingRequest &msg) {
  }
 }
 void APIServerConnection::on_device_info_request(const DeviceInfoRequest &msg) {
-  if (!this->send_device_info_response(msg)) {
+  if (this->check_connection_setup_() && !this->send_device_info_response(msg)) {
    this->on_fatal_error();
  }
 }
-void APIServerConnection::on_list_entities_request(const ListEntitiesRequest &msg) { this->list_entities(msg); }
-void APIServerConnection::on_subscribe_states_request(const SubscribeStatesRequest &msg) {
-  this->subscribe_states(msg);
+void APIServerConnection::on_list_entities_request(const ListEntitiesRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->list_entities(msg);
+  }
+}
+void APIServerConnection::on_subscribe_states_request(const SubscribeStatesRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->subscribe_states(msg);
+  }
+}
+void APIServerConnection::on_subscribe_logs_request(const SubscribeLogsRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->subscribe_logs(msg);
+  }
 }
-void APIServerConnection::on_subscribe_logs_request(const SubscribeLogsRequest &msg) { this->subscribe_logs(msg); }
 #ifdef USE_API_HOMEASSISTANT_SERVICES
 void APIServerConnection::on_subscribe_homeassistant_services_request(
    const SubscribeHomeassistantServicesRequest &msg) {
-  this->subscribe_homeassistant_services(msg);
+  if (this->check_authenticated_()) {
+    this->subscribe_homeassistant_services(msg);
+  }
 }
 #endif
 #ifdef USE_API_HOMEASSISTANT_STATES
 void APIServerConnection::on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &msg) {
-  this->subscribe_home_assistant_states(msg);
+  if (this->check_authenticated_()) {
+    this->subscribe_home_assistant_states(msg);
+  }
 }
 #endif
+void APIServerConnection::on_get_time_request(const GetTimeRequest &msg) {
+  if (this->check_connection_setup_() && !this->send_get_time_response(msg)) {
+    this->on_fatal_error();
+  }
+}
 #ifdef USE_API_SERVICES
-void APIServerConnection::on_execute_service_request(const ExecuteServiceRequest &msg) { this->execute_service(msg); }
+void APIServerConnection::on_execute_service_request(const ExecuteServiceRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->execute_service(msg);
+  }
+}
 #endif
 #ifdef USE_API_NOISE
 void APIServerConnection::on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &msg) {
-  if (!this->send_noise_encryption_set_key_response(msg)) {
+  if (this->check_authenticated_() && !this->send_noise_encryption_set_key_response(msg)) {
    this->on_fatal_error();
  }
 }
 #endif
 #ifdef USE_BUTTON
-void APIServerConnection::on_button_command_request(const ButtonCommandRequest &msg) { this->button_command(msg); }
+void APIServerConnection::on_button_command_request(const ButtonCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->button_command(msg);
+  }
+}
 #endif
 #ifdef USE_CAMERA
-void APIServerConnection::on_camera_image_request(const CameraImageRequest &msg) { this->camera_image(msg); }
+void APIServerConnection::on_camera_image_request(const CameraImageRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->camera_image(msg);
+  }
+}
 #endif
 #ifdef USE_CLIMATE
-void APIServerConnection::on_climate_command_request(const ClimateCommandRequest &msg) { this->climate_command(msg); }
+void APIServerConnection::on_climate_command_request(const ClimateCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->climate_command(msg);
+  }
+}
 #endif
 #ifdef USE_COVER
-void APIServerConnection::on_cover_command_request(const CoverCommandRequest &msg) { this->cover_command(msg); }
+void APIServerConnection::on_cover_command_request(const CoverCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->cover_command(msg);
+  }
+}
 #endif
 #ifdef USE_DATETIME_DATE
-void APIServerConnection::on_date_command_request(const DateCommandRequest &msg) { this->date_command(msg); }
+void APIServerConnection::on_date_command_request(const DateCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->date_command(msg);
+  }
+}
 #endif
 #ifdef USE_DATETIME_DATETIME
 void APIServerConnection::on_date_time_command_request(const DateTimeCommandRequest &msg) {
-  this->datetime_command(msg);
+  if (this->check_authenticated_()) {
+    this->datetime_command(msg);
+  }
 }
 #endif
 #ifdef USE_FAN
-void APIServerConnection::on_fan_command_request(const FanCommandRequest &msg) { this->fan_command(msg); }
+void APIServerConnection::on_fan_command_request(const FanCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->fan_command(msg);
+  }
+}
 #endif
 #ifdef USE_LIGHT
-void APIServerConnection::on_light_command_request(const LightCommandRequest &msg) { this->light_command(msg); }
+void APIServerConnection::on_light_command_request(const LightCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->light_command(msg);
+  }
+}
 #endif
 #ifdef USE_LOCK
-void APIServerConnection::on_lock_command_request(const LockCommandRequest &msg) { this->lock_command(msg); }
+void APIServerConnection::on_lock_command_request(const LockCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->lock_command(msg);
+  }
+}
 #endif
 #ifdef USE_MEDIA_PLAYER
 void APIServerConnection::on_media_player_command_request(const MediaPlayerCommandRequest &msg) {
-  this->media_player_command(msg);
+  if (this->check_authenticated_()) {
+    this->media_player_command(msg);
+  }
 }
 #endif
 #ifdef USE_NUMBER
-void APIServerConnection::on_number_command_request(const NumberCommandRequest &msg) { this->number_command(msg); }
+void APIServerConnection::on_number_command_request(const NumberCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->number_command(msg);
+  }
+}
 #endif
 #ifdef USE_SELECT
-void APIServerConnection::on_select_command_request(const SelectCommandRequest &msg) { this->select_command(msg); }
+void APIServerConnection::on_select_command_request(const SelectCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->select_command(msg);
+  }
+}
 #endif
 #ifdef USE_SIREN
-void APIServerConnection::on_siren_command_request(const SirenCommandRequest &msg) { this->siren_command(msg); }
+void APIServerConnection::on_siren_command_request(const SirenCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->siren_command(msg);
+  }
+}
 #endif
 #ifdef USE_SWITCH
-void APIServerConnection::on_switch_command_request(const SwitchCommandRequest &msg) { this->switch_command(msg); }
+void APIServerConnection::on_switch_command_request(const SwitchCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->switch_command(msg);
+  }
+}
 #endif
 #ifdef USE_TEXT
-void APIServerConnection::on_text_command_request(const TextCommandRequest &msg) { this->text_command(msg); }
+void APIServerConnection::on_text_command_request(const TextCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->text_command(msg);
+  }
+}
 #endif
 #ifdef USE_DATETIME_TIME
-void APIServerConnection::on_time_command_request(const TimeCommandRequest &msg) { this->time_command(msg); }
+void APIServerConnection::on_time_command_request(const TimeCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->time_command(msg);
+  }
+}
 #endif
 #ifdef USE_UPDATE
-void APIServerConnection::on_update_command_request(const UpdateCommandRequest &msg) { this->update_command(msg); }
+void APIServerConnection::on_update_command_request(const UpdateCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->update_command(msg);
+  }
+}
 #endif
 #ifdef USE_VALVE
-void APIServerConnection::on_valve_command_request(const ValveCommandRequest &msg) { this->valve_command(msg); }
+void APIServerConnection::on_valve_command_request(const ValveCommandRequest &msg) {
+  if (this->check_authenticated_()) {
+    this->valve_command(msg);
+  }
+}
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_subscribe_bluetooth_le_advertisements_request(
    const SubscribeBluetoothLEAdvertisementsRequest &msg) {
-  this->subscribe_bluetooth_le_advertisements(msg);
+  if (this->check_authenticated_()) {
+    this->subscribe_bluetooth_le_advertisements(msg);
+  }
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_bluetooth_device_request(const BluetoothDeviceRequest &msg) {
-  this->bluetooth_device_request(msg);
+  if (this->check_authenticated_()) {
+    this->bluetooth_device_request(msg);
+  }
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg) {
-  this->bluetooth_gatt_get_services(msg);
+  if (this->check_authenticated_()) {
+    this->bluetooth_gatt_get_services(msg);
+  }
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg) {
-  this->bluetooth_gatt_read(msg);
+  if (this->check_authenticated_()) {
+    this->bluetooth_gatt_read(msg);
+  }
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg) {
-  this->bluetooth_gatt_write(msg);
+  if (this->check_authenticated_()) {
+    this->bluetooth_gatt_write(msg);
+  }
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &msg) {
-  this->bluetooth_gatt_read_descriptor(msg);
+  if (this->check_authenticated_()) {
+    this->bluetooth_gatt_read_descriptor(msg);
+  }
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &msg) {
-  this->bluetooth_gatt_write_descriptor(msg);
+  if (this->check_authenticated_()) {
+    this->bluetooth_gatt_write_descriptor(msg);
+  }
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg) {
-  this->bluetooth_gatt_notify(msg);
+  if (this->check_authenticated_()) {
+    this->bluetooth_gatt_notify(msg);
+  }
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_subscribe_bluetooth_connections_free_request(
    const SubscribeBluetoothConnectionsFreeRequest &msg) {
-  if (!this->send_subscribe_bluetooth_connections_free_response(msg)) {
+  if (this->check_authenticated_() && !this->send_subscribe_bluetooth_connections_free_response(msg)) {
    this->on_fatal_error();
  }
 }
@@ -779,68 +869,45 @@ void APIServerConnection::on_subscribe_bluetooth_connections_free_request(
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_unsubscribe_bluetooth_le_advertisements_request(
    const UnsubscribeBluetoothLEAdvertisementsRequest &msg) {
-  this->unsubscribe_bluetooth_le_advertisements(msg);
+  if (this->check_authenticated_()) {
+    this->unsubscribe_bluetooth_le_advertisements(msg);
+  }
 }
 #endif
 #ifdef USE_BLUETOOTH_PROXY
 void APIServerConnection::on_bluetooth_scanner_set_mode_request(const BluetoothScannerSetModeRequest &msg) {
-  this->bluetooth_scanner_set_mode(msg);
+  if (this->check_authenticated_()) {
+    this->bluetooth_scanner_set_mode(msg);
+  }
 }
 #endif
 #ifdef USE_VOICE_ASSISTANT
 void APIServerConnection::on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &msg) {
-  this->subscribe_voice_assistant(msg);
+  if (this->check_authenticated_()) {
+    this->subscribe_voice_assistant(msg);
+  }
 }
 #endif
 #ifdef USE_VOICE_ASSISTANT
 void APIServerConnection::on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) {
-  if (!this->send_voice_assistant_get_configuration_response(msg)) {
+  if (this->check_authenticated_() && !this->send_voice_assistant_get_configuration_response(msg)) {
    this->on_fatal_error();
  }
 }
 #endif
 #ifdef USE_VOICE_ASSISTANT
 void APIServerConnection::on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) {
-  this->voice_assistant_set_configuration(msg);
+  if (this->check_authenticated_()) {
+    this->voice_assistant_set_configuration(msg);
+  }
 }
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
 void APIServerConnection::on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) {
-  this->alarm_control_panel_command(msg);
-}
-#endif
-#ifdef USE_ZWAVE_PROXY
-void APIServerConnection::on_z_wave_proxy_frame(const ZWaveProxyFrame &msg) { this->zwave_proxy_frame(msg); }
-#endif
-#ifdef USE_ZWAVE_PROXY
-void APIServerConnection::on_z_wave_proxy_request(const ZWaveProxyRequest &msg) { this->zwave_proxy_request(msg); }
-#endif
-
-void APIServerConnection::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
-  // Check authentication/connection requirements for messages
-  switch (msg_type) {
-    case HelloRequest::MESSAGE_TYPE:  // No setup required
-#ifdef USE_API_PASSWORD
-    case AuthenticationRequest::MESSAGE_TYPE:  // No setup required
-#endif
-    case DisconnectRequest::MESSAGE_TYPE:  // No setup required
-    case PingRequest::MESSAGE_TYPE:        // No setup required
-      break;                               // Skip all checks for these messages
-    case DeviceInfoRequest::MESSAGE_TYPE:  // Connection setup only
-      if (!this->check_connection_setup_()) {
-        return;  // Connection not setup
-      }
-      break;
-    default:
-      // All other messages require authentication (which includes connection check)
-      if (!this->check_authenticated_()) {
-        return;  // Authentication failed
-      }
-      break;
+  if (this->check_authenticated_()) {
+    this->alarm_control_panel_command(msg);
  }
-
-  // Call base implementation to process the message
-  APIServerConnectionBase::read_message(msg_size, msg_type, msg_data);
 }
+#endif

 }  // namespace esphome::api
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -26,9 +26,7 @@ class APIServerConnectionBase : public ProtoService {

  virtual void on_hello_request(const HelloRequest &value){};

-#ifdef USE_API_PASSWORD
-  virtual void on_authentication_request(const AuthenticationRequest &value){};
-#endif
+  virtual void on_connect_request(const ConnectRequest &value){};

  virtual void on_disconnect_request(const DisconnectRequest &value){};
  virtual void on_disconnect_response(const DisconnectResponse &value){};
@@ -73,7 +71,7 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_API_HOMEASSISTANT_STATES
  virtual void on_home_assistant_state_response(const HomeAssistantStateResponse &value){};
 #endif
-
+  virtual void on_get_time_request(const GetTimeRequest &value){};
  virtual void on_get_time_response(const GetTimeResponse &value){};

 #ifdef USE_API_SERVICES
@@ -207,12 +205,6 @@ class APIServerConnectionBase : public ProtoService {

 #ifdef USE_UPDATE
  virtual void on_update_command_request(const UpdateCommandRequest &value){};
-#endif
-#ifdef USE_ZWAVE_PROXY
-  virtual void on_z_wave_proxy_frame(const ZWaveProxyFrame &value){};
-#endif
-#ifdef USE_ZWAVE_PROXY
-  virtual void on_z_wave_proxy_request(const ZWaveProxyRequest &value){};
 #endif
 protected:
  void read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -221,9 +213,7 @@ class APIServerConnectionBase : public ProtoService {
 class APIServerConnection : public APIServerConnectionBase {
 public:
  virtual bool send_hello_response(const HelloRequest &msg) = 0;
-#ifdef USE_API_PASSWORD
-  virtual bool send_authenticate_response(const AuthenticationRequest &msg) = 0;
-#endif
+  virtual bool send_connect_response(const ConnectRequest &msg) = 0;
  virtual bool send_disconnect_response(const DisconnectRequest &msg) = 0;
  virtual bool send_ping_response(const PingRequest &msg) = 0;
  virtual bool send_device_info_response(const DeviceInfoRequest &msg) = 0;
@@ -236,6 +226,7 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_API_HOMEASSISTANT_STATES
  virtual void subscribe_home_assistant_states(const SubscribeHomeAssistantStatesRequest &msg) = 0;
 #endif
+  virtual bool send_get_time_response(const GetTimeRequest &msg) = 0;
 #ifdef USE_API_SERVICES
  virtual void execute_service(const ExecuteServiceRequest &msg) = 0;
 #endif
@@ -341,18 +332,10 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
  virtual void alarm_control_panel_command(const AlarmControlPanelCommandRequest &msg) = 0;
-#endif
-#ifdef USE_ZWAVE_PROXY
-  virtual void zwave_proxy_frame(const ZWaveProxyFrame &msg) = 0;
-#endif
-#ifdef USE_ZWAVE_PROXY
-  virtual void zwave_proxy_request(const ZWaveProxyRequest &msg) = 0;
 #endif
 protected:
  void on_hello_request(const HelloRequest &msg) override;
-#ifdef USE_API_PASSWORD
-  void on_authentication_request(const AuthenticationRequest &msg) override;
-#endif
+  void on_connect_request(const ConnectRequest &msg) override;
  void on_disconnect_request(const DisconnectRequest &msg) override;
  void on_ping_request(const PingRequest &msg) override;
  void on_device_info_request(const DeviceInfoRequest &msg) override;
@@ -365,6 +348,7 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_API_HOMEASSISTANT_STATES
  void on_subscribe_home_assistant_states_request(const SubscribeHomeAssistantStatesRequest &msg) override;
 #endif
+  void on_get_time_request(const GetTimeRequest &msg) override;
 #ifdef USE_API_SERVICES
  void on_execute_service_request(const ExecuteServiceRequest &msg) override;
 #endif
@@ -471,13 +455,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_ALARM_CONTROL_PANEL
  void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) override;
 #endif
-#ifdef USE_ZWAVE_PROXY
-  void on_z_wave_proxy_frame(const ZWaveProxyFrame &msg) override;
-#endif
-#ifdef USE_ZWAVE_PROXY
-  void on_z_wave_proxy_request(const ZWaveProxyRequest &msg) override;
-#endif
-  void read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
 };

 }  // namespace esphome::api
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -37,14 +37,12 @@ void APIServer::setup() {

  this->noise_pref_ = global_preferences->make_preference<SavedNoisePsk>(hash, true);

-#ifndef USE_API_NOISE_PSK_FROM_YAML
-  // Only load saved PSK if not set from YAML
  SavedNoisePsk noise_pref_saved{};
  if (this->noise_pref_.load(&noise_pref_saved)) {
    ESP_LOGD(TAG, "Loaded saved Noise PSK");
+
    this->set_noise_psk(noise_pref_saved.psk);
  }
-#endif
 #endif

  // Schedule reboot if no clients connect within timeout
@@ -87,7 +85,7 @@ void APIServer::setup() {
    return;
  }

-  err = this->socket_->listen(this->listen_backlog_);
+  err = this->socket_->listen(4);
  if (err != 0) {
    ESP_LOGW(TAG, "Socket unable to listen: errno %d", errno);
    this->mark_failed();
@@ -140,19 +138,9 @@ void APIServer::loop() {
    while (true) {
      struct sockaddr_storage source_addr;
      socklen_t addr_len = sizeof(source_addr);
-
      auto sock = this->socket_->accept_loop_monitored((struct sockaddr *) &source_addr, &addr_len);
      if (!sock)
        break;
-
-      // Check if we're at the connection limit
-      if (this->clients_.size() >= this->max_connections_) {
-        ESP_LOGW(TAG, "Max connections (%d), rejecting %s", this->max_connections_, sock->getpeername().c_str());
-        // Immediately close - socket destructor will handle cleanup
-        sock.reset();
-        continue;
-      }
-
      ESP_LOGD(TAG, "Accept %s", sock->getpeername().c_str());

      auto *conn = new APIConnection(std::move(sock), this);
@@ -177,8 +165,7 @@ void APIServer::loop() {
    // Network is down - disconnect all clients
    for (auto &client : this->clients_) {
      client->on_fatal_error();
-      ESP_LOGW(TAG, "%s (%s): Network down; disconnect", client->client_info_.name.c_str(),
-               client->client_info_.peername.c_str());
+      ESP_LOGW(TAG, "%s: Network down; disconnect", client->get_client_combined_info().c_str());
    }
    // Continue to process and clean up the clients below
  }
@@ -217,10 +204,8 @@ void APIServer::loop() {
 void APIServer::dump_config() {
  ESP_LOGCONFIG(TAG,
                "Server:\n"
-                "  Address: %s:%u\n"
-                "  Listen backlog: %u\n"
-                "  Max connections: %u",
-                network::get_use_address().c_str(), this->port_, this->listen_backlog_, this->max_connections_);
+                "  Address: %s:%u",
+                network::get_use_address().c_str(), this->port_);
 #ifdef USE_API_NOISE
  ESP_LOGCONFIG(TAG, "  Noise encryption: %s", YESNO(this->noise_ctx_->has_psk()));
  if (!this->noise_ctx_->has_psk()) {
@@ -232,12 +217,12 @@ void APIServer::dump_config() {
 }

 #ifdef USE_API_PASSWORD
-bool APIServer::check_password(const uint8_t *password_data, size_t password_len) const {
+bool APIServer::check_password(const std::string &password) const {
  // depend only on input password length
  const char *a = this->password_.c_str();
  uint32_t len_a = this->password_.length();
-  const char *b = reinterpret_cast<const char *>(password_data);
-  uint32_t len_b = password_len;
+  const char *b = password.c_str();
+  uint32_t len_b = password.length();

  // disable optimization with volatile
  volatile uint32_t length = len_b;
@@ -260,7 +245,6 @@ bool APIServer::check_password(const uint8_t *password_data, size_t password_len

  return result == 0;
 }
-
 #endif

 void APIServer::handle_disconnect(APIConnection *conn) {}
@@ -371,15 +355,6 @@ void APIServer::on_update(update::UpdateEntity *obj) {
 }
 #endif

-#ifdef USE_ZWAVE_PROXY
-void APIServer::on_zwave_proxy_request(const esphome::api::ProtoMessage &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->clients_)
-    c->send_message(msg, api::ZWaveProxyRequest::MESSAGE_TYPE);
-}
-#endif
-
 #ifdef USE_ALARM_CONTROL_PANEL
 API_DISPATCH_UPDATE(alarm_control_panel::AlarmControlPanel, alarm_control_panel)
 #endif
@@ -395,9 +370,9 @@ void APIServer::set_password(const std::string &password) { this->password_ = pa
 void APIServer::set_batch_delay(uint16_t batch_delay) { this->batch_delay_ = batch_delay; }

 #ifdef USE_API_HOMEASSISTANT_SERVICES
-void APIServer::send_homeassistant_action(const HomeassistantActionRequest &call) {
+void APIServer::send_homeassistant_service_call(const HomeassistantServiceResponse &call) {
  for (auto &client : this->clients_) {
-    client->send_homeassistant_action(call);
+    client->send_homeassistant_service_call(call);
  }
 }
 #endif
@@ -434,12 +409,6 @@ void APIServer::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeo

 #ifdef USE_API_NOISE
 bool APIServer::save_noise_psk(psk_t psk, bool make_active) {
-#ifdef USE_API_NOISE_PSK_FROM_YAML
-  // When PSK is set from YAML, this function should never be called
-  // but if it is, reject the change
-  ESP_LOGW(TAG, "Key set in YAML");
-  return false;
-#else
  auto &old_psk = this->noise_ctx_->get_psk();
  if (std::equal(old_psk.begin(), old_psk.end(), psk.begin())) {
    ESP_LOGW(TAG, "New PSK matches old");
@@ -468,7 +437,6 @@ bool APIServer::save_noise_psk(psk_t psk, bool make_active) {
    });
  }
  return true;
-#endif
 }
 #endif

--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -37,15 +37,13 @@ class APIServer : public Component, public Controller {
  void on_shutdown() override;
  bool teardown() override;
 #ifdef USE_API_PASSWORD
-  bool check_password(const uint8_t *password_data, size_t password_len) const;
+  bool check_password(const std::string &password) const;
  void set_password(const std::string &password);
 #endif
  void set_port(uint16_t port);
  void set_reboot_timeout(uint32_t reboot_timeout);
  void set_batch_delay(uint16_t batch_delay);
  uint16_t get_batch_delay() const { return batch_delay_; }
-  void set_listen_backlog(uint8_t listen_backlog) { this->listen_backlog_ = listen_backlog; }
-  void set_max_connections(uint8_t max_connections) { this->max_connections_ = max_connections; }

  // Get reference to shared buffer for API connections
  std::vector<uint8_t> &get_shared_buffer_ref() { return shared_write_buffer_; }
@@ -109,8 +107,7 @@ class APIServer : public Component, public Controller {
  void on_media_player_update(media_player::MediaPlayer *obj) override;
 #endif
 #ifdef USE_API_HOMEASSISTANT_SERVICES
-  void send_homeassistant_action(const HomeassistantActionRequest &call);
-
+  void send_homeassistant_service_call(const HomeassistantServiceResponse &call);
 #endif
 #ifdef USE_API_SERVICES
  void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
@@ -128,9 +125,6 @@ class APIServer : public Component, public Controller {
 #ifdef USE_UPDATE
  void on_update(update::UpdateEntity *obj) override;
 #endif
-#ifdef USE_ZWAVE_PROXY
-  void on_zwave_proxy_request(const esphome::api::ProtoMessage &msg);
-#endif

  bool is_connected() const;

@@ -191,12 +185,8 @@ class APIServer : public Component, public Controller {
  // Group smaller types together
  uint16_t port_{6053};
  uint16_t batch_delay_{100};
-  // Connection limits - these defaults will be overridden by config values
-  // from cv.SplitDefault in __init__.py which sets platform-specific defaults
-  uint8_t listen_backlog_{4};
-  uint8_t max_connections_{8};
  bool shutting_down_ = false;
-  // 7 bytes used, 1 byte padding
+  // 5 bytes used, 3 bytes padding

 #ifdef USE_API_NOISE
  std::shared_ptr<APINoiseContext> noise_ctx_ = std::make_shared<APINoiseContext>();
--- a/esphome/components/api/custom_api_device.h
+++ b/esphome/components/api/custom_api_device.h
@@ -179,9 +179,9 @@ class CustomAPIDevice {
   * @param service_name The service to call.
   */
  void call_homeassistant_service(const std::string &service_name) {
-    HomeassistantActionRequest resp;
+    HomeassistantServiceResponse resp;
    resp.set_service(StringRef(service_name));
-    global_api_server->send_homeassistant_action(resp);
+    global_api_server->send_homeassistant_service_call(resp);
  }

  /** Call a Home Assistant service from ESPHome.
@@ -199,7 +199,7 @@ class CustomAPIDevice {
   * @param data The data for the service call, mapping from string to string.
   */
  void call_homeassistant_service(const std::string &service_name, const std::map<std::string, std::string> &data) {
-    HomeassistantActionRequest resp;
+    HomeassistantServiceResponse resp;
    resp.set_service(StringRef(service_name));
    for (auto &it : data) {
      resp.data.emplace_back();
@@ -207,7 +207,7 @@ class CustomAPIDevice {
      kv.set_key(StringRef(it.first));
      kv.value = it.second;
    }
-    global_api_server->send_homeassistant_action(resp);
+    global_api_server->send_homeassistant_service_call(resp);
  }

  /** Fire an ESPHome event in Home Assistant.
@@ -221,10 +221,10 @@ class CustomAPIDevice {
   * @param event_name The event to fire.
   */
  void fire_homeassistant_event(const std::string &event_name) {
-    HomeassistantActionRequest resp;
+    HomeassistantServiceResponse resp;
    resp.set_service(StringRef(event_name));
    resp.is_event = true;
-    global_api_server->send_homeassistant_action(resp);
+    global_api_server->send_homeassistant_service_call(resp);
  }

  /** Fire an ESPHome event in Home Assistant.
@@ -241,7 +241,7 @@ class CustomAPIDevice {
   * @param data The data for the event, mapping from string to string.
   */
  void fire_homeassistant_event(const std::string &service_name, const std::map<std::string, std::string> &data) {
-    HomeassistantActionRequest resp;
+    HomeassistantServiceResponse resp;
    resp.set_service(StringRef(service_name));
    resp.is_event = true;
    for (auto &it : data) {
@@ -250,7 +250,7 @@ class CustomAPIDevice {
      kv.set_key(StringRef(it.first));
      kv.value = it.second;
    }
-    global_api_server->send_homeassistant_action(resp);
+    global_api_server->send_homeassistant_service_call(resp);
  }
 #else
  template<typename T = void> void call_homeassistant_service(const std::string &service_name) {
--- a/esphome/components/api/homeassistant_service.h
+++ b/esphome/components/api/homeassistant_service.h
@@ -3,10 +3,10 @@
 #include "api_server.h"
 #ifdef USE_API
 #ifdef USE_API_HOMEASSISTANT_SERVICES
-#include <vector>
 #include "api_pb2.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/helpers.h"
+#include <vector>

 namespace esphome::api {

@@ -62,7 +62,7 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
  }

  void play(Ts... x) override {
-    HomeassistantActionRequest resp;
+    HomeassistantServiceResponse resp;
    std::string service_value = this->service_.value(x...);
    resp.set_service(StringRef(service_value));
    resp.is_event = this->is_event_;
@@ -84,7 +84,7 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
      kv.set_key(StringRef(it.key));
      kv.value = it.value.value(x...);
    }
-    this->parent_->send_homeassistant_action(resp);
+    this->parent_->send_homeassistant_service_call(resp);
  }

 protected:
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -182,10 +182,6 @@ class ProtoLengthDelimited {
  explicit ProtoLengthDelimited(const uint8_t *value, size_t length) : value_(value), length_(length) {}
  std::string as_string() const { return std::string(reinterpret_cast<const char *>(this->value_), this->length_); }

-  // Direct access to raw data without string allocation
-  const uint8_t *data() const { return this->value_; }
-  size_t size() const { return this->length_; }
-
  /**
   * Decode the length-delimited data into an existing ProtoDecodableMessage instance.
   *
@@ -831,7 +827,7 @@ class ProtoService {
  }

  // Authentication helper methods
-  inline bool check_connection_setup_() {
+  bool check_connection_setup_() {
    if (!this->is_connection_setup()) {
      this->on_no_setup_connection();
      return false;
@@ -839,7 +835,7 @@ class ProtoService {
    return true;
  }

-  inline bool check_authenticated_() {
+  bool check_authenticated_() {
 #ifdef USE_API_PASSWORD
    if (!this->check_connection_setup_()) {
      return false;
--- a/esphome/components/api/user_services.h
+++ b/esphome/components/api/user_services.h
@@ -55,7 +55,7 @@ template<typename... Ts> class UserServiceBase : public UserServiceDescriptor {

 protected:
  virtual void execute(Ts... x) = 0;
-  template<int... S> void execute_(const std::vector<ExecuteServiceArgument> &args, seq<S...> type) {
+  template<int... S> void execute_(std::vector<ExecuteServiceArgument> args, seq<S...> type) {
    this->execute((get_execute_arg_value<Ts>(args[S]))...);
  }

--- a/esphome/components/as7341/sensor.py
+++ b/esphome/components/as7341/sensor.py
@@ -2,7 +2,6 @@ import esphome.codegen as cg
 from esphome.components import i2c, sensor
 import esphome.config_validation as cv
 from esphome.const import (
-    CONF_CLEAR,
    CONF_GAIN,
    CONF_ID,
    DEVICE_CLASS_ILLUMINANCE,
@@ -30,6 +29,7 @@ CONF_F5 = "f5"
 CONF_F6 = "f6"
 CONF_F7 = "f7"
 CONF_F8 = "f8"
+CONF_CLEAR = "clear"
 CONF_NIR = "nir"

 UNIT_COUNTS = "#"
--- a/esphome/components/bluetooth_proxy/init.py
+++ b/esphome/components/bluetooth_proxy/init.py
@@ -6,6 +6,8 @@ from esphome.components.esp32 import add_idf_sdkconfig_option
 from esphome.components.esp32_ble import BTLoggers
 import esphome.config_validation as cv
 from esphome.const import CONF_ACTIVE, CONF_ID
+from esphome.core import CORE
+from esphome.log import AnsiFore, color

 AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
 DEPENDENCIES = ["api", "esp32"]
@@ -46,6 +48,26 @@ def validate_connections(config):
            config
        )

+        # Warn about connection slot waste when using Arduino framework
+        if CORE.using_arduino and connection_slots:
+            _LOGGER.warning(
+                "Bluetooth Proxy with active connections on Arduino framework has suboptimal performance.\n"
+                "If BLE connections fail, they can waste connection slots for 10 seconds because\n"
+                "Arduino doesn't allow configuring the BLE connection timeout (fixed at 30s).\n"
+                "ESP-IDF framework allows setting it to 20s to match client timeouts.\n"
+                "\n"
+                "To switch to ESP-IDF, add this to your YAML:\n"
+                "  esp32:\n"
+                "    framework:\n"
+                "      type: esp-idf\n"
+                "\n"
+                "For detailed migration instructions, see:\n"
+                "%s",
+                color(
+                    AnsiFore.BLUE, "https://esphome.io/guides/esp32_arduino_to_idf.html"
+                ),
+            )
+
        return {
            **config,
            CONF_CONNECTIONS: [CONNECTION_SCHEMA({}) for _ in range(connection_slots)],
@@ -59,17 +81,19 @@ CONFIG_SCHEMA = cv.All(
            {
                cv.GenerateID(): cv.declare_id(BluetoothProxy),
                cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
-                cv.Optional(CONF_CACHE_SERVICES, default=True): cv.boolean,
+                cv.SplitDefault(CONF_CACHE_SERVICES, esp32_idf=True): cv.All(
+                    cv.only_with_esp_idf, cv.boolean
+                ),
                cv.Optional(
                    CONF_CONNECTION_SLOTS,
                    default=DEFAULT_CONNECTION_SLOTS,
                ): cv.All(
                    cv.positive_int,
-                    cv.Range(min=1, max=esp32_ble_tracker.IDF_MAX_CONNECTIONS),
+                    cv.Range(min=1, max=esp32_ble_tracker.max_connections()),
                ),
                cv.Optional(CONF_CONNECTIONS): cv.All(
                    cv.ensure_list(CONNECTION_SCHEMA),
-                    cv.Length(min=1, max=esp32_ble_tracker.IDF_MAX_CONNECTIONS),
+                    cv.Length(min=1, max=esp32_ble_tracker.max_connections()),
                ),
            }
        )
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -514,8 +514,7 @@ esp_err_t BluetoothConnection::read_characteristic(uint16_t handle) {
  return this->check_and_log_error_("esp_ble_gattc_read_char", err);
 }

-esp_err_t BluetoothConnection::write_characteristic(uint16_t handle, const uint8_t *data, size_t length,
-                                                    bool response) {
+esp_err_t BluetoothConnection::write_characteristic(uint16_t handle, const std::string &data, bool response) {
  if (!this->connected()) {
    this->log_gatt_not_connected_("write", "characteristic");
    return ESP_GATT_NOT_CONNECTED;
@@ -523,11 +522,8 @@ esp_err_t BluetoothConnection::write_characteristic(uint16_t handle, const uint8
  ESP_LOGV(TAG, "[%d] [%s] Writing GATT characteristic handle %d", this->connection_index_, this->address_str_.c_str(),
           handle);

-  // ESP-IDF's API requires a non-const uint8_t* but it doesn't modify the data
-  // The BTC layer immediately copies the data to its own buffer (see btc_gattc.c)
-  // const_cast is safe here and was previously hidden by a C-style cast
  esp_err_t err =
-      esp_ble_gattc_write_char(this->gattc_if_, this->conn_id_, handle, length, const_cast<uint8_t *>(data),
+      esp_ble_gattc_write_char(this->gattc_if_, this->conn_id_, handle, data.size(), (uint8_t *) data.data(),
                               response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
  return this->check_and_log_error_("esp_ble_gattc_write_char", err);
 }
@@ -544,7 +540,7 @@ esp_err_t BluetoothConnection::read_descriptor(uint16_t handle) {
  return this->check_and_log_error_("esp_ble_gattc_read_char_descr", err);
 }

-esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const uint8_t *data, size_t length, bool response) {
+esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const std::string &data, bool response) {
  if (!this->connected()) {
    this->log_gatt_not_connected_("write", "descriptor");
    return ESP_GATT_NOT_CONNECTED;
@@ -552,11 +548,8 @@ esp_err_t BluetoothConnection::write_descriptor(uint16_t handle, const uint8_t *
  ESP_LOGV(TAG, "[%d] [%s] Writing GATT descriptor handle %d", this->connection_index_, this->address_str_.c_str(),
           handle);

-  // ESP-IDF's API requires a non-const uint8_t* but it doesn't modify the data
-  // The BTC layer immediately copies the data to its own buffer (see btc_gattc.c)
-  // const_cast is safe here and was previously hidden by a C-style cast
  esp_err_t err = esp_ble_gattc_write_char_descr(
-      this->gattc_if_, this->conn_id_, handle, length, const_cast<uint8_t *>(data),
+      this->gattc_if_, this->conn_id_, handle, data.size(), (uint8_t *) data.data(),
      response ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP, ESP_GATT_AUTH_REQ_NONE);
  return this->check_and_log_error_("esp_ble_gattc_write_char_descr", err);
 }
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.h
@@ -18,9 +18,9 @@ class BluetoothConnection final : public esp32_ble_client::BLEClientBase {
  esp32_ble_tracker::AdvertisementParserType get_advertisement_parser_type() override;

  esp_err_t read_characteristic(uint16_t handle);
-  esp_err_t write_characteristic(uint16_t handle, const uint8_t *data, size_t length, bool response);
+  esp_err_t write_characteristic(uint16_t handle, const std::string &data, bool response);
  esp_err_t read_descriptor(uint16_t handle);
-  esp_err_t write_descriptor(uint16_t handle, const uint8_t *data, size_t length, bool response);
+  esp_err_t write_descriptor(uint16_t handle, const std::string &data, bool response);

  esp_err_t notify_characteristic(uint16_t handle, bool enable);

--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -305,7 +305,7 @@ void BluetoothProxy::bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &
    return;
  }

-  auto err = connection->write_characteristic(msg.handle, msg.data, msg.data_len, msg.response);
+  auto err = connection->write_characteristic(msg.handle, msg.data, msg.response);
  if (err != ESP_OK) {
    this->send_gatt_error(msg.address, msg.handle, err);
  }
@@ -331,7 +331,7 @@ void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWri
    return;
  }

-  auto err = connection->write_descriptor(msg.handle, msg.data, msg.data_len, true);
+  auto err = connection->write_descriptor(msg.handle, msg.data, true);
  if (err != ESP_OK) {
    this->send_gatt_error(msg.address, msg.handle, err);
  }
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.h
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.h
@@ -130,9 +130,7 @@ class BluetoothProxy final : public esp32_ble_tracker::ESPBTDeviceListener, publ

  std::string get_bluetooth_mac_address_pretty() {
    const uint8_t *mac = esp_bt_dev_get_address();
-    char buf[18];
-    format_mac_addr_upper(mac, buf);
-    return std::string(buf);
+    return str_snprintf("%02X:%02X:%02X:%02X:%02X:%02X", 17, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
  }

 protected:
--- a/esphome/components/camera_encoder/init.py
+++ b/esphome/components/camera_encoder/init.py
@@ -2,6 +2,7 @@ import esphome.codegen as cg
 from esphome.components.esp32 import add_idf_component
 import esphome.config_validation as cv
 from esphome.const import CONF_BUFFER_SIZE, CONF_ID, CONF_TYPE
+from esphome.core import CORE
 from esphome.types import ConfigType

 CODEOWNERS = ["@DT-art1"]
@@ -50,8 +51,9 @@ async def to_code(config: ConfigType) -> None:
    buffer = cg.new_Pvariable(config[CONF_ENCODER_BUFFER_ID])
    cg.add(buffer.set_buffer_size(config[CONF_BUFFER_SIZE]))
    if config[CONF_TYPE] == ESP32_CAMERA_ENCODER:
-        add_idf_component(name="espressif/esp32-camera", ref="2.1.1")
-        cg.add_define("USE_ESP32_CAMERA_JPEG_ENCODER")
+        if CORE.using_esp_idf:
+            add_idf_component(name="espressif/esp32-camera", ref="2.1.0")
+        cg.add_build_flag("-DUSE_ESP32_CAMERA_JPEG_ENCODER")
        var = cg.new_Pvariable(
            config[CONF_ID],
            config[CONF_QUALITY],
--- a/esphome/components/camera_encoder/esp32_camera_jpeg_encoder.cpp
+++ b/esphome/components/camera_encoder/esp32_camera_jpeg_encoder.cpp
@@ -1,5 +1,3 @@
-#include "esphome/core/defines.h"
-
 #ifdef USE_ESP32_CAMERA_JPEG_ENCODER

 #include "esp32_camera_jpeg_encoder.h"
@@ -17,7 +15,7 @@ camera::EncoderError ESP32CameraJPEGEncoder::encode_pixels(camera::CameraImageSp
  this->bytes_written_ = 0;
  this->out_of_output_memory_ = false;
  bool success = fmt2jpg_cb(pixels->get_data_buffer(), pixels->get_data_length(), spec->width, spec->height,
-                            to_internal_(spec->format), this->quality_, callback, this);
+                            to_internal_(spec->format), this->quality_, callback_, this);

  if (!success)
    return camera::ENCODER_ERROR_CONFIGURATION;
@@ -51,7 +49,7 @@ void ESP32CameraJPEGEncoder::dump_config() {
                this->output_->get_max_size(), this->quality_, this->buffer_expand_size_);
 }

-size_t ESP32CameraJPEGEncoder::callback(void *arg, size_t index, const void *data, size_t len) {
+size_t ESP32CameraJPEGEncoder::callback_(void *arg, size_t index, const void *data, size_t len) {
  ESP32CameraJPEGEncoder *that = reinterpret_cast<ESP32CameraJPEGEncoder *>(arg);
  uint8_t *buffer = that->output_->get_data();
  size_t buffer_length = that->output_->get_max_size();
--- a/esphome/components/camera_encoder/esp32_camera_jpeg_encoder.h
+++ b/esphome/components/camera_encoder/esp32_camera_jpeg_encoder.h
@@ -1,7 +1,5 @@
 #pragma once

-#include "esphome/core/defines.h"
-
 #ifdef USE_ESP32_CAMERA_JPEG_ENCODER

 #include <esp_camera.h>
@@ -26,7 +24,7 @@ class ESP32CameraJPEGEncoder : public camera::Encoder {
  void dump_config() override;
  // -------------------------
 protected:
-  static size_t callback(void *arg, size_t index, const void *data, size_t len);
+  static size_t callback_(void *arg, size_t index, const void *data, size_t len);
  pixformat_t to_internal_(camera::PixelFormat format);

  camera::EncoderBuffer *output_{};
--- a/esphome/components/canbus/canbus.cpp
+++ b/esphome/components/canbus/canbus.cpp
@@ -21,8 +21,8 @@ void Canbus::dump_config() {
  }
 }

-canbus::Error Canbus::send_data(uint32_t can_id, bool use_extended_id, bool remote_transmission_request,
-                                const std::vector<uint8_t> &data) {
+void Canbus::send_data(uint32_t can_id, bool use_extended_id, bool remote_transmission_request,
+                       const std::vector<uint8_t> &data) {
  struct CanFrame can_message;

  uint8_t size = static_cast<uint8_t>(data.size());
@@ -45,15 +45,13 @@ canbus::Error Canbus::send_data(uint32_t can_id, bool use_extended_id, bool remo
    ESP_LOGVV(TAG, "  data[%d]=%02x", i, can_message.data[i]);
  }

-  canbus::Error error = this->send_message(&can_message);
-  if (error != canbus::ERROR_OK) {
+  if (this->send_message(&can_message) != canbus::ERROR_OK) {
    if (use_extended_id) {
-      ESP_LOGW(TAG, "send to extended id=0x%08" PRIx32 " failed with error %d!", can_id, error);
+      ESP_LOGW(TAG, "send to extended id=0x%08" PRIx32 " failed!", can_id);
    } else {
-      ESP_LOGW(TAG, "send to standard id=0x%03" PRIx32 " failed with error %d!", can_id, error);
+      ESP_LOGW(TAG, "send to standard id=0x%03" PRIx32 " failed!", can_id);
    }
  }
-  return error;
 }

 void Canbus::add_trigger(CanbusTrigger *trigger) {
--- a/esphome/components/canbus/canbus.h
+++ b/esphome/components/canbus/canbus.h
@@ -70,11 +70,11 @@ class Canbus : public Component {
  float get_setup_priority() const override { return setup_priority::HARDWARE; }
  void loop() override;

-  canbus::Error send_data(uint32_t can_id, bool use_extended_id, bool remote_transmission_request,
-                          const std::vector<uint8_t> &data);
-  canbus::Error send_data(uint32_t can_id, bool use_extended_id, const std::vector<uint8_t> &data) {
+  void send_data(uint32_t can_id, bool use_extended_id, bool remote_transmission_request,
+                 const std::vector<uint8_t> &data);
+  void send_data(uint32_t can_id, bool use_extended_id, const std::vector<uint8_t> &data) {
    // for backwards compatibility only
-    return this->send_data(can_id, use_extended_id, false, data);
+    this->send_data(can_id, use_extended_id, false, data);
  }
  void set_can_id(uint32_t can_id) { this->can_id_ = can_id; }
  void set_use_extended_id(bool use_extended_id) { this->use_extended_id_ = use_extended_id; }
--- a/esphome/components/captive_portal/init.py
+++ b/esphome/components/captive_portal/init.py
@@ -1,7 +1,6 @@
 import esphome.codegen as cg
 from esphome.components import web_server_base
 from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
-from esphome.config_helpers import filter_source_files_from_platform
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_ID,
@@ -10,19 +9,10 @@ from esphome.const import (
    PLATFORM_ESP8266,
    PLATFORM_LN882X,
    PLATFORM_RTL87XX,
-    PlatformFramework,
 )
-from esphome.core import CORE, coroutine_with_priority
-from esphome.coroutine import CoroPriority
-
-
-def AUTO_LOAD() -> list[str]:
-    auto_load = ["web_server_base", "ota.web_server"]
-    if CORE.using_esp_idf:
-        auto_load.append("socket")
-    return auto_load
-
+from esphome.core import CORE, CoroPriority, coroutine_with_priority

+AUTO_LOAD = ["web_server_base", "ota.web_server"]
 DEPENDENCIES = ["wifi"]
 CODEOWNERS = ["@esphome/core"]

@@ -50,7 +40,7 @@ CONFIG_SCHEMA = cv.All(
 )


-@coroutine_with_priority(CoroPriority.CAPTIVE_PORTAL)
+@coroutine_with_priority(CoroPriority.COMMUNICATION)
 async def to_code(config):
    paren = await cg.get_variable(config[CONF_WEB_SERVER_BASE_ID])

@@ -67,11 +57,3 @@ async def to_code(config):
            cg.add_library("DNSServer", None)
        if CORE.is_libretiny:
            cg.add_library("DNSServer", None)
-
-
-# Only compile the ESP-IDF DNS server when using ESP-IDF framework
-FILTER_SOURCE_FILES = filter_source_files_from_platform(
-    {
-        "dns_server_esp32_idf.cpp": {PlatformFramework.ESP32_IDF},
-    }
-)
--- a/esphome/components/captive_portal/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -11,14 +11,14 @@ namespace captive_portal {
 static const char *const TAG = "captive_portal";

 void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
-  AsyncResponseStream *stream = request->beginResponseStream(ESPHOME_F("application/json"));
-  stream->addHeader(ESPHOME_F("cache-control"), ESPHOME_F("public, max-age=0, must-revalidate"));
+  AsyncResponseStream *stream = request->beginResponseStream(F("application/json"));
+  stream->addHeader(F("cache-control"), F("public, max-age=0, must-revalidate"));
 #ifdef USE_ESP8266
-  stream->print(ESPHOME_F("{\"mac\":\""));
+  stream->print(F("{\"mac\":\""));
  stream->print(get_mac_address_pretty().c_str());
-  stream->print(ESPHOME_F("\",\"name\":\""));
+  stream->print(F("\",\"name\":\""));
  stream->print(App.get_name().c_str());
-  stream->print(ESPHOME_F("\",\"aps\":[{}"));
+  stream->print(F("\",\"aps\":[{}"));
 #else
  stream->printf(R"({"mac":"%s","name":"%s","aps":[{})", get_mac_address_pretty().c_str(), App.get_name().c_str());
 #endif
@@ -29,35 +29,37 @@ void CaptivePortal::handle_config(AsyncWebServerRequest *request) {

      // Assumes no " in ssid, possible unicode isses?
 #ifdef USE_ESP8266
-    stream->print(ESPHOME_F(",{\"ssid\":\""));
+    stream->print(F(",{\"ssid\":\""));
    stream->print(scan.get_ssid().c_str());
-    stream->print(ESPHOME_F("\",\"rssi\":"));
+    stream->print(F("\",\"rssi\":"));
    stream->print(scan.get_rssi());
-    stream->print(ESPHOME_F(",\"lock\":"));
+    stream->print(F(",\"lock\":"));
    stream->print(scan.get_with_auth());
-    stream->print(ESPHOME_F("}"));
+    stream->print(F("}"));
 #else
    stream->printf(R"(,{"ssid":"%s","rssi":%d,"lock":%d})", scan.get_ssid().c_str(), scan.get_rssi(),
                   scan.get_with_auth());
 #endif
  }
-  stream->print(ESPHOME_F("]}"));
+  stream->print(F("]}"));
  request->send(stream);
 }
 void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
-  std::string ssid = request->arg("ssid").c_str();  // NOLINT(readability-redundant-string-cstr)
-  std::string psk = request->arg("psk").c_str();    // NOLINT(readability-redundant-string-cstr)
+  std::string ssid = request->arg("ssid").c_str();
+  std::string psk = request->arg("psk").c_str();
  ESP_LOGI(TAG, "Requested WiFi Settings Change:");
  ESP_LOGI(TAG, "  SSID='%s'", ssid.c_str());
  ESP_LOGI(TAG, "  Password=" LOG_SECRET("'%s'"), psk.c_str());
  wifi::global_wifi_component->save_wifi_sta(ssid, psk);
  wifi::global_wifi_component->start_scanning();
-  request->redirect(ESPHOME_F("/?save"));
+  request->redirect(F("/?save"));
 }

 void CaptivePortal::setup() {
-  // Disable loop by default - will be enabled when captive portal starts
+#ifndef USE_ARDUINO
+  // No DNS server needed for non-Arduino frameworks
  this->disable_loop();
+#endif
 }
 void CaptivePortal::start() {
  this->base_->init();
@@ -65,47 +67,51 @@ void CaptivePortal::start() {
    this->base_->add_handler(this);
  }

-  network::IPAddress ip = wifi::global_wifi_component->wifi_soft_ap_ip();
-
-#ifdef USE_ESP_IDF
-  // Create DNS server instance for ESP-IDF
-  this->dns_server_ = make_unique<DNSServer>();
-  this->dns_server_->start(ip);
-#endif
 #ifdef USE_ARDUINO
  this->dns_server_ = make_unique<DNSServer>();
  this->dns_server_->setErrorReplyCode(DNSReplyCode::NoError);
-  this->dns_server_->start(53, ESPHOME_F("*"), ip);
+  network::IPAddress ip = wifi::global_wifi_component->wifi_soft_ap_ip();
+  this->dns_server_->start(53, F("*"), ip);
+  // Re-enable loop() when DNS server is started
+  this->enable_loop();
 #endif

+  this->base_->get_server()->onNotFound([this](AsyncWebServerRequest *req) {
+    if (!this->active_ || req->host().c_str() == wifi::global_wifi_component->wifi_soft_ap_ip().str()) {
+      req->send(404, F("text/html"), F("File not found"));
+      return;
+    }
+
+#ifdef USE_ESP8266
+    String url = F("http://");
+    url += wifi::global_wifi_component->wifi_soft_ap_ip().str().c_str();
+#else
+    auto url = "http://" + wifi::global_wifi_component->wifi_soft_ap_ip().str();
+#endif
+    req->redirect(url.c_str());
+  });
+
  this->initialized_ = true;
  this->active_ = true;
-
-  // Enable loop() now that captive portal is active
-  this->enable_loop();
-
-  ESP_LOGV(TAG, "Captive portal started");
 }

 void CaptivePortal::handleRequest(AsyncWebServerRequest *req) {
-  if (req->url() == ESPHOME_F("/config.json")) {
+  if (req->url() == F("/")) {
+#ifndef USE_ESP8266
+    auto *response = req->beginResponse(200, F("text/html"), INDEX_GZ, sizeof(INDEX_GZ));
+#else
+    auto *response = req->beginResponse_P(200, F("text/html"), INDEX_GZ, sizeof(INDEX_GZ));
+#endif
+    response->addHeader(F("Content-Encoding"), F("gzip"));
+    req->send(response);
+    return;
+  } else if (req->url() == F("/config.json")) {
    this->handle_config(req);
    return;
-  } else if (req->url() == ESPHOME_F("/wifisave")) {
+  } else if (req->url() == F("/wifisave")) {
    this->handle_wifisave(req);
    return;
  }
-
-  // All other requests get the captive portal page
-  // This includes OS captive portal detection endpoints which will trigger
-  // the captive portal when they don't receive their expected responses
-#ifndef USE_ESP8266
-  auto *response = req->beginResponse(200, ESPHOME_F("text/html"), INDEX_GZ, sizeof(INDEX_GZ));
-#else
-  auto *response = req->beginResponse_P(200, ESPHOME_F("text/html"), INDEX_GZ, sizeof(INDEX_GZ));
-#endif
-  response->addHeader(ESPHOME_F("Content-Encoding"), ESPHOME_F("gzip"));
-  req->send(response);
 }

 CaptivePortal::CaptivePortal(web_server_base::WebServerBase *base) : base_(base) { global_captive_portal = this; }
--- a/esphome/components/captive_portal/captive_portal.h
+++ b/esphome/components/captive_portal/captive_portal.h
@@ -5,9 +5,6 @@
 #ifdef USE_ARDUINO
 #include <DNSServer.h>
 #endif
-#ifdef USE_ESP_IDF
-#include "dns_server_esp32_idf.h"
-#endif
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/preferences.h"
@@ -22,36 +19,41 @@ class CaptivePortal : public AsyncWebHandler, public Component {
  CaptivePortal(web_server_base::WebServerBase *base);
  void setup() override;
  void dump_config() override;
-  void loop() override {
 #ifdef USE_ARDUINO
+  void loop() override {
    if (this->dns_server_ != nullptr) {
      this->dns_server_->processNextRequest();
+    } else {
+      this->disable_loop();
    }
-#endif
-#ifdef USE_ESP_IDF
-    if (this->dns_server_ != nullptr) {
-      this->dns_server_->process_next_request();
-    }
-#endif
  }
+#endif
  float get_setup_priority() const override;
  void start();
  bool is_active() const { return this->active_; }
  void end() {
    this->active_ = false;
-    this->disable_loop();  // Stop processing DNS requests
    this->base_->deinit();
-    if (this->dns_server_ != nullptr) {
-      this->dns_server_->stop();
-      this->dns_server_ = nullptr;
-    }
+#ifdef USE_ARDUINO
+    this->dns_server_->stop();
+    this->dns_server_ = nullptr;
+#endif
  }

  bool canHandle(AsyncWebServerRequest *request) const override {
-    // Handle all GET requests when captive portal is active
-    // This allows us to respond with the portal page for any URL,
-    // triggering OS captive portal detection
-    return this->active_ && request->method() == HTTP_GET;
+    if (!this->active_)
+      return false;
+
+    if (request->method() == HTTP_GET) {
+      if (request->url() == F("/"))
+        return true;
+      if (request->url() == F("/config.json"))
+        return true;
+      if (request->url() == F("/wifisave"))
+        return true;
+    }
+
+    return false;
  }

  void handle_config(AsyncWebServerRequest *request);
@@ -64,7 +66,7 @@ class CaptivePortal : public AsyncWebHandler, public Component {
  web_server_base::WebServerBase *base_;
  bool initialized_{false};
  bool active_{false};
-#if defined(USE_ARDUINO) || defined(USE_ESP_IDF)
+#ifdef USE_ARDUINO
  std::unique_ptr<DNSServer> dns_server_{nullptr};
 #endif
 };
--- a/esphome/components/captive_portal/dns_server_esp32_idf.cpp
+++ b/esphome/components/captive_portal/dns_server_esp32_idf.cpp
@@ -1,205 +0,0 @@
-#include "dns_server_esp32_idf.h"
-#ifdef USE_ESP_IDF
-
-#include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/socket/socket.h"
-#include <lwip/sockets.h>
-#include <lwip/inet.h>
-
-namespace esphome::captive_portal {
-
-static const char *const TAG = "captive_portal.dns";
-
-// DNS constants
-static constexpr uint16_t DNS_PORT = 53;
-static constexpr uint16_t DNS_QR_FLAG = 1 << 15;
-static constexpr uint16_t DNS_OPCODE_MASK = 0x7800;
-static constexpr uint16_t DNS_QTYPE_A = 0x0001;
-static constexpr uint16_t DNS_QCLASS_IN = 0x0001;
-static constexpr uint16_t DNS_ANSWER_TTL = 300;
-
-// DNS Header structure
-struct DNSHeader {
-  uint16_t id;
-  uint16_t flags;
-  uint16_t qd_count;
-  uint16_t an_count;
-  uint16_t ns_count;
-  uint16_t ar_count;
-} __attribute__((packed));
-
-// DNS Question structure
-struct DNSQuestion {
-  uint16_t type;
-  uint16_t dns_class;
-} __attribute__((packed));
-
-// DNS Answer structure
-struct DNSAnswer {
-  uint16_t ptr_offset;
-  uint16_t type;
-  uint16_t dns_class;
-  uint32_t ttl;
-  uint16_t addr_len;
-  uint32_t ip_addr;
-} __attribute__((packed));
-
-void DNSServer::start(const network::IPAddress &ip) {
-  this->server_ip_ = ip;
-  ESP_LOGV(TAG, "Starting DNS server on %s", ip.str().c_str());
-
-  // Create loop-monitored UDP socket
-  this->socket_ = socket::socket_ip_loop_monitored(SOCK_DGRAM, IPPROTO_UDP);
-  if (this->socket_ == nullptr) {
-    ESP_LOGE(TAG, "Socket create failed");
-    return;
-  }
-
-  // Set socket options
-  int enable = 1;
-  this->socket_->setsockopt(SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
-
-  // Bind to port 53
-  struct sockaddr_storage server_addr = {};
-  socklen_t addr_len = socket::set_sockaddr_any((struct sockaddr *) &server_addr, sizeof(server_addr), DNS_PORT);
-
-  int err = this->socket_->bind((struct sockaddr *) &server_addr, addr_len);
-  if (err != 0) {
-    ESP_LOGE(TAG, "Bind failed: %d", errno);
-    this->socket_ = nullptr;
-    return;
-  }
-  ESP_LOGV(TAG, "Bound to port %d", DNS_PORT);
-}
-
-void DNSServer::stop() {
-  if (this->socket_ != nullptr) {
-    this->socket_->close();
-    this->socket_ = nullptr;
-  }
-  ESP_LOGV(TAG, "Stopped");
-}
-
-void DNSServer::process_next_request() {
-  // Process one request if socket is valid and data is available
-  if (this->socket_ == nullptr || !this->socket_->ready()) {
-    return;
-  }
-  struct sockaddr_in client_addr;
-  socklen_t client_addr_len = sizeof(client_addr);
-
-  // Receive DNS request using raw fd for recvfrom
-  int fd = this->socket_->get_fd();
-  if (fd < 0) {
-    return;
-  }
-
-  ssize_t len = recvfrom(fd, this->buffer_, sizeof(this->buffer_), MSG_DONTWAIT, (struct sockaddr *) &client_addr,
-                         &client_addr_len);
-
-  if (len < 0) {
-    if (errno != EAGAIN && errno != EWOULDBLOCK && errno != EINTR) {
-      ESP_LOGE(TAG, "recvfrom failed: %d", errno);
-    }
-    return;
-  }
-
-  ESP_LOGVV(TAG, "Received %d bytes from %s:%d", len, inet_ntoa(client_addr.sin_addr), ntohs(client_addr.sin_port));
-
-  if (len < static_cast<ssize_t>(sizeof(DNSHeader) + 1)) {
-    ESP_LOGV(TAG, "Request too short: %d", len);
-    return;
-  }
-
-  // Parse DNS header
-  DNSHeader *header = (DNSHeader *) this->buffer_;
-  uint16_t flags = ntohs(header->flags);
-  uint16_t qd_count = ntohs(header->qd_count);
-
-  // Check if it's a standard query
-  if ((flags & DNS_QR_FLAG) || (flags & DNS_OPCODE_MASK) || qd_count != 1) {
-    ESP_LOGV(TAG, "Not a standard query: flags=0x%04X, qd_count=%d", flags, qd_count);
-    return;  // Not a standard query
-  }
-
-  // Parse domain name (we don't actually care about it - redirect everything)
-  uint8_t *ptr = this->buffer_ + sizeof(DNSHeader);
-  uint8_t *end = this->buffer_ + len;
-
-  while (ptr < end && *ptr != 0) {
-    uint8_t label_len = *ptr;
-    if (label_len > 63) {  // Check for invalid label length
-      return;
-    }
-    // Check if we have room for this label plus the length byte
-    if (ptr + label_len + 1 > end) {
-      return;  // Would overflow
-    }
-    ptr += label_len + 1;
-  }
-
-  // Check if we reached a proper null terminator
-  if (ptr >= end || *ptr != 0) {
-    return;  // Name not terminated or truncated
-  }
-  ptr++;  // Skip the null terminator
-
-  // Check we have room for the question
-  if (ptr + sizeof(DNSQuestion) > end) {
-    return;  // Request truncated
-  }
-
-  // Parse DNS question
-  DNSQuestion *question = (DNSQuestion *) ptr;
-  uint16_t qtype = ntohs(question->type);
-  uint16_t qclass = ntohs(question->dns_class);
-
-  // We only handle A queries
-  if (qtype != DNS_QTYPE_A || qclass != DNS_QCLASS_IN) {
-    ESP_LOGV(TAG, "Not an A query: type=0x%04X, class=0x%04X", qtype, qclass);
-    return;  // Not an A query
-  }
-
-  // Build DNS response by modifying the request in-place
-  header->flags = htons(DNS_QR_FLAG | 0x8000);  // Response + Authoritative
-  header->an_count = htons(1);                  // One answer
-
-  // Add answer section after the question
-  size_t question_len = (ptr + sizeof(DNSQuestion)) - this->buffer_ - sizeof(DNSHeader);
-  size_t answer_offset = sizeof(DNSHeader) + question_len;
-
-  // Check if we have room for the answer
-  if (answer_offset + sizeof(DNSAnswer) > sizeof(this->buffer_)) {
-    ESP_LOGW(TAG, "Response too large");
-    return;
-  }
-
-  DNSAnswer *answer = (DNSAnswer *) (this->buffer_ + answer_offset);
-
-  // Pointer to name in question (offset from start of packet)
-  answer->ptr_offset = htons(0xC000 | sizeof(DNSHeader));
-  answer->type = htons(DNS_QTYPE_A);
-  answer->dns_class = htons(DNS_QCLASS_IN);
-  answer->ttl = htonl(DNS_ANSWER_TTL);
-  answer->addr_len = htons(4);
-
-  // Get the raw IP address
-  ip4_addr_t addr = this->server_ip_;
-  answer->ip_addr = addr.addr;
-
-  size_t response_len = answer_offset + sizeof(DNSAnswer);
-
-  // Send response
-  ssize_t sent =
-      this->socket_->sendto(this->buffer_, response_len, 0, (struct sockaddr *) &client_addr, client_addr_len);
-  if (sent < 0) {
-    ESP_LOGV(TAG, "Send failed: %d", errno);
-  } else {
-    ESP_LOGV(TAG, "Sent %d bytes", sent);
-  }
-}
-
-}  // namespace esphome::captive_portal
-
-#endif  // USE_ESP_IDF
--- a/esphome/components/captive_portal/dns_server_esp32_idf.h
+++ b/esphome/components/captive_portal/dns_server_esp32_idf.h
@@ -1,27 +0,0 @@
-#pragma once
-#ifdef USE_ESP_IDF
-
-#include <memory>
-#include "esphome/core/helpers.h"
-#include "esphome/components/network/ip_address.h"
-#include "esphome/components/socket/socket.h"
-
-namespace esphome::captive_portal {
-
-class DNSServer {
- public:
-  void start(const network::IPAddress &ip);
-  void stop();
-  void process_next_request();
-
- protected:
-  static constexpr size_t DNS_BUFFER_SIZE = 192;
-
-  std::unique_ptr<socket::Socket> socket_{nullptr};
-  network::IPAddress server_ip_;
-  uint8_t buffer_[DNS_BUFFER_SIZE];
-};
-
-}  // namespace esphome::captive_portal
-
-#endif  // USE_ESP_IDF
--- a/esphome/components/ccs811/ccs811.cpp
+++ b/esphome/components/ccs811/ccs811.cpp
@@ -155,7 +155,7 @@ void CCS811Component::dump_config() {
  LOG_UPDATE_INTERVAL(this);
  LOG_SENSOR("  ", "CO2 Sensor", this->co2_);
  LOG_SENSOR("  ", "TVOC Sensor", this->tvoc_);
-  LOG_TEXT_SENSOR("  ", "Firmware Version Sensor", this->version_);
+  LOG_TEXT_SENSOR("  ", "Firmware Version Sensor", this->version_)
  if (this->baseline_) {
    ESP_LOGCONFIG(TAG, "  Baseline: %04X", *this->baseline_);
  } else {
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -367,11 +367,9 @@ void Climate::save_state_() {
    state.uses_custom_fan_mode = true;
    const auto &supported = traits.get_supported_custom_fan_modes();
    std::vector<std::string> vec{supported.begin(), supported.end()};
-    for (size_t i = 0; i < vec.size(); i++) {
-      if (vec[i] == custom_fan_mode) {
-        state.custom_fan_mode = i;
-        break;
-      }
+    auto it = std::find(vec.begin(), vec.end(), custom_fan_mode);
+    if (it != vec.end()) {
+      state.custom_fan_mode = std::distance(vec.begin(), it);
    }
  }
  if (traits.get_supports_presets() && preset.has_value()) {
@@ -382,11 +380,10 @@ void Climate::save_state_() {
    state.uses_custom_preset = true;
    const auto &supported = traits.get_supported_custom_presets();
    std::vector<std::string> vec{supported.begin(), supported.end()};
-    for (size_t i = 0; i < vec.size(); i++) {
-      if (vec[i] == custom_preset) {
-        state.custom_preset = i;
-        break;
-      }
+    auto it = std::find(vec.begin(), vec.end(), custom_preset);
+    // only set custom preset if value exists, otherwise leave it as is
+    if (it != vec.cend()) {
+      state.custom_preset = std::distance(vec.begin(), it);
    }
  }
  if (traits.get_supports_swing_modes()) {
--- a/esphome/components/copy/lock/copy_lock.cpp
+++ b/esphome/components/copy/lock/copy_lock.cpp
@@ -11,7 +11,7 @@ void CopyLock::setup() {

  traits.set_assumed_state(source_->traits.get_assumed_state());
  traits.set_requires_code(source_->traits.get_requires_code());
-  traits.set_supported_states_mask(source_->traits.get_supported_states_mask());
+  traits.set_supported_states(source_->traits.get_supported_states());
  traits.set_supports_open(source_->traits.get_supports_open());

  this->publish_state(source_->state);
--- a/esphome/components/cover/cover.cpp
+++ b/esphome/components/cover/cover.cpp
@@ -1,6 +1,5 @@
 #include "cover.h"
 #include "esphome/core/log.h"
-#include <strings.h>

 namespace esphome {
 namespace cover {
--- a/esphome/components/deep_sleep/init.py
+++ b/esphome/components/deep_sleep/init.py
@@ -197,8 +197,7 @@ CONFIG_SCHEMA = cv.All(
            cv.Optional(CONF_ESP32_EXT1_WAKEUP): cv.All(
                cv.only_on_esp32,
                esp32.only_on_variant(
-                    unsupported=[VARIANT_ESP32C2, VARIANT_ESP32C3],
-                    msg_prefix="Wakeup from ext1",
+                    unsupported=[VARIANT_ESP32C3], msg_prefix="Wakeup from ext1"
                ),
                cv.Schema(
                    {
@@ -215,13 +214,7 @@ CONFIG_SCHEMA = cv.All(
            cv.Optional(CONF_TOUCH_WAKEUP): cv.All(
                cv.only_on_esp32,
                esp32.only_on_variant(
-                    unsupported=[
-                        VARIANT_ESP32C2,
-                        VARIANT_ESP32C3,
-                        VARIANT_ESP32C6,
-                        VARIANT_ESP32H2,
-                    ],
-                    msg_prefix="Wakeup from touch",
+                    unsupported=[VARIANT_ESP32C3], msg_prefix="Wakeup from touch"
                ),
                cv.boolean,
            ),
--- a/esphome/components/deep_sleep/deep_sleep_component.h
+++ b/esphome/components/deep_sleep/deep_sleep_component.h
@@ -34,7 +34,7 @@ enum WakeupPinMode {
  WAKEUP_PIN_MODE_INVERT_WAKEUP,
 };

-#if defined(USE_ESP32) && !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3)
+#if defined(USE_ESP32) && !defined(USE_ESP32_VARIANT_ESP32C3)
 struct Ext1Wakeup {
  uint64_t mask;
  esp_sleep_ext1_wakeup_mode_t wakeup_mode;
@@ -50,7 +50,7 @@ struct WakeupCauseToRunDuration {
  uint32_t gpio_cause;
 };

-#endif  // USE_ESP32
+#endif

 template<typename... Ts> class EnterDeepSleepAction;

@@ -73,22 +73,20 @@ class DeepSleepComponent : public Component {
  void set_wakeup_pin(InternalGPIOPin *pin) { this->wakeup_pin_ = pin; }

  void set_wakeup_pin_mode(WakeupPinMode wakeup_pin_mode);
-#endif  // USE_ESP32
+#endif

 #if defined(USE_ESP32)
-#if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3)
+#if !defined(USE_ESP32_VARIANT_ESP32C3)
+
  void set_ext1_wakeup(Ext1Wakeup ext1_wakeup);
-#endif

-#if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3) && \
-    !defined(USE_ESP32_VARIANT_ESP32C6) && !defined(USE_ESP32_VARIANT_ESP32H2)
  void set_touch_wakeup(bool touch_wakeup);
-#endif

+#endif
  // Set the duration in ms for how long the code should run before entering
  // deep sleep mode, according to the cause the ESP32 has woken.
  void set_run_duration(WakeupCauseToRunDuration wakeup_cause_to_run_duration);
-#endif  // USE_ESP32
+#endif

  /// Set a duration in ms for how long the code should run before entering deep sleep mode.
  void set_run_duration(uint32_t time_ms);
@@ -119,13 +117,13 @@ class DeepSleepComponent : public Component {
  InternalGPIOPin *wakeup_pin_;
  WakeupPinMode wakeup_pin_mode_{WAKEUP_PIN_MODE_IGNORE};

-#if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3)
+#if !defined(USE_ESP32_VARIANT_ESP32C3)
  optional<Ext1Wakeup> ext1_wakeup_;
 #endif

  optional<bool> touch_wakeup_;
  optional<WakeupCauseToRunDuration> wakeup_cause_to_run_duration_;
-#endif  // USE_ESP32
+#endif
  optional<uint32_t> run_duration_;
  bool next_enter_deep_sleep_{false};
  bool prevent_{false};
--- a/esphome/components/deep_sleep/deep_sleep_esp32.cpp
+++ b/esphome/components/deep_sleep/deep_sleep_esp32.cpp
@@ -7,26 +7,6 @@
 namespace esphome {
 namespace deep_sleep {

-// Deep Sleep feature support matrix for ESP32 variants:
-//
-// | Variant   | ext0 | ext1 | Touch | GPIO wakeup |
-// |-----------|------|------|-------|-------------|
-// | ESP32     | ✓    | ✓    | ✓     |             |
-// | ESP32-S2  | ✓    | ✓    | ✓     |             |
-// | ESP32-S3  | ✓    | ✓    | ✓     |             |
-// | ESP32-C2  |      |      |       | ✓           |
-// | ESP32-C3  |      |      |       | ✓           |
-// | ESP32-C5  |      | (✓)  |       | (✓)         |
-// | ESP32-C6  |      | ✓    |       | ✓           |
-// | ESP32-H2  |      | ✓    |       |             |
-//
-// Notes:
-// - (✓) = Supported by hardware but not yet implemented in ESPHome
-// - ext0: Single pin wakeup using RTC GPIO (esp_sleep_enable_ext0_wakeup)
-// - ext1: Multiple pin wakeup (esp_sleep_enable_ext1_wakeup)
-// - Touch: Touch pad wakeup (esp_sleep_enable_touchpad_wakeup)
-// - GPIO wakeup: GPIO wakeup for non-RTC pins (esp_deep_sleep_enable_gpio_wakeup)
-
 static const char *const TAG = "deep_sleep";

 optional<uint32_t> DeepSleepComponent::get_run_duration_() const {
@@ -50,13 +30,13 @@ void DeepSleepComponent::set_wakeup_pin_mode(WakeupPinMode wakeup_pin_mode) {
  this->wakeup_pin_mode_ = wakeup_pin_mode;
 }

-#if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3)
+#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32C6)
 void DeepSleepComponent::set_ext1_wakeup(Ext1Wakeup ext1_wakeup) { this->ext1_wakeup_ = ext1_wakeup; }
+
+#if !defined(USE_ESP32_VARIANT_ESP32H2)
+void DeepSleepComponent::set_touch_wakeup(bool touch_wakeup) { this->touch_wakeup_ = touch_wakeup; }
 #endif

-#if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3) && \
-    !defined(USE_ESP32_VARIANT_ESP32C6) && !defined(USE_ESP32_VARIANT_ESP32H2)
-void DeepSleepComponent::set_touch_wakeup(bool touch_wakeup) { this->touch_wakeup_ = touch_wakeup; }
 #endif

 void DeepSleepComponent::set_run_duration(WakeupCauseToRunDuration wakeup_cause_to_run_duration) {
@@ -92,13 +72,9 @@ bool DeepSleepComponent::prepare_to_sleep_() {
 }

 void DeepSleepComponent::deep_sleep_() {
-  // Timer wakeup - all variants support this
+#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32C6) && !defined(USE_ESP32_VARIANT_ESP32H2)
  if (this->sleep_duration_.has_value())
    esp_sleep_enable_timer_wakeup(*this->sleep_duration_);
-
-    // Single pin wakeup (ext0) - ESP32, S2, S3 only
-#if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3) && \
-    !defined(USE_ESP32_VARIANT_ESP32C6) && !defined(USE_ESP32_VARIANT_ESP32H2)
  if (this->wakeup_pin_ != nullptr) {
    const auto gpio_pin = gpio_num_t(this->wakeup_pin_->get_pin());
    if (this->wakeup_pin_->get_flags() & gpio::FLAG_PULLUP) {
@@ -119,15 +95,32 @@ void DeepSleepComponent::deep_sleep_() {
    }
    esp_sleep_enable_ext0_wakeup(gpio_pin, level);
  }
+  if (this->ext1_wakeup_.has_value()) {
+    esp_sleep_enable_ext1_wakeup(this->ext1_wakeup_->mask, this->ext1_wakeup_->wakeup_mode);
+  }
+
+  if (this->touch_wakeup_.has_value() && *(this->touch_wakeup_)) {
+    esp_sleep_enable_touchpad_wakeup();
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+  }
 #endif

-  // GPIO wakeup - C2, C3, C6 only
-#if defined(USE_ESP32_VARIANT_ESP32C2) || defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6)
+#if defined(USE_ESP32_VARIANT_ESP32H2)
+  if (this->sleep_duration_.has_value())
+    esp_sleep_enable_timer_wakeup(*this->sleep_duration_);
+  if (this->ext1_wakeup_.has_value()) {
+    esp_sleep_enable_ext1_wakeup(this->ext1_wakeup_->mask, this->ext1_wakeup_->wakeup_mode);
+  }
+#endif
+
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6)
+  if (this->sleep_duration_.has_value())
+    esp_sleep_enable_timer_wakeup(*this->sleep_duration_);
  if (this->wakeup_pin_ != nullptr) {
    const auto gpio_pin = gpio_num_t(this->wakeup_pin_->get_pin());
-    if (this->wakeup_pin_->get_flags() & gpio::FLAG_PULLUP) {
+    if (this->wakeup_pin_->get_flags() && gpio::FLAG_PULLUP) {
      gpio_sleep_set_pull_mode(gpio_pin, GPIO_PULLUP_ONLY);
-    } else if (this->wakeup_pin_->get_flags() & gpio::FLAG_PULLDOWN) {
+    } else if (this->wakeup_pin_->get_flags() && gpio::FLAG_PULLDOWN) {
      gpio_sleep_set_pull_mode(gpio_pin, GPIO_PULLDOWN_ONLY);
    }
    gpio_sleep_set_direction(gpio_pin, GPIO_MODE_INPUT);
@@ -145,26 +138,9 @@ void DeepSleepComponent::deep_sleep_() {
                                      static_cast<esp_deepsleep_gpio_wake_up_mode_t>(level));
  }
 #endif
-
-  // Multiple pin wakeup (ext1) - All except C2, C3
-#if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3)
-  if (this->ext1_wakeup_.has_value()) {
-    esp_sleep_enable_ext1_wakeup(this->ext1_wakeup_->mask, this->ext1_wakeup_->wakeup_mode);
-  }
-#endif
-
-  // Touch wakeup - ESP32, S2, S3 only
-#if !defined(USE_ESP32_VARIANT_ESP32C2) && !defined(USE_ESP32_VARIANT_ESP32C3) && \
-    !defined(USE_ESP32_VARIANT_ESP32C6) && !defined(USE_ESP32_VARIANT_ESP32H2)
-  if (this->touch_wakeup_.has_value() && *(this->touch_wakeup_)) {
-    esp_sleep_enable_touchpad_wakeup();
-    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
-  }
-#endif
-
  esp_deep_sleep_start();
 }

 }  // namespace deep_sleep
 }  // namespace esphome
-#endif  // USE_ESP32
+#endif
--- a/esphome/components/ektf2232/touchscreen/init.py
+++ b/esphome/components/ektf2232/touchscreen/init.py
@@ -2,7 +2,7 @@ from esphome import pins
 import esphome.codegen as cg
 from esphome.components import i2c, touchscreen
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_INTERRUPT_PIN, CONF_RESET_PIN
+from esphome.const import CONF_ID, CONF_INTERRUPT_PIN

 CODEOWNERS = ["@jesserockz"]
 DEPENDENCIES = ["i2c"]
@@ -15,7 +15,7 @@ EKTF2232Touchscreen = ektf2232_ns.class_(
 )

 CONF_EKTF2232_ID = "ektf2232_id"
-CONF_RTS_PIN = "rts_pin"  # To be removed before 2026.4.0
+CONF_RTS_PIN = "rts_pin"

 CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
    cv.Schema(
@@ -24,10 +24,7 @@ CONFIG_SCHEMA = touchscreen.TOUCHSCREEN_SCHEMA.extend(
            cv.Required(CONF_INTERRUPT_PIN): cv.All(
                pins.internal_gpio_input_pin_schema
            ),
-            cv.Required(CONF_RESET_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(CONF_RTS_PIN): cv.invalid(
-                f"{CONF_RTS_PIN} has been renamed to {CONF_RESET_PIN}"
-            ),
+            cv.Required(CONF_RTS_PIN): pins.gpio_output_pin_schema,
        }
    ).extend(i2c.i2c_device_schema(0x15))
 )
@@ -40,5 +37,5 @@ async def to_code(config):

    interrupt_pin = await cg.gpio_pin_expression(config[CONF_INTERRUPT_PIN])
    cg.add(var.set_interrupt_pin(interrupt_pin))
-    reset_pin = await cg.gpio_pin_expression(config[CONF_RESET_PIN])
-    cg.add(var.set_reset_pin(reset_pin))
+    rts_pin = await cg.gpio_pin_expression(config[CONF_RTS_PIN])
+    cg.add(var.set_rts_pin(rts_pin))
--- a/esphome/components/ektf2232/touchscreen/ektf2232.cpp
+++ b/esphome/components/ektf2232/touchscreen/ektf2232.cpp
@@ -21,7 +21,7 @@ void EKTF2232Touchscreen::setup() {

  this->attach_interrupt_(this->interrupt_pin_, gpio::INTERRUPT_FALLING_EDGE);

-  this->reset_pin_->setup();
+  this->rts_pin_->setup();

  this->hard_reset_();
  if (!this->soft_reset_()) {
@@ -98,9 +98,9 @@ bool EKTF2232Touchscreen::get_power_state() {
 }

 void EKTF2232Touchscreen::hard_reset_() {
-  this->reset_pin_->digital_write(false);
+  this->rts_pin_->digital_write(false);
  delay(15);
-  this->reset_pin_->digital_write(true);
+  this->rts_pin_->digital_write(true);
  delay(15);
 }

@@ -127,7 +127,7 @@ void EKTF2232Touchscreen::dump_config() {
  ESP_LOGCONFIG(TAG, "EKT2232 Touchscreen:");
  LOG_I2C_DEVICE(this);
  LOG_PIN("  Interrupt Pin: ", this->interrupt_pin_);
-  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_PIN("  RTS Pin: ", this->rts_pin_);
 }

 }  // namespace ektf2232
--- a/esphome/components/ektf2232/touchscreen/ektf2232.h
+++ b/esphome/components/ektf2232/touchscreen/ektf2232.h
@@ -17,7 +17,7 @@ class EKTF2232Touchscreen : public Touchscreen, public i2c::I2CDevice {
  void dump_config() override;

  void set_interrupt_pin(InternalGPIOPin *pin) { this->interrupt_pin_ = pin; }
-  void set_reset_pin(GPIOPin *pin) { this->reset_pin_ = pin; }
+  void set_rts_pin(GPIOPin *pin) { this->rts_pin_ = pin; }

  void set_power_state(bool enable);
  bool get_power_state();
@@ -28,7 +28,7 @@ class EKTF2232Touchscreen : public Touchscreen, public i2c::I2CDevice {
  void update_touches() override;

  InternalGPIOPin *interrupt_pin_;
-  GPIOPin *reset_pin_;
+  GPIOPin *rts_pin_;
 };

 }  // namespace ektf2232
--- a/esphome/components/epdiy/init.py
+++ b/esphome/components/epdiy/init.py
--- a/esphome/components/epdiy/display.py
+++ b/esphome/components/epdiy/display.py
@@ -0,0 +1,107 @@
+import esphome.codegen as cg
+from esphome.components import display, esp32
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_FULL_UPDATE_EVERY,
+    CONF_ID,
+    CONF_LAMBDA,
+    CONF_MODEL,
+    CONF_PAGES,
+)
+from esphome.cpp_generator import MockObj
+
+CODEOWNERS = ["@jesserockz"]
+DEPENDENCIES = ["esp32", "psram"]
+
+CONF_POWER_OFF_DELAY_ENABLED = "power_off_delay_enabled"
+
+epdiy_ns = cg.esphome_ns.namespace("epdiy")
+EPDiyDisplay = epdiy_ns.class_("EPDiyDisplay", display.Display)
+
+
+class EpdBoardDefinition(MockObj):
+    def __str__(self):
+        return f"&{self.base}"
+
+
+class EpdDisplay_t(MockObj):
+    def __str__(self):
+        return f"&{self.base}"
+
+
+EpdInitOptions = cg.global_ns.enum("EpdInitOptions")
+
+
+class Model:
+    def __init__(
+        self,
+        *,
+        board_definition: MockObj,
+        display_t: MockObj,
+        init_options: MockObj,
+        width: int,
+        height: int,
+        vcom_mv: int = 0,
+    ):
+        self.board_definition = board_definition
+        self.display_t = display_t
+        self.init_options = init_options
+        self.width = width
+        self.height = height
+        self.vcom_mv = vcom_mv
+
+
+MODELS: dict[str, Model] = {
+    "lilygo_t5_4.7": Model(
+        board_definition=EpdBoardDefinition("epd_board_lilygo_t5_47"),
+        display_t=EpdDisplay_t("ED047TC2"),
+        init_options=(EpdInitOptions.EPD_LUT_64K, EpdInitOptions.EPD_FEED_QUEUE_8),
+        width=960,
+        height=540,
+    ),
+}
+
+CONFIG_SCHEMA = cv.All(
+    display.FULL_DISPLAY_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(EPDiyDisplay),
+            cv.Required(CONF_MODEL): cv.one_of(*MODELS.keys()),
+            cv.Optional(CONF_FULL_UPDATE_EVERY, default=10): cv.uint32_t,
+            cv.Optional(CONF_POWER_OFF_DELAY_ENABLED, default=False): cv.boolean,
+        }
+    ).extend(cv.polling_component_schema("60s")),
+    cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA),
+    cv.only_with_esp_idf,  # When trying to add library via platformio it breaks, using as an idf component works fine
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+
+    await display.register_display(var, config)
+
+    model = MODELS[config[CONF_MODEL]]
+    cg.add(
+        var.set_model_details(
+            model.board_definition,
+            model.display_t,
+            cg.RawExpression(
+                f"static_cast<EpdInitOptions>({'|'.join(str(o) for o in model.init_options)})"
+            ),
+            model.vcom_mv,
+        )
+    )
+
+    if CONF_LAMBDA in config:
+        lambda_ = await cg.process_lambda(
+            config[CONF_LAMBDA], [(display.DisplayRef, "it")], return_type=cg.void
+        )
+        cg.add(var.set_writer(lambda_))
+
+    cg.add(var.set_power_off_delay_enabled(config[CONF_POWER_OFF_DELAY_ENABLED]))
+
+    esp32.add_idf_component(
+        name="vroland/epdiy",
+        repo="https://github.com/vroland/epdiy",
+        ref="c61e9e923ce2418150d54f88cea5d196cdc40c54",
+    )
--- a/esphome/components/epdiy/epdiy_display.cpp
+++ b/esphome/components/epdiy/epdiy_display.cpp
@@ -0,0 +1,76 @@
+#include "epdiy_display.h"
+
+#include "esphome/core/application.h"
+
+#ifdef USE_ESP_IDF
+
+#include "esphome/core/log.h"
+
+namespace esphome::epdiy {
+
+static const char *const TAG = "epdiy";
+
+static constexpr uint8_t TEMPERATURE = 23;  // default temperature for e-paper displays
+
+float EPDiyDisplay::get_setup_priority() const { return esphome::setup_priority::LATE; }
+
+void EPDiyDisplay::setup() {
+  epd_init(this->board_definition_, this->display_t_, this->init_options_);
+  if (this->vcom_mv_ != 0) {
+    epd_set_vcom(this->vcom_mv_);
+  }
+  this->state_ = epd_hl_init(nullptr);
+  this->framebuffer_ = epd_hl_get_framebuffer(&this->state_);
+}
+
+void EPDiyDisplay::update() {
+  this->do_update_();
+  this->defer([this]() { this->flush_screen_changes_(); });
+}
+
+void EPDiyDisplay::fill(Color color) {
+  if (color == display::COLOR_OFF) {
+    memset(this->framebuffer_, 0xFF, this->get_buffer_length());
+
+    epd_poweron();
+    epd_hl_update_screen(&this->state_, MODE_GC16, TEMPERATURE);
+    epd_clear();
+
+    epd_poweroff();
+    App.feed_wdt();
+  } else {
+    Display::fill(color);
+  }
+}
+
+void EPDiyDisplay::flush_screen_changes_() {
+  epd_poweron();
+
+  epd_hl_update_screen(&this->state_, MODE_GC16, TEMPERATURE);
+  memset(this->state_.back_fb, 0xFF, this->get_buffer_length());
+
+  uint16_t delay = 0;
+  if (this->power_off_delay_enabled_) {
+    delay = 700;
+  }
+  this->set_timeout("poweroff", delay, []() { epd_poweroff(); });
+}
+
+void EPDiyDisplay::on_shutdown() {
+  epd_poweroff();
+  epd_deinit();
+}
+
+void HOT EPDiyDisplay::draw_pixel_at(int x, int y, Color color) {
+  if (color.red == 255 && color.green == 255 && color.blue == 255) {
+    epd_draw_pixel(x, y, 0, this->framebuffer_);
+  } else {
+    int col = (0.2126 * color.red) + (0.7152 * color.green) + (0.0722 * color.blue);
+    int cl = 255 - col;
+    epd_draw_pixel(x, y, cl, this->framebuffer_);
+  }
+}
+
+}  // namespace esphome::epdiy
+
+#endif  // USE_ESP_IDF
--- a/esphome/components/epdiy/epdiy_display.h
+++ b/esphome/components/epdiy/epdiy_display.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#ifdef USE_ESP_IDF
+
+#include "esphome/core/component.h"
+
+#include "esphome/components/display/display_buffer.h"
+#include "esphome/components/display/display_color_utils.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/version.h"
+
+#include "epd_display.h"
+#include "epd_highlevel.h"
+
+namespace esphome::epdiy {
+
+class EPDiyDisplay : public display::Display {
+ public:
+  float get_setup_priority() const override;
+  void setup() override;
+  void update() override;
+  void on_shutdown() override;
+
+  display::DisplayType get_display_type() override { return display::DisplayType::DISPLAY_TYPE_GRAYSCALE; }
+
+  int get_width_internal() override { return this->display_t_->width; };
+  int get_height_internal() override { return this->display_t_->height; };
+
+  size_t get_buffer_length() const { return this->display_t_->width / 2 * this->display_t_->height; }
+
+  void set_power_off_delay_enabled(bool power_off_delay_enabled) {
+    this->power_off_delay_enabled_ = power_off_delay_enabled;
+  }
+
+  void set_model_details(const EpdBoardDefinition *board_definition, const EpdDisplay_t *display_t,
+                         enum EpdInitOptions init_options, uint16_t vcom) {
+    this->board_definition_ = board_definition;
+    this->display_t_ = display_t;
+    this->init_options_ = init_options;
+    this->vcom_mv_ = vcom;
+  }
+
+  void fill(Color color) override;
+
+  void draw_pixel_at(int x, int y, Color color) override;
+
+ protected:
+  void flush_screen_changes_();
+  EpdiyHighlevelState state_;
+
+  uint8_t *framebuffer_;
+
+  const EpdBoardDefinition *board_definition_;
+  const EpdDisplay_t *display_t_;
+  enum EpdInitOptions init_options_;
+  uint16_t vcom_mv_;
+
+  bool power_off_delay_enabled_;
+};
+
+}  // namespace esphome::epdiy
+
+#endif  // USE_ESP_IDF
--- a/esphome/components/esp32/init.py
+++ b/esphome/components/esp32/init.py
@@ -36,8 +36,9 @@ from esphome.const import (
    __version__,
 )
 from esphome.core import CORE, HexInt, TimePeriod
+from esphome.cpp_generator import RawExpression
 import esphome.final_validate as fv
-from esphome.helpers import copy_file_if_changed, write_file_if_changed
+from esphome.helpers import copy_file_if_changed, mkdir_p, write_file_if_changed
 from esphome.types import ConfigType
 from esphome.writer import clean_cmake_cache

@@ -156,6 +157,8 @@ def set_core_data(config):
    conf = config[CONF_FRAMEWORK]
    if conf[CONF_TYPE] == FRAMEWORK_ESP_IDF:
        CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "esp-idf"
+        CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS] = {}
+        CORE.data[KEY_ESP32][KEY_COMPONENTS] = {}
    elif conf[CONF_TYPE] == FRAMEWORK_ARDUINO:
        CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "arduino"
        if variant not in ARDUINO_ALLOWED_VARIANTS:
@@ -163,8 +166,6 @@ def set_core_data(config):
                f"ESPHome does not support using the Arduino framework for the {variant}. Please use the ESP-IDF framework instead.",
                path=[CONF_FRAMEWORK, CONF_TYPE],
            )
-    CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS] = {}
-    CORE.data[KEY_ESP32][KEY_COMPONENTS] = {}
    CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] = cv.Version.parse(
        config[CONF_FRAMEWORK][CONF_VERSION]
    )
@@ -235,6 +236,8 @@ SdkconfigValueType = bool | int | HexInt | str | RawSdkconfigValue

 def add_idf_sdkconfig_option(name: str, value: SdkconfigValueType):
    """Set an esp-idf sdkconfig value."""
+    if not CORE.using_esp_idf:
+        raise ValueError("Not an esp-idf project")
    CORE.data[KEY_ESP32][KEY_SDKCONFIG_OPTIONS][name] = value


@@ -249,6 +252,8 @@ def add_idf_component(
    submodules: list[str] | None = None,
 ):
    """Add an esp-idf component to the project."""
+    if not CORE.using_esp_idf:
+        raise ValueError("Not an esp-idf project")
    if not repo and not ref and not path:
        raise ValueError("Requires at least one of repo, ref or path")
    if refresh or submodules or components:
@@ -272,14 +277,14 @@ def add_idf_component(
        }


-def add_extra_script(stage: str, filename: str, path: Path):
+def add_extra_script(stage: str, filename: str, path: str):
    """Add an extra script to the project."""
    key = f"{stage}:{filename}"
    if add_extra_build_file(filename, path):
        cg.add_platformio_option("extra_scripts", [key])


-def add_extra_build_file(filename: str, path: Path) -> bool:
+def add_extra_build_file(filename: str, path: str) -> bool:
    """Add an extra build file to the project."""
    if filename not in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES]:
        CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES][filename] = {
@@ -362,49 +367,47 @@ SUPPORTED_PIOARDUINO_ESP_IDF_5X = [
 ]


-def _check_versions(value):
+def _arduino_check_versions(value):
    value = value.copy()
-    if value[CONF_TYPE] == FRAMEWORK_ARDUINO:
-        lookups = {
-            "dev": (
-                cv.Version(3, 2, 1),
-                "https://github.com/espressif/arduino-esp32.git",
-            ),
-            "latest": (cv.Version(3, 2, 1), None),
-            "recommended": (RECOMMENDED_ARDUINO_FRAMEWORK_VERSION, None),
-        }
+    lookups = {
+        "dev": (cv.Version(3, 2, 1), "https://github.com/espressif/arduino-esp32.git"),
+        "latest": (cv.Version(3, 2, 1), None),
+        "recommended": (RECOMMENDED_ARDUINO_FRAMEWORK_VERSION, None),
+    }

-        if value[CONF_VERSION] in lookups:
-            if CONF_SOURCE in value:
-                raise cv.Invalid(
-                    "Framework version needs to be explicitly specified when custom source is used."
-                )
-
-            version, source = lookups[value[CONF_VERSION]]
-        else:
-            version = cv.Version.parse(cv.version_number(value[CONF_VERSION]))
-            source = value.get(CONF_SOURCE, None)
-
-        value[CONF_VERSION] = str(version)
-        value[CONF_SOURCE] = source or _format_framework_arduino_version(version)
-
-        value[CONF_PLATFORM_VERSION] = value.get(
-            CONF_PLATFORM_VERSION,
-            _parse_platform_version(str(ARDUINO_PLATFORM_VERSION)),
-        )
-
-        if value[CONF_SOURCE].startswith("http"):
-            # prefix is necessary or platformio will complain with a cryptic error
-            value[CONF_SOURCE] = f"framework-arduinoespressif32@{value[CONF_SOURCE]}"
-
-        if version != RECOMMENDED_ARDUINO_FRAMEWORK_VERSION:
-            _LOGGER.warning(
-                "The selected Arduino framework version is not the recommended one. "
-                "If there are connectivity or build issues please remove the manual version."
+    if value[CONF_VERSION] in lookups:
+        if CONF_SOURCE in value:
+            raise cv.Invalid(
+                "Framework version needs to be explicitly specified when custom source is used."
            )

-        return value
+        version, source = lookups[value[CONF_VERSION]]
+    else:
+        version = cv.Version.parse(cv.version_number(value[CONF_VERSION]))
+        source = value.get(CONF_SOURCE, None)

+    value[CONF_VERSION] = str(version)
+    value[CONF_SOURCE] = source or _format_framework_arduino_version(version)
+
+    value[CONF_PLATFORM_VERSION] = value.get(
+        CONF_PLATFORM_VERSION, _parse_platform_version(str(ARDUINO_PLATFORM_VERSION))
+    )
+
+    if value[CONF_SOURCE].startswith("http"):
+        # prefix is necessary or platformio will complain with a cryptic error
+        value[CONF_SOURCE] = f"framework-arduinoespressif32@{value[CONF_SOURCE]}"
+
+    if version != RECOMMENDED_ARDUINO_FRAMEWORK_VERSION:
+        _LOGGER.warning(
+            "The selected Arduino framework version is not the recommended one. "
+            "If there are connectivity or build issues please remove the manual version."
+        )
+
+    return value
+
+
+def _esp_idf_check_versions(value):
+    value = value.copy()
    lookups = {
        "dev": (cv.Version(5, 4, 2), "https://github.com/espressif/esp-idf.git"),
        "latest": (cv.Version(5, 2, 2), None),
@@ -586,6 +589,24 @@ def final_validate(config):
    return config


+ARDUINO_FRAMEWORK_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.Optional(CONF_VERSION, default="recommended"): cv.string_strict,
+            cv.Optional(CONF_SOURCE): cv.string_strict,
+            cv.Optional(CONF_PLATFORM_VERSION): _parse_platform_version,
+            cv.Optional(CONF_ADVANCED, default={}): cv.Schema(
+                {
+                    cv.Optional(
+                        CONF_IGNORE_EFUSE_CUSTOM_MAC, default=False
+                    ): cv.boolean,
+                }
+            ),
+        }
+    ),
+    _arduino_check_versions,
+)
+
 CONF_SDKCONFIG_OPTIONS = "sdkconfig_options"
 CONF_ENABLE_LWIP_DHCP_SERVER = "enable_lwip_dhcp_server"
 CONF_ENABLE_LWIP_MDNS_QUERIES = "enable_lwip_mdns_queries"
@@ -604,14 +625,9 @@ def _validate_idf_component(config: ConfigType) -> ConfigType:
    return config


-FRAMEWORK_ESP_IDF = "esp-idf"
-FRAMEWORK_ARDUINO = "arduino"
-FRAMEWORK_SCHEMA = cv.All(
+ESP_IDF_FRAMEWORK_SCHEMA = cv.All(
    cv.Schema(
        {
-            cv.Optional(CONF_TYPE, default=FRAMEWORK_ARDUINO): cv.one_of(
-                FRAMEWORK_ESP_IDF, FRAMEWORK_ARDUINO
-            ),
            cv.Optional(CONF_VERSION, default="recommended"): cv.string_strict,
            cv.Optional(CONF_RELEASE): cv.string_strict,
            cv.Optional(CONF_SOURCE): cv.string_strict,
@@ -675,7 +691,7 @@ FRAMEWORK_SCHEMA = cv.All(
            ),
        }
    ),
-    _check_versions,
+    _esp_idf_check_versions,
 )


@@ -742,18 +758,32 @@ def _set_default_framework(config):
        config = config.copy()

        variant = config[CONF_VARIANT]
-        config[CONF_FRAMEWORK] = FRAMEWORK_SCHEMA({})
        if variant in ARDUINO_ALLOWED_VARIANTS:
+            config[CONF_FRAMEWORK] = ARDUINO_FRAMEWORK_SCHEMA({})
            config[CONF_FRAMEWORK][CONF_TYPE] = FRAMEWORK_ARDUINO
+            # Show the migration message
            _show_framework_migration_message(
                config.get(CONF_NAME, "This device"), variant
            )
        else:
+            config[CONF_FRAMEWORK] = ESP_IDF_FRAMEWORK_SCHEMA({})
            config[CONF_FRAMEWORK][CONF_TYPE] = FRAMEWORK_ESP_IDF

    return config


+FRAMEWORK_ESP_IDF = "esp-idf"
+FRAMEWORK_ARDUINO = "arduino"
+FRAMEWORK_SCHEMA = cv.typed_schema(
+    {
+        FRAMEWORK_ESP_IDF: ESP_IDF_FRAMEWORK_SCHEMA,
+        FRAMEWORK_ARDUINO: ARDUINO_FRAMEWORK_SCHEMA,
+    },
+    lower=True,
+    space="-",
+)
+
+
 FLASH_SIZES = [
    "2MB",
    "4MB",
@@ -818,148 +848,142 @@ async def to_code(config):
    add_extra_script(
        "post",
        "post_build.py",
-        Path(__file__).parent / "post_build.py.script",
+        os.path.join(os.path.dirname(__file__), "post_build.py.script"),
    )

+    freq = config[CONF_CPU_FREQUENCY][:-3]
    if conf[CONF_TYPE] == FRAMEWORK_ESP_IDF:
        cg.add_platformio_option("framework", "espidf")
        cg.add_build_flag("-DUSE_ESP_IDF")
        cg.add_build_flag("-DUSE_ESP32_FRAMEWORK_ESP_IDF")
-    else:
-        cg.add_platformio_option("framework", "arduino, espidf")
+        cg.add_build_flag("-Wno-nonnull-compare")
+
+        cg.add_platformio_option("platform_packages", [conf[CONF_SOURCE]])
+
+        add_idf_sdkconfig_option(f"CONFIG_IDF_TARGET_{variant}", True)
+        add_idf_sdkconfig_option(
+            f"CONFIG_ESPTOOLPY_FLASHSIZE_{config[CONF_FLASH_SIZE]}", True
+        )
+        add_idf_sdkconfig_option("CONFIG_PARTITION_TABLE_SINGLE_APP", False)
+        add_idf_sdkconfig_option("CONFIG_PARTITION_TABLE_CUSTOM", True)
+        add_idf_sdkconfig_option(
+            "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME", "partitions.csv"
+        )
+
+        # Increase freertos tick speed from 100Hz to 1kHz so that delay() resolution is 1ms
+        add_idf_sdkconfig_option("CONFIG_FREERTOS_HZ", 1000)
+
+        # Setup watchdog
+        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT", True)
+        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_PANIC", True)
+        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0", False)
+        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1", False)
+
+        # Disable dynamic log level control to save memory
+        add_idf_sdkconfig_option("CONFIG_LOG_DYNAMIC_LEVEL_CONTROL", False)
+
+        # Set default CPU frequency
+        add_idf_sdkconfig_option(f"CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_{freq}", True)
+
+        # Apply LWIP optimization settings
+        advanced = conf[CONF_ADVANCED]
+        # DHCP server: only disable if explicitly set to false
+        # WiFi component handles its own optimization when AP mode is not used
+        if (
+            CONF_ENABLE_LWIP_DHCP_SERVER in advanced
+            and not advanced[CONF_ENABLE_LWIP_DHCP_SERVER]
+        ):
+            add_idf_sdkconfig_option("CONFIG_LWIP_DHCPS", False)
+        if not advanced.get(CONF_ENABLE_LWIP_MDNS_QUERIES, True):
+            add_idf_sdkconfig_option("CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES", False)
+        if not advanced.get(CONF_ENABLE_LWIP_BRIDGE_INTERFACE, False):
+            add_idf_sdkconfig_option("CONFIG_LWIP_BRIDGEIF_MAX_PORTS", 0)
+        if advanced.get(CONF_EXECUTE_FROM_PSRAM, False):
+            add_idf_sdkconfig_option("CONFIG_SPIRAM_FETCH_INSTRUCTIONS", True)
+            add_idf_sdkconfig_option("CONFIG_SPIRAM_RODATA", True)
+
+        # Apply LWIP core locking for better socket performance
+        # This is already enabled by default in Arduino framework, where it provides
+        # significant performance benefits. Our benchmarks show socket operations are
+        # 24-200% faster with core locking enabled:
+        # - select() on 4 sockets: ~190μs (Arduino/core locking) vs ~235μs (ESP-IDF default)
+        # - Up to 200% slower under load when all operations queue through tcpip_thread
+        # Enabling this makes ESP-IDF socket performance match Arduino framework.
+        if advanced.get(CONF_ENABLE_LWIP_TCPIP_CORE_LOCKING, True):
+            add_idf_sdkconfig_option("CONFIG_LWIP_TCPIP_CORE_LOCKING", True)
+        if advanced.get(CONF_ENABLE_LWIP_CHECK_THREAD_SAFETY, True):
+            add_idf_sdkconfig_option("CONFIG_LWIP_CHECK_THREAD_SAFETY", True)
+
+        cg.add_platformio_option("board_build.partitions", "partitions.csv")
+        if CONF_PARTITIONS in config:
+            add_extra_build_file(
+                "partitions.csv", CORE.relative_config_path(config[CONF_PARTITIONS])
+            )
+
+        if assertion_level := advanced.get(CONF_ASSERTION_LEVEL):
+            for key, flag in ASSERTION_LEVELS.items():
+                add_idf_sdkconfig_option(flag, assertion_level == key)
+
+        add_idf_sdkconfig_option("CONFIG_COMPILER_OPTIMIZATION_DEFAULT", False)
+        compiler_optimization = advanced.get(CONF_COMPILER_OPTIMIZATION)
+        for key, flag in COMPILER_OPTIMIZATIONS.items():
+            add_idf_sdkconfig_option(flag, compiler_optimization == key)
+
+        add_idf_sdkconfig_option(
+            "CONFIG_LWIP_ESP_LWIP_ASSERT",
+            conf[CONF_ADVANCED][CONF_ENABLE_LWIP_ASSERT],
+        )
+
+        if advanced.get(CONF_IGNORE_EFUSE_MAC_CRC):
+            add_idf_sdkconfig_option("CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR", True)
+            add_idf_sdkconfig_option(
+                "CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE", False
+            )
+        if advanced.get(CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES):
+            _LOGGER.warning(
+                "Using experimental features in ESP-IDF may result in unexpected failures."
+            )
+            add_idf_sdkconfig_option("CONFIG_IDF_EXPERIMENTAL_FEATURES", True)
+
+        cg.add_define(
+            "USE_ESP_IDF_VERSION_CODE",
+            cg.RawExpression(
+                f"VERSION_CODE({framework_ver.major}, {framework_ver.minor}, {framework_ver.patch})"
+            ),
+        )
+
+        add_idf_sdkconfig_option(
+            f"CONFIG_LOG_DEFAULT_LEVEL_{conf[CONF_LOG_LEVEL]}", True
+        )
+
+        for name, value in conf[CONF_SDKCONFIG_OPTIONS].items():
+            add_idf_sdkconfig_option(name, RawSdkconfigValue(value))
+
+        for component in conf[CONF_COMPONENTS]:
+            add_idf_component(
+                name=component[CONF_NAME],
+                repo=component.get(CONF_SOURCE),
+                ref=component.get(CONF_REF),
+                path=component.get(CONF_PATH),
+            )
+    elif conf[CONF_TYPE] == FRAMEWORK_ARDUINO:
+        cg.add_platformio_option("framework", "arduino")
        cg.add_build_flag("-DUSE_ARDUINO")
        cg.add_build_flag("-DUSE_ESP32_FRAMEWORK_ARDUINO")
-        cg.add_platformio_option(
-            "board_build.embed_txtfiles",
-            [
-                "managed_components/espressif__esp_insights/server_certs/https_server.crt",
-                "managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt",
-                "managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt",
-                "managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt",
-            ],
-        )
+        cg.add_platformio_option("platform_packages", [conf[CONF_SOURCE]])
+
+        if CONF_PARTITIONS in config:
+            cg.add_platformio_option("board_build.partitions", config[CONF_PARTITIONS])
+        else:
+            cg.add_platformio_option("board_build.partitions", "partitions.csv")
+
        cg.add_define(
            "USE_ARDUINO_VERSION_CODE",
            cg.RawExpression(
                f"VERSION_CODE({framework_ver.major}, {framework_ver.minor}, {framework_ver.patch})"
            ),
        )
-        add_idf_sdkconfig_option("CONFIG_AUTOSTART_ARDUINO", True)
-        add_idf_sdkconfig_option("CONFIG_MBEDTLS_PSK_MODES", True)
-        add_idf_sdkconfig_option("CONFIG_MBEDTLS_CERTIFICATE_BUNDLE", True)
-
-    cg.add_build_flag("-Wno-nonnull-compare")
-
-    cg.add_platformio_option("platform_packages", [conf[CONF_SOURCE]])
-
-    add_idf_sdkconfig_option(f"CONFIG_IDF_TARGET_{variant}", True)
-    add_idf_sdkconfig_option(
-        f"CONFIG_ESPTOOLPY_FLASHSIZE_{config[CONF_FLASH_SIZE]}", True
-    )
-    add_idf_sdkconfig_option("CONFIG_PARTITION_TABLE_SINGLE_APP", False)
-    add_idf_sdkconfig_option("CONFIG_PARTITION_TABLE_CUSTOM", True)
-    add_idf_sdkconfig_option("CONFIG_PARTITION_TABLE_CUSTOM_FILENAME", "partitions.csv")
-
-    # Increase freertos tick speed from 100Hz to 1kHz so that delay() resolution is 1ms
-    add_idf_sdkconfig_option("CONFIG_FREERTOS_HZ", 1000)
-
-    # Setup watchdog
-    add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT", True)
-    add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_PANIC", True)
-    add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0", False)
-    add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1", False)
-
-    # Disable dynamic log level control to save memory
-    add_idf_sdkconfig_option("CONFIG_LOG_DYNAMIC_LEVEL_CONTROL", False)
-
-    # Set default CPU frequency
-    add_idf_sdkconfig_option(
-        f"CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_{config[CONF_CPU_FREQUENCY][:-3]}", True
-    )
-
-    # Apply LWIP optimization settings
-    advanced = conf[CONF_ADVANCED]
-    # DHCP server: only disable if explicitly set to false
-    # WiFi component handles its own optimization when AP mode is not used
-    # When using Arduino with Ethernet, DHCP server functions must be available
-    # for the Network library to compile, even if not actively used
-    if (
-        CONF_ENABLE_LWIP_DHCP_SERVER in advanced
-        and not advanced[CONF_ENABLE_LWIP_DHCP_SERVER]
-        and not (
-            conf[CONF_TYPE] == FRAMEWORK_ARDUINO
-            and "ethernet" in CORE.loaded_integrations
-        )
-    ):
-        add_idf_sdkconfig_option("CONFIG_LWIP_DHCPS", False)
-    if not advanced.get(CONF_ENABLE_LWIP_MDNS_QUERIES, True):
-        add_idf_sdkconfig_option("CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES", False)
-    if not advanced.get(CONF_ENABLE_LWIP_BRIDGE_INTERFACE, False):
-        add_idf_sdkconfig_option("CONFIG_LWIP_BRIDGEIF_MAX_PORTS", 0)
-    if advanced.get(CONF_EXECUTE_FROM_PSRAM, False):
-        add_idf_sdkconfig_option("CONFIG_SPIRAM_FETCH_INSTRUCTIONS", True)
-        add_idf_sdkconfig_option("CONFIG_SPIRAM_RODATA", True)
-
-    # Apply LWIP core locking for better socket performance
-    # This is already enabled by default in Arduino framework, where it provides
-    # significant performance benefits. Our benchmarks show socket operations are
-    # 24-200% faster with core locking enabled:
-    # - select() on 4 sockets: ~190μs (Arduino/core locking) vs ~235μs (ESP-IDF default)
-    # - Up to 200% slower under load when all operations queue through tcpip_thread
-    # Enabling this makes ESP-IDF socket performance match Arduino framework.
-    if advanced.get(CONF_ENABLE_LWIP_TCPIP_CORE_LOCKING, True):
-        add_idf_sdkconfig_option("CONFIG_LWIP_TCPIP_CORE_LOCKING", True)
-    if advanced.get(CONF_ENABLE_LWIP_CHECK_THREAD_SAFETY, True):
-        add_idf_sdkconfig_option("CONFIG_LWIP_CHECK_THREAD_SAFETY", True)
-
-    cg.add_platformio_option("board_build.partitions", "partitions.csv")
-    if CONF_PARTITIONS in config:
-        add_extra_build_file(
-            "partitions.csv", CORE.relative_config_path(config[CONF_PARTITIONS])
-        )
-
-    if assertion_level := advanced.get(CONF_ASSERTION_LEVEL):
-        for key, flag in ASSERTION_LEVELS.items():
-            add_idf_sdkconfig_option(flag, assertion_level == key)
-
-    add_idf_sdkconfig_option("CONFIG_COMPILER_OPTIMIZATION_DEFAULT", False)
-    compiler_optimization = advanced.get(CONF_COMPILER_OPTIMIZATION)
-    for key, flag in COMPILER_OPTIMIZATIONS.items():
-        add_idf_sdkconfig_option(flag, compiler_optimization == key)
-
-    add_idf_sdkconfig_option(
-        "CONFIG_LWIP_ESP_LWIP_ASSERT",
-        conf[CONF_ADVANCED][CONF_ENABLE_LWIP_ASSERT],
-    )
-
-    if advanced.get(CONF_IGNORE_EFUSE_MAC_CRC):
-        add_idf_sdkconfig_option("CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR", True)
-        add_idf_sdkconfig_option("CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE", False)
-    if advanced.get(CONF_ENABLE_IDF_EXPERIMENTAL_FEATURES):
-        _LOGGER.warning(
-            "Using experimental features in ESP-IDF may result in unexpected failures."
-        )
-        add_idf_sdkconfig_option("CONFIG_IDF_EXPERIMENTAL_FEATURES", True)
-
-    cg.add_define(
-        "USE_ESP_IDF_VERSION_CODE",
-        cg.RawExpression(
-            f"VERSION_CODE({framework_ver.major}, {framework_ver.minor}, {framework_ver.patch})"
-        ),
-    )
-
-    add_idf_sdkconfig_option(f"CONFIG_LOG_DEFAULT_LEVEL_{conf[CONF_LOG_LEVEL]}", True)
-
-    for name, value in conf[CONF_SDKCONFIG_OPTIONS].items():
-        add_idf_sdkconfig_option(name, RawSdkconfigValue(value))
-
-    for component in conf[CONF_COMPONENTS]:
-        add_idf_component(
-            name=component[CONF_NAME],
-            repo=component.get(CONF_SOURCE),
-            ref=component.get(CONF_REF),
-            path=component.get(CONF_PATH),
-        )
+        cg.add(RawExpression(f"setCpuFrequencyMhz({freq})"))


 APP_PARTITION_SIZES = {
@@ -1033,14 +1057,13 @@ def _write_sdkconfig():
        )
        + "\n"
    )
-
    if write_file_if_changed(internal_path, contents):
        # internal changed, update real one
        write_file_if_changed(sdk_path, contents)


 def _write_idf_component_yml():
-    yml_path = CORE.relative_build_path("src/idf_component.yml")
+    yml_path = Path(CORE.relative_build_path("src/idf_component.yml"))
    if CORE.data[KEY_ESP32][KEY_COMPONENTS]:
        components: dict = CORE.data[KEY_ESP32][KEY_COMPONENTS]
        dependencies = {}
@@ -1058,48 +1081,51 @@ def _write_idf_component_yml():
        contents = ""
    if write_file_if_changed(yml_path, contents):
        dependencies_lock = CORE.relative_build_path("dependencies.lock")
-        if dependencies_lock.is_file():
-            dependencies_lock.unlink()
+        if os.path.isfile(dependencies_lock):
+            os.remove(dependencies_lock)
        clean_cmake_cache()


 # Called by writer.py
 def copy_files():
-    _write_sdkconfig()
-    _write_idf_component_yml()
-
-    if "partitions.csv" not in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES]:
-        if CORE.using_arduino:
-            write_file_if_changed(
-                CORE.relative_build_path("partitions.csv"),
-                get_arduino_partition_csv(
-                    CORE.platformio_options.get("board_upload.flash_size")
-                ),
-            )
-        else:
+    if (
+        CORE.using_arduino
+        and "partitions.csv" not in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES]
+    ):
+        write_file_if_changed(
+            CORE.relative_build_path("partitions.csv"),
+            get_arduino_partition_csv(
+                CORE.platformio_options.get("board_upload.flash_size")
+            ),
+        )
+    if CORE.using_esp_idf:
+        _write_sdkconfig()
+        _write_idf_component_yml()
+        if "partitions.csv" not in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES]:
            write_file_if_changed(
                CORE.relative_build_path("partitions.csv"),
                get_idf_partition_csv(
                    CORE.platformio_options.get("board_upload.flash_size")
                ),
            )
-    # IDF build scripts look for version string to put in the build.
-    # However, if the build path does not have an initialized git repo,
-    # and no version.txt file exists, the CMake script fails for some setups.
-    # Fix by manually pasting a version.txt file, containing the ESPHome version
-    write_file_if_changed(
-        CORE.relative_build_path("version.txt"),
-        __version__,
-    )
+        # IDF build scripts look for version string to put in the build.
+        # However, if the build path does not have an initialized git repo,
+        # and no version.txt file exists, the CMake script fails for some setups.
+        # Fix by manually pasting a version.txt file, containing the ESPHome version
+        write_file_if_changed(
+            CORE.relative_build_path("version.txt"),
+            __version__,
+        )

    for file in CORE.data[KEY_ESP32][KEY_EXTRA_BUILD_FILES].values():
-        name: str = file[KEY_NAME]
-        path: Path = file[KEY_PATH]
-        if str(path).startswith("http"):
+        if file[KEY_PATH].startswith("http"):
            import requests

-            CORE.relative_build_path(name).parent.mkdir(parents=True, exist_ok=True)
-            content = requests.get(path, timeout=30).content
-            CORE.relative_build_path(name).write_bytes(content)
+            mkdir_p(CORE.relative_build_path(os.path.dirname(file[KEY_NAME])))
+            with open(CORE.relative_build_path(file[KEY_NAME]), "wb") as f:
+                f.write(requests.get(file[KEY_PATH], timeout=30).content)
        else:
-            copy_file_if_changed(path, CORE.relative_build_path(name))
+            copy_file_if_changed(
+                file[KEY_PATH],
+                CORE.relative_build_path(file[KEY_NAME]),
+            )
--- a/esphome/components/esp32/boards.py
+++ b/esphome/components/esp32/boards.py
@@ -1504,10 +1504,6 @@ BOARDS = {
        "name": "BPI-Bit",
        "variant": VARIANT_ESP32,
    },
-    "bpi-centi-s3": {
-        "name": "BPI-Centi-S3",
-        "variant": VARIANT_ESP32S3,
-    },
    "bpi_leaf_s3": {
        "name": "BPI-Leaf-S3",
        "variant": VARIANT_ESP32S3,
@@ -1668,46 +1664,10 @@ BOARDS = {
        "name": "Espressif ESP32-S3-DevKitC-1-N8 (8 MB QD, No PSRAM)",
        "variant": VARIANT_ESP32S3,
    },
-    "esp32-s3-devkitc-1-n32r8v": {
-        "name": "Espressif ESP32-S3-DevKitC-1-N32R8V (32 MB Flash Octal, 8 MB PSRAM Octal)",
-        "variant": VARIANT_ESP32S3,
-    },
-    "esp32-s3-devkitc1-n16r16": {
-        "name": "Espressif ESP32-S3-DevKitC-1-N16R16V (16 MB Flash Quad, 16 MB PSRAM Octal)",
-        "variant": VARIANT_ESP32S3,
-    },
-    "esp32-s3-devkitc1-n16r2": {
-        "name": "Espressif ESP32-S3-DevKitC-1-N16R2 (16 MB Flash Quad, 2 MB PSRAM Quad)",
-        "variant": VARIANT_ESP32S3,
-    },
-    "esp32-s3-devkitc1-n16r8": {
-        "name": "Espressif ESP32-S3-DevKitC-1-N16R8V (16 MB Flash Quad, 8 MB PSRAM Octal)",
-        "variant": VARIANT_ESP32S3,
-    },
-    "esp32-s3-devkitc1-n4r2": {
-        "name": "Espressif ESP32-S3-DevKitC-1-N4R2 (4 MB Flash Quad, 2 MB PSRAM Quad)",
-        "variant": VARIANT_ESP32S3,
-    },
-    "esp32-s3-devkitc1-n4r8": {
-        "name": "Espressif ESP32-S3-DevKitC-1-N4R8 (4 MB Flash Quad, 8 MB PSRAM Octal)",
-        "variant": VARIANT_ESP32S3,
-    },
-    "esp32-s3-devkitc1-n8r2": {
-        "name": "Espressif ESP32-S3-DevKitC-1-N8R2 (8 MB Flash Quad, 2 MB PSRAM quad)",
-        "variant": VARIANT_ESP32S3,
-    },
-    "esp32-s3-devkitc1-n8r8": {
-        "name": "Espressif ESP32-S3-DevKitC-1-N8R8 (8 MB Flash Quad, 8 MB PSRAM Octal)",
-        "variant": VARIANT_ESP32S3,
-    },
    "esp32-s3-devkitm-1": {
        "name": "Espressif ESP32-S3-DevKitM-1",
        "variant": VARIANT_ESP32S3,
    },
-    "esp32-s3-fh4r2": {
-        "name": "Espressif ESP32-S3-FH4R2 (4 MB QD, 2MB PSRAM)",
-        "variant": VARIANT_ESP32S3,
-    },
    "esp32-solo1": {
        "name": "Espressif Generic ESP32-solo1 4M Flash",
        "variant": VARIANT_ESP32,
@@ -1804,10 +1764,6 @@ BOARDS = {
        "name": "Franzininho WiFi MSC",
        "variant": VARIANT_ESP32S2,
    },
-    "freenove-esp32-s3-n8r8": {
-        "name": "Freenove ESP32-S3 WROOM N8R8 (8MB Flash / 8MB PSRAM)",
-        "variant": VARIANT_ESP32S3,
-    },
    "freenove_esp32_s3_wroom": {
        "name": "Freenove ESP32-S3 WROOM N8R8 (8MB Flash / 8MB PSRAM)",
        "variant": VARIANT_ESP32S3,
@@ -2008,10 +1964,6 @@ BOARDS = {
        "name": "M5Stack AtomS3",
        "variant": VARIANT_ESP32S3,
    },
-    "m5stack-atoms3u": {
-        "name": "M5Stack AtomS3U",
-        "variant": VARIANT_ESP32S3,
-    },
    "m5stack-core-esp32": {
        "name": "M5Stack Core ESP32",
        "variant": VARIANT_ESP32,
@@ -2132,10 +2084,6 @@ BOARDS = {
        "name": "Ai-Thinker NodeMCU-32S2 (ESP-12K)",
        "variant": VARIANT_ESP32S2,
    },
-    "nologo_esp32c3_super_mini": {
-        "name": "Nologo ESP32C3 SuperMini",
-        "variant": VARIANT_ESP32C3,
-    },
    "nscreen-32": {
        "name": "YeaCreate NSCREEN-32",
        "variant": VARIANT_ESP32,
@@ -2244,10 +2192,6 @@ BOARDS = {
        "name": "SparkFun LoRa Gateway 1-Channel",
        "variant": VARIANT_ESP32,
    },
-    "sparkfun_pro_micro_esp32c3": {
-        "name": "SparkFun Pro Micro ESP32-C3",
-        "variant": VARIANT_ESP32C3,
-    },
    "sparkfun_qwiic_pocket_esp32c6": {
        "name": "SparkFun ESP32-C6 Qwiic Pocket",
        "variant": VARIANT_ESP32C6,
@@ -2312,14 +2256,6 @@ BOARDS = {
        "name": "Turta IoT Node",
        "variant": VARIANT_ESP32,
    },
-    "um_bling": {
-        "name": "Unexpected Maker BLING!",
-        "variant": VARIANT_ESP32S3,
-    },
-    "um_edges3_d": {
-        "name": "Unexpected Maker EDGES3[D]",
-        "variant": VARIANT_ESP32S3,
-    },
    "um_feathers2": {
        "name": "Unexpected Maker FeatherS2",
        "variant": VARIANT_ESP32S2,
@@ -2332,18 +2268,10 @@ BOARDS = {
        "name": "Unexpected Maker FeatherS3",
        "variant": VARIANT_ESP32S3,
    },
-    "um_feathers3_neo": {
-        "name": "Unexpected Maker FeatherS3 Neo",
-        "variant": VARIANT_ESP32S3,
-    },
    "um_nanos3": {
        "name": "Unexpected Maker NanoS3",
        "variant": VARIANT_ESP32S3,
    },
-    "um_omgs3": {
-        "name": "Unexpected Maker OMGS3",
-        "variant": VARIANT_ESP32S3,
-    },
    "um_pros3": {
        "name": "Unexpected Maker PROS3",
        "variant": VARIANT_ESP32S3,
@@ -2352,14 +2280,6 @@ BOARDS = {
        "name": "Unexpected Maker RMP",
        "variant": VARIANT_ESP32S2,
    },
-    "um_squixl": {
-        "name": "Unexpected Maker SQUiXL",
-        "variant": VARIANT_ESP32S3,
-    },
-    "um_tinyc6": {
-        "name": "Unexpected Maker TinyC6",
-        "variant": VARIANT_ESP32C6,
-    },
    "um_tinys2": {
        "name": "Unexpected Maker TinyS2",
        "variant": VARIANT_ESP32S2,
@@ -2481,4 +2401,3 @@ BOARDS = {
        "variant": VARIANT_ESP32S3,
    },
 }
-# DO NOT ADD ANYTHING BELOW THIS LINE
--- a/esphome/components/esp32/preferences.cpp
+++ b/esphome/components/esp32/preferences.cpp
@@ -17,14 +17,7 @@ static const char *const TAG = "esp32.preferences";

 struct NVSData {
  std::string key;
-  std::unique_ptr<uint8_t[]> data;
-  size_t len;
-
-  void set_data(const uint8_t *src, size_t size) {
-    data = std::make_unique<uint8_t[]>(size);
-    memcpy(data.get(), src, size);
-    len = size;
-  }
+  std::vector<uint8_t> data;
 };

 static std::vector<NVSData> s_pending_save;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -37,26 +30,26 @@ class ESP32PreferenceBackend : public ESPPreferenceBackend {
    // try find in pending saves and update that
    for (auto &obj : s_pending_save) {
      if (obj.key == key) {
-        obj.set_data(data, len);
+        obj.data.assign(data, data + len);
        return true;
      }
    }
    NVSData save{};
    save.key = key;
-    save.set_data(data, len);
-    s_pending_save.emplace_back(std::move(save));
-    ESP_LOGVV(TAG, "s_pending_save: key: %s, len: %zu", key.c_str(), len);
+    save.data.assign(data, data + len);
+    s_pending_save.emplace_back(save);
+    ESP_LOGVV(TAG, "s_pending_save: key: %s, len: %d", key.c_str(), len);
    return true;
  }
  bool load(uint8_t *data, size_t len) override {
    // try find in pending saves and load from that
    for (auto &obj : s_pending_save) {
      if (obj.key == key) {
-        if (obj.len != len) {
+        if (obj.data.size() != len) {
          // size mismatch
          return false;
        }
-        memcpy(data, obj.data.get(), len);
+        memcpy(data, obj.data.data(), len);
        return true;
      }
    }
@@ -68,7 +61,7 @@ class ESP32PreferenceBackend : public ESPPreferenceBackend {
      return false;
    }
    if (actual_len != len) {
-      ESP_LOGVV(TAG, "NVS length does not match (%zu!=%zu)", actual_len, len);
+      ESP_LOGVV(TAG, "NVS length does not match (%u!=%u)", actual_len, len);
      return false;
    }
    err = nvs_get_blob(nvs_handle, key.c_str(), data, &len);
@@ -76,7 +69,7 @@ class ESP32PreferenceBackend : public ESPPreferenceBackend {
      ESP_LOGV(TAG, "nvs_get_blob('%s') failed: %s", key.c_str(), esp_err_to_name(err));
      return false;
    } else {
-      ESP_LOGVV(TAG, "nvs_get_blob: key: %s, len: %zu", key.c_str(), len);
+      ESP_LOGVV(TAG, "nvs_get_blob: key: %s, len: %d", key.c_str(), len);
    }
    return true;
  }
@@ -119,7 +112,7 @@ class ESP32Preferences : public ESPPreferences {
    if (s_pending_save.empty())
      return true;

-    ESP_LOGV(TAG, "Saving %zu items...", s_pending_save.size());
+    ESP_LOGV(TAG, "Saving %d items...", s_pending_save.size());
    // goal try write all pending saves even if one fails
    int cached = 0, written = 0, failed = 0;
    esp_err_t last_err = ESP_OK;
@@ -130,10 +123,11 @@ class ESP32Preferences : public ESPPreferences {
      const auto &save = s_pending_save[i];
      ESP_LOGVV(TAG, "Checking if NVS data %s has changed", save.key.c_str());
      if (is_changed(nvs_handle, save)) {
-        esp_err_t err = nvs_set_blob(nvs_handle, save.key.c_str(), save.data.get(), save.len);
-        ESP_LOGV(TAG, "sync: key: %s, len: %zu", save.key.c_str(), save.len);
+        esp_err_t err = nvs_set_blob(nvs_handle, save.key.c_str(), save.data.data(), save.data.size());
+        ESP_LOGV(TAG, "sync: key: %s, len: %d", save.key.c_str(), save.data.size());
        if (err != 0) {
-          ESP_LOGV(TAG, "nvs_set_blob('%s', len=%zu) failed: %s", save.key.c_str(), save.len, esp_err_to_name(err));
+          ESP_LOGV(TAG, "nvs_set_blob('%s', len=%u) failed: %s", save.key.c_str(), save.data.size(),
+                   esp_err_to_name(err));
          failed++;
          last_err = err;
          last_key = save.key;
@@ -141,7 +135,7 @@ class ESP32Preferences : public ESPPreferences {
        }
        written++;
      } else {
-        ESP_LOGV(TAG, "NVS data not changed skipping %s  len=%zu", save.key.c_str(), save.len);
+        ESP_LOGV(TAG, "NVS data not changed skipping %s  len=%u", save.key.c_str(), save.data.size());
        cached++;
      }
      s_pending_save.erase(s_pending_save.begin() + i);
@@ -170,7 +164,7 @@ class ESP32Preferences : public ESPPreferences {
      return true;
    }
    // Check size first before allocating memory
-    if (actual_len != to_save.len) {
+    if (actual_len != to_save.data.size()) {
      return true;
    }
    auto stored_data = std::make_unique<uint8_t[]>(actual_len);
@@ -179,7 +173,7 @@ class ESP32Preferences : public ESPPreferences {
      ESP_LOGV(TAG, "nvs_get_blob('%s') failed: %s", to_save.key.c_str(), esp_err_to_name(err));
      return true;
    }
-    return memcmp(to_save.data.get(), stored_data.get(), to_save.len) != 0;
+    return memcmp(to_save.data.data(), stored_data.get(), to_save.data.size()) != 0;
  }

  bool reset() override {
--- a/esphome/components/esp32_ble/init.py
+++ b/esphome/components/esp32_ble/init.py
@@ -12,7 +12,7 @@ from esphome.const import (
    CONF_NAME,
    CONF_NAME_ADD_MAC_SUFFIX,
 )
-from esphome.core import TimePeriod
+from esphome.core import CORE, TimePeriod
 import esphome.final_validate as fv

 DEPENDENCIES = ["esp32"]
@@ -174,12 +174,16 @@ CONFIG_SCHEMA = cv.Schema(
        cv.Optional(
            CONF_ADVERTISING_CYCLE_TIME, default="10s"
        ): cv.positive_time_period_milliseconds,
-        cv.Optional(CONF_DISABLE_BT_LOGS, default=True): cv.boolean,
-        cv.Optional(CONF_CONNECTION_TIMEOUT, default="20s"): cv.All(
+        cv.SplitDefault(CONF_DISABLE_BT_LOGS, esp32_idf=True): cv.All(
+            cv.only_with_esp_idf, cv.boolean
+        ),
+        cv.SplitDefault(CONF_CONNECTION_TIMEOUT, esp32_idf="20s"): cv.All(
+            cv.only_with_esp_idf,
            cv.positive_time_period_seconds,
            cv.Range(min=TimePeriod(seconds=10), max=TimePeriod(seconds=180)),
        ),
-        cv.Optional(CONF_MAX_NOTIFICATIONS, default=12): cv.All(
+        cv.SplitDefault(CONF_MAX_NOTIFICATIONS, esp32_idf=12): cv.All(
+            cv.only_with_esp_idf,
            cv.positive_int,
            cv.Range(min=1, max=64),
        ),
@@ -242,19 +246,6 @@ def final_validation(config):
                f"Name '{name}' is too long, maximum length is {max_length} characters"
            )

-    # Set GATT Client/Server sdkconfig options based on which components are loaded
-    full_config = fv.full_config.get()
-
-    # Check if BLE Server is needed
-    has_ble_server = "esp32_ble_server" in full_config
-    add_idf_sdkconfig_option("CONFIG_BT_GATTS_ENABLE", has_ble_server)
-
-    # Check if BLE Client is needed (via esp32_ble_tracker or esp32_ble_client)
-    has_ble_client = (
-        "esp32_ble_tracker" in full_config or "esp32_ble_client" in full_config
-    )
-    add_idf_sdkconfig_option("CONFIG_BT_GATTC_ENABLE", has_ble_client)
-
    return config


@@ -270,40 +261,43 @@ async def to_code(config):
        cg.add(var.set_name(name))
    await cg.register_component(var, config)

-    add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
-    add_idf_sdkconfig_option("CONFIG_BT_BLE_42_FEATURES_SUPPORTED", True)
+    if CORE.using_esp_idf:
+        add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
+        add_idf_sdkconfig_option("CONFIG_BT_BLE_42_FEATURES_SUPPORTED", True)

-    # Register the core BLE loggers that are always needed
-    register_bt_logger(BTLoggers.GAP, BTLoggers.BTM, BTLoggers.HCI)
+        # Register the core BLE loggers that are always needed
+        register_bt_logger(BTLoggers.GAP, BTLoggers.BTM, BTLoggers.HCI)

-    # Apply logger settings if log disabling is enabled
-    if config.get(CONF_DISABLE_BT_LOGS, False):
-        # Disable all Bluetooth loggers that are not required
-        for logger in BTLoggers:
-            if logger not in _required_loggers:
-                add_idf_sdkconfig_option(f"{logger.value}_NONE", True)
+        # Apply logger settings if log disabling is enabled
+        if config.get(CONF_DISABLE_BT_LOGS, False):
+            # Disable all Bluetooth loggers that are not required
+            for logger in BTLoggers:
+                if logger not in _required_loggers:
+                    add_idf_sdkconfig_option(f"{logger.value}_NONE", True)

-    # Set BLE connection establishment timeout to match aioesphomeapi/bleak-retry-connector
-    # Default is 20 seconds instead of ESP-IDF's 30 seconds. Because there is no way to
-    # cancel a BLE connection in progress, when aioesphomeapi times out at 20 seconds,
-    # the connection slot remains occupied for the remaining time, preventing new connection
-    # attempts and wasting valuable connection slots.
-    if CONF_CONNECTION_TIMEOUT in config:
-        timeout_seconds = int(config[CONF_CONNECTION_TIMEOUT].total_seconds)
-        add_idf_sdkconfig_option("CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT", timeout_seconds)
-        # Increase GATT client connection retry count for problematic devices
-        # Default in ESP-IDF is 3, we increase to 10 for better reliability with
-        # low-power/timing-sensitive devices
-        add_idf_sdkconfig_option("CONFIG_BT_GATTC_CONNECT_RETRY_COUNT", 10)
+        # Set BLE connection establishment timeout to match aioesphomeapi/bleak-retry-connector
+        # Default is 20 seconds instead of ESP-IDF's 30 seconds. Because there is no way to
+        # cancel a BLE connection in progress, when aioesphomeapi times out at 20 seconds,
+        # the connection slot remains occupied for the remaining time, preventing new connection
+        # attempts and wasting valuable connection slots.
+        if CONF_CONNECTION_TIMEOUT in config:
+            timeout_seconds = int(config[CONF_CONNECTION_TIMEOUT].total_seconds)
+            add_idf_sdkconfig_option(
+                "CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT", timeout_seconds
+            )
+            # Increase GATT client connection retry count for problematic devices
+            # Default in ESP-IDF is 3, we increase to 10 for better reliability with
+            # low-power/timing-sensitive devices
+            add_idf_sdkconfig_option("CONFIG_BT_GATTC_CONNECT_RETRY_COUNT", 10)

-    # Set the maximum number of notification registrations
-    # This controls how many BLE characteristics can have notifications enabled
-    # across all connections for a single GATT client interface
-    # https://github.com/esphome/issues/issues/6808
-    if CONF_MAX_NOTIFICATIONS in config:
-        add_idf_sdkconfig_option(
-            "CONFIG_BT_GATTC_NOTIF_REG_MAX", config[CONF_MAX_NOTIFICATIONS]
-        )
+        # Set the maximum number of notification registrations
+        # This controls how many BLE characteristics can have notifications enabled
+        # across all connections for a single GATT client interface
+        # https://github.com/esphome/issues/issues/6808
+        if CONF_MAX_NOTIFICATIONS in config:
+            add_idf_sdkconfig_option(
+                "CONFIG_BT_GATTC_NOTIF_REG_MAX", config[CONF_MAX_NOTIFICATIONS]
+            )

    cg.add_define("USE_ESP32_BLE")

--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -73,28 +73,6 @@ void ESP32BLE::advertising_set_manufacturer_data(const std::vector<uint8_t> &dat
  this->advertising_start();
 }

-void ESP32BLE::advertising_set_service_data_and_name(std::span<const uint8_t> data, bool include_name) {
-  // This method atomically updates both service data and device name inclusion in BLE advertising.
-  // When include_name is true, the device name is included in the advertising packet making it
-  // visible to passive BLE scanners. When false, the name is only visible in scan response
-  // (requires active scanning). This atomic operation ensures we only restart advertising once
-  // when changing both properties, avoiding the brief gap that would occur with separate calls.
-
-  this->advertising_init_();
-
-  if (include_name) {
-    // When including name, clear service data first to avoid packet overflow
-    this->advertising_->set_service_data(std::span<const uint8_t>{});
-    this->advertising_->set_include_name(true);
-  } else {
-    // When including service data, clear name first to avoid packet overflow
-    this->advertising_->set_include_name(false);
-    this->advertising_->set_service_data(data);
-  }
-
-  this->advertising_start();
-}
-
 void ESP32BLE::advertising_register_raw_advertisement_callback(std::function<void(bool)> &&callback) {
  this->advertising_init_();
  this->advertising_->register_raw_advertisement_callback(std::move(callback));
@@ -189,7 +167,6 @@ bool ESP32BLE::ble_setup_() {
    }
  }

-#ifdef USE_ESP32_BLE_SERVER
  if (!this->gatts_event_handlers_.empty()) {
    err = esp_ble_gatts_register_callback(ESP32BLE::gatts_event_handler);
    if (err != ESP_OK) {
@@ -197,9 +174,7 @@ bool ESP32BLE::ble_setup_() {
      return false;
    }
  }
-#endif

-#ifdef USE_ESP32_BLE_CLIENT
  if (!this->gattc_event_handlers_.empty()) {
    err = esp_ble_gattc_register_callback(ESP32BLE::gattc_event_handler);
    if (err != ESP_OK) {
@@ -207,7 +182,6 @@ bool ESP32BLE::ble_setup_() {
      return false;
    }
  }
-#endif

  std::string name;
  if (this->name_.has_value()) {
@@ -329,7 +303,6 @@ void ESP32BLE::loop() {
  BLEEvent *ble_event = this->ble_events_.pop();
  while (ble_event != nullptr) {
    switch (ble_event->type_) {
-#ifdef USE_ESP32_BLE_SERVER
      case BLEEvent::GATTS: {
        esp_gatts_cb_event_t event = ble_event->event_.gatts.gatts_event;
        esp_gatt_if_t gatts_if = ble_event->event_.gatts.gatts_if;
@@ -340,8 +313,6 @@ void ESP32BLE::loop() {
        }
        break;
      }
-#endif
-#ifdef USE_ESP32_BLE_CLIENT
      case BLEEvent::GATTC: {
        esp_gattc_cb_event_t event = ble_event->event_.gattc.gattc_event;
        esp_gatt_if_t gattc_if = ble_event->event_.gattc.gattc_if;
@@ -352,7 +323,6 @@ void ESP32BLE::loop() {
        }
        break;
      }
-#endif
      case BLEEvent::GAP: {
        esp_gap_ble_cb_event_t gap_event = ble_event->event_.gap.gap_event;
        switch (gap_event) {
@@ -446,17 +416,13 @@ void load_ble_event(BLEEvent *event, esp_gap_ble_cb_event_t e, esp_ble_gap_cb_pa
  event->load_gap_event(e, p);
 }

-#ifdef USE_ESP32_BLE_CLIENT
 void load_ble_event(BLEEvent *event, esp_gattc_cb_event_t e, esp_gatt_if_t i, esp_ble_gattc_cb_param_t *p) {
  event->load_gattc_event(e, i, p);
 }
-#endif

-#ifdef USE_ESP32_BLE_SERVER
 void load_ble_event(BLEEvent *event, esp_gatts_cb_event_t e, esp_gatt_if_t i, esp_ble_gatts_cb_param_t *p) {
  event->load_gatts_event(e, i, p);
 }
-#endif

 template<typename... Args> void enqueue_ble_event(Args... args) {
  // Allocate an event from the pool
@@ -477,12 +443,8 @@ template<typename... Args> void enqueue_ble_event(Args... args) {

 // Explicit template instantiations for the friend function
 template void enqueue_ble_event(esp_gap_ble_cb_event_t, esp_ble_gap_cb_param_t *);
-#ifdef USE_ESP32_BLE_SERVER
 template void enqueue_ble_event(esp_gatts_cb_event_t, esp_gatt_if_t, esp_ble_gatts_cb_param_t *);
-#endif
-#ifdef USE_ESP32_BLE_CLIENT
 template void enqueue_ble_event(esp_gattc_cb_event_t, esp_gatt_if_t, esp_ble_gattc_cb_param_t *);
-#endif

 void ESP32BLE::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) {
  switch (event) {
@@ -522,19 +484,15 @@ void ESP32BLE::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_pa
  ESP_LOGW(TAG, "Ignoring unexpected GAP event type: %d", event);
 }

-#ifdef USE_ESP32_BLE_SERVER
 void ESP32BLE::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
                                   esp_ble_gatts_cb_param_t *param) {
  enqueue_ble_event(event, gatts_if, param);
 }
-#endif

-#ifdef USE_ESP32_BLE_CLIENT
 void ESP32BLE::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                   esp_ble_gattc_cb_param_t *param) {
  enqueue_ble_event(event, gattc_if, param);
 }
-#endif

 float ESP32BLE::get_setup_priority() const { return setup_priority::BLUETOOTH; }

--- a/esphome/components/esp32_ble/ble.h
+++ b/esphome/components/esp32_ble/ble.h
@@ -9,7 +9,6 @@
 #endif

 #include <functional>
-#include <span>

 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
@@ -75,21 +74,17 @@ class GAPScanEventHandler {
  virtual void gap_scan_event_handler(const BLEScanResult &scan_result) = 0;
 };

-#ifdef USE_ESP32_BLE_CLIENT
 class GATTcEventHandler {
 public:
  virtual void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                                   esp_ble_gattc_cb_param_t *param) = 0;
 };
-#endif

-#ifdef USE_ESP32_BLE_SERVER
 class GATTsEventHandler {
 public:
  virtual void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
                                   esp_ble_gatts_cb_param_t *param) = 0;
 };
-#endif

 class BLEStatusEventHandler {
 public:
@@ -119,7 +114,6 @@ class ESP32BLE : public Component {
  void advertising_set_service_data(const std::vector<uint8_t> &data);
  void advertising_set_manufacturer_data(const std::vector<uint8_t> &data);
  void advertising_set_appearance(uint16_t appearance) { this->appearance_ = appearance; }
-  void advertising_set_service_data_and_name(std::span<const uint8_t> data, bool include_name);
  void advertising_add_service_uuid(ESPBTUUID uuid);
  void advertising_remove_service_uuid(ESPBTUUID uuid);
  void advertising_register_raw_advertisement_callback(std::function<void(bool)> &&callback);
@@ -129,24 +123,16 @@ class ESP32BLE : public Component {
  void register_gap_scan_event_handler(GAPScanEventHandler *handler) {
    this->gap_scan_event_handlers_.push_back(handler);
  }
-#ifdef USE_ESP32_BLE_CLIENT
  void register_gattc_event_handler(GATTcEventHandler *handler) { this->gattc_event_handlers_.push_back(handler); }
-#endif
-#ifdef USE_ESP32_BLE_SERVER
  void register_gatts_event_handler(GATTsEventHandler *handler) { this->gatts_event_handlers_.push_back(handler); }
-#endif
  void register_ble_status_event_handler(BLEStatusEventHandler *handler) {
    this->ble_status_event_handlers_.push_back(handler);
  }
  void set_enable_on_boot(bool enable_on_boot) { this->enable_on_boot_ = enable_on_boot; }

 protected:
-#ifdef USE_ESP32_BLE_SERVER
  static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param);
-#endif
-#ifdef USE_ESP32_BLE_CLIENT
  static void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp_ble_gattc_cb_param_t *param);
-#endif
  static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);

  bool ble_setup_();
@@ -162,12 +148,8 @@ class ESP32BLE : public Component {
  // Vectors (12 bytes each on 32-bit, naturally aligned to 4 bytes)
  std::vector<GAPEventHandler *> gap_event_handlers_;
  std::vector<GAPScanEventHandler *> gap_scan_event_handlers_;
-#ifdef USE_ESP32_BLE_CLIENT
  std::vector<GATTcEventHandler *> gattc_event_handlers_;
-#endif
-#ifdef USE_ESP32_BLE_SERVER
  std::vector<GATTsEventHandler *> gatts_event_handlers_;
-#endif
  std::vector<BLEStatusEventHandler *> ble_status_event_handlers_;

  // Large objects (size depends on template parameters, but typically aligned to 4 bytes)
--- a/esphome/components/esp32_ble/ble_advertising.cpp
+++ b/esphome/components/esp32_ble/ble_advertising.cpp
@@ -43,7 +43,7 @@ void BLEAdvertising::remove_service_uuid(ESPBTUUID uuid) {
                                 this->advertising_uuids_.end());
 }

-void BLEAdvertising::set_service_data(std::span<const uint8_t> data) {
+void BLEAdvertising::set_service_data(const std::vector<uint8_t> &data) {
  delete[] this->advertising_data_.p_service_data;
  this->advertising_data_.p_service_data = nullptr;
  this->advertising_data_.service_data_len = data.size();
@@ -54,10 +54,6 @@ void BLEAdvertising::set_service_data(std::span<const uint8_t> data) {
  }
 }

-void BLEAdvertising::set_service_data(const std::vector<uint8_t> &data) {
-  this->set_service_data(std::span<const uint8_t>(data));
-}
-
 void BLEAdvertising::set_manufacturer_data(const std::vector<uint8_t> &data) {
  delete[] this->advertising_data_.p_manufacturer_data;
  this->advertising_data_.p_manufacturer_data = nullptr;
@@ -88,7 +84,7 @@ esp_err_t BLEAdvertising::services_advertisement_() {
  esp_err_t err;

  this->advertising_data_.set_scan_rsp = false;
-  this->advertising_data_.include_name = this->include_name_in_adv_ || !this->scan_response_;
+  this->advertising_data_.include_name = !this->scan_response_;
  this->advertising_data_.include_txpower = !this->scan_response_;
  err = esp_ble_gap_config_adv_data(&this->advertising_data_);
  if (err != ESP_OK) {
--- a/esphome/components/esp32_ble/ble_advertising.h
+++ b/esphome/components/esp32_ble/ble_advertising.h
@@ -4,7 +4,6 @@

 #include <array>
 #include <functional>
-#include <span>
 #include <vector>

 #ifdef USE_ESP32
@@ -37,8 +36,6 @@ class BLEAdvertising {
  void set_manufacturer_data(const std::vector<uint8_t> &data);
  void set_appearance(uint16_t appearance) { this->advertising_data_.appearance = appearance; }
  void set_service_data(const std::vector<uint8_t> &data);
-  void set_service_data(std::span<const uint8_t> data);
-  void set_include_name(bool include_name) { this->include_name_in_adv_ = include_name; }
  void register_raw_advertisement_callback(std::function<void(bool)> &&callback);

  void start();
@@ -48,7 +45,6 @@ class BLEAdvertising {
  esp_err_t services_advertisement_();

  bool scan_response_;
-  bool include_name_in_adv_{false};
  esp_ble_adv_data_t advertising_data_;
  esp_ble_adv_data_t scan_response_data_;
  esp_ble_adv_params_t advertising_params_;
--- a/esphome/components/esp32_ble/ble_uuid.cpp
+++ b/esphome/components/esp32_ble/ble_uuid.cpp
@@ -7,7 +7,6 @@
 #include <cstdio>
 #include <cinttypes>
 #include "esphome/core/log.h"
-#include "esphome/core/helpers.h"

 namespace esphome::esp32_ble {

@@ -170,42 +169,22 @@ bool ESPBTUUID::operator==(const ESPBTUUID &uuid) const {
 }
 esp_bt_uuid_t ESPBTUUID::get_uuid() const { return this->uuid_; }
 std::string ESPBTUUID::to_string() const {
-  char buf[40];  // Enough for 128-bit UUID with dashes
-  char *pos = buf;
-
  switch (this->uuid_.len) {
    case ESP_UUID_LEN_16:
-      *pos++ = '0';
-      *pos++ = 'x';
-      *pos++ = format_hex_pretty_char(this->uuid_.uuid.uuid16 >> 12);
-      *pos++ = format_hex_pretty_char((this->uuid_.uuid.uuid16 >> 8) & 0x0F);
-      *pos++ = format_hex_pretty_char((this->uuid_.uuid.uuid16 >> 4) & 0x0F);
-      *pos++ = format_hex_pretty_char(this->uuid_.uuid.uuid16 & 0x0F);
-      *pos = '\0';
-      return std::string(buf);
-
+      return str_snprintf("0x%02X%02X", 6, this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16 & 0xff);
    case ESP_UUID_LEN_32:
-      *pos++ = '0';
-      *pos++ = 'x';
-      for (int shift = 28; shift >= 0; shift -= 4) {
-        *pos++ = format_hex_pretty_char((this->uuid_.uuid.uuid32 >> shift) & 0x0F);
-      }
-      *pos = '\0';
-      return std::string(buf);
-
+      return str_snprintf("0x%02" PRIX32 "%02" PRIX32 "%02" PRIX32 "%02" PRIX32, 10, (this->uuid_.uuid.uuid32 >> 24),
+                          (this->uuid_.uuid.uuid32 >> 16 & 0xff), (this->uuid_.uuid.uuid32 >> 8 & 0xff),
+                          this->uuid_.uuid.uuid32 & 0xff);
    default:
    case ESP_UUID_LEN_128:
-      // Format: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+      std::string buf;
      for (int8_t i = 15; i >= 0; i--) {
-        uint8_t byte = this->uuid_.uuid.uuid128[i];
-        *pos++ = format_hex_pretty_char(byte >> 4);
-        *pos++ = format_hex_pretty_char(byte & 0x0F);
-        if (i == 12 || i == 10 || i == 8 || i == 6) {
-          *pos++ = '-';
-        }
+        buf += str_snprintf("%02X", 2, this->uuid_.uuid.uuid128[i]);
+        if (i == 6 || i == 8 || i == 10 || i == 12)
+          buf += "-";
      }
-      *pos = '\0';
-      return std::string(buf);
+      return buf;
  }
  return "";
 }
--- a/esphome/components/esp32_ble_beacon/init.py
+++ b/esphome/components/esp32_ble_beacon/init.py
@@ -4,7 +4,7 @@ from esphome.components.esp32 import add_idf_sdkconfig_option
 from esphome.components.esp32_ble import CONF_BLE_ID
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_TX_POWER, CONF_TYPE, CONF_UUID
-from esphome.core import TimePeriod
+from esphome.core import CORE, TimePeriod

 AUTO_LOAD = ["esp32_ble"]
 DEPENDENCIES = ["esp32"]
@@ -86,5 +86,6 @@ async def to_code(config):

    cg.add_define("USE_ESP32_BLE_ADVERTISING")

-    add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
-    add_idf_sdkconfig_option("CONFIG_BT_BLE_42_FEATURES_SUPPORTED", True)
+    if CORE.using_esp_idf:
+        add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
+        add_idf_sdkconfig_option("CONFIG_BT_BLE_42_FEATURES_SUPPORTED", True)
--- a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
+++ b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
@@ -1,6 +1,5 @@
 #include "esp32_ble_beacon.h"
 #include "esphome/core/log.h"
-#include "esphome/core/helpers.h"

 #ifdef USE_ESP32

@@ -32,13 +31,12 @@ void ESP32BLEBeacon::dump_config() {
  char uuid[37];
  char *bpos = uuid;
  for (int8_t ii = 0; ii < 16; ++ii) {
-    *bpos++ = format_hex_pretty_char(this->uuid_[ii] >> 4);
-    *bpos++ = format_hex_pretty_char(this->uuid_[ii] & 0x0F);
+    bpos += sprintf(bpos, "%02X", this->uuid_[ii]);
    if (ii == 3 || ii == 5 || ii == 7 || ii == 9) {
-      *bpos++ = '-';
+      bpos += sprintf(bpos, "-");
    }
  }
-  *bpos = '\0';
+  uuid[36] = '\0';
  ESP_LOGCONFIG(TAG,
                "  UUID: %s, Major: %u, Minor: %u, Min Interval: %ums, Max Interval: %ums, Measured Power: %d"
                ", TX Power: %ddBm",
--- a/esphome/components/esp32_ble_client/ble_client_base.h
+++ b/esphome/components/esp32_ble_client/ble_client_base.h
@@ -60,14 +60,11 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
    if (address == 0) {
      this->address_str_ = "";
    } else {
-      char buf[18];
-      uint8_t mac[6] = {
-          (uint8_t) ((this->address_ >> 40) & 0xff), (uint8_t) ((this->address_ >> 32) & 0xff),
-          (uint8_t) ((this->address_ >> 24) & 0xff), (uint8_t) ((this->address_ >> 16) & 0xff),
-          (uint8_t) ((this->address_ >> 8) & 0xff),  (uint8_t) ((this->address_ >> 0) & 0xff),
-      };
-      format_mac_addr_upper(mac, buf);
-      this->address_str_ = buf;
+      this->address_str_ =
+          str_snprintf("%02X:%02X:%02X:%02X:%02X:%02X", 17, (uint8_t) (this->address_ >> 40) & 0xff,
+                       (uint8_t) (this->address_ >> 32) & 0xff, (uint8_t) (this->address_ >> 24) & 0xff,
+                       (uint8_t) (this->address_ >> 16) & 0xff, (uint8_t) (this->address_ >> 8) & 0xff,
+                       (uint8_t) (this->address_ >> 0) & 0xff);
    }
  }
  const std::string &address_str() const { return this->address_str_; }
--- a/esphome/components/esp32_ble_server/init.py
+++ b/esphome/components/esp32_ble_server/init.py
@@ -26,7 +26,7 @@ from esphome.const import (
 from esphome.core import CORE
 from esphome.schema_extractors import SCHEMA_EXTRACT

-AUTO_LOAD = ["esp32_ble", "bytebuffer"]
+AUTO_LOAD = ["esp32_ble", "bytebuffer", "event_emitter"]
 CODEOWNERS = ["@jesserockz", "@clydebarrow", "@Rapsssito"]
 DEPENDENCIES = ["esp32"]
 DOMAIN = "esp32_ble_server"
@@ -488,7 +488,6 @@ async def to_code_descriptor(descriptor_conf, char_var):
    cg.add(desc_var.set_value(value))
    if CONF_ON_WRITE in descriptor_conf:
        on_write_conf = descriptor_conf[CONF_ON_WRITE]
-        cg.add_define("USE_ESP32_BLE_SERVER_DESCRIPTOR_ON_WRITE")
        await automation.build_automation(
            BLETriggers_ns.create_descriptor_on_write_trigger(desc_var),
            [(cg.std_vector.template(cg.uint8), "x"), (cg.uint16, "id")],
@@ -506,32 +505,23 @@ async def to_code_characteristic(service_var, char_conf):
    )
    if CONF_ON_WRITE in char_conf:
        on_write_conf = char_conf[CONF_ON_WRITE]
-        cg.add_define("USE_ESP32_BLE_SERVER_CHARACTERISTIC_ON_WRITE")
        await automation.build_automation(
            BLETriggers_ns.create_characteristic_on_write_trigger(char_var),
            [(cg.std_vector.template(cg.uint8), "x"), (cg.uint16, "id")],
            on_write_conf,
        )
    if CONF_VALUE in char_conf:
-        # Check if the value is templated (Lambda)
-        value_data = char_conf[CONF_VALUE][CONF_DATA]
-        if isinstance(value_data, cv.Lambda):
-            # Templated value - need the full action infrastructure
-            action_conf = {
-                CONF_ID: char_conf[CONF_ID],
-                CONF_VALUE: char_conf[CONF_VALUE],
-            }
-            value_action = await ble_server_characteristic_set_value(
-                action_conf,
-                char_conf[CONF_CHAR_VALUE_ACTION_ID_],
-                cg.TemplateArguments(),
-                {},
-            )
-            cg.add(value_action.play())
-        else:
-            # Static value - just set it directly without action infrastructure
-            value = await parse_value(char_conf[CONF_VALUE], {})
-            cg.add(char_var.set_value(value))
+        action_conf = {
+            CONF_ID: char_conf[CONF_ID],
+            CONF_VALUE: char_conf[CONF_VALUE],
+        }
+        value_action = await ble_server_characteristic_set_value(
+            action_conf,
+            char_conf[CONF_CHAR_VALUE_ACTION_ID_],
+            cg.TemplateArguments(),
+            {},
+        )
+        cg.add(value_action.play())
    for descriptor_conf in char_conf[CONF_DESCRIPTORS]:
        await to_code_descriptor(descriptor_conf, char_var)

@@ -570,14 +560,12 @@ async def to_code(config):
        else:
            cg.add(var.enqueue_start_service(service_var))
    if CONF_ON_CONNECT in config:
-        cg.add_define("USE_ESP32_BLE_SERVER_ON_CONNECT")
        await automation.build_automation(
            BLETriggers_ns.create_server_on_connect_trigger(var),
            [(cg.uint16, "id")],
            config[CONF_ON_CONNECT],
        )
    if CONF_ON_DISCONNECT in config:
-        cg.add_define("USE_ESP32_BLE_SERVER_ON_DISCONNECT")
        await automation.build_automation(
            BLETriggers_ns.create_server_on_disconnect_trigger(var),
            [(cg.uint16, "id")],
@@ -585,7 +573,8 @@ async def to_code(config):
        )
    cg.add_define("USE_ESP32_BLE_SERVER")
    cg.add_define("USE_ESP32_BLE_ADVERTISING")
-    add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
+    if CORE.using_esp_idf:
+        add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)


@automation.register_action(
@@ -606,7 +595,6 @@ async def ble_server_characteristic_set_value(config, action_id, template_arg, a
    var = cg.new_Pvariable(action_id, template_arg, paren)
    value = await parse_value(config[CONF_VALUE], args)
    cg.add(var.set_buffer(value))
-    cg.add_define("USE_ESP32_BLE_SERVER_SET_VALUE_ACTION")
    return var


@@ -625,7 +613,6 @@ async def ble_server_descriptor_set_value(config, action_id, template_arg, args)
    var = cg.new_Pvariable(action_id, template_arg, paren)
    value = await parse_value(config[CONF_VALUE], args)
    cg.add(var.set_buffer(value))
-    cg.add_define("USE_ESP32_BLE_SERVER_DESCRIPTOR_SET_VALUE_ACTION")
    return var


@@ -643,5 +630,4 @@ async def ble_server_descriptor_set_value(config, action_id, template_arg, args)
 )
 async def ble_server_characteristic_notify(config, action_id, template_arg, args):
    paren = await cg.get_variable(config[CONF_ID])
-    cg.add_define("USE_ESP32_BLE_SERVER_NOTIFY_ACTION")
    return cg.new_Pvariable(action_id, template_arg, paren)
--- a/esphome/components/esp32_ble_server/ble_characteristic.cpp
+++ b/esphome/components/esp32_ble_server/ble_characteristic.cpp
@@ -51,11 +51,11 @@ void BLECharacteristic::notify() {

  for (auto &client : this->service_->get_server()->get_clients()) {
    size_t length = this->value_.size();
-    // Find the client in the list of clients to notify
-    auto *entry = this->find_client_in_notify_list_(client);
-    if (entry == nullptr)
+    // If the client is not in the list of clients to notify, skip it
+    if (this->clients_to_notify_.count(client) == 0)
      continue;
-    bool require_ack = entry->indicate;
+    // If the client is in the list of clients to notify, check if it requires an ack (i.e. INDICATE)
+    bool require_ack = this->clients_to_notify_[client];
    // TODO: Remove this block when INDICATE acknowledgment is supported
    if (require_ack) {
      ESP_LOGW(TAG, "INDICATE acknowledgment is not yet supported (i.e. it works as a NOTIFY)");
@@ -73,17 +73,16 @@ void BLECharacteristic::notify() {
 void BLECharacteristic::add_descriptor(BLEDescriptor *descriptor) {
  // If the descriptor is the CCCD descriptor, listen to its write event to know if the client wants to be notified
  if (descriptor->get_uuid() == ESPBTUUID::from_uint16(ESP_GATT_UUID_CHAR_CLIENT_CONFIG)) {
-    descriptor->on_write([this](std::span<const uint8_t> value, uint16_t conn_id) {
+    descriptor->on(BLEDescriptorEvt::VectorEvt::ON_WRITE, [this](const std::vector<uint8_t> &value, uint16_t conn_id) {
      if (value.size() != 2)
        return;
      uint16_t cccd = encode_uint16(value[1], value[0]);
      bool notify = (cccd & 1) != 0;
      bool indicate = (cccd & 2) != 0;
-      // Remove existing entry if present
-      this->remove_client_from_notify_list_(conn_id);
-      // Add new entry if needed
      if (notify || indicate) {
-        this->clients_to_notify_.push_back({conn_id, indicate});
+        this->clients_to_notify_[conn_id] = indicate;
+      } else {
+        this->clients_to_notify_.erase(conn_id);
      }
    });
  }
@@ -208,9 +207,8 @@ void BLECharacteristic::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt
      if (!param->read.need_rsp)
        break;  // For some reason you can request a read but not want a response

-      if (this->on_read_callback_) {
-        (*this->on_read_callback_)(param->read.conn_id);
-      }
+      this->EventEmitter<BLECharacteristicEvt::EmptyEvt, uint16_t>::emit_(BLECharacteristicEvt::EmptyEvt::ON_READ,
+                                                                          param->read.conn_id);

      uint16_t max_offset = 22;

@@ -278,9 +276,8 @@ void BLECharacteristic::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt
      }

      if (!param->write.is_prep) {
-        if (this->on_write_callback_) {
-          (*this->on_write_callback_)(this->value_, param->write.conn_id);
-        }
+        this->EventEmitter<BLECharacteristicEvt::VectorEvt, std::vector<uint8_t>, uint16_t>::emit_(
+            BLECharacteristicEvt::VectorEvt::ON_WRITE, this->value_, param->write.conn_id);
      }

      break;
@@ -291,9 +288,8 @@ void BLECharacteristic::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt
        break;
      this->write_event_ = false;
      if (param->exec_write.exec_write_flag == ESP_GATT_PREP_WRITE_EXEC) {
-        if (this->on_write_callback_) {
-          (*this->on_write_callback_)(this->value_, param->exec_write.conn_id);
-        }
+        this->EventEmitter<BLECharacteristicEvt::VectorEvt, std::vector<uint8_t>, uint16_t>::emit_(
+            BLECharacteristicEvt::VectorEvt::ON_WRITE, this->value_, param->exec_write.conn_id);
      }
      esp_err_t err =
          esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, ESP_GATT_OK, nullptr);
@@ -311,28 +307,6 @@ void BLECharacteristic::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt
  }
 }

-void BLECharacteristic::remove_client_from_notify_list_(uint16_t conn_id) {
-  // Since we typically have very few clients (often just 1), we can optimize
-  // for the common case by swapping with the last element and popping
-  for (size_t i = 0; i < this->clients_to_notify_.size(); i++) {
-    if (this->clients_to_notify_[i].conn_id == conn_id) {
-      // Swap with last element and pop (safe even when i is the last element)
-      this->clients_to_notify_[i] = this->clients_to_notify_.back();
-      this->clients_to_notify_.pop_back();
-      return;
-    }
-  }
-}
-
-BLECharacteristic::ClientNotificationEntry *BLECharacteristic::find_client_in_notify_list_(uint16_t conn_id) {
-  for (auto &entry : this->clients_to_notify_) {
-    if (entry.conn_id == conn_id) {
-      return &entry;
-    }
-  }
-  return nullptr;
-}
-
 }  // namespace esp32_ble_server
 }  // namespace esphome

--- a/esphome/components/esp32_ble_server/ble_characteristic.h
+++ b/esphome/components/esp32_ble_server/ble_characteristic.h
@@ -2,12 +2,11 @@

 #include "ble_descriptor.h"
 #include "esphome/components/esp32_ble/ble_uuid.h"
+#include "esphome/components/event_emitter/event_emitter.h"
 #include "esphome/components/bytebuffer/bytebuffer.h"

 #include <vector>
-#include <span>
-#include <functional>
-#include <memory>
+#include <unordered_map>

 #ifdef USE_ESP32

@@ -24,10 +23,22 @@ namespace esp32_ble_server {

 using namespace esp32_ble;
 using namespace bytebuffer;
+using namespace event_emitter;

 class BLEService;

-class BLECharacteristic {
+namespace BLECharacteristicEvt {
+enum VectorEvt {
+  ON_WRITE,
+};
+
+enum EmptyEvt {
+  ON_READ,
+};
+}  // namespace BLECharacteristicEvt
+
+class BLECharacteristic : public EventEmitter<BLECharacteristicEvt::VectorEvt, std::vector<uint8_t>, uint16_t>,
+                          public EventEmitter<BLECharacteristicEvt::EmptyEvt, uint16_t> {
 public:
  BLECharacteristic(ESPBTUUID uuid, uint32_t properties);
  ~BLECharacteristic();
@@ -66,15 +77,6 @@ class BLECharacteristic {
  bool is_created();
  bool is_failed();

-  // Direct callback registration - only allocates when callback is set
-  void on_write(std::function<void(std::span<const uint8_t>, uint16_t)> &&callback) {
-    this->on_write_callback_ =
-        std::make_unique<std::function<void(std::span<const uint8_t>, uint16_t)>>(std::move(callback));
-  }
-  void on_read(std::function<void(uint16_t)> &&callback) {
-    this->on_read_callback_ = std::make_unique<std::function<void(uint16_t)>>(std::move(callback));
-  }
-
 protected:
  bool write_event_{false};
  BLEService *service_{};
@@ -87,18 +89,7 @@ class BLECharacteristic {
  SemaphoreHandle_t set_value_lock_;

  std::vector<BLEDescriptor *> descriptors_;
-
-  struct ClientNotificationEntry {
-    uint16_t conn_id;
-    bool indicate;  // true = indicate, false = notify
-  };
-  std::vector<ClientNotificationEntry> clients_to_notify_;
-
-  void remove_client_from_notify_list_(uint16_t conn_id);
-  ClientNotificationEntry *find_client_in_notify_list_(uint16_t conn_id);
-
-  std::unique_ptr<std::function<void(std::span<const uint8_t>, uint16_t)>> on_write_callback_;
-  std::unique_ptr<std::function<void(uint16_t)>> on_read_callback_;
+  std::unordered_map<uint16_t, bool> clients_to_notify_;

  esp_gatt_perm_t permissions_ = ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE;

--- a/esphome/components/esp32_ble_server/ble_descriptor.cpp
+++ b/esphome/components/esp32_ble_server/ble_descriptor.cpp
@@ -74,10 +74,9 @@ void BLEDescriptor::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_
        break;
      this->value_.attr_len = param->write.len;
      memcpy(this->value_.attr_value, param->write.value, param->write.len);
-      if (this->on_write_callback_) {
-        (*this->on_write_callback_)(std::span<const uint8_t>(param->write.value, param->write.len),
-                                    param->write.conn_id);
-      }
+      this->emit_(BLEDescriptorEvt::VectorEvt::ON_WRITE,
+                  std::vector<uint8_t>(param->write.value, param->write.value + param->write.len),
+                  param->write.conn_id);
      break;
    }
    default:
--- a/esphome/components/esp32_ble_server/ble_descriptor.h
+++ b/esphome/components/esp32_ble_server/ble_descriptor.h
@@ -1,26 +1,30 @@
 #pragma once

 #include "esphome/components/esp32_ble/ble_uuid.h"
+#include "esphome/components/event_emitter/event_emitter.h"
 #include "esphome/components/bytebuffer/bytebuffer.h"

 #ifdef USE_ESP32

 #include <esp_gatt_defs.h>
 #include <esp_gatts_api.h>
-#include <span>
-#include <functional>
-#include <memory>

 namespace esphome {
 namespace esp32_ble_server {

 using namespace esp32_ble;
 using namespace bytebuffer;
+using namespace event_emitter;

 class BLECharacteristic;

-// Base class for BLE descriptors
-class BLEDescriptor {
+namespace BLEDescriptorEvt {
+enum VectorEvt {
+  ON_WRITE,
+};
+}  // namespace BLEDescriptorEvt
+
+class BLEDescriptor : public EventEmitter<BLEDescriptorEvt::VectorEvt, std::vector<uint8_t>, uint16_t> {
 public:
  BLEDescriptor(ESPBTUUID uuid, uint16_t max_len = 100, bool read = true, bool write = true);
  virtual ~BLEDescriptor();
@@ -35,12 +39,6 @@ class BLEDescriptor {
  bool is_created() { return this->state_ == CREATED; }
  bool is_failed() { return this->state_ == FAILED; }

-  // Direct callback registration - only allocates when callback is set
-  void on_write(std::function<void(std::span<const uint8_t>, uint16_t)> &&callback) {
-    this->on_write_callback_ =
-        std::make_unique<std::function<void(std::span<const uint8_t>, uint16_t)>>(std::move(callback));
-  }
-
 protected:
  BLECharacteristic *characteristic_{nullptr};
  ESPBTUUID uuid_;
@@ -48,8 +46,6 @@ class BLEDescriptor {

  esp_attr_value_t value_{};

-  std::unique_ptr<std::function<void(std::span<const uint8_t>, uint16_t)>> on_write_callback_;
-
  esp_gatt_perm_t permissions_{};

  enum State : uint8_t {
--- a/esphome/components/esp32_ble_server/ble_server.cpp
+++ b/esphome/components/esp32_ble_server/ble_server.cpp
@@ -70,11 +70,11 @@ void BLEServer::loop() {
        // it is at the top of the GATT table
        this->device_information_service_->do_create(this);
        // Create all services previously created
-        for (auto &entry : this->services_) {
-          if (entry.service == this->device_information_service_) {
+        for (auto &pair : this->services_) {
+          if (pair.second == this->device_information_service_) {
            continue;
          }
-          entry.service->do_create(this);
+          pair.second->do_create(this);
        }
        this->state_ = STARTING_SERVICE;
      }
@@ -118,7 +118,7 @@ BLEService *BLEServer::create_service(ESPBTUUID uuid, bool advertise, uint16_t n
  }
  BLEService *service =  // NOLINT(cppcoreguidelines-owning-memory)
      new BLEService(uuid, num_handles, inst_id, advertise);
-  this->services_.push_back({uuid, inst_id, service});
+  this->services_.emplace(BLEServer::get_service_key(uuid, inst_id), service);
  if (this->parent_->is_active() && this->registered_) {
    service->do_create(this);
  }
@@ -127,32 +127,26 @@ BLEService *BLEServer::create_service(ESPBTUUID uuid, bool advertise, uint16_t n

 void BLEServer::remove_service(ESPBTUUID uuid, uint8_t inst_id) {
  ESP_LOGV(TAG, "Removing BLE service - %s %d", uuid.to_string().c_str(), inst_id);
-  for (auto it = this->services_.begin(); it != this->services_.end(); ++it) {
-    if (it->uuid == uuid && it->inst_id == inst_id) {
-      it->service->do_delete();
-      delete it->service;  // NOLINT(cppcoreguidelines-owning-memory)
-      this->services_.erase(it);
-      return;
-    }
+  BLEService *service = this->get_service(uuid, inst_id);
+  if (service == nullptr) {
+    ESP_LOGW(TAG, "BLE service %s %d does not exist", uuid.to_string().c_str(), inst_id);
+    return;
  }
-  ESP_LOGW(TAG, "BLE service %s %d does not exist", uuid.to_string().c_str(), inst_id);
+  service->do_delete();
+  delete service;  // NOLINT(cppcoreguidelines-owning-memory)
+  this->services_.erase(BLEServer::get_service_key(uuid, inst_id));
 }

 BLEService *BLEServer::get_service(ESPBTUUID uuid, uint8_t inst_id) {
-  for (auto &entry : this->services_) {
-    if (entry.uuid == uuid && entry.inst_id == inst_id) {
-      return entry.service;
-    }
+  BLEService *service = nullptr;
+  if (this->services_.count(BLEServer::get_service_key(uuid, inst_id)) > 0) {
+    service = this->services_.at(BLEServer::get_service_key(uuid, inst_id));
  }
-  return nullptr;
+  return service;
 }

-void BLEServer::dispatch_callbacks_(CallbackType type, uint16_t conn_id) {
-  for (auto &entry : this->callbacks_) {
-    if (entry.type == type) {
-      entry.callback(conn_id);
-    }
-  }
+std::string BLEServer::get_service_key(ESPBTUUID uuid, uint8_t inst_id) {
+  return uuid.to_string() + std::to_string(inst_id);
 }

 void BLEServer::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
@@ -161,14 +155,14 @@ void BLEServer::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t ga
    case ESP_GATTS_CONNECT_EVT: {
      ESP_LOGD(TAG, "BLE Client connected");
      this->add_client_(param->connect.conn_id);
-      this->dispatch_callbacks_(CallbackType::ON_CONNECT, param->connect.conn_id);
+      this->emit_(BLEServerEvt::EmptyEvt::ON_CONNECT, param->connect.conn_id);
      break;
    }
    case ESP_GATTS_DISCONNECT_EVT: {
      ESP_LOGD(TAG, "BLE Client disconnected");
      this->remove_client_(param->disconnect.conn_id);
      this->parent_->advertising_start();
-      this->dispatch_callbacks_(CallbackType::ON_DISCONNECT, param->disconnect.conn_id);
+      this->emit_(BLEServerEvt::EmptyEvt::ON_DISCONNECT, param->disconnect.conn_id);
      break;
    }
    case ESP_GATTS_REG_EVT: {
@@ -180,8 +174,8 @@ void BLEServer::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t ga
      break;
  }

-  for (auto &entry : this->services_) {
-    entry.service->gatts_event_handler(event, gatts_if, param);
+  for (const auto &pair : this->services_) {
+    pair.second->gatts_event_handler(event, gatts_if, param);
  }
 }

@@ -189,8 +183,8 @@ void BLEServer::ble_before_disabled_event_handler() {
  // Delete all clients
  this->clients_.clear();
  // Delete all services
-  for (auto &entry : this->services_) {
-    entry.service->do_delete();
+  for (auto &pair : this->services_) {
+    pair.second->do_delete();
  }
  this->registered_ = false;
  this->state_ = INIT;
--- a/esphome/components/esp32_ble_server/ble_server.h
+++ b/esphome/components/esp32_ble_server/ble_server.h
@@ -13,7 +13,6 @@
 #include <vector>
 #include <unordered_map>
 #include <unordered_set>
-#include <functional>

 #ifdef USE_ESP32

@@ -25,7 +24,18 @@ namespace esp32_ble_server {
 using namespace esp32_ble;
 using namespace bytebuffer;

-class BLEServer : public Component, public GATTsEventHandler, public BLEStatusEventHandler, public Parented<ESP32BLE> {
+namespace BLEServerEvt {
+enum EmptyEvt {
+  ON_CONNECT,
+  ON_DISCONNECT,
+};
+}  // namespace BLEServerEvt
+
+class BLEServer : public Component,
+                  public GATTsEventHandler,
+                  public BLEStatusEventHandler,
+                  public Parented<ESP32BLE>,
+                  public EventEmitter<BLEServerEvt::EmptyEvt, uint16_t> {
 public:
  void setup() override;
  void loop() override;
@@ -55,45 +65,19 @@ class BLEServer : public Component, public GATTsEventHandler, public BLEStatusEv

  void ble_before_disabled_event_handler() override;

-  // Direct callback registration - supports multiple callbacks
-  void on_connect(std::function<void(uint16_t)> &&callback) {
-    this->callbacks_.push_back({CallbackType::ON_CONNECT, std::move(callback)});
-  }
-  void on_disconnect(std::function<void(uint16_t)> &&callback) {
-    this->callbacks_.push_back({CallbackType::ON_DISCONNECT, std::move(callback)});
-  }
-
 protected:
-  enum class CallbackType : uint8_t {
-    ON_CONNECT,
-    ON_DISCONNECT,
-  };
-
-  struct CallbackEntry {
-    CallbackType type;
-    std::function<void(uint16_t)> callback;
-  };
-
-  struct ServiceEntry {
-    ESPBTUUID uuid;
-    uint8_t inst_id;
-    BLEService *service;
-  };
-
+  static std::string get_service_key(ESPBTUUID uuid, uint8_t inst_id);
  void restart_advertising_();

  void add_client_(uint16_t conn_id) { this->clients_.insert(conn_id); }
  void remove_client_(uint16_t conn_id) { this->clients_.erase(conn_id); }
-  void dispatch_callbacks_(CallbackType type, uint16_t conn_id);
-
-  std::vector<CallbackEntry> callbacks_;

  std::vector<uint8_t> manufacturer_data_{};
  esp_gatt_if_t gatts_if_{0};
  bool registered_{false};

  std::unordered_set<uint16_t> clients_;
-  std::vector<ServiceEntry> services_{};
+  std::unordered_map<std::string, BLEService *> services_{};
  std::vector<BLEService *> services_to_start_{};
  BLEService *device_information_service_{};

--- a/esphome/components/esp32_ble_server/ble_server_automations.cpp
+++ b/esphome/components/esp32_ble_server/ble_server_automations.cpp
@@ -9,89 +9,67 @@ namespace esp32_ble_server_automations {

 using namespace esp32_ble;

-#ifdef USE_ESP32_BLE_SERVER_CHARACTERISTIC_ON_WRITE
 Trigger<std::vector<uint8_t>, uint16_t> *BLETriggers::create_characteristic_on_write_trigger(
    BLECharacteristic *characteristic) {
  Trigger<std::vector<uint8_t>, uint16_t> *on_write_trigger =  // NOLINT(cppcoreguidelines-owning-memory)
      new Trigger<std::vector<uint8_t>, uint16_t>();
-  characteristic->on_write([on_write_trigger](std::span<const uint8_t> data, uint16_t id) {
-    // Convert span to vector for trigger - copy is necessary because:
-    // 1. Trigger stores the data for use in automation actions that execute later
-    // 2. The span is only valid during this callback (points to temporary BLE stack data)
-    // 3. User lambdas in automations need persistent data they can access asynchronously
-    on_write_trigger->trigger(std::vector<uint8_t>(data.begin(), data.end()), id);
-  });
+  characteristic->EventEmitter<BLECharacteristicEvt::VectorEvt, std::vector<uint8_t>, uint16_t>::on(
+      BLECharacteristicEvt::VectorEvt::ON_WRITE,
+      [on_write_trigger](const std::vector<uint8_t> &data, uint16_t id) { on_write_trigger->trigger(data, id); });
  return on_write_trigger;
 }
-#endif

-#ifdef USE_ESP32_BLE_SERVER_DESCRIPTOR_ON_WRITE
 Trigger<std::vector<uint8_t>, uint16_t> *BLETriggers::create_descriptor_on_write_trigger(BLEDescriptor *descriptor) {
  Trigger<std::vector<uint8_t>, uint16_t> *on_write_trigger =  // NOLINT(cppcoreguidelines-owning-memory)
      new Trigger<std::vector<uint8_t>, uint16_t>();
-  descriptor->on_write([on_write_trigger](std::span<const uint8_t> data, uint16_t id) {
-    // Convert span to vector for trigger - copy is necessary because:
-    // 1. Trigger stores the data for use in automation actions that execute later
-    // 2. The span is only valid during this callback (points to temporary BLE stack data)
-    // 3. User lambdas in automations need persistent data they can access asynchronously
-    on_write_trigger->trigger(std::vector<uint8_t>(data.begin(), data.end()), id);
-  });
+  descriptor->on(
+      BLEDescriptorEvt::VectorEvt::ON_WRITE,
+      [on_write_trigger](const std::vector<uint8_t> &data, uint16_t id) { on_write_trigger->trigger(data, id); });
  return on_write_trigger;
 }
-#endif

-#ifdef USE_ESP32_BLE_SERVER_ON_CONNECT
 Trigger<uint16_t> *BLETriggers::create_server_on_connect_trigger(BLEServer *server) {
  Trigger<uint16_t> *on_connect_trigger = new Trigger<uint16_t>();  // NOLINT(cppcoreguidelines-owning-memory)
-  server->on_connect([on_connect_trigger](uint16_t conn_id) { on_connect_trigger->trigger(conn_id); });
+  server->on(BLEServerEvt::EmptyEvt::ON_CONNECT,
+             [on_connect_trigger](uint16_t conn_id) { on_connect_trigger->trigger(conn_id); });
  return on_connect_trigger;
 }
-#endif

-#ifdef USE_ESP32_BLE_SERVER_ON_DISCONNECT
 Trigger<uint16_t> *BLETriggers::create_server_on_disconnect_trigger(BLEServer *server) {
  Trigger<uint16_t> *on_disconnect_trigger = new Trigger<uint16_t>();  // NOLINT(cppcoreguidelines-owning-memory)
-  server->on_disconnect([on_disconnect_trigger](uint16_t conn_id) { on_disconnect_trigger->trigger(conn_id); });
+  server->on(BLEServerEvt::EmptyEvt::ON_DISCONNECT,
+             [on_disconnect_trigger](uint16_t conn_id) { on_disconnect_trigger->trigger(conn_id); });
  return on_disconnect_trigger;
 }
-#endif

-#ifdef USE_ESP32_BLE_SERVER_SET_VALUE_ACTION
 void BLECharacteristicSetValueActionManager::set_listener(BLECharacteristic *characteristic,
+                                                          EventEmitterListenerID listener_id,
                                                          const std::function<void()> &pre_notify_listener) {
-  // Find and remove existing listener for this characteristic
-  auto *existing = this->find_listener_(characteristic);
-  if (existing != nullptr) {
-    // Remove from vector
-    this->remove_listener_(characteristic);
+  // Check if there is already a listener for this characteristic
+  if (this->listeners_.count(characteristic) > 0) {
+    // Unpack the pair listener_id, pre_notify_listener_id
+    auto listener_pairs = this->listeners_[characteristic];
+    EventEmitterListenerID old_listener_id = listener_pairs.first;
+    EventEmitterListenerID old_pre_notify_listener_id = listener_pairs.second;
+    // Remove the previous listener
+    characteristic->EventEmitter<BLECharacteristicEvt::EmptyEvt, uint16_t>::off(BLECharacteristicEvt::EmptyEvt::ON_READ,
+                                                                                old_listener_id);
+    // Remove the pre-notify listener
+    this->off(BLECharacteristicSetValueActionEvt::PRE_NOTIFY, old_pre_notify_listener_id);
  }
-  // Save the entry to the vector
-  this->listeners_.push_back({characteristic, pre_notify_listener});
+  // Create a new listener for the pre-notify event
+  EventEmitterListenerID pre_notify_listener_id =
+      this->on(BLECharacteristicSetValueActionEvt::PRE_NOTIFY,
+               [pre_notify_listener, characteristic](const BLECharacteristic *evt_characteristic) {
+                 // Only call the pre-notify listener if the characteristic is the one we are interested in
+                 if (characteristic == evt_characteristic) {
+                   pre_notify_listener();
+                 }
+               });
+  // Save the pair listener_id, pre_notify_listener_id to the map
+  this->listeners_[characteristic] = std::make_pair(listener_id, pre_notify_listener_id);
 }

-BLECharacteristicSetValueActionManager::ListenerEntry *BLECharacteristicSetValueActionManager::find_listener_(
-    BLECharacteristic *characteristic) {
-  for (auto &entry : this->listeners_) {
-    if (entry.characteristic == characteristic) {
-      return &entry;
-    }
-  }
-  return nullptr;
-}
-
-void BLECharacteristicSetValueActionManager::remove_listener_(BLECharacteristic *characteristic) {
-  // Since we typically have very few listeners, optimize by swapping with back and popping
-  for (size_t i = 0; i < this->listeners_.size(); i++) {
-    if (this->listeners_[i].characteristic == characteristic) {
-      // Swap with last element and pop (safe even when i is the last element)
-      this->listeners_[i] = this->listeners_.back();
-      this->listeners_.pop_back();
-      return;
-    }
-  }
-}
-#endif
-
 }  // namespace esp32_ble_server_automations
 }  // namespace esp32_ble_server
 }  // namespace esphome
--- a/esphome/components/esp32_ble_server/ble_server_automations.h
+++ b/esphome/components/esp32_ble_server/ble_server_automations.h
@@ -4,9 +4,11 @@
 #include "ble_characteristic.h"
 #include "ble_descriptor.h"

+#include "esphome/components/event_emitter/event_emitter.h"
 #include "esphome/core/automation.h"

 #include <vector>
+#include <unordered_map>
 #include <functional>

 #ifdef USE_ESP32
@@ -17,53 +19,41 @@ namespace esp32_ble_server {
 namespace esp32_ble_server_automations {

 using namespace esp32_ble;
+using namespace event_emitter;

 class BLETriggers {
 public:
-#ifdef USE_ESP32_BLE_SERVER_CHARACTERISTIC_ON_WRITE
  static Trigger<std::vector<uint8_t>, uint16_t> *create_characteristic_on_write_trigger(
      BLECharacteristic *characteristic);
-#endif
-#ifdef USE_ESP32_BLE_SERVER_DESCRIPTOR_ON_WRITE
  static Trigger<std::vector<uint8_t>, uint16_t> *create_descriptor_on_write_trigger(BLEDescriptor *descriptor);
-#endif
-#ifdef USE_ESP32_BLE_SERVER_ON_CONNECT
  static Trigger<uint16_t> *create_server_on_connect_trigger(BLEServer *server);
-#endif
-#ifdef USE_ESP32_BLE_SERVER_ON_DISCONNECT
  static Trigger<uint16_t> *create_server_on_disconnect_trigger(BLEServer *server);
-#endif
 };

-#ifdef USE_ESP32_BLE_SERVER_SET_VALUE_ACTION
+enum BLECharacteristicSetValueActionEvt {
+  PRE_NOTIFY,
+};
+
 // Class to make sure only one BLECharacteristicSetValueAction is active at a time for each characteristic
-class BLECharacteristicSetValueActionManager {
+class BLECharacteristicSetValueActionManager
+    : public EventEmitter<BLECharacteristicSetValueActionEvt, BLECharacteristic *> {
 public:
  // Singleton pattern
  static BLECharacteristicSetValueActionManager *get_instance() {
    static BLECharacteristicSetValueActionManager instance;
    return &instance;
  }
-  void set_listener(BLECharacteristic *characteristic, const std::function<void()> &pre_notify_listener);
-  bool has_listener(BLECharacteristic *characteristic) { return this->find_listener_(characteristic) != nullptr; }
+  void set_listener(BLECharacteristic *characteristic, EventEmitterListenerID listener_id,
+                    const std::function<void()> &pre_notify_listener);
+  EventEmitterListenerID get_listener(BLECharacteristic *characteristic) {
+    return this->listeners_[characteristic].first;
+  }
  void emit_pre_notify(BLECharacteristic *characteristic) {
-    for (const auto &entry : this->listeners_) {
-      if (entry.characteristic == characteristic) {
-        entry.pre_notify_listener();
-        break;
-      }
-    }
+    this->emit_(BLECharacteristicSetValueActionEvt::PRE_NOTIFY, characteristic);
  }

 private:
-  struct ListenerEntry {
-    BLECharacteristic *characteristic;
-    std::function<void()> pre_notify_listener;
-  };
-  std::vector<ListenerEntry> listeners_;
-
-  ListenerEntry *find_listener_(BLECharacteristic *characteristic);
-  void remove_listener_(BLECharacteristic *characteristic);
+  std::unordered_map<BLECharacteristic *, std::pair<EventEmitterListenerID, EventEmitterListenerID>> listeners_;
 };

 template<typename... Ts> class BLECharacteristicSetValueAction : public Action<Ts...> {
@@ -73,34 +63,32 @@ template<typename... Ts> class BLECharacteristicSetValueAction : public Action<T
  void set_buffer(ByteBuffer buffer) { this->set_buffer(buffer.get_data()); }
  void play(Ts... x) override {
    // If the listener is already set, do nothing
-    if (BLECharacteristicSetValueActionManager::get_instance()->has_listener(this->parent_))
+    if (BLECharacteristicSetValueActionManager::get_instance()->get_listener(this->parent_) == this->listener_id_)
      return;
    // Set initial value
    this->parent_->set_value(this->buffer_.value(x...));
    // Set the listener for read events
-    this->parent_->on_read([this, x...](uint16_t id) {
-      // Set the value of the characteristic every time it is read
-      this->parent_->set_value(this->buffer_.value(x...));
-    });
+    this->listener_id_ = this->parent_->EventEmitter<BLECharacteristicEvt::EmptyEvt, uint16_t>::on(
+        BLECharacteristicEvt::EmptyEvt::ON_READ, [this, x...](uint16_t id) {
+          // Set the value of the characteristic every time it is read
+          this->parent_->set_value(this->buffer_.value(x...));
+        });
    // Set the listener in the global manager so only one BLECharacteristicSetValueAction is set for each characteristic
    BLECharacteristicSetValueActionManager::get_instance()->set_listener(
-        this->parent_, [this, x...]() { this->parent_->set_value(this->buffer_.value(x...)); });
+        this->parent_, this->listener_id_, [this, x...]() { this->parent_->set_value(this->buffer_.value(x...)); });
  }

 protected:
  BLECharacteristic *parent_;
+  EventEmitterListenerID listener_id_;
 };
-#endif  // USE_ESP32_BLE_SERVER_SET_VALUE_ACTION

-#ifdef USE_ESP32_BLE_SERVER_NOTIFY_ACTION
 template<typename... Ts> class BLECharacteristicNotifyAction : public Action<Ts...> {
 public:
  BLECharacteristicNotifyAction(BLECharacteristic *characteristic) : parent_(characteristic) {}
  void play(Ts... x) override {
-#ifdef USE_ESP32_BLE_SERVER_SET_VALUE_ACTION
    // Call the pre-notify event
    BLECharacteristicSetValueActionManager::get_instance()->emit_pre_notify(this->parent_);
-#endif
    // Notify the characteristic
    this->parent_->notify();
  }
@@ -108,9 +96,7 @@ template<typename... Ts> class BLECharacteristicNotifyAction : public Action<Ts.
 protected:
  BLECharacteristic *parent_;
 };
-#endif  // USE_ESP32_BLE_SERVER_NOTIFY_ACTION

-#ifdef USE_ESP32_BLE_SERVER_DESCRIPTOR_SET_VALUE_ACTION
 template<typename... Ts> class BLEDescriptorSetValueAction : public Action<Ts...> {
 public:
  BLEDescriptorSetValueAction(BLEDescriptor *descriptor) : parent_(descriptor) {}
@@ -121,7 +107,6 @@ template<typename... Ts> class BLEDescriptorSetValueAction : public Action<Ts...
 protected:
  BLEDescriptor *parent_;
 };
-#endif  // USE_ESP32_BLE_SERVER_DESCRIPTOR_SET_VALUE_ACTION

 }  // namespace esp32_ble_server_automations
 }  // namespace esp32_ble_server
--- a/esphome/components/esp32_ble_tracker/init.py
+++ b/esphome/components/esp32_ble_tracker/init.py
@@ -150,6 +150,10 @@ def as_reversed_hex_array(value):
    )


+def max_connections() -> int:
+    return IDF_MAX_CONNECTIONS if CORE.using_esp_idf else DEFAULT_MAX_CONNECTIONS
+
+
 def consume_connection_slots(
    value: int, consumer: str
 ) -> Callable[[MutableMapping], MutableMapping]:
@@ -168,7 +172,7 @@ CONFIG_SCHEMA = cv.All(
            cv.GenerateID(): cv.declare_id(ESP32BLETracker),
            cv.GenerateID(esp32_ble.CONF_BLE_ID): cv.use_id(esp32_ble.ESP32BLE),
            cv.Optional(CONF_MAX_CONNECTIONS, default=DEFAULT_MAX_CONNECTIONS): cv.All(
-                cv.positive_int, cv.Range(min=0, max=IDF_MAX_CONNECTIONS)
+                cv.positive_int, cv.Range(min=0, max=max_connections())
            ),
            cv.Optional(CONF_SCAN_PARAMETERS, default={}): cv.All(
                cv.Schema(
@@ -234,8 +238,9 @@ def validate_remaining_connections(config):
    if used_slots <= config[CONF_MAX_CONNECTIONS]:
        return config
    slot_users = ", ".join(slots)
+    hard_limit = max_connections()

-    if used_slots < IDF_MAX_CONNECTIONS:
+    if used_slots < hard_limit:
        _LOGGER.warning(
            "esp32_ble_tracker exceeded `%s`: components attempted to consume %d "
            "connection slot(s) out of available configured maximum %d connection "
@@ -257,9 +262,9 @@ def validate_remaining_connections(config):
        f"out of available configured maximum {config[CONF_MAX_CONNECTIONS]} "
        f"connection slot(s); Decrease the number of BLE clients ({slot_users})"
    )
-    if config[CONF_MAX_CONNECTIONS] < IDF_MAX_CONNECTIONS:
+    if config[CONF_MAX_CONNECTIONS] < hard_limit:
        msg += f" or increase {CONF_MAX_CONNECTIONS}` to {used_slots}"
-    msg += f" to stay under the {IDF_MAX_CONNECTIONS} connection slot(s) limit."
+    msg += f" to stay under the {hard_limit} connection slot(s) limit."
    raise cv.Invalid(msg)


@@ -337,18 +342,19 @@ async def to_code(config):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
        await automation.build_automation(trigger, [], conf)

-    add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
-    if config.get(CONF_SOFTWARE_COEXISTENCE):
-        add_idf_sdkconfig_option("CONFIG_SW_COEXIST_ENABLE", True)
-    # https://github.com/espressif/esp-idf/issues/4101
-    # https://github.com/espressif/esp-idf/issues/2503
-    # Match arduino CONFIG_BTU_TASK_STACK_SIZE
-    # https://github.com/espressif/arduino-esp32/blob/fd72cf46ad6fc1a6de99c1d83ba8eba17d80a4ee/tools/sdk/esp32/sdkconfig#L1866
-    add_idf_sdkconfig_option("CONFIG_BT_BTU_TASK_STACK_SIZE", 8192)
-    add_idf_sdkconfig_option("CONFIG_BT_ACL_CONNECTIONS", 9)
-    add_idf_sdkconfig_option(
-        "CONFIG_BTDM_CTRL_BLE_MAX_CONN", config[CONF_MAX_CONNECTIONS]
-    )
+    if CORE.using_esp_idf:
+        add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
+        if config.get(CONF_SOFTWARE_COEXISTENCE):
+            add_idf_sdkconfig_option("CONFIG_SW_COEXIST_ENABLE", True)
+        # https://github.com/espressif/esp-idf/issues/4101
+        # https://github.com/espressif/esp-idf/issues/2503
+        # Match arduino CONFIG_BTU_TASK_STACK_SIZE
+        # https://github.com/espressif/arduino-esp32/blob/fd72cf46ad6fc1a6de99c1d83ba8eba17d80a4ee/tools/sdk/esp32/sdkconfig#L1866
+        add_idf_sdkconfig_option("CONFIG_BT_BTU_TASK_STACK_SIZE", 8192)
+        add_idf_sdkconfig_option("CONFIG_BT_ACL_CONNECTIONS", 9)
+        add_idf_sdkconfig_option(
+            "CONFIG_BTDM_CTRL_BLE_MAX_CONN", config[CONF_MAX_CONNECTIONS]
+        )

    cg.add_define("USE_OTA_STATE_CALLBACK")  # To be notified when an OTA update starts
    cg.add_define("USE_ESP32_BLE_CLIENT")
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -295,7 +295,7 @@ void ESP32BLETracker::gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_ga
 void ESP32BLETracker::gap_scan_event_handler(const BLEScanResult &scan_result) {
  // Note: This handler is called from the main loop context via esp32_ble's event queue.
  // We process advertisements immediately instead of buffering them.
-  ESP_LOGVV(TAG, "gap_scan_result - event %d", scan_result.search_evt);
+  ESP_LOGV(TAG, "gap_scan_result - event %d", scan_result.search_evt);

  if (scan_result.search_evt == ESP_GAP_SEARCH_INQ_RES_EVT) {
    // Process the scan result immediately
@@ -605,8 +605,9 @@ void ESPBTDevice::parse_adv_(const uint8_t *payload, uint8_t len) {
 }

 std::string ESPBTDevice::address_str() const {
-  char mac[18];
-  format_mac_addr_upper(this->address_, mac);
+  char mac[24];
+  snprintf(mac, sizeof(mac), "%02X:%02X:%02X:%02X:%02X:%02X", this->address_[0], this->address_[1], this->address_[2],
+           this->address_[3], this->address_[4], this->address_[5]);
  return mac;
 }

--- a/esphome/components/esp32_camera/init.py
+++ b/esphome/components/esp32_camera/init.py
@@ -21,6 +21,7 @@ from esphome.const import (
    CONF_TRIGGER_ID,
    CONF_VSYNC_PIN,
 )
+from esphome.core import CORE
 from esphome.core.entity_helpers import setup_entity
 import esphome.final_validate as fv

@@ -343,7 +344,8 @@ async def to_code(config):

    cg.add_define("USE_CAMERA")

-    add_idf_component(name="espressif/esp32-camera", ref="2.1.1")
+    if CORE.using_esp_idf:
+        add_idf_component(name="espressif/esp32-camera", ref="2.1.1")

    for conf in config.get(CONF_ON_STREAM_START, []):
        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
--- a/esphome/components/esp32_hosted/init.py
+++ b/esphome/components/esp32_hosted/init.py
@@ -1,5 +1,4 @@
 import os
-from pathlib import Path

 from esphome import pins
 from esphome.components import esp32
@@ -98,5 +97,5 @@ async def to_code(config):
    esp32.add_extra_script(
        "post",
        "esp32_hosted.py",
-        Path(__file__).parent / "esp32_hosted.py.script",
+        os.path.join(os.path.dirname(__file__), "esp32_hosted.py.script"),
    )
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jesse Hills	b6e0502203	idf only	2025-09-13 10:12:49 +12:00
Jesse Hills	6d427bec49	[epdiy] ePaper display(s)	2025-09-13 10:01:42 +12:00