Merge branch 'ci_impact_analysis' into mqtt_reduce_json_assign_flash

2025-11-05 09:31:54 +00:00 · 2025-10-17 23:36:31 -10:00
796 changed files with 6570 additions and 20746 deletions
--- a/.clang-tidy.hash
+++ b/.clang-tidy.hash
@@ -1 +1 @@
-3d46b63015d761c85ca9cb77ab79a389509e5776701fb22aed16e7b79d432c0c
+d7693a1e996cacd4a3d1c9a16336799c2a8cc3db02e4e74084151ce964581248
--- a/.github/workflows/auto-label-pr.yml
+++ b/.github/workflows/auto-label-pr.yml
@@ -53,7 +53,6 @@ jobs:
              'new-target-platform',
              'merging-to-release',
              'merging-to-beta',
-              'chained-pr',
              'core',
              'small-pr',
              'dashboard',
@@ -141,8 +140,6 @@ jobs:
                labels.add('merging-to-release');
              } else if (baseRef === 'beta') {
                labels.add('merging-to-beta');
-              } else if (baseRef !== 'dev') {
-                labels.add('chained-pr');
              }

              return labels;
@@ -416,7 +413,7 @@ jobs:
            }

            // Generate review messages
-            function generateReviewMessages(finalLabels, originalLabelCount) {
+            function generateReviewMessages(finalLabels) {
              const messages = [];
              const prAuthor = context.payload.pull_request.user.login;

@@ -430,15 +427,15 @@ jobs:
                  .reduce((sum, file) => sum + (file.deletions || 0), 0);
                const nonTestChanges = (totalAdditions - testAdditions) - (totalDeletions - testDeletions);

-                const tooManyLabels = originalLabelCount > MAX_LABELS;
+                const tooManyLabels = finalLabels.length > MAX_LABELS;
                const tooManyChanges = nonTestChanges > TOO_BIG_THRESHOLD;

                let message = `${TOO_BIG_MARKER}\n### 📦 Pull Request Size\n\n`;

                if (tooManyLabels && tooManyChanges) {
-                  message += `This PR is too large with ${nonTestChanges} line changes (excluding tests) and affects ${originalLabelCount} different components/areas.`;
+                  message += `This PR is too large with ${nonTestChanges} line changes (excluding tests) and affects ${finalLabels.length} different components/areas.`;
                } else if (tooManyLabels) {
-                  message += `This PR affects ${originalLabelCount} different components/areas.`;
+                  message += `This PR affects ${finalLabels.length} different components/areas.`;
                } else {
                  message += `This PR is too large with ${nonTestChanges} line changes (excluding tests).`;
                }
@@ -466,8 +463,8 @@ jobs:
            }

            // Handle reviews
-            async function handleReviews(finalLabels, originalLabelCount) {
-              const reviewMessages = generateReviewMessages(finalLabels, originalLabelCount);
+            async function handleReviews(finalLabels) {
+              const reviewMessages = generateReviewMessages(finalLabels);
              const hasReviewableLabels = finalLabels.some(label =>
                ['too-big', 'needs-codeowners'].includes(label)
              );
@@ -531,8 +528,8 @@ jobs:
            const apiData = await fetchApiData();
            const baseRef = context.payload.pull_request.base.ref;

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

@@ -627,7 +624,6 @@ jobs:

            // Handle too many labels (only for non-mega PRs)
            const tooManyLabels = finalLabels.length > MAX_LABELS;
-            const originalLabelCount = finalLabels.length;

            if (tooManyLabels && !isMegaPR && !finalLabels.includes('too-big')) {
              finalLabels = ['too-big'];
@@ -636,7 +632,7 @@ jobs:
            console.log('Computed labels:', finalLabels.join(', '));

            // Handle reviews
-            await handleReviews(finalLabels, originalLabelCount);
+            await handleReviews(finalLabels);

            // Apply labels
            if (finalLabels.length > 0) {
--- a/.github/workflows/ci-api-proto.yml
+++ b/.github/workflows/ci-api-proto.yml
@@ -62,7 +62,7 @@ jobs:
        run: git diff
      - if: failure()
        name: Archive artifacts
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: generated-proto-files
          path: |
--- a/.github/workflows/ci-memory-impact-comment.yml
+++ b/.github/workflows/ci-memory-impact-comment.yml
@@ -1,111 +0,0 @@
---
-name: Memory Impact Comment (Forks)
-
-on:
-  workflow_run:
-    workflows: ["CI"]
-    types: [completed]
-
-permissions:
-  contents: read
-  pull-requests: write
-  actions: read
-
-jobs:
-  memory-impact-comment:
-    name: Post memory impact comment (fork PRs only)
-    runs-on: ubuntu-24.04
-    # Only run for PRs from forks that had successful CI runs
-    if: >
-      github.event.workflow_run.event == 'pull_request' &&
-      github.event.workflow_run.conclusion == 'success' &&
-      github.event.workflow_run.head_repository.full_name != github.repository
-    env:
-      GH_TOKEN: ${{ github.token }}
-    steps:
-      - name: Get PR details
-        id: pr
-        run: |
-          # Get PR details by searching for PR with matching head SHA
-          # The workflow_run.pull_requests field is often empty for forks
-          # Use paginate to handle repos with many open PRs
-          head_sha="${{ github.event.workflow_run.head_sha }}"
-          pr_data=$(gh api --paginate "/repos/${{ github.repository }}/pulls" \
-            --jq ".[] | select(.head.sha == \"$head_sha\") | {number: .number, base_ref: .base.ref}" \
-            | head -n 1)
-
-          if [ -z "$pr_data" ]; then
-            echo "No PR found for SHA $head_sha, skipping"
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-
-          pr_number=$(echo "$pr_data" | jq -r '.number')
-          base_ref=$(echo "$pr_data" | jq -r '.base_ref')
-
-          echo "pr_number=$pr_number" >> "$GITHUB_OUTPUT"
-          echo "base_ref=$base_ref" >> "$GITHUB_OUTPUT"
-          echo "Found PR #$pr_number targeting base branch: $base_ref"
-
-      - name: Check out code from base repository
-        if: steps.pr.outputs.skip != 'true'
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          # Always check out from the base repository (esphome/esphome), never from forks
-          # Use the PR's target branch to ensure we run trusted code from the main repo
-          repository: ${{ github.repository }}
-          ref: ${{ steps.pr.outputs.base_ref }}
-
-      - name: Restore Python
-        if: steps.pr.outputs.skip != 'true'
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: "3.11"
-          cache-key: ${{ hashFiles('.cache-key') }}
-
-      - name: Download memory analysis artifacts
-        if: steps.pr.outputs.skip != 'true'
-        run: |
-          run_id="${{ github.event.workflow_run.id }}"
-          echo "Downloading artifacts from workflow run $run_id"
-
-          mkdir -p memory-analysis
-
-          # Download target analysis artifact
-          if gh run download --name "memory-analysis-target" --dir memory-analysis --repo "${{ github.repository }}" "$run_id"; then
-            echo "Downloaded memory-analysis-target artifact."
-          else
-            echo "No memory-analysis-target artifact found."
-          fi
-
-          # Download PR analysis artifact
-          if gh run download --name "memory-analysis-pr" --dir memory-analysis --repo "${{ github.repository }}" "$run_id"; then
-            echo "Downloaded memory-analysis-pr artifact."
-          else
-            echo "No memory-analysis-pr artifact found."
-          fi
-
-      - name: Check if artifacts exist
-        id: check
-        if: steps.pr.outputs.skip != 'true'
-        run: |
-          if [ -f ./memory-analysis/memory-analysis-target.json ] && [ -f ./memory-analysis/memory-analysis-pr.json ]; then
-            echo "found=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "found=false" >> "$GITHUB_OUTPUT"
-            echo "Memory analysis artifacts not found, skipping comment"
-          fi
-
-      - name: Post or update PR comment
-        if: steps.pr.outputs.skip != 'true' && steps.check.outputs.found == 'true'
-        env:
-          PR_NUMBER: ${{ steps.pr.outputs.pr_number }}
-        run: |
-          . venv/bin/activate
-          # Pass PR number and JSON file paths directly to Python script
-          # Let Python parse the JSON to avoid shell injection risks
-          # The script will validate and sanitize all inputs
-          python script/ci_memory_impact_comment.py \
-            --pr-number "$PR_NUMBER" \
-            --target-json ./memory-analysis/memory-analysis-target.json \
-            --pr-json ./memory-analysis/memory-analysis-pr.json
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
      matrix:
        python-version:
          - "3.11"
-          - "3.13"
+          - "3.14"
        os:
          - ubuntu-latest
          - macOS-latest
@@ -123,9 +123,9 @@ jobs:
          # Minimize CI resource usage
          # by only running the Python version
          # version used for docker images on Windows and macOS
-          - python-version: "3.13"
+          - python-version: "3.14"
            os: windows-latest
-          - python-version: "3.13"
+          - python-version: "3.14"
            os: macOS-latest
    runs-on: ${{ matrix.os }}
    needs:
@@ -170,17 +170,12 @@ jobs:
    outputs:
      integration-tests: ${{ steps.determine.outputs.integration-tests }}
      clang-tidy: ${{ steps.determine.outputs.clang-tidy }}
-      clang-tidy-mode: ${{ steps.determine.outputs.clang-tidy-mode }}
      python-linters: ${{ steps.determine.outputs.python-linters }}
      changed-components: ${{ steps.determine.outputs.changed-components }}
      changed-components-with-tests: ${{ steps.determine.outputs.changed-components-with-tests }}
      directly-changed-components-with-tests: ${{ steps.determine.outputs.directly-changed-components-with-tests }}
      component-test-count: ${{ steps.determine.outputs.component-test-count }}
-      changed-cpp-file-count: ${{ steps.determine.outputs.changed-cpp-file-count }}
      memory_impact: ${{ steps.determine.outputs.memory-impact }}
-      cpp-unit-tests-run-all: ${{ steps.determine.outputs.cpp-unit-tests-run-all }}
-      cpp-unit-tests-components: ${{ steps.determine.outputs.cpp-unit-tests-components }}
-      component-test-batches: ${{ steps.determine.outputs.component-test-batches }}
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -192,11 +187,6 @@ jobs:
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Restore components graph cache
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: .temp/components_graph.json
-          key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}
      - name: Determine which tests to run
        id: determine
        env:
@@ -210,23 +200,12 @@ jobs:
          # Extract individual fields
          echo "integration-tests=$(echo "$output" | jq -r '.integration_tests')" >> $GITHUB_OUTPUT
          echo "clang-tidy=$(echo "$output" | jq -r '.clang_tidy')" >> $GITHUB_OUTPUT
-          echo "clang-tidy-mode=$(echo "$output" | jq -r '.clang_tidy_mode')" >> $GITHUB_OUTPUT
          echo "python-linters=$(echo "$output" | jq -r '.python_linters')" >> $GITHUB_OUTPUT
          echo "changed-components=$(echo "$output" | jq -c '.changed_components')" >> $GITHUB_OUTPUT
          echo "changed-components-with-tests=$(echo "$output" | jq -c '.changed_components_with_tests')" >> $GITHUB_OUTPUT
          echo "directly-changed-components-with-tests=$(echo "$output" | jq -c '.directly_changed_components_with_tests')" >> $GITHUB_OUTPUT
          echo "component-test-count=$(echo "$output" | jq -r '.component_test_count')" >> $GITHUB_OUTPUT
-          echo "changed-cpp-file-count=$(echo "$output" | jq -r '.changed_cpp_file_count')" >> $GITHUB_OUTPUT
          echo "memory-impact=$(echo "$output" | jq -c '.memory_impact')" >> $GITHUB_OUTPUT
-          echo "cpp-unit-tests-run-all=$(echo "$output" | jq -r '.cpp_unit_tests_run_all')" >> $GITHUB_OUTPUT
-          echo "cpp-unit-tests-components=$(echo "$output" | jq -c '.cpp_unit_tests_components')" >> $GITHUB_OUTPUT
-          echo "component-test-batches=$(echo "$output" | jq -c '.component_test_batches')" >> $GITHUB_OUTPUT
-      - name: Save components graph cache
-        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: .temp/components_graph.json
-          key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}

  integration-tests:
    name: Run integration tests
@@ -264,34 +243,7 @@ jobs:
          . venv/bin/activate
          pytest -vv --no-cov --tb=native -n auto tests/integration/

-  cpp-unit-tests:
-    name: Run C++ unit tests
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: github.event_name == 'pull_request' && (needs.determine-jobs.outputs.cpp-unit-tests-run-all == 'true' || needs.determine-jobs.outputs.cpp-unit-tests-components != '[]')
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-
-      - name: Run cpp_unit_test.py
-        run: |
-          . venv/bin/activate
-          if [ "${{ needs.determine-jobs.outputs.cpp-unit-tests-run-all }}" = "true" ]; then
-            script/cpp_unit_test.py --all
-          else
-            ARGS=$(echo '${{ needs.determine-jobs.outputs.cpp-unit-tests-components }}' | jq -r '.[] | @sh' | xargs)
-            script/cpp_unit_test.py $ARGS
-          fi
-
-  clang-tidy-single:
+  clang-tidy:
    name: ${{ matrix.name }}
    runs-on: ubuntu-24.04
    needs:
@@ -309,6 +261,22 @@ jobs:
            name: Run script/clang-tidy for ESP8266
            options: --environment esp8266-arduino-tidy --grep USE_ESP8266
            pio_cache_key: tidyesp8266
+          - id: clang-tidy
+            name: Run script/clang-tidy for ESP32 Arduino 1/4
+            options: --environment esp32-arduino-tidy --split-num 4 --split-at 1
+            pio_cache_key: tidyesp32
+          - id: clang-tidy
+            name: Run script/clang-tidy for ESP32 Arduino 2/4
+            options: --environment esp32-arduino-tidy --split-num 4 --split-at 2
+            pio_cache_key: tidyesp32
+          - id: clang-tidy
+            name: Run script/clang-tidy for ESP32 Arduino 3/4
+            options: --environment esp32-arduino-tidy --split-num 4 --split-at 3
+            pio_cache_key: tidyesp32
+          - id: clang-tidy
+            name: Run script/clang-tidy for ESP32 Arduino 4/4
+            options: --environment esp32-arduino-tidy --split-num 4 --split-at 4
+            pio_cache_key: tidyesp32
          - id: clang-tidy
            name: Run script/clang-tidy for ESP32 IDF
            options: --environment esp32-idf-tidy --grep USE_ESP_IDF
@@ -389,165 +357,45 @@ jobs:
        # yamllint disable-line rule:line-length
        if: always()

-  clang-tidy-nosplit:
-    name: Run script/clang-tidy for ESP32 Arduino
+  test-build-components-splitter:
+    name: Split components for intelligent grouping (40 weighted per batch)
    runs-on: ubuntu-24.04
    needs:
      - common
      - determine-jobs
-    if: needs.determine-jobs.outputs.clang-tidy-mode == 'nosplit'
-    env:
-      GH_TOKEN: ${{ github.token }}
+    if: github.event_name == 'pull_request' && fromJSON(needs.determine-jobs.outputs.component-test-count) > 0
+    outputs:
+      matrix: ${{ steps.split.outputs.components }}
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          # Need history for HEAD~1 to work for checking changed files
-          fetch-depth: 2
-
      - name: Restore Python
        uses: ./.github/actions/restore-python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
-
-      - name: Cache platformio
-        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: ~/.platformio
-          key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
-
-      - name: Cache platformio
-        if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: ~/.platformio
-          key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
-
-      - name: Register problem matchers
-        run: |
-          echo "::add-matcher::.github/workflows/matchers/gcc.json"
-          echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
-
-      - name: Check if full clang-tidy scan needed
-        id: check_full_scan
+      - name: Split components intelligently based on bus configurations
+        id: split
        run: |
          . venv/bin/activate
-          if python script/clang_tidy_hash.py --check; then
-            echo "full_scan=true" >> $GITHUB_OUTPUT
-            echo "reason=hash_changed" >> $GITHUB_OUTPUT
+
+          # Use intelligent splitter that groups components with same bus configs
+          components='${{ needs.determine-jobs.outputs.changed-components-with-tests }}'
+
+          # Only isolate directly changed components when targeting dev branch
+          # For beta/release branches, group everything for faster CI
+          if [[ "${{ github.base_ref }}" == beta* ]] || [[ "${{ github.base_ref }}" == release* ]]; then
+            directly_changed='[]'
+            echo "Target branch: ${{ github.base_ref }} - grouping all components"
          else
-            echo "full_scan=false" >> $GITHUB_OUTPUT
-            echo "reason=normal" >> $GITHUB_OUTPUT
+            directly_changed='${{ needs.determine-jobs.outputs.directly-changed-components-with-tests }}'
+            echo "Target branch: ${{ github.base_ref }} - isolating directly changed components"
          fi

-      - name: Run clang-tidy
-        run: |
-          . venv/bin/activate
-          if [ "${{ steps.check_full_scan.outputs.full_scan }}" = "true" ]; then
-            echo "Running FULL clang-tidy scan (hash changed)"
-            script/clang-tidy --all-headers --fix --environment esp32-arduino-tidy
-          else
-            echo "Running clang-tidy on changed files only"
-            script/clang-tidy --all-headers --fix --changed --environment esp32-arduino-tidy
-          fi
-        env:
-          # Also cache libdeps, store them in a ~/.platformio subfolder
-          PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps
+          echo "Splitting components intelligently..."
+          output=$(python3 script/split_components_for_ci.py --components "$components" --directly-changed "$directly_changed" --batch-size 40 --output github)

-      - name: Suggested changes
-        run: script/ci-suggest-changes
-        if: always()
-
-  clang-tidy-split:
-    name: ${{ matrix.name }}
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.clang-tidy-mode == 'split'
-    env:
-      GH_TOKEN: ${{ github.token }}
-    strategy:
-      fail-fast: false
-      max-parallel: 2
-      matrix:
-        include:
-          - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 1/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 1
-          - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 2/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 2
-          - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 3/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 3
-          - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 4/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 4
-
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          # Need history for HEAD~1 to work for checking changed files
-          fetch-depth: 2
-
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-
-      - name: Cache platformio
-        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: ~/.platformio
-          key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
-
-      - name: Cache platformio
-        if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
-        with:
-          path: ~/.platformio
-          key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
-
-      - name: Register problem matchers
-        run: |
-          echo "::add-matcher::.github/workflows/matchers/gcc.json"
-          echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
-
-      - name: Check if full clang-tidy scan needed
-        id: check_full_scan
-        run: |
-          . venv/bin/activate
-          if python script/clang_tidy_hash.py --check; then
-            echo "full_scan=true" >> $GITHUB_OUTPUT
-            echo "reason=hash_changed" >> $GITHUB_OUTPUT
-          else
-            echo "full_scan=false" >> $GITHUB_OUTPUT
-            echo "reason=normal" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Run clang-tidy
-        run: |
-          . venv/bin/activate
-          if [ "${{ steps.check_full_scan.outputs.full_scan }}" = "true" ]; then
-            echo "Running FULL clang-tidy scan (hash changed)"
-            script/clang-tidy --all-headers --fix ${{ matrix.options }}
-          else
-            echo "Running clang-tidy on changed files only"
-            script/clang-tidy --all-headers --fix --changed ${{ matrix.options }}
-          fi
-        env:
-          # Also cache libdeps, store them in a ~/.platformio subfolder
-          PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps
-
-      - name: Suggested changes
-        run: script/ci-suggest-changes
-        if: always()
+          echo "$output" >> $GITHUB_OUTPUT

  test-build-components-split:
    name: Test components batch (${{ matrix.components }})
@@ -555,12 +403,13 @@ jobs:
    needs:
      - common
      - determine-jobs
+      - test-build-components-splitter
    if: github.event_name == 'pull_request' && fromJSON(needs.determine-jobs.outputs.component-test-count) > 0
    strategy:
      fail-fast: false
      max-parallel: ${{ (startsWith(github.base_ref, 'beta') || startsWith(github.base_ref, 'release')) && 8 || 4 }}
      matrix:
-        components: ${{ fromJson(needs.determine-jobs.outputs.component-test-batches) }}
+        components: ${{ fromJson(needs.test-build-components-splitter.outputs.matrix) }}
    steps:
      - name: Show disk space
        run: |
@@ -792,12 +641,6 @@ jobs:
              --output-env \
              --output-json memory-analysis-target.json

-          # Add metadata to JSON before caching
-          python script/ci_add_metadata_to_json.py \
-            --json-file memory-analysis-target.json \
-            --components "$components" \
-            --platform "$platform"
-
      - name: Save memory analysis to cache
        if: steps.check-script.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true' && steps.build.outcome == 'success'
        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
@@ -821,7 +664,7 @@ jobs:
          fi

      - name: Upload memory analysis JSON
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: memory-analysis-target
          path: memory-analysis-target.json
@@ -877,15 +720,8 @@ jobs:
            python script/ci_memory_impact_extract.py \
              --output-env \
              --output-json memory-analysis-pr.json
-
-          # Add metadata to JSON (components and platform are in shell variables above)
-          python script/ci_add_metadata_to_json.py \
-            --json-file memory-analysis-pr.json \
-            --components "$components" \
-            --platform "$platform"
-
      - name: Upload memory analysis JSON
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: memory-analysis-pr
          path: memory-analysis-pr.json
@@ -900,12 +736,10 @@ jobs:
      - determine-jobs
      - memory-impact-target-branch
      - memory-impact-pr-branch
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && fromJSON(needs.determine-jobs.outputs.memory_impact).should_run == 'true' && needs.memory-impact-target-branch.outputs.skip != 'true'
+    if: github.event_name == 'pull_request' && fromJSON(needs.determine-jobs.outputs.memory_impact).should_run == 'true' && needs.memory-impact-target-branch.outputs.skip != 'true'
    permissions:
      contents: read
      pull-requests: write
-    env:
-      GH_TOKEN: ${{ github.token }}
    steps:
      - name: Check out code
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -915,29 +749,65 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
      - name: Download target analysis JSON
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: memory-analysis-target
          path: ./memory-analysis
        continue-on-error: true
      - name: Download PR analysis JSON
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
        with:
          name: memory-analysis-pr
          path: ./memory-analysis
        continue-on-error: true
      - name: Post or update PR comment
        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
+          GH_TOKEN: ${{ github.token }}
+          COMPONENTS: ${{ toJSON(fromJSON(needs.determine-jobs.outputs.memory_impact).components) }}
+          PLATFORM: ${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}
+          TARGET_RAM: ${{ needs.memory-impact-target-branch.outputs.ram_usage }}
+          TARGET_FLASH: ${{ needs.memory-impact-target-branch.outputs.flash_usage }}
+          PR_RAM: ${{ needs.memory-impact-pr-branch.outputs.ram_usage }}
+          PR_FLASH: ${{ needs.memory-impact-pr-branch.outputs.flash_usage }}
+          TARGET_CACHE_HIT: ${{ needs.memory-impact-target-branch.outputs.cache_hit }}
        run: |
          . venv/bin/activate

-          # Pass JSON file paths directly to Python script
-          # All data is extracted from JSON files for security
+          # Check if analysis JSON files exist
+          target_json_arg=""
+          pr_json_arg=""
+
+          if [ -f ./memory-analysis/memory-analysis-target.json ]; then
+            echo "Found target analysis JSON"
+            target_json_arg="--target-json ./memory-analysis/memory-analysis-target.json"
+          else
+            echo "No target analysis JSON found"
+          fi
+
+          if [ -f ./memory-analysis/memory-analysis-pr.json ]; then
+            echo "Found PR analysis JSON"
+            pr_json_arg="--pr-json ./memory-analysis/memory-analysis-pr.json"
+          else
+            echo "No PR analysis JSON found"
+          fi
+
+          # Add cache flag if target was cached
+          cache_flag=""
+          if [ "$TARGET_CACHE_HIT" == "true" ]; then
+            cache_flag="--target-cache-hit"
+          fi
+
          python script/ci_memory_impact_comment.py \
-            --pr-number "$PR_NUMBER" \
-            --target-json ./memory-analysis/memory-analysis-target.json \
-            --pr-json ./memory-analysis/memory-analysis-pr.json
+            --pr-number "${{ github.event.pull_request.number }}" \
+            --components "$COMPONENTS" \
+            --platform "$PLATFORM" \
+            --target-ram "$TARGET_RAM" \
+            --target-flash "$TARGET_FLASH" \
+            --pr-ram "$PR_RAM" \
+            --pr-flash "$PR_FLASH" \
+            $target_json_arg \
+            $pr_json_arg \
+            $cache_flag

  ci-status:
    name: CI Status
@@ -948,10 +818,9 @@ jobs:
      - pylint
      - pytest
      - integration-tests
-      - clang-tidy-single
-      - clang-tidy-nosplit
-      - clang-tidy-split
+      - clang-tidy
      - determine-jobs
+      - test-build-components-splitter
      - test-build-components-split
      - pre-commit-ci-lite
      - memory-impact-target-branch
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -58,7 +58,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
        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@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
        with:
          category: "/language:${{matrix.language}}"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -138,7 +138,7 @@ jobs:
      #     version: ${{ needs.init.outputs.tag }}

      - name: Upload digests
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: digests-${{ matrix.platform.arch }}
          path: /tmp/digests
@@ -171,7 +171,7 @@ jobs:
      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Download digests
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
        with:
          pattern: digests-*
          path: /tmp/digests
--- a/.github/workflows/status-check-labels.yml
+++ b/.github/workflows/status-check-labels.yml
@@ -14,7 +14,6 @@ jobs:
        label:
          - needs-docs
          - merge-after-release
-          - chained-pr
    steps:
      - name: Check for ${{ matrix.label }} label
        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
--- 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.14.3
+    rev: v0.14.1
    hooks:
      # Run the linter.
      - id: ruff
--- a/7
+++ b/7
@@ -70,7 +70,6 @@ esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @dan-s-github @tobias-
 esphome/components/bl0942/* @dbuezas @dwmw2
 esphome/components/ble_client/* @buxtronix @clydebarrow
-esphome/components/ble_nus/* @tomaszduda23
 esphome/components/bluetooth_proxy/* @bdraco @jesserockz
 esphome/components/bme280_base/* @esphome/core
 esphome/components/bme280_spi/* @apbodrov
@@ -155,14 +154,12 @@ esphome/components/esp32_ble_tracker/* @bdraco
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_hosted/* @swoboda1337
-esphome/components/esp32_hosted/update/* @swoboda1337
 esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp32_rmt/* @jesserockz
 esphome/components/esp32_rmt_led_strip/* @jesserockz
 esphome/components/esp8266/* @esphome/core
 esphome/components/esp_ldo/* @clydebarrow
 esphome/components/espnow/* @jesserockz
-esphome/components/espnow/packet_transport/* @EasilyBoredEngineer
 esphome/components/ethernet_info/* @gtjadsonsantos
 esphome/components/event/* @nohat
 esphome/components/exposure_notifications/* @OttoWinter
@@ -181,7 +178,7 @@ esphome/components/gdk101/* @Szewcson
 esphome/components/gl_r01_i2c/* @pkejval
 esphome/components/globals/* @esphome/core
 esphome/components/gp2y1010au0f/* @zry98
-esphome/components/gp8403/* @jesserockz @sebydocky
+esphome/components/gp8403/* @jesserockz
 esphome/components/gpio/* @esphome/core
 esphome/components/gpio/one_wire/* @ssieb
 esphome/components/gps/* @coogle @ximex
@@ -202,7 +199,6 @@ esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
 esphome/components/hbridge/switch/* @dwmw2
-esphome/components/hdc2010/* @optimusprimespace @ssieb
 esphome/components/he60r/* @clydebarrow
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
@@ -480,7 +476,6 @@ esphome/components/template/fan/* @ssieb
 esphome/components/text/* @mauritskorse
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @esphome/core
-esphome/components/tinyusb/* @kbx81
 esphome/components/tlc5947/* @rnauber
 esphome/components/tlc5971/* @IJIJI
 esphome/components/tm1621/* @Philippe12
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -62,40 +62,6 @@ from esphome.util import (

 _LOGGER = logging.getLogger(__name__)

-# Special non-component keys that appear in configs
-_NON_COMPONENT_KEYS = frozenset(
-    {
-        CONF_ESPHOME,
-        "substitutions",
-        "packages",
-        "globals",
-        "external_components",
-        "<<",
-    }
-)
-
-
-def detect_external_components(config: ConfigType) -> set[str]:
-    """Detect external/custom components in the configuration.
-
-    External components are those that appear in the config but are not
-    part of ESPHome's built-in components and are not special config keys.
-
-    Args:
-        config: The ESPHome configuration dictionary
-
-    Returns:
-        A set of external component names
-    """
-    from esphome.analyze_memory.helpers import get_esphome_components
-
-    builtin_components = get_esphome_components()
-    return {
-        key
-        for key in config
-        if key not in builtin_components and key not in _NON_COMPONENT_KEYS
-    }
-

 class ArgsProtocol(Protocol):
    device: list[str] | None
@@ -207,21 +173,19 @@ def choose_upload_log_host(
                    if has_mqtt_logging():
                        resolved.append("MQTT")

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

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

-                    if has_ota() and has_non_ip_address() and has_resolvable_address():
+                    if has_ota() and has_non_ip_address():
                        resolved.extend(_resolve_with_cache(CORE.address, purpose))
            else:
                resolved.append(device)
        if not resolved:
-            raise EsphomeError(
-                f"All specified devices {defaults} could not be resolved. Is the device connected to the network?"
-            )
+            _LOGGER.error("All specified devices: %s could not be resolved.", defaults)
        return resolved

    # No devices specified, show interactive chooser
@@ -318,17 +282,7 @@ def has_resolvable_address() -> bool:
    """Check if CORE.address is resolvable (via mDNS, DNS, or is an IP address)."""
    # Any address (IP, mDNS hostname, or regular DNS hostname) is resolvable
    # The resolve_ip_address() function in helpers.py handles all types via AsyncResolver
-    if CORE.address is None:
-        return False
-
-    if has_ip_address():
-        return True
-
-    if has_mdns():
-        return True
-
-    # .local mDNS hostnames are only resolvable if mDNS is enabled
-    return not CORE.address.endswith(".local")
+    return CORE.address is not None


 def mqtt_get_ip(config: ConfigType, username: str, password: str, client_id: str):
@@ -741,13 +695,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
@@ -943,54 +890,6 @@ def command_idedata(args: ArgsProtocol, config: ConfigType) -> int:
    return 0


-def command_analyze_memory(args: ArgsProtocol, config: ConfigType) -> int:
-    """Analyze memory usage by component.
-
-    This command compiles the configuration and performs memory analysis.
-    Compilation is fast if sources haven't changed (just relinking).
-    """
-    from esphome import platformio_api
-    from esphome.analyze_memory.cli import MemoryAnalyzerCLI
-
-    # Always compile to ensure fresh data (fast if no changes - just relinks)
-    exit_code = write_cpp(config)
-    if exit_code != 0:
-        return exit_code
-    exit_code = compile_program(args, config)
-    if exit_code != 0:
-        return exit_code
-    _LOGGER.info("Successfully compiled program.")
-
-    # Get idedata for analysis
-    idedata = platformio_api.get_idedata(config)
-    if idedata is None:
-        _LOGGER.error("Failed to get IDE data for memory analysis")
-        return 1
-
-    firmware_elf = Path(idedata.firmware_elf_path)
-
-    # Extract external components from config
-    external_components = detect_external_components(config)
-    _LOGGER.debug("Detected external components: %s", external_components)
-
-    # Perform memory analysis
-    _LOGGER.info("Analyzing memory usage...")
-    analyzer = MemoryAnalyzerCLI(
-        str(firmware_elf),
-        idedata.objdump_path,
-        idedata.readelf_path,
-        external_components,
-    )
-    analyzer.analyze()
-
-    # Generate and display report
-    report = analyzer.generate_report()
-    print()
-    print(report)
-
-    return 0
-
-
 def command_rename(args: ArgsProtocol, config: ConfigType) -> int | None:
    new_name = args.name
    for c in new_name:
@@ -1106,7 +1005,6 @@ POST_CONFIG_ACTIONS = {
    "idedata": command_idedata,
    "rename": command_rename,
    "discover": command_discover,
-    "analyze-memory": command_analyze_memory,
 }

 SIMPLE_CONFIG_ACTIONS = [
@@ -1209,17 +1107,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",
@@ -1403,14 +1290,6 @@ def parse_args(argv):
    )
    parser_rename.add_argument("name", help="The new name for the device.", type=str)

-    parser_analyze_memory = subparsers.add_parser(
-        "analyze-memory",
-        help="Analyze memory usage by component.",
-    )
-    parser_analyze_memory.add_argument(
-        "configuration", help="Your YAML configuration file(s).", nargs="+"
-    )
-
    # Keep backward compatibility with the old command line format of
    # esphome <config> <command>.
    #
--- a/esphome/analyze_memory/cli.py
+++ b/esphome/analyze_memory/cli.py
@@ -1,7 +1,6 @@
 """CLI interface for memory analysis with report generation."""

 from collections import defaultdict
-import json
 import sys

 from . import (
@@ -232,22 +231,9 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
                api_component = (name, mem)
                break

-        # Also include wifi_stack and other important system components if they exist
-        system_components_to_include = [
-            # Empty list - we've finished debugging symbol categorization
-            # Add component names here if you need to debug their symbols
-        ]
-        system_components = [
-            (name, mem)
-            for name, mem in components
-            if name in system_components_to_include
-        ]
-
-        # Combine all components to analyze: top ESPHome + all external + API if not already included + system components
-        components_to_analyze = (
-            list(top_esphome_components)
-            + list(top_external_components)
-            + system_components
+        # Combine all components to analyze: top ESPHome + all external + API if not already included
+        components_to_analyze = list(top_esphome_components) + list(
+            top_external_components
        )
        if api_component and api_component not in components_to_analyze:
            components_to_analyze.append(api_component)
@@ -284,28 +270,6 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):

        return "\n".join(lines)

-    def to_json(self) -> str:
-        """Export analysis results as JSON."""
-        data = {
-            "components": {
-                name: {
-                    "text": mem.text_size,
-                    "rodata": mem.rodata_size,
-                    "data": mem.data_size,
-                    "bss": mem.bss_size,
-                    "flash_total": mem.flash_total,
-                    "ram_total": mem.ram_total,
-                    "symbol_count": mem.symbol_count,
-                }
-                for name, mem in self.components.items()
-            },
-            "totals": {
-                "flash": sum(c.flash_total for c in self.components.values()),
-                "ram": sum(c.ram_total for c in self.components.values()),
-            },
-        }
-        return json.dumps(data, indent=2)
-
    def dump_uncategorized_symbols(self, output_file: str | None = None) -> None:
        """Dump uncategorized symbols for analysis."""
        # Sort by size descending
--- a/esphome/analyze_memory/const.py
+++ b/esphome/analyze_memory/const.py
@@ -127,39 +127,40 @@ SYMBOL_PATTERNS = {
        "tryget_socket_unconn",
        "cs_create_ctrl_sock",
        "netbuf_alloc",
-        "tcp_",  # TCP protocol functions
-        "udp_",  # UDP protocol functions
-        "lwip_",  # LwIP stack functions
-        "eagle_lwip",  # ESP-specific LwIP functions
-        "new_linkoutput",  # Link output function
-        "acd_",  # Address Conflict Detection (ACD)
-        "eth_",  # Ethernet functions
-        "mac_enable_bb",  # MAC baseband enable
-        "reassemble_and_dispatch",  # Packet reassembly
    ],
-    # dhcp must come before libc to avoid "dhcp_select" matching "select" pattern
-    "dhcp": ["dhcp", "handle_dhcp"],
    "ipv6_stack": ["nd6_", "ip6_", "mld6_", "icmp6_", "icmp6_input"],
-    # Order matters! More specific categories must come before general ones.
-    # mdns must come before bluetooth to avoid "_mdns_disable_pcb" matching "ble_" pattern
-    "mdns_lib": ["mdns"],
-    # memory_mgmt must come before wifi_stack to catch mmu_hal_* symbols
-    "memory_mgmt": [
-        "mem_",
-        "memory_",
-        "tlsf_",
-        "memp_",
-        "pbuf_",
-        "pbuf_alloc",
-        "pbuf_copy_partial_pbuf",
-        "esp_mmu_map",
-        "mmu_hal_",
-        "s_do_mapping",  # Memory mapping function, not WiFi
-        "hash_map_",  # Hash map data structure
-        "umm_assimilate",  # UMM malloc assimilation
+    "wifi_stack": [
+        "ieee80211",
+        "hostap",
+        "sta_",
+        "ap_",
+        "scan_",
+        "wifi_",
+        "wpa_",
+        "wps_",
+        "esp_wifi",
+        "cnx_",
+        "wpa3_",
+        "sae_",
+        "wDev_",
+        "ic_",
+        "mac_",
+        "esf_buf",
+        "gWpaSm",
+        "sm_WPA",
+        "eapol_",
+        "owe_",
+        "wifiLowLevelInit",
+        "s_do_mapping",
+        "gScanStruct",
+        "ppSearchTxframe",
+        "ppMapWaitTxq",
+        "ppFillAMPDUBar",
+        "ppCheckTxConnTrafficIdle",
+        "ppCalTkipMic",
    ],
-    # Bluetooth categories must come BEFORE wifi_stack to avoid misclassification
-    # Many BLE symbols contain patterns like "ble_" that would otherwise match wifi patterns
+    "bluetooth": ["bt_", "ble_", "l2c_", "gatt_", "gap_", "hci_", "BT_init"],
+    "wifi_bt_coex": ["coex"],
    "bluetooth_rom": ["r_ble", "r_lld", "r_llc", "r_llm"],
    "bluedroid_bt": [
        "bluedroid",
@@ -206,61 +207,6 @@ SYMBOL_PATTERNS = {
        "copy_extra_byte_in_db",
        "parse_read_local_supported_commands_response",
    ],
-    "bluetooth": [
-        "bt_",
-        "_ble_",  # More specific than "ble_" to avoid matching "able_", "enable_", "disable_"
-        "l2c_",
-        "l2ble_",  # L2CAP for BLE
-        "gatt_",
-        "gap_",
-        "hci_",
-        "btsnd_hcic_",  # Bluetooth HCI command send functions
-        "BT_init",
-        "BT_tx_",  # Bluetooth transmit functions
-        "esp_ble_",  # Catch esp_ble_* functions
-    ],
-    "bluetooth_ll": [
-        "llm_",  # Link layer manager
-        "llc_",  # Link layer control
-        "lld_",  # Link layer driver
-        "ld_acl_",  # Link layer ACL (Asynchronous Connection-Oriented)
-        "llcp_",  # Link layer control protocol
-        "lmp_",  # Link manager protocol
-    ],
-    "wifi_bt_coex": ["coex"],
-    "wifi_stack": [
-        "ieee80211",
-        "hostap",
-        "sta_",
-        "wifi_ap_",  # More specific than "ap_" to avoid matching "cap_", "map_"
-        "wifi_scan_",  # More specific than "scan_" to avoid matching "_scan_" in other contexts
-        "wifi_",
-        "wpa_",
-        "wps_",
-        "esp_wifi",
-        "cnx_",
-        "wpa3_",
-        "sae_",
-        "wDev_",
-        "ic_mac_",  # More specific than "mac_" to avoid matching emac_
-        "esf_buf",
-        "gWpaSm",
-        "sm_WPA",
-        "eapol_",
-        "owe_",
-        "wifiLowLevelInit",
-        # Removed "s_do_mapping" - this is memory management, not WiFi
-        "gScanStruct",
-        "ppSearchTxframe",
-        "ppMapWaitTxq",
-        "ppFillAMPDUBar",
-        "ppCheckTxConnTrafficIdle",
-        "ppCalTkipMic",
-        "phy_force_wifi",
-        "phy_unforce_wifi",
-        "write_wifi_chan",
-        "wifi_track_pll",
-    ],
    "crypto_math": [
        "ecp_",
        "bignum_",
@@ -285,36 +231,13 @@ SYMBOL_PATTERNS = {
        "p_256_init_curve",
        "shift_sub_rows",
        "rshift",
-        "rijndaelEncrypt",  # AES Rijndael encryption
-    ],
-    # System and Arduino core functions must come before libc
-    "esp_system": [
-        "system_",  # ESP system functions
-        "postmortem_",  # Postmortem reporting
-    ],
-    "arduino_core": [
-        "pinMode",
-        "resetPins",
-        "millis",
-        "micros",
-        "delay(",  # More specific - Arduino delay function with parenthesis
-        "delayMicroseconds",
-        "digitalWrite",
-        "digitalRead",
-    ],
-    "sntp": ["sntp_", "sntp_recv"],
-    "scheduler": [
-        "run_scheduled_",
-        "compute_scheduled_",
-        "event_TaskQueue",
    ],
    "hw_crypto": ["esp_aes", "esp_sha", "esp_rsa", "esp_bignum", "esp_mpi"],
    "libc": [
        "printf",
        "scanf",
        "malloc",
-        "_free",  # More specific than "free" to match _free, __free_r, etc. but not arbitrary "free" substring
-        "umm_free",  # UMM malloc free function
+        "free",
        "memcpy",
        "memset",
        "strcpy",
@@ -336,7 +259,7 @@ SYMBOL_PATTERNS = {
        "_setenv_r",
        "_tzset_unlocked_r",
        "__tzcalc_limits",
-        "_select",  # More specific than "select" to avoid matching "dhcp_select", etc.
+        "select",
        "scalbnf",
        "strtof",
        "strtof_l",
@@ -393,24 +316,8 @@ SYMBOL_PATTERNS = {
        "CSWTCH$",
        "dst$",
        "sulp",
-        "_strtol_l",  # String to long with locale
-        "__cvt",  # Convert
-        "__utoa",  # Unsigned to ASCII
-        "__global_locale",  # Global locale
-        "_ctype_",  # Character type
-        "impure_data",  # Impure data
-    ],
-    "string_ops": [
-        "strcmp",
-        "strncmp",
-        "strchr",
-        "strstr",
-        "strtok",
-        "strdup",
-        "strncasecmp_P",  # String compare (case insensitive, from program memory)
-        "strnlen_P",  # String length (from program memory)
-        "strncat_P",  # String concatenate (from program memory)
    ],
+    "string_ops": ["strcmp", "strncmp", "strchr", "strstr", "strtok", "strdup"],
    "memory_alloc": ["malloc", "calloc", "realloc", "free", "_sbrk"],
    "file_io": [
        "fread",
@@ -431,26 +338,10 @@ SYMBOL_PATTERNS = {
        "vsscanf",
    ],
    "cpp_anonymous": ["_GLOBAL__N_", "n$"],
-    # Plain C patterns only - C++ symbols will be categorized via DEMANGLED_PATTERNS
-    "nvs": ["nvs_"],  # Plain C NVS functions
-    "ota": ["ota_", "OTA", "esp_ota", "app_desc"],
-    # cpp_runtime: Removed _ZN, _ZL to let DEMANGLED_PATTERNS categorize C++ symbols properly
-    # Only keep patterns that are truly runtime-specific and not categorizable by namespace
-    "cpp_runtime": ["__cxx", "_ZSt", "__gxx_personality", "_Z16"],
-    "exception_handling": [
-        "__cxa_",
-        "_Unwind_",
-        "__gcc_personality",
-        "uw_frame_state",
-        "search_object",  # Search for exception handling object
-        "get_cie_encoding",  # Get CIE encoding
-        "add_fdes",  # Add frame description entries
-        "fde_unencoded_compare",  # Compare FDEs
-        "fde_mixed_encoding_compare",  # Compare mixed encoding FDEs
-        "frame_downheap",  # Frame heap operations
-        "frame_heapsort",  # Frame heap sorting
-    ],
+    "cpp_runtime": ["__cxx", "_ZN", "_ZL", "_ZSt", "__gxx_personality", "_Z16"],
+    "exception_handling": ["__cxa_", "_Unwind_", "__gcc_personality", "uw_frame_state"],
    "static_init": ["_GLOBAL__sub_I_"],
+    "mdns_lib": ["mdns"],
    "phy_radio": [
        "phy_",
        "rf_",
@@ -503,47 +394,10 @@ SYMBOL_PATTERNS = {
        "txcal_debuge_mode",
        "ant_wifitx_cfg",
        "reg_init_begin",
-        "tx_cap_init",  # TX capacitance init
-        "ram_set_txcap",  # RAM TX capacitance setting
-        "tx_atten_",  # TX attenuation
-        "txiq_",  # TX I/Q calibration
-        "ram_cal_",  # RAM calibration
-        "ram_rxiq_",  # RAM RX I/Q
-        "readvdd33",  # Read VDD33
-        "test_tout",  # Test timeout
-        "tsen_meas",  # Temperature sensor measurement
-        "bbpll_cal",  # Baseband PLL calibration
-        "set_cal_",  # Set calibration
-        "set_rfanagain_",  # Set RF analog gain
-        "set_txdc_",  # Set TX DC
-        "get_vdd33_",  # Get VDD33
-        "gen_rx_gain_table",  # Generate RX gain table
-        "ram_ana_inf_gating_en",  # RAM analog interface gating enable
-        "tx_cont_en",  # TX continuous enable
-        "tx_delay_cfg",  # TX delay configuration
-        "tx_gain_table_set",  # TX gain table set
-        "check_and_reset_hw_deadlock",  # Hardware deadlock check
-        "s_config",  # System/hardware config
-        "chan14_mic_cfg",  # Channel 14 MIC config
-    ],
-    "wifi_phy_pp": [
-        "pp_",
-        "ppT",
-        "ppR",
-        "ppP",
-        "ppInstall",
-        "ppCalTxAMPDULength",
-        "ppCheckTx",  # Packet processor TX check
-        "ppCal",  # Packet processor calibration
-        "HdlAllBuffedEb",  # Handle buffered EB
    ],
+    "wifi_phy_pp": ["pp_", "ppT", "ppR", "ppP", "ppInstall", "ppCalTxAMPDULength"],
    "wifi_lmac": ["lmac"],
-    "wifi_device": [
-        "wdev",
-        "wDev_",
-        "ic_set_sta",  # Set station mode
-        "ic_set_vif",  # Set virtual interface
-    ],
+    "wifi_device": ["wdev", "wDev_"],
    "power_mgmt": [
        "pm_",
        "sleep",
@@ -552,7 +406,15 @@ SYMBOL_PATTERNS = {
        "deep_sleep",
        "power_down",
        "g_pm",
-        "pmc",  # Power Management Controller
+    ],
+    "memory_mgmt": [
+        "mem_",
+        "memory_",
+        "tlsf_",
+        "memp_",
+        "pbuf_",
+        "pbuf_alloc",
+        "pbuf_copy_partial_pbuf",
    ],
    "hal_layer": ["hal_"],
    "clock_mgmt": [
@@ -577,6 +439,7 @@ SYMBOL_PATTERNS = {
    "error_handling": ["panic", "abort", "assert", "error_", "fault"],
    "authentication": ["auth"],
    "ppp_protocol": ["ppp", "ipcp_", "lcp_", "chap_", "LcpEchoCheck"],
+    "dhcp": ["dhcp", "handle_dhcp"],
    "ethernet_phy": [
        "emac_",
        "eth_phy_",
@@ -755,15 +618,7 @@ SYMBOL_PATTERNS = {
        "ampdu_dispatch_upto",
    ],
    "ieee802_11": ["ieee802_11_", "ieee802_11_parse_elems"],
-    "rate_control": [
-        "rssi_margin",
-        "rcGetSched",
-        "get_rate_fcc_index",
-        "rcGetRate",  # Get rate
-        "rc_get_",  # Rate control getters
-        "rc_set_",  # Rate control setters
-        "rc_enable_",  # Rate control enable functions
-    ],
+    "rate_control": ["rssi_margin", "rcGetSched", "get_rate_fcc_index"],
    "nan": ["nan_dp_", "nan_dp_post_tx", "nan_dp_delete_peer"],
    "channel_mgmt": ["chm_init", "chm_set_current_channel"],
    "trace": ["trc_init", "trc_onAmpduOp"],
@@ -944,18 +799,31 @@ SYMBOL_PATTERNS = {
        "supports_interlaced_inquiry_scan",
        "supports_reading_remote_extended_features",
    ],
+    "bluetooth_ll": [
+        "lld_pdu_",
+        "ld_acl_",
+        "lld_stop_ind_handler",
+        "lld_evt_winsize_change",
+        "config_lld_evt_funcs_reset",
+        "config_lld_funcs_reset",
+        "config_llm_funcs_reset",
+        "llm_set_long_adv_data",
+        "lld_retry_tx_prog",
+        "llc_link_sup_to_ind_handler",
+        "config_llc_funcs_reset",
+        "lld_evt_rxwin_compute",
+        "config_btdm_funcs_reset",
+        "config_ea_funcs_reset",
+        "llc_defalut_state_tab_reset",
+        "config_rwip_funcs_reset",
+        "ke_lmp_rx_flooding_detect",
+    ],
 }

 # Demangled patterns: patterns found in demangled C++ names
 DEMANGLED_PATTERNS = {
    "gpio_driver": ["GPIO"],
    "uart_driver": ["UART"],
-    # mdns_lib must come before network_stack to avoid "udp" matching "_udpReadBuffer" in MDNSResponder
-    "mdns_lib": [
-        "MDNSResponder",
-        "MDNSImplementation",
-        "MDNS",
-    ],
    "network_stack": [
        "lwip",
        "tcp",
@@ -968,24 +836,6 @@ DEMANGLED_PATTERNS = {
        "ethernet",
        "ppp",
        "slip",
-        "UdpContext",  # UDP context class
-        "DhcpServer",  # DHCP server class
-    ],
-    "arduino_core": [
-        "String::",  # Arduino String class
-        "Print::",  # Arduino Print class
-        "HardwareSerial::",  # Serial class
-        "IPAddress::",  # IP address class
-        "EspClass::",  # ESP class
-        "experimental::_SPI",  # Experimental SPI
-    ],
-    "ota": [
-        "UpdaterClass",
-        "Updater::",
-    ],
-    "wifi": [
-        "ESP8266WiFi",
-        "WiFi::",
    ],
    "wifi_stack": ["NetworkInterface"],
    "nimble_bt": [
@@ -1004,6 +854,7 @@ DEMANGLED_PATTERNS = {
    "rtti": ["__type_info", "__class_type_info"],
    "web_server_lib": ["AsyncWebServer", "AsyncWebHandler", "WebServer"],
    "async_tcp": ["AsyncClient", "AsyncServer"],
+    "mdns_lib": ["mdns"],
    "json_lib": [
        "ArduinoJson",
        "JsonDocument",
--- a/esphome/automation.py
+++ b/esphome/automation.py
@@ -15,13 +15,8 @@ from esphome.const import (
    CONF_TYPE_ID,
    CONF_UPDATE_INTERVAL,
 )
-from esphome.core import ID, Lambda
-from esphome.cpp_generator import (
-    LambdaExpression,
-    MockObj,
-    MockObjClass,
-    TemplateArgsType,
-)
+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
@@ -92,7 +87,6 @@ def validate_potentially_or_condition(value):

 DelayAction = cg.esphome_ns.class_("DelayAction", Action, cg.Component)
 LambdaAction = cg.esphome_ns.class_("LambdaAction", Action)
-StatelessLambdaAction = cg.esphome_ns.class_("StatelessLambdaAction", Action)
 IfAction = cg.esphome_ns.class_("IfAction", Action)
 WhileAction = cg.esphome_ns.class_("WhileAction", Action)
 RepeatAction = cg.esphome_ns.class_("RepeatAction", Action)
@@ -103,40 +97,9 @@ ResumeComponentAction = cg.esphome_ns.class_("ResumeComponentAction", Action)
 Automation = cg.esphome_ns.class_("Automation")

 LambdaCondition = cg.esphome_ns.class_("LambdaCondition", Condition)
-StatelessLambdaCondition = cg.esphome_ns.class_("StatelessLambdaCondition", Condition)
 ForCondition = cg.esphome_ns.class_("ForCondition", Condition, cg.Component)


-def new_lambda_pvariable(
-    id_obj: ID,
-    lambda_expr: LambdaExpression,
-    stateless_class: MockObjClass,
-    template_arg: cg.TemplateArguments | None = None,
-) -> MockObj:
-    """Create Pvariable for lambda, using stateless class if applicable.
-
-    Combines ID selection and Pvariable creation in one call. For stateless
-    lambdas (empty capture), uses function pointer instead of std::function.
-
-    Args:
-        id_obj: The ID object (action_id, condition_id, or filter_id)
-        lambda_expr: The lambda expression object
-        stateless_class: The stateless class to use for stateless lambdas
-        template_arg: Optional template arguments (for actions/conditions)
-
-    Returns:
-        The created Pvariable
-    """
-    # For stateless lambdas, use function pointer instead of std::function
-    if lambda_expr.capture == "":
-        id_obj = id_obj.copy()
-        id_obj.type = stateless_class
-
-    if template_arg is not None:
-        return cg.new_Pvariable(id_obj, template_arg, lambda_expr)
-    return cg.new_Pvariable(id_obj, lambda_expr)
-
-
 def validate_automation(extra_schema=None, extra_validators=None, single=False):
    if extra_schema is None:
        extra_schema = {}
@@ -182,7 +145,7 @@ def validate_automation(extra_schema=None, extra_validators=None, single=False):
            value = cv.Schema([extra_validators])(value)
        if single:
            if len(value) != 1:
-                raise cv.Invalid("This trigger allows only a single automation")
+                raise cv.Invalid("Cannot have more than 1 automation for templates")
            return value[0]
        return value

@@ -277,9 +240,7 @@ async def lambda_condition_to_code(
    args: TemplateArgsType,
 ) -> MockObj:
    lambda_ = await cg.process_lambda(config, args, return_type=bool)
-    return new_lambda_pvariable(
-        condition_id, lambda_, StatelessLambdaCondition, template_arg
-    )
+    return cg.new_Pvariable(condition_id, template_arg, lambda_)


@register_condition(
@@ -310,30 +271,6 @@ async def for_condition_to_code(
    return var


-@register_condition(
-    "component.is_idle",
-    LambdaCondition,
-    maybe_simple_id(
-        {
-            cv.Required(CONF_ID): cv.use_id(cg.Component),
-        }
-    ),
-)
-async def component_is_idle_condition_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    comp = await cg.get_variable(config[CONF_ID])
-    lambda_ = await cg.process_lambda(
-        Lambda(f"return {comp}->is_idle();"), args, return_type=bool
-    )
-    return new_lambda_pvariable(
-        condition_id, lambda_, StatelessLambdaCondition, template_arg
-    )
-
-
@register_action(
    "delay", DelayAction, cv.templatable(cv.positive_time_period_milliseconds)
 )
@@ -469,7 +406,7 @@ async def lambda_action_to_code(
    args: TemplateArgsType,
 ) -> MockObj:
    lambda_ = await cg.process_lambda(config, args, return_type=cg.void)
-    return new_lambda_pvariable(action_id, lambda_, StatelessLambdaAction, template_arg)
+    return cg.new_Pvariable(action_id, template_arg, lambda_)


@register_action(
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -62,7 +62,6 @@ from esphome.cpp_types import (  # noqa: F401
    EntityBase,
    EntityCategory,
    ESPTime,
-    FixedVector,
    GPIOPin,
    InternalGPIOPin,
    JsonObject,
--- a/esphome/components/adalight/adalight_light_effect.cpp
+++ b/esphome/components/adalight/adalight_light_effect.cpp
@@ -9,7 +9,7 @@ static const char *const TAG = "adalight_light_effect";
 static const uint32_t ADALIGHT_ACK_INTERVAL = 1000;
 static const uint32_t ADALIGHT_RECEIVE_TIMEOUT = 1000;

-AdalightLightEffect::AdalightLightEffect(const char *name) : AddressableLightEffect(name) {}
+AdalightLightEffect::AdalightLightEffect(const std::string &name) : AddressableLightEffect(name) {}

 void AdalightLightEffect::start() {
  AddressableLightEffect::start();
--- a/esphome/components/adalight/adalight_light_effect.h
+++ b/esphome/components/adalight/adalight_light_effect.h
@@ -11,7 +11,7 @@ namespace adalight {

 class AdalightLightEffect : public light::AddressableLightEffect, public uart::UARTDevice {
 public:
-  AdalightLightEffect(const char *name);
+  AdalightLightEffect(const std::string &name);

  void start() override;
  void stop() override;
--- a/esphome/components/ags10/ags10.h
+++ b/esphome/components/ags10/ags10.h
@@ -105,7 +105,7 @@ template<typename... Ts> class AGS10NewI2cAddressAction : public Action<Ts...>,
 public:
  TEMPLATABLE_VALUE(uint8_t, new_address)

-  void play(const Ts &...x) override { this->parent_->new_i2c_address(this->new_address_.value(x...)); }
+  void play(Ts... x) override { this->parent_->new_i2c_address(this->new_address_.value(x...)); }
 };

 enum AGS10SetZeroPointActionMode {
@@ -122,7 +122,7 @@ template<typename... Ts> class AGS10SetZeroPointAction : public Action<Ts...>, p
  TEMPLATABLE_VALUE(uint16_t, value)
  TEMPLATABLE_VALUE(AGS10SetZeroPointActionMode, mode)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    switch (this->mode_.value(x...)) {
      case FACTORY_DEFAULT:
        this->parent_->set_zero_point_with_factory_defaults();
--- a/esphome/components/aic3204/automation.h
+++ b/esphome/components/aic3204/automation.h
@@ -13,7 +13,7 @@ template<typename... Ts> class SetAutoMuteAction : public Action<Ts...> {

  TEMPLATABLE_VALUE(uint8_t, auto_mute_mode)

-  void play(const Ts &...x) override { this->aic3204_->set_auto_mute_mode(this->auto_mute_mode_.value(x...)); }
+  void play(Ts... x) override { this->aic3204_->set_auto_mute_mode(this->auto_mute_mode_.value(x...)); }

 protected:
  AIC3204 *aic3204_;
--- a/esphome/components/alarm_control_panel/init.py
+++ b/esphome/components/alarm_control_panel/init.py
@@ -172,6 +172,12 @@ def alarm_control_panel_schema(
    return _ALARM_CONTROL_PANEL_SCHEMA.extend(schema)


+# Remove before 2025.11.0
+ALARM_CONTROL_PANEL_SCHEMA = alarm_control_panel_schema(AlarmControlPanel)
+ALARM_CONTROL_PANEL_SCHEMA.add_extra(
+    cv.deprecated_schema_constant("alarm_control_panel")
+)
+
 ALARM_CONTROL_PANEL_ACTION_SCHEMA = maybe_simple_id(
    {
        cv.GenerateID(): cv.use_id(AlarmControlPanel),
--- a/esphome/components/alarm_control_panel/automation.h
+++ b/esphome/components/alarm_control_panel/automation.h
@@ -89,7 +89,7 @@ template<typename... Ts> class ArmAwayAction : public Action<Ts...> {

  TEMPLATABLE_VALUE(std::string, code)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto call = this->alarm_control_panel_->make_call();
    auto code = this->code_.optional_value(x...);
    if (code.has_value()) {
@@ -109,7 +109,7 @@ template<typename... Ts> class ArmHomeAction : public Action<Ts...> {

  TEMPLATABLE_VALUE(std::string, code)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto call = this->alarm_control_panel_->make_call();
    auto code = this->code_.optional_value(x...);
    if (code.has_value()) {
@@ -129,7 +129,7 @@ template<typename... Ts> class ArmNightAction : public Action<Ts...> {

  TEMPLATABLE_VALUE(std::string, code)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto call = this->alarm_control_panel_->make_call();
    auto code = this->code_.optional_value(x...);
    if (code.has_value()) {
@@ -149,7 +149,7 @@ template<typename... Ts> class DisarmAction : public Action<Ts...> {

  TEMPLATABLE_VALUE(std::string, code)

-  void play(const Ts &...x) override { this->alarm_control_panel_->disarm(this->code_.optional_value(x...)); }
+  void play(Ts... x) override { this->alarm_control_panel_->disarm(this->code_.optional_value(x...)); }

 protected:
  AlarmControlPanel *alarm_control_panel_;
@@ -159,7 +159,7 @@ template<typename... Ts> class PendingAction : public Action<Ts...> {
 public:
  explicit PendingAction(AlarmControlPanel *alarm_control_panel) : alarm_control_panel_(alarm_control_panel) {}

-  void play(const Ts &...x) override { this->alarm_control_panel_->make_call().pending().perform(); }
+  void play(Ts... x) override { this->alarm_control_panel_->make_call().pending().perform(); }

 protected:
  AlarmControlPanel *alarm_control_panel_;
@@ -169,7 +169,7 @@ template<typename... Ts> class TriggeredAction : public Action<Ts...> {
 public:
  explicit TriggeredAction(AlarmControlPanel *alarm_control_panel) : alarm_control_panel_(alarm_control_panel) {}

-  void play(const Ts &...x) override { this->alarm_control_panel_->make_call().triggered().perform(); }
+  void play(Ts... x) override { this->alarm_control_panel_->make_call().triggered().perform(); }

 protected:
  AlarmControlPanel *alarm_control_panel_;
@@ -178,7 +178,7 @@ template<typename... Ts> class TriggeredAction : public Action<Ts...> {
 template<typename... Ts> class AlarmControlPanelCondition : public Condition<Ts...> {
 public:
  AlarmControlPanelCondition(AlarmControlPanel *parent) : parent_(parent) {}
-  bool check(const Ts &...x) override {
+  bool check(Ts... x) override {
    return this->parent_->is_state_armed(this->parent_->get_state()) ||
           this->parent_->get_state() == ACP_STATE_PENDING || this->parent_->get_state() == ACP_STATE_TRIGGERED;
  }
--- a/esphome/components/animation/animation.h
+++ b/esphome/components/animation/animation.h
@@ -39,7 +39,7 @@ class Animation : public image::Image {
 template<typename... Ts> class AnimationNextFrameAction : public Action<Ts...> {
 public:
  AnimationNextFrameAction(Animation *parent) : parent_(parent) {}
-  void play(const Ts &...x) override { this->parent_->next_frame(); }
+  void play(Ts... x) override { this->parent_->next_frame(); }

 protected:
  Animation *parent_;
@@ -48,7 +48,7 @@ template<typename... Ts> class AnimationNextFrameAction : public Action<Ts...> {
 template<typename... Ts> class AnimationPrevFrameAction : public Action<Ts...> {
 public:
  AnimationPrevFrameAction(Animation *parent) : parent_(parent) {}
-  void play(const Ts &...x) override { this->parent_->prev_frame(); }
+  void play(Ts... x) override { this->parent_->prev_frame(); }

 protected:
  Animation *parent_;
@@ -58,7 +58,7 @@ template<typename... Ts> class AnimationSetFrameAction : public Action<Ts...> {
 public:
  AnimationSetFrameAction(Animation *parent) : parent_(parent) {}
  TEMPLATABLE_VALUE(uint16_t, frame)
-  void play(const Ts &...x) override { this->parent_->set_frame(this->frame_.value(x...)); }
+  void play(Ts... x) override { this->parent_->set_frame(this->frame_.value(x...)); }

 protected:
  Animation *parent_;
--- a/esphome/components/anova/anova.h
+++ b/esphome/components/anova/anova.h
@@ -28,7 +28,7 @@ class Anova : public climate::Climate, public esphome::ble_client::BLEClientNode
  void dump_config() override;
  climate::ClimateTraits traits() override {
    auto traits = climate::ClimateTraits();
-    traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE);
+    traits.set_supports_current_temperature(true);
    traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::ClimateMode::CLIMATE_MODE_HEAT});
    traits.set_visual_min_temperature(25.0);
    traits.set_visual_max_temperature(100.0);
--- a/esphome/components/api/init.py
+++ b/esphome/components/api/init.py
@@ -71,12 +71,10 @@ SERVICE_ARG_NATIVE_TYPES = {
    "int": cg.int32,
    "float": float,
    "string": cg.std_string,
-    "bool[]": cg.FixedVector.template(bool).operator("const").operator("ref"),
-    "int[]": cg.FixedVector.template(cg.int32).operator("const").operator("ref"),
-    "float[]": cg.FixedVector.template(float).operator("const").operator("ref"),
-    "string[]": cg.FixedVector.template(cg.std_string)
-    .operator("const")
-    .operator("ref"),
+    "bool[]": cg.std_vector.template(bool),
+    "int[]": cg.std_vector.template(cg.int32),
+    "float[]": cg.std_vector.template(float),
+    "string[]": cg.std_vector.template(cg.std_string),
 }
 CONF_ENCRYPTION = "encryption"
 CONF_BATCH_DELAY = "batch_delay"
@@ -157,17 +155,6 @@ def _validate_api_config(config: ConfigType) -> ConfigType:
    return config


-def _consume_api_sockets(config: ConfigType) -> ConfigType:
-    """Register socket needs for API component."""
-    from esphome.components import socket
-
-    # API needs 1 listening socket + typically 3 concurrent client connections
-    # (not max_connections, which is the upper limit rarely reached)
-    sockets_needed = 1 + 3
-    socket.consume_sockets(sockets_needed, "api")(config)
-    return config
-
-
 CONFIG_SCHEMA = cv.All(
    cv.Schema(
        {
@@ -235,7 +222,6 @@ CONFIG_SCHEMA = cv.All(
    ).extend(cv.COMPONENT_SCHEMA),
    cv.rename_key(CONF_SERVICES, CONF_ACTIONS),
    _validate_api_config,
-    _consume_api_sockets,
 )


@@ -260,10 +246,6 @@ async def to_code(config):
    if config.get(CONF_ACTIONS) or config[CONF_CUSTOM_SERVICES]:
        cg.add_define("USE_API_SERVICES")

-    # Set USE_API_CUSTOM_SERVICES if external components need dynamic service registration
-    if config[CONF_CUSTOM_SERVICES]:
-        cg.add_define("USE_API_CUSTOM_SERVICES")
-
    if config[CONF_HOMEASSISTANT_SERVICES]:
        cg.add_define("USE_API_HOMEASSISTANT_SERVICES")

@@ -271,8 +253,6 @@ async def to_code(config):
        cg.add_define("USE_API_HOMEASSISTANT_STATES")

    if actions := config.get(CONF_ACTIONS, []):
-        # Collect all triggers first, then register all at once with initializer_list
-        triggers: list[cg.Pvariable] = []
        for conf in actions:
            template_args = []
            func_args = []
@@ -286,10 +266,8 @@ async def to_code(config):
            trigger = cg.new_Pvariable(
                conf[CONF_TRIGGER_ID], templ, conf[CONF_ACTION], service_arg_names
            )
-            triggers.append(trigger)
+            cg.add(var.register_user_service(trigger))
            await automation.build_automation(trigger, func_args, conf)
-        # Register all services at once - single allocation, no reallocations
-        cg.add(var.initialize_user_services(triggers))

    if CONF_ON_CLIENT_CONNECTED in config:
        cg.add_define("USE_API_CLIENT_CONNECTED_TRIGGER")
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -425,7 +425,7 @@ message ListEntitiesFanResponse {
  bool disabled_by_default = 9;
  string icon = 10 [(field_ifdef) = "USE_ENTITY_ICON"];
  EntityCategory entity_category = 11;
-  repeated string supported_preset_modes = 12 [(container_pointer_no_template) = "std::vector<const char *>"];
+  repeated string supported_preset_modes = 12 [(container_pointer) = "std::set"];
  uint32 device_id = 13 [(field_ifdef) = "USE_DEVICES"];
 }
 // Deprecated in API version 1.6 - only used in deprecated fields
@@ -506,7 +506,7 @@ message ListEntitiesLightResponse {
  string name = 3;
  reserved 4; // Deprecated: was string unique_id

-  repeated ColorMode supported_color_modes = 12 [(container_pointer_no_template) = "light::ColorModeMask"];
+  repeated ColorMode supported_color_modes = 12 [(container_pointer) = "std::set<light::ColorMode>"];
  // next four supports_* are for legacy clients, newer clients should use color modes
  // Deprecated in API version 1.6
  bool legacy_supports_brightness = 5 [deprecated=true];
@@ -989,7 +989,7 @@ message ListEntitiesClimateResponse {

  bool supports_current_temperature = 5; // Deprecated: use feature_flags
  bool supports_two_point_target_temperature = 6; // Deprecated: use feature_flags
-  repeated ClimateMode supported_modes = 7 [(container_pointer_no_template) = "climate::ClimateModeMask"];
+  repeated ClimateMode supported_modes = 7 [(container_pointer) = "std::set<climate::ClimateMode>"];
  float visual_min_temperature = 8;
  float visual_max_temperature = 9;
  float visual_target_temperature_step = 10;
@@ -998,11 +998,11 @@ message ListEntitiesClimateResponse {
  // Deprecated in API version 1.5
  bool legacy_supports_away = 11 [deprecated=true];
  bool supports_action = 12; // Deprecated: use feature_flags
-  repeated ClimateFanMode supported_fan_modes = 13 [(container_pointer_no_template) = "climate::ClimateFanModeMask"];
-  repeated ClimateSwingMode supported_swing_modes = 14 [(container_pointer_no_template) = "climate::ClimateSwingModeMask"];
-  repeated string supported_custom_fan_modes = 15 [(container_pointer_no_template) = "std::vector<const char *>"];
-  repeated ClimatePreset supported_presets = 16 [(container_pointer_no_template) = "climate::ClimatePresetMask"];
-  repeated string supported_custom_presets = 17 [(container_pointer_no_template) = "std::vector<const char *>"];
+  repeated ClimateFanMode supported_fan_modes = 13 [(container_pointer) = "std::set<climate::ClimateFanMode>"];
+  repeated ClimateSwingMode supported_swing_modes = 14 [(container_pointer) = "std::set<climate::ClimateSwingMode>"];
+  repeated string supported_custom_fan_modes = 15 [(container_pointer) = "std::set"];
+  repeated ClimatePreset supported_presets = 16 [(container_pointer) = "std::set<climate::ClimatePreset>"];
+  repeated string supported_custom_presets = 17 [(container_pointer) = "std::set"];
  bool disabled_by_default = 18;
  string icon = 19 [(field_ifdef) = "USE_ENTITY_ICON"];
  EntityCategory entity_category = 20;
@@ -1143,7 +1143,7 @@ message ListEntitiesSelectResponse {
  reserved 4; // Deprecated: was string unique_id

  string icon = 5 [(field_ifdef) = "USE_ENTITY_ICON"];
-  repeated string options = 6 [(container_pointer_no_template) = "FixedVector<const char *>"];
+  repeated string options = 6 [(container_pointer) = "std::vector"];
  bool disabled_by_default = 7;
  EntityCategory entity_category = 8;
  uint32 device_id = 9 [(field_ifdef) = "USE_DEVICES"];
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -410,8 +410,8 @@ uint16_t APIConnection::try_send_fan_state(EntityBase *entity, APIConnection *co
  }
  if (traits.supports_direction())
    msg.direction = static_cast<enums::FanDirection>(fan->direction);
-  if (traits.supports_preset_modes() && fan->has_preset_mode())
-    msg.set_preset_mode(StringRef(fan->get_preset_mode()));
+  if (traits.supports_preset_modes())
+    msg.set_preset_mode(StringRef(fan->preset_mode));
  return fill_and_encode_entity_state(fan, msg, FanStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_fan_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -423,7 +423,7 @@ uint16_t APIConnection::try_send_fan_info(EntityBase *entity, APIConnection *con
  msg.supports_speed = traits.supports_speed();
  msg.supports_direction = traits.supports_direction();
  msg.supported_speed_count = traits.supported_speed_count();
-  msg.supported_preset_modes = &traits.supported_preset_modes();
+  msg.supported_preset_modes = &traits.supported_preset_modes_for_api_();
  return fill_and_encode_entity_info(fan, msg, ListEntitiesFanResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 void APIConnection::fan_command(const FanCommandRequest &msg) {
@@ -453,6 +453,7 @@ uint16_t APIConnection::try_send_light_state(EntityBase *entity, APIConnection *
                                             bool is_single) {
  auto *light = static_cast<light::LightState *>(entity);
  LightStateResponse resp;
+  auto traits = light->get_traits();
  auto values = light->remote_values;
  auto color_mode = values.get_color_mode();
  resp.state = values.is_on();
@@ -476,8 +477,7 @@ uint16_t APIConnection::try_send_light_info(EntityBase *entity, APIConnection *c
  auto *light = static_cast<light::LightState *>(entity);
  ListEntitiesLightResponse msg;
  auto traits = light->get_traits();
-  // Pass pointer to ColorModeMask so the iterator can encode actual ColorMode enum values
-  msg.supported_color_modes = &traits.get_supported_color_modes();
+  msg.supported_color_modes = &traits.get_supported_color_modes_for_api_();
  if (traits.supports_color_capability(light::ColorCapability::COLOR_TEMPERATURE) ||
      traits.supports_color_capability(light::ColorCapability::COLD_WARM_WHITE)) {
    msg.min_mireds = traits.get_min_mireds();
@@ -486,7 +486,7 @@ uint16_t APIConnection::try_send_light_info(EntityBase *entity, APIConnection *c
  if (light->supports_effects()) {
    msg.effects.emplace_back("None");
    for (auto *effect : light->get_effects()) {
-      msg.effects.emplace_back(effect->get_name());
+      msg.effects.push_back(effect->get_name());
    }
  }
  return fill_and_encode_entity_info(light, msg, ListEntitiesLightResponse::MESSAGE_TYPE, conn, remaining_size,
@@ -637,14 +637,14 @@ uint16_t APIConnection::try_send_climate_state(EntityBase *entity, APIConnection
  }
  if (traits.get_supports_fan_modes() && climate->fan_mode.has_value())
    resp.fan_mode = static_cast<enums::ClimateFanMode>(climate->fan_mode.value());
-  if (!traits.get_supported_custom_fan_modes().empty() && climate->has_custom_fan_mode()) {
-    resp.set_custom_fan_mode(StringRef(climate->get_custom_fan_mode()));
+  if (!traits.get_supported_custom_fan_modes().empty() && climate->custom_fan_mode.has_value()) {
+    resp.set_custom_fan_mode(StringRef(climate->custom_fan_mode.value()));
  }
  if (traits.get_supports_presets() && climate->preset.has_value()) {
    resp.preset = static_cast<enums::ClimatePreset>(climate->preset.value());
  }
-  if (!traits.get_supported_custom_presets().empty() && climate->has_custom_preset()) {
-    resp.set_custom_preset(StringRef(climate->get_custom_preset()));
+  if (!traits.get_supported_custom_presets().empty() && climate->custom_preset.has_value()) {
+    resp.set_custom_preset(StringRef(climate->custom_preset.value()));
  }
  if (traits.get_supports_swing_modes())
    resp.swing_mode = static_cast<enums::ClimateSwingMode>(climate->swing_mode);
@@ -661,26 +661,25 @@ uint16_t APIConnection::try_send_climate_info(EntityBase *entity, APIConnection
  ListEntitiesClimateResponse msg;
  auto traits = climate->get_traits();
  // Flags set for backward compatibility, deprecated in 2025.11.0
-  msg.supports_current_temperature = traits.has_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE);
-  msg.supports_current_humidity = traits.has_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_HUMIDITY);
-  msg.supports_two_point_target_temperature = traits.has_feature_flags(
-      climate::CLIMATE_SUPPORTS_TWO_POINT_TARGET_TEMPERATURE | climate::CLIMATE_REQUIRES_TWO_POINT_TARGET_TEMPERATURE);
-  msg.supports_target_humidity = traits.has_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY);
-  msg.supports_action = traits.has_feature_flags(climate::CLIMATE_SUPPORTS_ACTION);
+  msg.supports_current_temperature = traits.get_supports_current_temperature();
+  msg.supports_current_humidity = traits.get_supports_current_humidity();
+  msg.supports_two_point_target_temperature = traits.get_supports_two_point_target_temperature();
+  msg.supports_target_humidity = traits.get_supports_target_humidity();
+  msg.supports_action = traits.get_supports_action();
  // Current feature flags and other supported parameters
  msg.feature_flags = traits.get_feature_flags();
-  msg.supported_modes = &traits.get_supported_modes();
+  msg.supported_modes = &traits.get_supported_modes_for_api_();
  msg.visual_min_temperature = traits.get_visual_min_temperature();
  msg.visual_max_temperature = traits.get_visual_max_temperature();
  msg.visual_target_temperature_step = traits.get_visual_target_temperature_step();
  msg.visual_current_temperature_step = traits.get_visual_current_temperature_step();
  msg.visual_min_humidity = traits.get_visual_min_humidity();
  msg.visual_max_humidity = traits.get_visual_max_humidity();
-  msg.supported_fan_modes = &traits.get_supported_fan_modes();
-  msg.supported_custom_fan_modes = &traits.get_supported_custom_fan_modes();
-  msg.supported_presets = &traits.get_supported_presets();
-  msg.supported_custom_presets = &traits.get_supported_custom_presets();
-  msg.supported_swing_modes = &traits.get_supported_swing_modes();
+  msg.supported_fan_modes = &traits.get_supported_fan_modes_for_api_();
+  msg.supported_custom_fan_modes = &traits.get_supported_custom_fan_modes_for_api_();
+  msg.supported_presets = &traits.get_supported_presets_for_api_();
+  msg.supported_custom_presets = &traits.get_supported_custom_presets_for_api_();
+  msg.supported_swing_modes = &traits.get_supported_swing_modes_for_api_();
  return fill_and_encode_entity_info(climate, msg, ListEntitiesClimateResponse::MESSAGE_TYPE, conn, remaining_size,
                                     is_single);
 }
@@ -877,7 +876,7 @@ uint16_t APIConnection::try_send_select_state(EntityBase *entity, APIConnection
                                              bool is_single) {
  auto *select = static_cast<select::Select *>(entity);
  SelectStateResponse resp;
-  resp.set_state(StringRef(select->current_option()));
+  resp.set_state(StringRef(select->state));
  resp.missing_state = !select->has_state();
  return fill_and_encode_entity_state(select, resp, SelectStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -1082,8 +1081,13 @@ void APIConnection::on_get_time_response(const GetTimeResponse &value) {
    homeassistant::global_homeassistant_time->set_epoch_time(value.epoch_seconds);
 #ifdef USE_TIME_TIMEZONE
    if (value.timezone_len > 0) {
-      homeassistant::global_homeassistant_time->set_timezone(reinterpret_cast<const char *>(value.timezone),
-                                                             value.timezone_len);
+      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));
+      }
    }
 #endif
  }
@@ -1572,13 +1576,7 @@ bool APIConnection::send_noise_encryption_set_key_response(const NoiseEncryption
  resp.success = false;

  psk_t psk{};
-  if (msg.key.empty()) {
-    if (this->parent_->clear_noise_psk(true)) {
-      resp.success = true;
-    } else {
-      ESP_LOGW(TAG, "Failed to clear encryption key");
-    }
-  } else if (base64_decode(msg.key, psk.data(), msg.key.size()) != psk.size()) {
+  if (base64_decode(msg.key, psk.data(), msg.key.size()) != psk.size()) {
    ESP_LOGW(TAG, "Invalid encryption key length");
  } else if (!this->parent_->save_noise_psk(psk, true)) {
    ESP_LOGW(TAG, "Failed to save encryption key");
--- a/esphome/components/api/api_frame_helper_noise.cpp
+++ b/esphome/components/api/api_frame_helper_noise.cpp
@@ -434,7 +434,8 @@ APIError APINoiseFrameHelper::write_protobuf_packets(ProtoWriteBuffer buffer, st
    return APIError::OK;
  }

-  uint8_t *buffer_data = buffer.get_buffer()->data();
+  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
+  uint8_t *buffer_data = raw_buffer->data();  // Cache buffer pointer

  this->reusable_iovs_.clear();
  this->reusable_iovs_.reserve(packets.size());
--- a/esphome/components/api/api_frame_helper_plaintext.cpp
+++ b/esphome/components/api/api_frame_helper_plaintext.cpp
@@ -230,7 +230,8 @@ APIError APIPlaintextFrameHelper::write_protobuf_packets(ProtoWriteBuffer buffer
    return APIError::OK;
  }

-  uint8_t *buffer_data = buffer.get_buffer()->data();
+  std::vector<uint8_t> *raw_buffer = buffer.get_buffer();
+  uint8_t *buffer_data = raw_buffer->data();  // Cache buffer pointer

  this->reusable_iovs_.clear();
  this->reusable_iovs_.reserve(packets.size());
--- a/esphome/components/api/api_options.proto
+++ b/esphome/components/api/api_options.proto
@@ -70,14 +70,4 @@ extend google.protobuf.FieldOptions {
    // init(size) before adding elements. This eliminates std::vector template overhead
    // and is ideal when the exact size is known before populating the array.
    optional bool fixed_vector = 50013 [default=false];
-
-    // container_pointer_no_template: Use a non-template container type for repeated fields
-    // Similar to container_pointer, but for containers that don't take template parameters.
-    // The container type is used as-is without appending element type.
-    // The container must have:
-    // - begin() and end() methods returning iterators
-    // - empty() method
-    // Example: [(container_pointer_no_template) = "light::ColorModeMask"]
-    //   generates: const light::ColorModeMask *supported_color_modes{};
-    optional string container_pointer_no_template = 50014;
 }
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -355,8 +355,8 @@ void ListEntitiesFanResponse::encode(ProtoWriteBuffer buffer) const {
  buffer.encode_string(10, this->icon_ref_);
 #endif
  buffer.encode_uint32(11, static_cast<uint32_t>(this->entity_category));
-  for (const char *it : *this->supported_preset_modes) {
-    buffer.encode_string(12, it, strlen(it), true);
+  for (const auto &it : *this->supported_preset_modes) {
+    buffer.encode_string(12, it, true);
  }
 #ifdef USE_DEVICES
  buffer.encode_uint32(13, this->device_id);
@@ -376,8 +376,8 @@ void ListEntitiesFanResponse::calculate_size(ProtoSize &size) const {
 #endif
  size.add_uint32(1, static_cast<uint32_t>(this->entity_category));
  if (!this->supported_preset_modes->empty()) {
-    for (const char *it : *this->supported_preset_modes) {
-      size.add_length_force(1, strlen(it));
+    for (const auto &it : *this->supported_preset_modes) {
+      size.add_length_force(1, it.size());
    }
  }
 #ifdef USE_DEVICES
@@ -1179,14 +1179,14 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
  for (const auto &it : *this->supported_swing_modes) {
    buffer.encode_uint32(14, static_cast<uint32_t>(it), true);
  }
-  for (const char *it : *this->supported_custom_fan_modes) {
-    buffer.encode_string(15, it, strlen(it), true);
+  for (const auto &it : *this->supported_custom_fan_modes) {
+    buffer.encode_string(15, it, true);
  }
  for (const auto &it : *this->supported_presets) {
    buffer.encode_uint32(16, static_cast<uint32_t>(it), true);
  }
-  for (const char *it : *this->supported_custom_presets) {
-    buffer.encode_string(17, it, strlen(it), true);
+  for (const auto &it : *this->supported_custom_presets) {
+    buffer.encode_string(17, it, true);
  }
  buffer.encode_bool(18, this->disabled_by_default);
 #ifdef USE_ENTITY_ICON
@@ -1229,8 +1229,8 @@ void ListEntitiesClimateResponse::calculate_size(ProtoSize &size) const {
    }
  }
  if (!this->supported_custom_fan_modes->empty()) {
-    for (const char *it : *this->supported_custom_fan_modes) {
-      size.add_length_force(1, strlen(it));
+    for (const auto &it : *this->supported_custom_fan_modes) {
+      size.add_length_force(1, it.size());
    }
  }
  if (!this->supported_presets->empty()) {
@@ -1239,8 +1239,8 @@ void ListEntitiesClimateResponse::calculate_size(ProtoSize &size) const {
    }
  }
  if (!this->supported_custom_presets->empty()) {
-    for (const char *it : *this->supported_custom_presets) {
-      size.add_length_force(2, strlen(it));
+    for (const auto &it : *this->supported_custom_presets) {
+      size.add_length_force(2, it.size());
    }
  }
  size.add_bool(2, this->disabled_by_default);
@@ -1475,8 +1475,8 @@ void ListEntitiesSelectResponse::encode(ProtoWriteBuffer buffer) const {
 #ifdef USE_ENTITY_ICON
  buffer.encode_string(5, this->icon_ref_);
 #endif
-  for (const char *it : *this->options) {
-    buffer.encode_string(6, it, strlen(it), true);
+  for (const auto &it : *this->options) {
+    buffer.encode_string(6, it, true);
  }
  buffer.encode_bool(7, this->disabled_by_default);
  buffer.encode_uint32(8, static_cast<uint32_t>(this->entity_category));
@@ -1492,8 +1492,8 @@ void ListEntitiesSelectResponse::calculate_size(ProtoSize &size) const {
  size.add_length(1, this->icon_ref_.size());
 #endif
  if (!this->options->empty()) {
-    for (const char *it : *this->options) {
-      size.add_length_force(1, strlen(it));
+    for (const auto &it : *this->options) {
+      size.add_length_force(1, it.size());
    }
  }
  size.add_bool(1, this->disabled_by_default);
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -725,7 +725,7 @@ class ListEntitiesFanResponse final : public InfoResponseProtoMessage {
  bool supports_speed{false};
  bool supports_direction{false};
  int32_t supported_speed_count{0};
-  const std::vector<const char *> *supported_preset_modes{};
+  const std::set<std::string> *supported_preset_modes{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(ProtoSize &size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
@@ -790,7 +790,7 @@ class ListEntitiesLightResponse final : public InfoResponseProtoMessage {
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *message_name() const override { return "list_entities_light_response"; }
 #endif
-  const light::ColorModeMask *supported_color_modes{};
+  const std::set<light::ColorMode> *supported_color_modes{};
  float min_mireds{0.0f};
  float max_mireds{0.0f};
  std::vector<std::string> effects{};
@@ -1377,16 +1377,16 @@ class ListEntitiesClimateResponse final : public InfoResponseProtoMessage {
 #endif
  bool supports_current_temperature{false};
  bool supports_two_point_target_temperature{false};
-  const climate::ClimateModeMask *supported_modes{};
+  const std::set<climate::ClimateMode> *supported_modes{};
  float visual_min_temperature{0.0f};
  float visual_max_temperature{0.0f};
  float visual_target_temperature_step{0.0f};
  bool supports_action{false};
-  const climate::ClimateFanModeMask *supported_fan_modes{};
-  const climate::ClimateSwingModeMask *supported_swing_modes{};
-  const std::vector<const char *> *supported_custom_fan_modes{};
-  const climate::ClimatePresetMask *supported_presets{};
-  const std::vector<const char *> *supported_custom_presets{};
+  const std::set<climate::ClimateFanMode> *supported_fan_modes{};
+  const std::set<climate::ClimateSwingMode> *supported_swing_modes{};
+  const std::set<std::string> *supported_custom_fan_modes{};
+  const std::set<climate::ClimatePreset> *supported_presets{};
+  const std::set<std::string> *supported_custom_presets{};
  float visual_current_temperature_step{0.0f};
  bool supports_current_humidity{false};
  bool supports_target_humidity{false};
@@ -1534,7 +1534,7 @@ class ListEntitiesSelectResponse final : public InfoResponseProtoMessage {
 #ifdef HAS_PROTO_MESSAGE_DUMP
  const char *message_name() const override { return "list_entities_select_response"; }
 #endif
-  const FixedVector<const char *> *options{};
+  const std::vector<std::string> *options{};
  void encode(ProtoWriteBuffer buffer) const override;
  void calculate_size(ProtoSize &size) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
@@ -88,12 +88,6 @@ static void dump_field(std::string &out, const char *field_name, StringRef value
  out.append("\n");
 }

-static void dump_field(std::string &out, const char *field_name, const char *value, int indent = 2) {
-  append_field_prefix(out, field_name, indent);
-  out.append("'").append(value).append("'");
-  out.append("\n");
-}
-
 template<typename T> static void dump_field(std::string &out, const char *field_name, T value, int indent = 2) {
  append_field_prefix(out, field_name, indent);
  out.append(proto_enum_to_string<T>(value));
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -224,7 +224,7 @@ void APIServer::dump_config() {
                "  Address: %s:%u\n"
                "  Listen backlog: %u\n"
                "  Max connections: %u",
-                network::get_use_address(), this->port_, this->listen_backlog_, this->max_connections_);
+                network::get_use_address().c_str(), this->port_, this->listen_backlog_, this->max_connections_);
 #ifdef USE_API_NOISE
  ESP_LOGCONFIG(TAG, "  Noise encryption: %s", YESNO(this->noise_ctx_->has_psk()));
  if (!this->noise_ctx_->has_psk()) {
@@ -468,31 +468,6 @@ uint16_t APIServer::get_port() const { return this->port_; }
 void APIServer::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeout_ = reboot_timeout; }

 #ifdef USE_API_NOISE
-bool APIServer::update_noise_psk_(const SavedNoisePsk &new_psk, const LogString *save_log_msg,
-                                  const LogString *fail_log_msg, const psk_t &active_psk, bool make_active) {
-  if (!this->noise_pref_.save(&new_psk)) {
-    ESP_LOGW(TAG, "%s", LOG_STR_ARG(fail_log_msg));
-    return false;
-  }
-  // ensure it's written immediately
-  if (!global_preferences->sync()) {
-    ESP_LOGW(TAG, "Failed to sync preferences");
-    return false;
-  }
-  ESP_LOGD(TAG, "%s", LOG_STR_ARG(save_log_msg));
-  if (make_active) {
-    this->set_timeout(100, [this, active_psk]() {
-      ESP_LOGW(TAG, "Disconnecting all clients to reset PSK");
-      this->set_noise_psk(active_psk);
-      for (auto &c : this->clients_) {
-        DisconnectRequest req;
-        c->send_message(req, DisconnectRequest::MESSAGE_TYPE);
-      }
-    });
-  }
-  return true;
-}
-
 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
@@ -507,21 +482,27 @@ bool APIServer::save_noise_psk(psk_t psk, bool make_active) {
  }

  SavedNoisePsk new_saved_psk{psk};
-  return this->update_noise_psk_(new_saved_psk, LOG_STR("Noise PSK saved"), LOG_STR("Failed to save Noise PSK"), psk,
-                                 make_active);
-#endif
-}
-bool APIServer::clear_noise_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
-  SavedNoisePsk empty_psk{};
-  psk_t empty{};
-  return this->update_noise_psk_(empty_psk, LOG_STR("Noise PSK cleared"), LOG_STR("Failed to clear Noise PSK"), empty,
-                                 make_active);
+  if (!this->noise_pref_.save(&new_saved_psk)) {
+    ESP_LOGW(TAG, "Failed to save Noise PSK");
+    return false;
+  }
+  // ensure it's written immediately
+  if (!global_preferences->sync()) {
+    ESP_LOGW(TAG, "Failed to sync preferences");
+    return false;
+  }
+  ESP_LOGD(TAG, "Noise PSK saved");
+  if (make_active) {
+    this->set_timeout(100, [this, psk]() {
+      ESP_LOGW(TAG, "Disconnecting all clients to reset PSK");
+      this->set_noise_psk(psk);
+      for (auto &c : this->clients_) {
+        DisconnectRequest req;
+        c->send_message(req, DisconnectRequest::MESSAGE_TYPE);
+      }
+    });
+  }
+  return true;
 #endif
 }
 #endif
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -53,7 +53,6 @@ class APIServer : public Component, public Controller {

 #ifdef USE_API_NOISE
  bool save_noise_psk(psk_t psk, bool make_active = true);
-  bool clear_noise_psk(bool make_active = true);
  void set_noise_psk(psk_t psk) { noise_ctx_->set_psk(psk); }
  std::shared_ptr<APINoiseContext> get_noise_ctx() { return noise_ctx_; }
 #endif  // USE_API_NOISE
@@ -125,14 +124,8 @@ class APIServer : public Component, public Controller {
 #endif  // USE_API_HOMEASSISTANT_ACTION_RESPONSES
 #endif  // USE_API_HOMEASSISTANT_SERVICES
 #ifdef USE_API_SERVICES
-  void initialize_user_services(std::initializer_list<UserServiceDescriptor *> services) {
-    this->user_services_.assign(services);
-  }
-#ifdef USE_API_CUSTOM_SERVICES
-  // Only compile push_back method when custom_services: true (external components)
  void register_user_service(UserServiceDescriptor *descriptor) { this->user_services_.push_back(descriptor); }
 #endif
-#endif
 #ifdef USE_HOMEASSISTANT_TIME
  void request_time();
 #endif
@@ -181,10 +174,6 @@ class APIServer : public Component, public Controller {

 protected:
  void schedule_reboot_timeout_();
-#ifdef USE_API_NOISE
-  bool update_noise_psk_(const SavedNoisePsk &new_psk, const LogString *save_log_msg, const LogString *fail_log_msg,
-                         const psk_t &active_psk, bool make_active);
-#endif  // USE_API_NOISE
  // Pointers and pointer-like types first (4 bytes each)
  std::unique_ptr<socket::Socket> socket_ = nullptr;
 #ifdef USE_API_CLIENT_CONNECTED_TRIGGER
@@ -237,7 +226,7 @@ extern APIServer *global_api_server;  // NOLINT(cppcoreguidelines-avoid-non-cons

 template<typename... Ts> class APIConnectedCondition : public Condition<Ts...> {
 public:
-  bool check(const Ts &...x) override { return global_api_server->is_connected(); }
+  bool check(Ts... x) override { return global_api_server->is_connected(); }
 };

 }  // namespace esphome::api
--- a/esphome/components/api/custom_api_device.h
+++ b/esphome/components/api/custom_api_device.h
@@ -53,14 +53,8 @@ class CustomAPIDevice {
  template<typename T, typename... Ts>
  void register_service(void (T::*callback)(Ts...), const std::string &name,
                        const std::array<std::string, sizeof...(Ts)> &arg_names) {
-#ifdef USE_API_CUSTOM_SERVICES
    auto *service = new CustomAPIDeviceService<T, Ts...>(name, arg_names, (T *) this, callback);  // NOLINT
    global_api_server->register_user_service(service);
-#else
-    static_assert(
-        sizeof(T) == 0,
-        "register_service() requires 'custom_services: true' in the 'api:' section of your YAML configuration");
-#endif
  }
 #else
  template<typename T, typename... Ts>
@@ -92,14 +86,8 @@ class CustomAPIDevice {
   */
 #ifdef USE_API_SERVICES
  template<typename T> void register_service(void (T::*callback)(), const std::string &name) {
-#ifdef USE_API_CUSTOM_SERVICES
    auto *service = new CustomAPIDeviceService<T>(name, {}, (T *) this, callback);  // NOLINT
    global_api_server->register_user_service(service);
-#else
-    static_assert(
-        sizeof(T) == 0,
-        "register_service() requires 'custom_services: true' in the 'api:' section of your YAML configuration");
-#endif
  }
 #else
  template<typename T> void register_service(void (T::*callback)(), const std::string &name) {
--- a/esphome/components/api/homeassistant_service.h
+++ b/esphome/components/api/homeassistant_service.h
@@ -133,7 +133,7 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
  Trigger<std::string, Ts...> *get_error_trigger() const { return this->error_trigger_; }
 #endif  // USE_API_HOMEASSISTANT_ACTION_RESPONSES

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    HomeassistantActionRequest resp;
    std::string service_value = this->service_.value(x...);
    resp.set_service(StringRef(service_value));
--- a/esphome/components/api/user_services.cpp
+++ b/esphome/components/api/user_services.cpp
@@ -11,58 +11,23 @@ template<> int32_t get_execute_arg_value<int32_t>(const ExecuteServiceArgument &
 }
 template<> float get_execute_arg_value<float>(const ExecuteServiceArgument &arg) { return arg.float_; }
 template<> std::string get_execute_arg_value<std::string>(const ExecuteServiceArgument &arg) { return arg.string_; }
-
-// Legacy std::vector versions for external components using custom_api_device.h - optimized with reserve
 template<> std::vector<bool> get_execute_arg_value<std::vector<bool>>(const ExecuteServiceArgument &arg) {
-  std::vector<bool> result;
-  result.reserve(arg.bool_array.size());
-  result.insert(result.end(), arg.bool_array.begin(), arg.bool_array.end());
-  return result;
+  return std::vector<bool>(arg.bool_array.begin(), arg.bool_array.end());
 }
 template<> std::vector<int32_t> get_execute_arg_value<std::vector<int32_t>>(const ExecuteServiceArgument &arg) {
-  std::vector<int32_t> result;
-  result.reserve(arg.int_array.size());
-  result.insert(result.end(), arg.int_array.begin(), arg.int_array.end());
-  return result;
+  return std::vector<int32_t>(arg.int_array.begin(), arg.int_array.end());
 }
 template<> std::vector<float> get_execute_arg_value<std::vector<float>>(const ExecuteServiceArgument &arg) {
-  std::vector<float> result;
-  result.reserve(arg.float_array.size());
-  result.insert(result.end(), arg.float_array.begin(), arg.float_array.end());
-  return result;
+  return std::vector<float>(arg.float_array.begin(), arg.float_array.end());
 }
 template<> std::vector<std::string> get_execute_arg_value<std::vector<std::string>>(const ExecuteServiceArgument &arg) {
-  std::vector<std::string> result;
-  result.reserve(arg.string_array.size());
-  result.insert(result.end(), arg.string_array.begin(), arg.string_array.end());
-  return result;
-}
-
-// New FixedVector const reference versions for YAML-generated services - zero-copy
-template<>
-const FixedVector<bool> &get_execute_arg_value<const FixedVector<bool> &>(const ExecuteServiceArgument &arg) {
-  return arg.bool_array;
-}
-template<>
-const FixedVector<int32_t> &get_execute_arg_value<const FixedVector<int32_t> &>(const ExecuteServiceArgument &arg) {
-  return arg.int_array;
-}
-template<>
-const FixedVector<float> &get_execute_arg_value<const FixedVector<float> &>(const ExecuteServiceArgument &arg) {
-  return arg.float_array;
-}
-template<>
-const FixedVector<std::string> &get_execute_arg_value<const FixedVector<std::string> &>(
-    const ExecuteServiceArgument &arg) {
-  return arg.string_array;
+  return std::vector<std::string>(arg.string_array.begin(), arg.string_array.end());
 }

 template<> enums::ServiceArgType to_service_arg_type<bool>() { return enums::SERVICE_ARG_TYPE_BOOL; }
 template<> enums::ServiceArgType to_service_arg_type<int32_t>() { return enums::SERVICE_ARG_TYPE_INT; }
 template<> enums::ServiceArgType to_service_arg_type<float>() { return enums::SERVICE_ARG_TYPE_FLOAT; }
 template<> enums::ServiceArgType to_service_arg_type<std::string>() { return enums::SERVICE_ARG_TYPE_STRING; }
-
-// Legacy std::vector versions for external components using custom_api_device.h
 template<> enums::ServiceArgType to_service_arg_type<std::vector<bool>>() { return enums::SERVICE_ARG_TYPE_BOOL_ARRAY; }
 template<> enums::ServiceArgType to_service_arg_type<std::vector<int32_t>>() {
  return enums::SERVICE_ARG_TYPE_INT_ARRAY;
@@ -74,18 +39,4 @@ template<> enums::ServiceArgType to_service_arg_type<std::vector<std::string>>()
  return enums::SERVICE_ARG_TYPE_STRING_ARRAY;
 }

-// New FixedVector const reference versions for YAML-generated services
-template<> enums::ServiceArgType to_service_arg_type<const FixedVector<bool> &>() {
-  return enums::SERVICE_ARG_TYPE_BOOL_ARRAY;
-}
-template<> enums::ServiceArgType to_service_arg_type<const FixedVector<int32_t> &>() {
-  return enums::SERVICE_ARG_TYPE_INT_ARRAY;
-}
-template<> enums::ServiceArgType to_service_arg_type<const FixedVector<float> &>() {
-  return enums::SERVICE_ARG_TYPE_FLOAT_ARRAY;
-}
-template<> enums::ServiceArgType to_service_arg_type<const FixedVector<std::string> &>() {
-  return enums::SERVICE_ARG_TYPE_STRING_ARRAY;
-}
-
 }  // namespace esphome::api
--- a/esphome/components/at581x/automation.h
+++ b/esphome/components/at581x/automation.h
@@ -10,7 +10,7 @@ namespace at581x {

 template<typename... Ts> class AT581XResetAction : public Action<Ts...>, public Parented<AT581XComponent> {
 public:
-  void play(const Ts &...x) { this->parent_->reset_hardware_frontend(); }
+  void play(Ts... x) { this->parent_->reset_hardware_frontend(); }
 };

 template<typename... Ts> class AT581XSettingsAction : public Action<Ts...>, public Parented<AT581XComponent> {
@@ -25,7 +25,7 @@ template<typename... Ts> class AT581XSettingsAction : public Action<Ts...>, publ
  TEMPLATABLE_VALUE(int, trigger_keep)
  TEMPLATABLE_VALUE(int, stage_gain)

-  void play(const Ts &...x) {
+  void play(Ts... x) {
    if (this->frequency_.has_value()) {
      int v = this->frequency_.value(x...);
      this->parent_->set_frequency(v);
--- a/esphome/components/audio_adc/automation.h
+++ b/esphome/components/audio_adc/automation.h
@@ -13,7 +13,7 @@ template<typename... Ts> class SetMicGainAction : public Action<Ts...> {

  TEMPLATABLE_VALUE(float, mic_gain)

-  void play(const Ts &...x) override { this->audio_adc_->set_mic_gain(this->mic_gain_.value(x...)); }
+  void play(Ts... x) override { this->audio_adc_->set_mic_gain(this->mic_gain_.value(x...)); }

 protected:
  AudioAdc *audio_adc_;
--- a/esphome/components/audio_dac/automation.h
+++ b/esphome/components/audio_dac/automation.h
@@ -11,7 +11,7 @@ template<typename... Ts> class MuteOffAction : public Action<Ts...> {
 public:
  explicit MuteOffAction(AudioDac *audio_dac) : audio_dac_(audio_dac) {}

-  void play(const Ts &...x) override { this->audio_dac_->set_mute_off(); }
+  void play(Ts... x) override { this->audio_dac_->set_mute_off(); }

 protected:
  AudioDac *audio_dac_;
@@ -21,7 +21,7 @@ template<typename... Ts> class MuteOnAction : public Action<Ts...> {
 public:
  explicit MuteOnAction(AudioDac *audio_dac) : audio_dac_(audio_dac) {}

-  void play(const Ts &...x) override { this->audio_dac_->set_mute_on(); }
+  void play(Ts... x) override { this->audio_dac_->set_mute_on(); }

 protected:
  AudioDac *audio_dac_;
@@ -33,7 +33,7 @@ template<typename... Ts> class SetVolumeAction : public Action<Ts...> {

  TEMPLATABLE_VALUE(float, volume)

-  void play(const Ts &...x) override { this->audio_dac_->set_volume(this->volume_.value(x...)); }
+  void play(Ts... x) override { this->audio_dac_->set_volume(this->volume_.value(x...)); }

 protected:
  AudioDac *audio_dac_;
--- a/esphome/components/bang_bang/bang_bang_climate.cpp
+++ b/esphome/components/bang_bang/bang_bang_climate.cpp
@@ -6,9 +6,6 @@ namespace bang_bang {

 static const char *const TAG = "bang_bang.climate";

-BangBangClimate::BangBangClimate()
-    : idle_trigger_(new Trigger<>()), cool_trigger_(new Trigger<>()), heat_trigger_(new Trigger<>()) {}
-
 void BangBangClimate::setup() {
  this->sensor_->add_on_state_callback([this](float state) {
    this->current_temperature = state;
@@ -34,63 +31,53 @@ void BangBangClimate::setup() {
    restore->to_call(this).perform();
  } else {
    // restore from defaults, change_away handles those for us
-    if (this->supports_cool_ && this->supports_heat_) {
+    if (supports_cool_ && supports_heat_) {
      this->mode = climate::CLIMATE_MODE_HEAT_COOL;
-    } else if (this->supports_cool_) {
+    } else if (supports_cool_) {
      this->mode = climate::CLIMATE_MODE_COOL;
-    } else if (this->supports_heat_) {
+    } else if (supports_heat_) {
      this->mode = climate::CLIMATE_MODE_HEAT;
    }
    this->change_away_(false);
  }
 }
-
 void BangBangClimate::control(const climate::ClimateCall &call) {
-  if (call.get_mode().has_value()) {
+  if (call.get_mode().has_value())
    this->mode = *call.get_mode();
-  }
-  if (call.get_target_temperature_low().has_value()) {
+  if (call.get_target_temperature_low().has_value())
    this->target_temperature_low = *call.get_target_temperature_low();
-  }
-  if (call.get_target_temperature_high().has_value()) {
+  if (call.get_target_temperature_high().has_value())
    this->target_temperature_high = *call.get_target_temperature_high();
-  }
-  if (call.get_preset().has_value()) {
+  if (call.get_preset().has_value())
    this->change_away_(*call.get_preset() == climate::CLIMATE_PRESET_AWAY);
-  }

  this->compute_state_();
  this->publish_state();
 }
-
 climate::ClimateTraits BangBangClimate::traits() {
  auto traits = climate::ClimateTraits();
-  traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE |
-                           climate::CLIMATE_REQUIRES_TWO_POINT_TARGET_TEMPERATURE | climate::CLIMATE_SUPPORTS_ACTION);
-  if (this->humidity_sensor_ != nullptr) {
-    traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_HUMIDITY);
-  }
+  traits.set_supports_current_temperature(true);
+  if (this->humidity_sensor_ != nullptr)
+    traits.set_supports_current_humidity(true);
  traits.set_supported_modes({
      climate::CLIMATE_MODE_OFF,
  });
-  if (this->supports_cool_) {
+  if (supports_cool_)
    traits.add_supported_mode(climate::CLIMATE_MODE_COOL);
-  }
-  if (this->supports_heat_) {
+  if (supports_heat_)
    traits.add_supported_mode(climate::CLIMATE_MODE_HEAT);
-  }
-  if (this->supports_cool_ && this->supports_heat_) {
+  if (supports_cool_ && supports_heat_)
    traits.add_supported_mode(climate::CLIMATE_MODE_HEAT_COOL);
-  }
-  if (this->supports_away_) {
+  traits.set_supports_two_point_target_temperature(true);
+  if (supports_away_) {
    traits.set_supported_presets({
        climate::CLIMATE_PRESET_HOME,
        climate::CLIMATE_PRESET_AWAY,
    });
  }
+  traits.set_supports_action(true);
  return traits;
 }
-
 void BangBangClimate::compute_state_() {
  if (this->mode == climate::CLIMATE_MODE_OFF) {
    this->switch_to_action_(climate::CLIMATE_ACTION_OFF);
@@ -135,7 +122,6 @@ void BangBangClimate::compute_state_() {

  this->switch_to_action_(target_action);
 }
-
 void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
  if (action == this->action) {
    // already in target mode
@@ -180,7 +166,6 @@ void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
  this->prev_trigger_ = trig;
  this->publish_state();
 }
-
 void BangBangClimate::change_away_(bool away) {
  if (!away) {
    this->target_temperature_low = this->normal_config_.default_temperature_low;
@@ -191,26 +176,22 @@ void BangBangClimate::change_away_(bool away) {
  }
  this->preset = away ? climate::CLIMATE_PRESET_AWAY : climate::CLIMATE_PRESET_HOME;
 }
-
 void BangBangClimate::set_normal_config(const BangBangClimateTargetTempConfig &normal_config) {
  this->normal_config_ = normal_config;
 }
-
 void BangBangClimate::set_away_config(const BangBangClimateTargetTempConfig &away_config) {
  this->supports_away_ = true;
  this->away_config_ = away_config;
 }
-
+BangBangClimate::BangBangClimate()
+    : idle_trigger_(new Trigger<>()), cool_trigger_(new Trigger<>()), heat_trigger_(new Trigger<>()) {}
 void BangBangClimate::set_sensor(sensor::Sensor *sensor) { this->sensor_ = sensor; }
 void BangBangClimate::set_humidity_sensor(sensor::Sensor *humidity_sensor) { this->humidity_sensor_ = humidity_sensor; }
-
 Trigger<> *BangBangClimate::get_idle_trigger() const { return this->idle_trigger_; }
 Trigger<> *BangBangClimate::get_cool_trigger() const { return this->cool_trigger_; }
-Trigger<> *BangBangClimate::get_heat_trigger() const { return this->heat_trigger_; }
-
 void BangBangClimate::set_supports_cool(bool supports_cool) { this->supports_cool_ = supports_cool; }
+Trigger<> *BangBangClimate::get_heat_trigger() const { return this->heat_trigger_; }
 void BangBangClimate::set_supports_heat(bool supports_heat) { this->supports_heat_ = supports_heat; }
-
 void BangBangClimate::dump_config() {
  LOG_CLIMATE("", "Bang Bang Climate", this);
  ESP_LOGCONFIG(TAG,
--- a/esphome/components/bang_bang/bang_bang_climate.h
+++ b/esphome/components/bang_bang/bang_bang_climate.h
@@ -25,15 +25,14 @@ class BangBangClimate : public climate::Climate, public Component {

  void set_sensor(sensor::Sensor *sensor);
  void set_humidity_sensor(sensor::Sensor *humidity_sensor);
+  Trigger<> *get_idle_trigger() const;
+  Trigger<> *get_cool_trigger() const;
  void set_supports_cool(bool supports_cool);
+  Trigger<> *get_heat_trigger() const;
  void set_supports_heat(bool supports_heat);
  void set_normal_config(const BangBangClimateTargetTempConfig &normal_config);
  void set_away_config(const BangBangClimateTargetTempConfig &away_config);

-  Trigger<> *get_idle_trigger() const;
-  Trigger<> *get_cool_trigger() const;
-  Trigger<> *get_heat_trigger() const;
-
 protected:
  /// Override control to change settings of the climate device.
  void control(const climate::ClimateCall &call) override;
@@ -57,10 +56,16 @@ class BangBangClimate : public climate::Climate, public Component {
   *
   * In idle mode, the controller is assumed to have both heating and cooling disabled.
   */
-  Trigger<> *idle_trigger_{nullptr};
+  Trigger<> *idle_trigger_;
  /** The trigger to call when the controller should switch to cooling mode.
   */
-  Trigger<> *cool_trigger_{nullptr};
+  Trigger<> *cool_trigger_;
+  /** Whether the controller supports cooling.
+   *
+   * A false value for this attribute means that the controller has no cooling action
+   * (for example a thermostat, where only heating and not-heating is possible).
+   */
+  bool supports_cool_{false};
  /** The trigger to call when the controller should switch to heating mode.
   *
   * A null value for this attribute means that the controller has no heating action
@@ -68,23 +73,15 @@ class BangBangClimate : public climate::Climate, public Component {
   * (blinds open) is possible.
   */
  Trigger<> *heat_trigger_{nullptr};
+  bool supports_heat_{false};
  /** A reference to the trigger that was previously active.
   *
   * This is so that the previous trigger can be stopped before enabling a new one.
   */
  Trigger<> *prev_trigger_{nullptr};

-  /** Whether the controller supports cooling/heating
-   *
-   * A false value for this attribute means that the controller has no respective action
-   * (for example a thermostat, where only heating and not-heating is possible).
-   */
-  bool supports_cool_{false};
-  bool supports_heat_{false};
-
-  bool supports_away_{false};
-
  BangBangClimateTargetTempConfig normal_config_{};
+  bool supports_away_{false};
  BangBangClimateTargetTempConfig away_config_{};
 };

--- a/esphome/components/bedjet/bedjet_const.h
+++ b/esphome/components/bedjet/bedjet_const.h
@@ -99,7 +99,9 @@ enum BedjetCommand : uint8_t {

 static const uint8_t BEDJET_FAN_SPEED_COUNT = 20;

-static constexpr const char *const BEDJET_FAN_STEP_NAMES[BEDJET_FAN_SPEED_COUNT] = BEDJET_FAN_STEP_NAMES_;
+static const char *const BEDJET_FAN_STEP_NAMES[BEDJET_FAN_SPEED_COUNT] = BEDJET_FAN_STEP_NAMES_;
+static const std::string BEDJET_FAN_STEP_NAME_STRINGS[BEDJET_FAN_SPEED_COUNT] = BEDJET_FAN_STEP_NAMES_;
+static const std::set<std::string> BEDJET_FAN_STEP_NAMES_SET BEDJET_FAN_STEP_NAMES_;

 }  // namespace bedjet
 }  // namespace esphome
--- a/esphome/components/bedjet/climate/bedjet_climate.cpp
+++ b/esphome/components/bedjet/climate/bedjet_climate.cpp
@@ -8,15 +8,15 @@ namespace bedjet {

 using namespace esphome::climate;

-static const char *bedjet_fan_step_to_fan_mode(const uint8_t fan_step) {
+static const std::string *bedjet_fan_step_to_fan_mode(const uint8_t fan_step) {
  if (fan_step < BEDJET_FAN_SPEED_COUNT)
-    return BEDJET_FAN_STEP_NAMES[fan_step];
+    return &BEDJET_FAN_STEP_NAME_STRINGS[fan_step];
  return nullptr;
 }

-static uint8_t bedjet_fan_speed_to_step(const char *fan_step_percent) {
+static uint8_t bedjet_fan_speed_to_step(const std::string &fan_step_percent) {
  for (int i = 0; i < BEDJET_FAN_SPEED_COUNT; i++) {
-    if (strcmp(BEDJET_FAN_STEP_NAMES[i], fan_step_percent) == 0) {
+    if (fan_step_percent == BEDJET_FAN_STEP_NAME_STRINGS[i]) {
      return i;
    }
  }
@@ -48,7 +48,7 @@ void BedJetClimate::dump_config() {
    ESP_LOGCONFIG(TAG, "   - %s", LOG_STR_ARG(climate_fan_mode_to_string(mode)));
  }
  for (const auto &mode : traits.get_supported_custom_fan_modes()) {
-    ESP_LOGCONFIG(TAG, "   - %s (c)", mode);
+    ESP_LOGCONFIG(TAG, "   - %s (c)", mode.c_str());
  }

  ESP_LOGCONFIG(TAG, "  Supported presets:");
@@ -56,7 +56,7 @@ void BedJetClimate::dump_config() {
    ESP_LOGCONFIG(TAG, "   - %s", LOG_STR_ARG(climate_preset_to_string(preset)));
  }
  for (const auto &preset : traits.get_supported_custom_presets()) {
-    ESP_LOGCONFIG(TAG, "   - %s (c)", preset);
+    ESP_LOGCONFIG(TAG, "   - %s (c)", preset.c_str());
  }
 }

@@ -79,7 +79,7 @@ void BedJetClimate::reset_state_() {
  this->target_temperature = NAN;
  this->current_temperature = NAN;
  this->preset.reset();
-  this->clear_custom_preset_();
+  this->custom_preset.reset();
  this->publish_state();
 }

@@ -120,7 +120,7 @@ void BedJetClimate::control(const ClimateCall &call) {
    if (button_result) {
      this->mode = mode;
      // We're using (custom) preset for Turbo, EXT HT, & M1-3 presets, so changing climate mode will clear those
-      this->clear_custom_preset_();
+      this->custom_preset.reset();
      this->preset.reset();
    }
  }
@@ -144,7 +144,8 @@ void BedJetClimate::control(const ClimateCall &call) {

      if (result) {
        this->mode = CLIMATE_MODE_HEAT;
-        this->set_preset_(CLIMATE_PRESET_BOOST);
+        this->preset = CLIMATE_PRESET_BOOST;
+        this->custom_preset.reset();
      }
    } else if (preset == CLIMATE_PRESET_NONE && this->preset.has_value()) {
      if (this->mode == CLIMATE_MODE_HEAT && this->preset == CLIMATE_PRESET_BOOST) {
@@ -152,7 +153,7 @@ void BedJetClimate::control(const ClimateCall &call) {
        result = this->parent_->send_button(heat_button(this->heating_mode_));
        if (result) {
          this->preset.reset();
-          this->clear_custom_preset_();
+          this->custom_preset.reset();
        }
      } else {
        ESP_LOGD(TAG, "Ignoring preset '%s' call; with current mode '%s' and preset '%s'",
@@ -163,27 +164,28 @@ void BedJetClimate::control(const ClimateCall &call) {
      ESP_LOGW(TAG, "Unsupported preset: %d", preset);
      return;
    }
-  } else if (call.has_custom_preset()) {
-    const char *preset = call.get_custom_preset();
+  } else if (call.get_custom_preset().has_value()) {
+    std::string preset = *call.get_custom_preset();
    bool result;

-    if (strcmp(preset, "M1") == 0) {
+    if (preset == "M1") {
      result = this->parent_->button_memory1();
-    } else if (strcmp(preset, "M2") == 0) {
+    } else if (preset == "M2") {
      result = this->parent_->button_memory2();
-    } else if (strcmp(preset, "M3") == 0) {
+    } else if (preset == "M3") {
      result = this->parent_->button_memory3();
-    } else if (strcmp(preset, "LTD HT") == 0) {
+    } else if (preset == "LTD HT") {
      result = this->parent_->button_heat();
-    } else if (strcmp(preset, "EXT HT") == 0) {
+    } else if (preset == "EXT HT") {
      result = this->parent_->button_ext_heat();
    } else {
-      ESP_LOGW(TAG, "Unsupported preset: %s", preset);
+      ESP_LOGW(TAG, "Unsupported preset: %s", preset.c_str());
      return;
    }

    if (result) {
-      this->set_custom_preset_(preset);
+      this->custom_preset = preset;
+      this->preset.reset();
    }
  }

@@ -205,16 +207,19 @@ void BedJetClimate::control(const ClimateCall &call) {
    }

    if (result) {
-      this->set_fan_mode_(fan_mode);
+      this->fan_mode = fan_mode;
+      this->custom_fan_mode.reset();
    }
-  } else if (call.has_custom_fan_mode()) {
-    const char *fan_mode = call.get_custom_fan_mode();
+  } else if (call.get_custom_fan_mode().has_value()) {
+    auto fan_mode = *call.get_custom_fan_mode();
    auto fan_index = bedjet_fan_speed_to_step(fan_mode);
    if (fan_index <= 19) {
-      ESP_LOGV(TAG, "[%s] Converted fan mode %s to bedjet fan step %d", this->get_name().c_str(), fan_mode, fan_index);
+      ESP_LOGV(TAG, "[%s] Converted fan mode %s to bedjet fan step %d", this->get_name().c_str(), fan_mode.c_str(),
+               fan_index);
      bool result = this->parent_->set_fan_index(fan_index);
      if (result) {
-        this->set_custom_fan_mode_(fan_mode);
+        this->custom_fan_mode = fan_mode;
+        this->fan_mode.reset();
      }
    }
  }
@@ -240,7 +245,7 @@ void BedJetClimate::on_status(const BedjetStatusPacket *data) {

  const auto *fan_mode_name = bedjet_fan_step_to_fan_mode(data->fan_step);
  if (fan_mode_name != nullptr) {
-    this->set_custom_fan_mode_(fan_mode_name);
+    this->custom_fan_mode = *fan_mode_name;
  }

  // TODO: Get biorhythm data to determine which preset (M1-3) is running, if any.
@@ -250,7 +255,7 @@ void BedJetClimate::on_status(const BedjetStatusPacket *data) {
      this->mode = CLIMATE_MODE_OFF;
      this->action = CLIMATE_ACTION_IDLE;
      this->fan_mode = CLIMATE_FAN_OFF;
-      this->clear_custom_preset_();
+      this->custom_preset.reset();
      this->preset.reset();
      break;

@@ -261,7 +266,7 @@ void BedJetClimate::on_status(const BedjetStatusPacket *data) {
      if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
        this->set_custom_preset_("LTD HT");
      } else {
-        this->clear_custom_preset_();
+        this->custom_preset.reset();
      }
      break;

@@ -270,7 +275,7 @@ void BedJetClimate::on_status(const BedjetStatusPacket *data) {
      this->action = CLIMATE_ACTION_HEATING;
      this->preset.reset();
      if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
-        this->clear_custom_preset_();
+        this->custom_preset.reset();
      } else {
        this->set_custom_preset_("EXT HT");
      }
@@ -279,19 +284,20 @@ void BedJetClimate::on_status(const BedjetStatusPacket *data) {
    case MODE_COOL:
      this->mode = CLIMATE_MODE_FAN_ONLY;
      this->action = CLIMATE_ACTION_COOLING;
-      this->clear_custom_preset_();
+      this->custom_preset.reset();
      this->preset.reset();
      break;

    case MODE_DRY:
      this->mode = CLIMATE_MODE_DRY;
      this->action = CLIMATE_ACTION_DRYING;
-      this->clear_custom_preset_();
+      this->custom_preset.reset();
      this->preset.reset();
      break;

    case MODE_TURBO:
-      this->set_preset_(CLIMATE_PRESET_BOOST);
+      this->preset = CLIMATE_PRESET_BOOST;
+      this->custom_preset.reset();
      this->mode = CLIMATE_MODE_HEAT;
      this->action = CLIMATE_ACTION_HEATING;
      break;
--- a/esphome/components/bedjet/climate/bedjet_climate.h
+++ b/esphome/components/bedjet/climate/bedjet_climate.h
@@ -33,7 +33,8 @@ class BedJetClimate : public climate::Climate, public BedJetClient, public Polli

  climate::ClimateTraits traits() override {
    auto traits = climate::ClimateTraits();
-    traits.add_feature_flags(climate::CLIMATE_SUPPORTS_ACTION | climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE);
+    traits.set_supports_action(true);
+    traits.set_supports_current_temperature(true);
    traits.set_supported_modes({
        climate::CLIMATE_MODE_OFF,
        climate::CLIMATE_MODE_HEAT,
@@ -43,20 +44,28 @@ class BedJetClimate : public climate::Climate, public BedJetClient, public Polli
    });

    // It would be better if we had a slider for the fan modes.
-    traits.set_supported_custom_fan_modes(BEDJET_FAN_STEP_NAMES);
+    traits.set_supported_custom_fan_modes(BEDJET_FAN_STEP_NAMES_SET);
    traits.set_supported_presets({
        // If we support NONE, then have to decide what happens if the user switches to it (turn off?)
        // climate::CLIMATE_PRESET_NONE,
        // Climate doesn't have a "TURBO" mode, but we can use the BOOST preset instead.
        climate::CLIMATE_PRESET_BOOST,
    });
-    // String literals are stored in rodata and valid for program lifetime
    traits.set_supported_custom_presets({
-        this->heating_mode_ == HEAT_MODE_EXTENDED ? "LTD HT" : "EXT HT",
+        // We could fetch biodata from bedjet and set these names that way.
+        // But then we have to invert the lookup in order to send the right preset.
+        // For now, we can leave them as M1-3 to match the remote buttons.
+        // EXT HT added to match remote button.
+        "EXT HT",
        "M1",
        "M2",
        "M3",
    });
+    if (this->heating_mode_ == HEAT_MODE_EXTENDED) {
+      traits.add_supported_custom_preset("LTD HT");
+    } else {
+      traits.add_supported_custom_preset("EXT HT");
+    }
    traits.set_visual_min_temperature(19.0);
    traits.set_visual_max_temperature(43.0);
    traits.set_visual_temperature_step(1.0);
--- a/esphome/components/binary_sensor/init.py
+++ b/esphome/components/binary_sensor/init.py
@@ -155,7 +155,6 @@ DelayedOffFilter = binary_sensor_ns.class_("DelayedOffFilter", Filter, cg.Compon
 InvertFilter = binary_sensor_ns.class_("InvertFilter", Filter)
 AutorepeatFilter = binary_sensor_ns.class_("AutorepeatFilter", Filter, cg.Component)
 LambdaFilter = binary_sensor_ns.class_("LambdaFilter", Filter)
-StatelessLambdaFilter = binary_sensor_ns.class_("StatelessLambdaFilter", Filter)
 SettleFilter = binary_sensor_ns.class_("SettleFilter", Filter, cg.Component)

 _LOGGER = getLogger(__name__)
@@ -265,31 +264,20 @@ async def delayed_off_filter_to_code(config, filter_id):
    ),
 )
 async def autorepeat_filter_to_code(config, filter_id):
+    timings = []
    if len(config) > 0:
-        timings = [
-            cg.StructInitializer(
-                cg.MockObj("AutorepeatFilterTiming", "esphome::binary_sensor::"),
-                ("delay", conf[CONF_DELAY]),
-                ("time_off", conf[CONF_TIME_OFF]),
-                ("time_on", conf[CONF_TIME_ON]),
-            )
+        timings.extend(
+            (conf[CONF_DELAY], conf[CONF_TIME_OFF], conf[CONF_TIME_ON])
            for conf in config
-        ]
+        )
    else:
-        timings = [
-            cg.StructInitializer(
-                cg.MockObj("AutorepeatFilterTiming", "esphome::binary_sensor::"),
-                ("delay", cv.time_period_str_unit(DEFAULT_DELAY).total_milliseconds),
-                (
-                    "time_off",
-                    cv.time_period_str_unit(DEFAULT_TIME_OFF).total_milliseconds,
-                ),
-                (
-                    "time_on",
-                    cv.time_period_str_unit(DEFAULT_TIME_ON).total_milliseconds,
-                ),
+        timings.append(
+            (
+                cv.time_period_str_unit(DEFAULT_DELAY).total_milliseconds,
+                cv.time_period_str_unit(DEFAULT_TIME_OFF).total_milliseconds,
+                cv.time_period_str_unit(DEFAULT_TIME_ON).total_milliseconds,
            )
-        ]
+        )
    var = cg.new_Pvariable(filter_id, timings)
    await cg.register_component(var, {})
    return var
@@ -300,7 +288,7 @@ async def lambda_filter_to_code(config, filter_id):
    lambda_ = await cg.process_lambda(
        config, [(bool, "x")], return_type=cg.optional.template(bool)
    )
-    return automation.new_lambda_pvariable(filter_id, lambda_, StatelessLambdaFilter)
+    return cg.new_Pvariable(filter_id, lambda_)


@register_filter(
@@ -548,6 +536,11 @@ def binary_sensor_schema(
    return _BINARY_SENSOR_SCHEMA.extend(schema)


+# Remove before 2025.11.0
+BINARY_SENSOR_SCHEMA = binary_sensor_schema()
+BINARY_SENSOR_SCHEMA.add_extra(cv.deprecated_schema_constant("binary_sensor"))
+
+
 async def setup_binary_sensor_core_(var, config):
    await setup_entity(var, config, "binary_sensor")

--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -2,11 +2,11 @@

 #include <cinttypes>
 #include <utility>
+#include <vector>

 #include "esphome/core/component.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"

 namespace esphome {
@@ -92,8 +92,8 @@ class DoubleClickTrigger : public Trigger<> {

 class MultiClickTrigger : public Trigger<>, public Component {
 public:
-  explicit MultiClickTrigger(BinarySensor *parent, std::initializer_list<MultiClickTriggerEvent> timing)
-      : parent_(parent), timing_(timing) {}
+  explicit MultiClickTrigger(BinarySensor *parent, std::vector<MultiClickTriggerEvent> timing)
+      : parent_(parent), timing_(std::move(timing)) {}

  void setup() override {
    this->last_state_ = this->parent_->get_state_default(false);
@@ -115,7 +115,7 @@ class MultiClickTrigger : public Trigger<>, public Component {
  void trigger_();

  BinarySensor *parent_;
-  FixedVector<MultiClickTriggerEvent> timing_;
+  std::vector<MultiClickTriggerEvent> timing_;
  uint32_t invalid_cooldown_{1000};
  optional<size_t> at_index_{};
  bool last_state_{false};
@@ -141,7 +141,7 @@ class StateChangeTrigger : public Trigger<optional<bool>, optional<bool> > {
 template<typename... Ts> class BinarySensorCondition : public Condition<Ts...> {
 public:
  BinarySensorCondition(BinarySensor *parent, bool state) : parent_(parent), state_(state) {}
-  bool check(const Ts &...x) override { return this->parent_->state == this->state_; }
+  bool check(Ts... x) override { return this->parent_->state == this->state_; }

 protected:
  BinarySensor *parent_;
@@ -153,7 +153,7 @@ template<typename... Ts> class BinarySensorPublishAction : public Action<Ts...>
  explicit BinarySensorPublishAction(BinarySensor *sensor) : sensor_(sensor) {}
  TEMPLATABLE_VALUE(bool, state)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto val = this->state_.value(x...);
    this->sensor_->publish_state(val);
  }
@@ -166,7 +166,7 @@ template<typename... Ts> class BinarySensorInvalidateAction : public Action<Ts..
 public:
  explicit BinarySensorInvalidateAction(BinarySensor *sensor) : sensor_(sensor) {}

-  void play(const Ts &...x) override { this->sensor_->invalidate_state(); }
+  void play(Ts... x) override { this->sensor_->invalidate_state(); }

 protected:
  BinarySensor *sensor_;
--- a/esphome/components/binary_sensor/binary_sensor.cpp
+++ b/esphome/components/binary_sensor/binary_sensor.cpp
@@ -51,7 +51,7 @@ void BinarySensor::add_filter(Filter *filter) {
    last_filter->next_ = filter;
  }
 }
-void BinarySensor::add_filters(std::initializer_list<Filter *> filters) {
+void BinarySensor::add_filters(const std::vector<Filter *> &filters) {
  for (Filter *filter : filters) {
    this->add_filter(filter);
  }
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -4,7 +4,7 @@
 #include "esphome/core/helpers.h"
 #include "esphome/components/binary_sensor/filter.h"

-#include <initializer_list>
+#include <vector>

 namespace esphome {

@@ -48,7 +48,7 @@ class BinarySensor : public StatefulEntityBase<bool>, public EntityBase_DeviceCl
  void publish_initial_state(bool new_state);

  void add_filter(Filter *filter);
-  void add_filters(std::initializer_list<Filter *> filters);
+  void add_filters(const std::vector<Filter *> &filters);

  // ========== INTERNAL METHODS ==========
  // (In most use cases you won't need these)
--- a/esphome/components/binary_sensor/filter.cpp
+++ b/esphome/components/binary_sensor/filter.cpp
@@ -1,6 +1,7 @@
 #include "filter.h"

 #include "binary_sensor.h"
+#include <utility>

 namespace esphome {

@@ -67,7 +68,7 @@ float DelayedOffFilter::get_setup_priority() const { return setup_priority::HARD

 optional<bool> InvertFilter::new_value(bool value) { return !value; }

-AutorepeatFilter::AutorepeatFilter(std::initializer_list<AutorepeatFilterTiming> timings) : timings_(timings) {}
+AutorepeatFilter::AutorepeatFilter(std::vector<AutorepeatFilterTiming> timings) : timings_(std::move(timings)) {}

 optional<bool> AutorepeatFilter::new_value(bool value) {
  if (value) {
--- a/esphome/components/binary_sensor/filter.h
+++ b/esphome/components/binary_sensor/filter.h
@@ -4,6 +4,8 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"

+#include <vector>
+
 namespace esphome {

 namespace binary_sensor {
@@ -80,6 +82,11 @@ class InvertFilter : public Filter {
 };

 struct AutorepeatFilterTiming {
+  AutorepeatFilterTiming(uint32_t delay, uint32_t off, uint32_t on) {
+    this->delay = delay;
+    this->time_off = off;
+    this->time_on = on;
+  }
  uint32_t delay;
  uint32_t time_off;
  uint32_t time_on;
@@ -87,7 +94,7 @@ struct AutorepeatFilterTiming {

 class AutorepeatFilter : public Filter, public Component {
 public:
-  explicit AutorepeatFilter(std::initializer_list<AutorepeatFilterTiming> timings);
+  explicit AutorepeatFilter(std::vector<AutorepeatFilterTiming> timings);

  optional<bool> new_value(bool value) override;

@@ -97,7 +104,7 @@ class AutorepeatFilter : public Filter, public Component {
  void next_timing_();
  void next_value_(bool val);

-  FixedVector<AutorepeatFilterTiming> timings_;
+  std::vector<AutorepeatFilterTiming> timings_;
  uint8_t active_timing_{0};
 };

@@ -111,21 +118,6 @@ class LambdaFilter : public Filter {
  std::function<optional<bool>(bool)> f_;
 };

-/** Optimized lambda filter for stateless lambdas (no capture).
- *
- * Uses function pointer instead of std::function to reduce memory overhead.
- * Memory: 4 bytes (function pointer on 32-bit) vs 32 bytes (std::function).
- */
-class StatelessLambdaFilter : public Filter {
- public:
-  explicit StatelessLambdaFilter(optional<bool> (*f)(bool)) : f_(f) {}
-
-  optional<bool> new_value(bool value) override { return this->f_(value); }
-
- protected:
-  optional<bool> (*f_)(bool);
-};
-
 class SettleFilter : public Filter, public Component {
 public:
  optional<bool> new_value(bool value) override;
--- a/esphome/components/bl0906/bl0906.h
+++ b/esphome/components/bl0906/bl0906.h
@@ -89,7 +89,7 @@ class BL0906 : public PollingComponent, public uart::UARTDevice {

 template<typename... Ts> class ResetEnergyAction : public Action<Ts...>, public Parented<BL0906> {
 public:
-  void play(const Ts &...x) override { this->parent_->enqueue_action_(&BL0906::reset_energy_); }
+  void play(Ts... x) override { this->parent_->enqueue_action_(&BL0906::reset_energy_); }
 };

 }  // namespace bl0906
--- a/esphome/components/ble_client/automation.h
+++ b/esphome/components/ble_client/automation.h
@@ -96,11 +96,8 @@ template<typename... Ts> class BLEClientWriteAction : public Action<Ts...>, publ
  BLEClientWriteAction(BLEClient *ble_client) {
    ble_client->register_ble_node(this);
    ble_client_ = ble_client;
-    this->construct_simple_value_();
  }

-  ~BLEClientWriteAction() { this->destroy_simple_value_(); }
-
  void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
  void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
  void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
@@ -109,26 +106,22 @@ template<typename... Ts> class BLEClientWriteAction : public Action<Ts...>, publ
  void set_char_uuid32(uint32_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
  void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }

-  void set_value_template(std::vector<uint8_t> (*func)(Ts...)) {
-    this->destroy_simple_value_();
-    this->value_.template_func = func;
-    this->has_simple_value_ = false;
+  void set_value_template(std::function<std::vector<uint8_t>(Ts...)> func) {
+    this->value_template_ = std::move(func);
+    has_simple_value_ = false;
  }

  void set_value_simple(const std::vector<uint8_t> &value) {
-    if (!this->has_simple_value_) {
-      this->construct_simple_value_();
-    }
-    this->value_.simple = value;
-    this->has_simple_value_ = true;
+    this->value_simple_ = value;
+    has_simple_value_ = true;
  }

-  void play(const Ts &...x) override {}
+  void play(Ts... x) override {}

-  void play_complex(const Ts &...x) override {
+  void play_complex(Ts... x) override {
    this->num_running_++;
    this->var_ = std::make_tuple(x...);
-    auto value = this->has_simple_value_ ? this->value_.simple : this->value_.template_func(x...);
+    auto value = this->has_simple_value_ ? this->value_simple_ : this->value_template_(x...);
    // on write failure, continue the automation chain rather than stopping so that e.g. disconnect can work.
    if (!write(value))
      this->play_next_(x...);
@@ -201,22 +194,10 @@ template<typename... Ts> class BLEClientWriteAction : public Action<Ts...>, publ
  }

 private:
-  void construct_simple_value_() { new (&this->value_.simple) std::vector<uint8_t>(); }
-
-  void destroy_simple_value_() {
-    if (this->has_simple_value_) {
-      this->value_.simple.~vector();
-    }
-  }
-
  BLEClient *ble_client_;
  bool has_simple_value_ = true;
-  union Value {
-    std::vector<uint8_t> simple;
-    std::vector<uint8_t> (*template_func)(Ts...);
-    Value() {}   // trivial constructor
-    ~Value() {}  // trivial destructor - we manage lifetime via discriminator
-  } value_;
+  std::vector<uint8_t> value_simple_;
+  std::function<std::vector<uint8_t>(Ts...)> value_template_{};
  espbt::ESPBTUUID service_uuid_;
  espbt::ESPBTUUID char_uuid_;
  std::tuple<Ts...> var_{};
@@ -229,12 +210,12 @@ template<typename... Ts> class BLEClientPasskeyReplyAction : public Action<Ts...
 public:
  BLEClientPasskeyReplyAction(BLEClient *ble_client) { parent_ = ble_client; }

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    uint32_t passkey;
    if (has_simple_value_) {
-      passkey = this->value_.simple;
+      passkey = this->value_simple_;
    } else {
-      passkey = this->value_.template_func(x...);
+      passkey = this->value_template_(x...);
    }
    if (passkey > 999999)
      return;
@@ -243,63 +224,59 @@ template<typename... Ts> class BLEClientPasskeyReplyAction : public Action<Ts...
    esp_ble_passkey_reply(remote_bda, true, passkey);
  }

-  void set_value_template(uint32_t (*func)(Ts...)) {
-    this->value_.template_func = func;
-    this->has_simple_value_ = false;
+  void set_value_template(std::function<uint32_t(Ts...)> func) {
+    this->value_template_ = std::move(func);
+    has_simple_value_ = false;
  }

  void set_value_simple(const uint32_t &value) {
-    this->value_.simple = value;
-    this->has_simple_value_ = true;
+    this->value_simple_ = value;
+    has_simple_value_ = true;
  }

 private:
  BLEClient *parent_{nullptr};
  bool has_simple_value_ = true;
-  union {
-    uint32_t simple;
-    uint32_t (*template_func)(Ts...);
-  } value_{.simple = 0};
+  uint32_t value_simple_{0};
+  std::function<uint32_t(Ts...)> value_template_{};
 };

 template<typename... Ts> class BLEClientNumericComparisonReplyAction : public Action<Ts...> {
 public:
  BLEClientNumericComparisonReplyAction(BLEClient *ble_client) { parent_ = ble_client; }

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    esp_bd_addr_t remote_bda;
    memcpy(remote_bda, parent_->get_remote_bda(), sizeof(esp_bd_addr_t));
    if (has_simple_value_) {
-      esp_ble_confirm_reply(remote_bda, this->value_.simple);
+      esp_ble_confirm_reply(remote_bda, this->value_simple_);
    } else {
-      esp_ble_confirm_reply(remote_bda, this->value_.template_func(x...));
+      esp_ble_confirm_reply(remote_bda, this->value_template_(x...));
    }
  }

-  void set_value_template(bool (*func)(Ts...)) {
-    this->value_.template_func = func;
-    this->has_simple_value_ = false;
+  void set_value_template(std::function<bool(Ts...)> func) {
+    this->value_template_ = std::move(func);
+    has_simple_value_ = false;
  }

  void set_value_simple(const bool &value) {
-    this->value_.simple = value;
-    this->has_simple_value_ = true;
+    this->value_simple_ = value;
+    has_simple_value_ = true;
  }

 private:
  BLEClient *parent_{nullptr};
  bool has_simple_value_ = true;
-  union {
-    bool simple;
-    bool (*template_func)(Ts...);
-  } value_{.simple = false};
+  bool value_simple_{false};
+  std::function<bool(Ts...)> value_template_{};
 };

 template<typename... Ts> class BLEClientRemoveBondAction : public Action<Ts...> {
 public:
  BLEClientRemoveBondAction(BLEClient *ble_client) { parent_ = ble_client; }

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    esp_bd_addr_t remote_bda;
    memcpy(remote_bda, parent_->get_remote_bda(), sizeof(esp_bd_addr_t));
    esp_ble_remove_bond_device(remote_bda);
@@ -334,9 +311,9 @@ template<typename... Ts> class BLEClientConnectAction : public Action<Ts...>, pu
  }

  // not used since we override play_complex_
-  void play(const Ts &...x) override {}
+  void play(Ts... x) override {}

-  void play_complex(const Ts &...x) override {
+  void play_complex(Ts... x) override {
    // it makes no sense to have multiple instances of this running at the same time.
    // this would occur only if the same automation was re-triggered while still
    // running. So just cancel the second chain if this is detected.
@@ -379,9 +356,9 @@ template<typename... Ts> class BLEClientDisconnectAction : public Action<Ts...>,
  }

  // not used since we override play_complex_
-  void play(const Ts &...x) override {}
+  void play(Ts... x) override {}

-  void play_complex(const Ts &...x) override {
+  void play_complex(Ts... x) override {
    this->num_running_++;
    if (this->node_state == espbt::ClientState::IDLE) {
      this->play_next_(x...);
--- a/esphome/components/ble_client/sensor/ble_sensor.cpp
+++ b/esphome/components/ble_client/sensor/ble_sensor.cpp
@@ -77,9 +77,6 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
        }
      } else {
        this->node_state = espbt::ClientState::ESTABLISHED;
-        // For non-notify characteristics, trigger an immediate read after service discovery
-        // to avoid peripherals disconnecting due to inactivity
-        this->update();
      }
      break;
    }
@@ -120,9 +117,9 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
 }

 float BLESensor::parse_data_(uint8_t *value, uint16_t value_len) {
-  if (this->has_data_to_value_) {
+  if (this->data_to_value_func_.has_value()) {
    std::vector<uint8_t> data(value, value + value_len);
-    return this->data_to_value_func_(data);
+    return (*this->data_to_value_func_)(data);
  } else {
    return value[0];
  }
--- a/esphome/components/ble_client/sensor/ble_sensor.h
+++ b/esphome/components/ble_client/sensor/ble_sensor.h
@@ -15,6 +15,8 @@ namespace ble_client {

 namespace espbt = esphome::esp32_ble_tracker;

+using data_to_value_t = std::function<float(std::vector<uint8_t>)>;
+
 class BLESensor : public sensor::Sensor, public PollingComponent, public BLEClientNode {
 public:
  void loop() override;
@@ -31,17 +33,13 @@ class BLESensor : public sensor::Sensor, public PollingComponent, public BLEClie
  void set_descr_uuid16(uint16_t uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
  void set_descr_uuid32(uint32_t uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
  void set_descr_uuid128(uint8_t *uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_data_to_value(float (*lambda)(const std::vector<uint8_t> &)) {
-    this->data_to_value_func_ = lambda;
-    this->has_data_to_value_ = true;
-  }
+  void set_data_to_value(data_to_value_t &&lambda) { this->data_to_value_func_ = lambda; }
  void set_enable_notify(bool notify) { this->notify_ = notify; }
  uint16_t handle;

 protected:
  float parse_data_(uint8_t *value, uint16_t value_len);
-  bool has_data_to_value_{false};
-  float (*data_to_value_func_)(const std::vector<uint8_t> &){};
+  optional<data_to_value_t> data_to_value_func_{};
  bool notify_;
  espbt::ESPBTUUID service_uuid_;
  espbt::ESPBTUUID char_uuid_;
--- a/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
+++ b/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
@@ -79,9 +79,6 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
        }
      } else {
        this->node_state = espbt::ClientState::ESTABLISHED;
-        // For non-notify characteristics, trigger an immediate read after service discovery
-        // to avoid peripherals disconnecting due to inactivity
-        this->update();
      }
      break;
    }
--- a/esphome/components/ble_nus/init.py
+++ b/esphome/components/ble_nus/init.py
@@ -1,29 +0,0 @@
-import esphome.codegen as cg
-from esphome.components.zephyr import zephyr_add_prj_conf
-import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_LOGS, CONF_TYPE
-
-AUTO_LOAD = ["zephyr_ble_server"]
-CODEOWNERS = ["@tomaszduda23"]
-
-ble_nus_ns = cg.esphome_ns.namespace("ble_nus")
-BLENUS = ble_nus_ns.class_("BLENUS", cg.Component)
-
-CONFIG_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BLENUS),
-            cv.Optional(CONF_TYPE, default=CONF_LOGS): cv.one_of(
-                *[CONF_LOGS], lower=True
-            ),
-        }
-    ).extend(cv.COMPONENT_SCHEMA),
-    cv.only_with_framework("zephyr"),
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    zephyr_add_prj_conf("BT_NUS", True)
-    cg.add(var.set_expose_log(config[CONF_TYPE] == CONF_LOGS))
-    await cg.register_component(var, config)
--- a/esphome/components/ble_nus/ble_nus.cpp
+++ b/esphome/components/ble_nus/ble_nus.cpp
@@ -1,157 +0,0 @@
-#ifdef USE_ZEPHYR
-#include "ble_nus.h"
-#include <zephyr/kernel.h>
-#include <bluetooth/services/nus.h>
-#include "esphome/core/log.h"
-#ifdef USE_LOGGER
-#include "esphome/components/logger/logger.h"
-#include "esphome/core/application.h"
-#endif
-#include <zephyr/sys/ring_buffer.h>
-
-namespace esphome::ble_nus {
-
-constexpr size_t BLE_TX_BUF_SIZE = 2048;
-
-// NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
-BLENUS *global_ble_nus;
-RING_BUF_DECLARE(global_ble_tx_ring_buf, BLE_TX_BUF_SIZE);
-// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
-
-static const char *const TAG = "ble_nus";
-
-size_t BLENUS::write_array(const uint8_t *data, size_t len) {
-  if (atomic_get(&this->tx_status_) == TX_DISABLED) {
-    return 0;
-  }
-  return ring_buf_put(&global_ble_tx_ring_buf, data, len);
-}
-
-void BLENUS::connected(bt_conn *conn, uint8_t err) {
-  if (err == 0) {
-    global_ble_nus->conn_.store(bt_conn_ref(conn));
-  }
-}
-
-void BLENUS::disconnected(bt_conn *conn, uint8_t reason) {
-  if (global_ble_nus->conn_) {
-    bt_conn_unref(global_ble_nus->conn_.load());
-    // Connection array is global static.
-    // Reference can be kept even if disconnected.
-  }
-}
-
-void BLENUS::tx_callback(bt_conn *conn) {
-  atomic_cas(&global_ble_nus->tx_status_, TX_BUSY, TX_ENABLED);
-  ESP_LOGVV(TAG, "Sent operation completed");
-}
-
-void BLENUS::send_enabled_callback(bt_nus_send_status status) {
-  switch (status) {
-    case BT_NUS_SEND_STATUS_ENABLED:
-      atomic_set(&global_ble_nus->tx_status_, TX_ENABLED);
-#ifdef USE_LOGGER
-      if (global_ble_nus->expose_log_) {
-        App.schedule_dump_config();
-      }
-#endif
-      ESP_LOGD(TAG, "NUS notification has been enabled");
-      break;
-    case BT_NUS_SEND_STATUS_DISABLED:
-      atomic_set(&global_ble_nus->tx_status_, TX_DISABLED);
-      ESP_LOGD(TAG, "NUS notification has been disabled");
-      break;
-  }
-}
-
-void BLENUS::rx_callback(bt_conn *conn, const uint8_t *const data, uint16_t len) {
-  ESP_LOGD(TAG, "Received %d bytes.", len);
-}
-
-void BLENUS::setup() {
-  bt_nus_cb callbacks = {
-      .received = rx_callback,
-      .sent = tx_callback,
-      .send_enabled = send_enabled_callback,
-  };
-
-  bt_nus_init(&callbacks);
-
-  static bt_conn_cb conn_callbacks = {
-      .connected = BLENUS::connected,
-      .disconnected = BLENUS::disconnected,
-  };
-
-  bt_conn_cb_register(&conn_callbacks);
-
-  global_ble_nus = this;
-#ifdef USE_LOGGER
-  if (logger::global_logger != nullptr && this->expose_log_) {
-    logger::global_logger->add_on_log_callback(
-        [this](int level, const char *tag, const char *message, size_t message_len) {
-          this->write_array(reinterpret_cast<const uint8_t *>(message), message_len);
-          const char c = '\n';
-          this->write_array(reinterpret_cast<const uint8_t *>(&c), 1);
-        });
-  }
-
-#endif
-}
-
-void BLENUS::dump_config() {
-  ESP_LOGCONFIG(TAG, "ble nus:");
-  ESP_LOGCONFIG(TAG, "  log: %s", YESNO(this->expose_log_));
-  uint32_t mtu = 0;
-  bt_conn *conn = this->conn_.load();
-  if (conn) {
-    mtu = bt_nus_get_mtu(conn);
-  }
-  ESP_LOGCONFIG(TAG, "  MTU: %u", mtu);
-}
-
-void BLENUS::loop() {
-  if (ring_buf_is_empty(&global_ble_tx_ring_buf)) {
-    return;
-  }
-
-  if (!atomic_cas(&this->tx_status_, TX_ENABLED, TX_BUSY)) {
-    if (atomic_get(&this->tx_status_) == TX_DISABLED) {
-      ring_buf_reset(&global_ble_tx_ring_buf);
-    }
-    return;
-  }
-
-  bt_conn *conn = this->conn_.load();
-  if (conn) {
-    conn = bt_conn_ref(conn);
-  }
-
-  if (nullptr == conn) {
-    atomic_cas(&this->tx_status_, TX_BUSY, TX_ENABLED);
-    return;
-  }
-
-  uint32_t req_len = bt_nus_get_mtu(conn);
-
-  uint8_t *buf;
-  uint32_t size = ring_buf_get_claim(&global_ble_tx_ring_buf, &buf, req_len);
-
-  int err, err2;
-
-  err = bt_nus_send(conn, buf, size);
-  err2 = ring_buf_get_finish(&global_ble_tx_ring_buf, size);
-  if (err2) {
-    // It should no happen.
-    ESP_LOGE(TAG, "Size %u exceeds valid bytes in the ring buffer (%d error)", size, err2);
-  }
-  if (err == 0) {
-    ESP_LOGVV(TAG, "Sent %d bytes", size);
-  } else {
-    ESP_LOGE(TAG, "Failed to send %d bytes (%d error)", size, err);
-    atomic_cas(&this->tx_status_, TX_BUSY, TX_ENABLED);
-  }
-  bt_conn_unref(conn);
-}
-
-}  // namespace esphome::ble_nus
-#endif
--- a/esphome/components/ble_nus/ble_nus.h
+++ b/esphome/components/ble_nus/ble_nus.h
@@ -1,37 +0,0 @@
-#pragma once
-#ifdef USE_ZEPHYR
-#include "esphome/core/defines.h"
-#include "esphome/core/component.h"
-#include <shell/shell_bt_nus.h>
-#include <atomic>
-
-namespace esphome::ble_nus {
-
-class BLENUS : public Component {
-  enum TxStatus {
-    TX_DISABLED,
-    TX_ENABLED,
-    TX_BUSY,
-  };
-
- public:
-  void setup() override;
-  void dump_config() override;
-  void loop() override;
-  size_t write_array(const uint8_t *data, size_t len);
-  void set_expose_log(bool expose_log) { this->expose_log_ = expose_log; }
-
- protected:
-  static void send_enabled_callback(bt_nus_send_status status);
-  static void tx_callback(bt_conn *conn);
-  static void rx_callback(bt_conn *conn, const uint8_t *data, uint16_t len);
-  static void connected(bt_conn *conn, uint8_t err);
-  static void disconnected(bt_conn *conn, uint8_t reason);
-
-  std::atomic<bt_conn *> conn_ = nullptr;
-  bool expose_log_ = false;
-  atomic_t tx_status_ = ATOMIC_INIT(TX_DISABLED);
-};
-
-}  // namespace esphome::ble_nus
-#endif
--- a/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_proxy.cpp
@@ -155,12 +155,16 @@ esp32_ble_tracker::AdvertisementParserType BluetoothProxy::get_advertisement_par
 BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool reserve) {
  for (uint8_t i = 0; i < this->connection_count_; i++) {
    auto *connection = this->connections_[i];
-    uint64_t conn_addr = connection->get_address();
-
-    if (conn_addr == address)
+    if (connection->get_address() == address)
      return connection;
+  }

-    if (reserve && conn_addr == 0) {
+  if (!reserve)
+    return nullptr;
+
+  for (uint8_t i = 0; i < this->connection_count_; i++) {
+    auto *connection = this->connections_[i];
+    if (connection->get_address() == 0) {
      connection->send_service_ = INIT_SENDING_SERVICES;
      connection->set_address(address);
      // All connections must start at INIT
@@ -171,6 +175,7 @@ BluetoothConnection *BluetoothProxy::get_connection_(uint64_t address, bool rese
      return connection;
    }
  }
+
  return nullptr;
 }

--- a/esphome/components/bme680_bsec/init.py
+++ b/esphome/components/bme680_bsec/init.py
@@ -41,7 +41,7 @@ CONFIG_SCHEMA = cv.All(
    cv.Schema(
        {
            cv.GenerateID(): cv.declare_id(BME680BSECComponent),
-            cv.Optional(CONF_TEMPERATURE_OFFSET, default=0): cv.temperature_delta,
+            cv.Optional(CONF_TEMPERATURE_OFFSET, default=0): cv.temperature,
            cv.Optional(CONF_IAQ_MODE, default="STATIC"): cv.enum(
                IAQ_MODE_OPTIONS, upper=True
            ),
--- a/esphome/components/bme68x_bsec2/init.py
+++ b/esphome/components/bme68x_bsec2/init.py
@@ -139,7 +139,7 @@ CONFIG_SCHEMA_BASE = (
            cv.Optional(CONF_SUPPLY_VOLTAGE, default="3.3V"): cv.enum(
                VOLTAGE_OPTIONS, upper=True
            ),
-            cv.Optional(CONF_TEMPERATURE_OFFSET, default=0): cv.temperature_delta,
+            cv.Optional(CONF_TEMPERATURE_OFFSET, default=0): cv.temperature,
            cv.Optional(
                CONF_STATE_SAVE_INTERVAL, default="6hours"
            ): cv.positive_time_period_minutes,
--- a/esphome/components/button/init.py
+++ b/esphome/components/button/init.py
@@ -84,6 +84,11 @@ def button_schema(
    return _BUTTON_SCHEMA.extend(schema)


+# Remove before 2025.11.0
+BUTTON_SCHEMA = button_schema(Button)
+BUTTON_SCHEMA.add_extra(cv.deprecated_schema_constant("button"))
+
+
 async def setup_button_core_(var, config):
    await setup_entity(var, config, "button")

--- a/esphome/components/button/automation.h
+++ b/esphome/components/button/automation.h
@@ -11,7 +11,7 @@ template<typename... Ts> class PressAction : public Action<Ts...> {
 public:
  explicit PressAction(Button *button) : button_(button) {}

-  void play(const Ts &...x) override { this->button_->press(); }
+  void play(Ts... x) override { this->button_->press(); }

 protected:
  Button *button_;
--- a/esphome/components/canbus/canbus.h
+++ b/esphome/components/canbus/canbus.h
@@ -129,7 +129,7 @@ template<typename... Ts> class CanbusSendAction : public Action<Ts...>, public P
    this->remote_transmission_request_ = remote_transmission_request;
  }

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto can_id = this->can_id_.has_value() ? *this->can_id_ : this->parent_->can_id_;
    auto use_extended_id =
        this->use_extended_id_.has_value() ? *this->use_extended_id_ : this->parent_->use_extended_id_;
--- a/esphome/components/climate/init.py
+++ b/esphome/components/climate/init.py
@@ -270,6 +270,11 @@ def climate_schema(
    return _CLIMATE_SCHEMA.extend(schema)


+# Remove before 2025.11.0
+CLIMATE_SCHEMA = climate_schema(Climate)
+CLIMATE_SCHEMA.add_extra(cv.deprecated_schema_constant("climate"))
+
+
 async def setup_climate_core_(var, config):
    await setup_entity(var, config, "climate")

--- a/esphome/components/climate/automation.h
+++ b/esphome/components/climate/automation.h
@@ -22,7 +22,7 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
  TEMPLATABLE_VALUE(std::string, custom_preset)
  TEMPLATABLE_VALUE(ClimateSwingMode, swing_mode)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto call = this->climate_->make_call();
    call.set_mode(this->mode_.optional_value(x...));
    call.set_target_temperature(this->target_temperature_.optional_value(x...));
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -6,42 +6,6 @@ namespace climate {

 static const char *const TAG = "climate";

-// Memory-efficient lookup tables
-struct StringToUint8 {
-  const char *str;
-  const uint8_t value;
-};
-
-constexpr StringToUint8 CLIMATE_MODES_BY_STR[] = {
-    {"OFF", CLIMATE_MODE_OFF},
-    {"AUTO", CLIMATE_MODE_AUTO},
-    {"COOL", CLIMATE_MODE_COOL},
-    {"HEAT", CLIMATE_MODE_HEAT},
-    {"FAN_ONLY", CLIMATE_MODE_FAN_ONLY},
-    {"DRY", CLIMATE_MODE_DRY},
-    {"HEAT_COOL", CLIMATE_MODE_HEAT_COOL},
-};
-
-constexpr StringToUint8 CLIMATE_FAN_MODES_BY_STR[] = {
-    {"ON", CLIMATE_FAN_ON},         {"OFF", CLIMATE_FAN_OFF},       {"AUTO", CLIMATE_FAN_AUTO},
-    {"LOW", CLIMATE_FAN_LOW},       {"MEDIUM", CLIMATE_FAN_MEDIUM}, {"HIGH", CLIMATE_FAN_HIGH},
-    {"MIDDLE", CLIMATE_FAN_MIDDLE}, {"FOCUS", CLIMATE_FAN_FOCUS},   {"DIFFUSE", CLIMATE_FAN_DIFFUSE},
-    {"QUIET", CLIMATE_FAN_QUIET},
-};
-
-constexpr StringToUint8 CLIMATE_PRESETS_BY_STR[] = {
-    {"ECO", CLIMATE_PRESET_ECO},           {"AWAY", CLIMATE_PRESET_AWAY}, {"BOOST", CLIMATE_PRESET_BOOST},
-    {"COMFORT", CLIMATE_PRESET_COMFORT},   {"HOME", CLIMATE_PRESET_HOME}, {"SLEEP", CLIMATE_PRESET_SLEEP},
-    {"ACTIVITY", CLIMATE_PRESET_ACTIVITY}, {"NONE", CLIMATE_PRESET_NONE},
-};
-
-constexpr StringToUint8 CLIMATE_SWING_MODES_BY_STR[] = {
-    {"OFF", CLIMATE_SWING_OFF},
-    {"BOTH", CLIMATE_SWING_BOTH},
-    {"VERTICAL", CLIMATE_SWING_VERTICAL},
-    {"HORIZONTAL", CLIMATE_SWING_HORIZONTAL},
-};
-
 void ClimateCall::perform() {
  this->parent_->control_callback_.call(*this);
  ESP_LOGD(TAG, "'%s' - Setting", this->parent_->get_name().c_str());
@@ -50,21 +14,21 @@ void ClimateCall::perform() {
    const LogString *mode_s = climate_mode_to_string(*this->mode_);
    ESP_LOGD(TAG, "  Mode: %s", LOG_STR_ARG(mode_s));
  }
-  if (this->custom_fan_mode_ != nullptr) {
+  if (this->custom_fan_mode_.has_value()) {
    this->fan_mode_.reset();
-    ESP_LOGD(TAG, " Custom Fan: %s", this->custom_fan_mode_);
+    ESP_LOGD(TAG, " Custom Fan: %s", this->custom_fan_mode_.value().c_str());
  }
  if (this->fan_mode_.has_value()) {
-    this->custom_fan_mode_ = nullptr;
+    this->custom_fan_mode_.reset();
    const LogString *fan_mode_s = climate_fan_mode_to_string(*this->fan_mode_);
    ESP_LOGD(TAG, "  Fan: %s", LOG_STR_ARG(fan_mode_s));
  }
-  if (this->custom_preset_ != nullptr) {
+  if (this->custom_preset_.has_value()) {
    this->preset_.reset();
-    ESP_LOGD(TAG, " Custom Preset: %s", this->custom_preset_);
+    ESP_LOGD(TAG, " Custom Preset: %s", this->custom_preset_.value().c_str());
  }
  if (this->preset_.has_value()) {
-    this->custom_preset_ = nullptr;
+    this->custom_preset_.reset();
    const LogString *preset_s = climate_preset_to_string(*this->preset_);
    ESP_LOGD(TAG, "  Preset: %s", LOG_STR_ARG(preset_s));
  }
@@ -86,44 +50,47 @@ void ClimateCall::perform() {
  }
  this->parent_->control(*this);
 }
-
 void ClimateCall::validate_() {
  auto traits = this->parent_->get_traits();
  if (this->mode_.has_value()) {
    auto mode = *this->mode_;
    if (!traits.supports_mode(mode)) {
-      ESP_LOGW(TAG, "  Mode %s not supported", LOG_STR_ARG(climate_mode_to_string(mode)));
+      ESP_LOGW(TAG, "  Mode %s is not supported by this device!", LOG_STR_ARG(climate_mode_to_string(mode)));
      this->mode_.reset();
    }
  }
-  if (this->custom_fan_mode_ != nullptr) {
-    if (!traits.supports_custom_fan_mode(this->custom_fan_mode_)) {
-      ESP_LOGW(TAG, "  Fan Mode %s not supported", this->custom_fan_mode_);
-      this->custom_fan_mode_ = nullptr;
+  if (this->custom_fan_mode_.has_value()) {
+    auto custom_fan_mode = *this->custom_fan_mode_;
+    if (!traits.supports_custom_fan_mode(custom_fan_mode)) {
+      ESP_LOGW(TAG, "  Fan Mode %s is not supported by this device!", custom_fan_mode.c_str());
+      this->custom_fan_mode_.reset();
    }
  } else if (this->fan_mode_.has_value()) {
    auto fan_mode = *this->fan_mode_;
    if (!traits.supports_fan_mode(fan_mode)) {
-      ESP_LOGW(TAG, "  Fan Mode %s not supported", LOG_STR_ARG(climate_fan_mode_to_string(fan_mode)));
+      ESP_LOGW(TAG, "  Fan Mode %s is not supported by this device!",
+               LOG_STR_ARG(climate_fan_mode_to_string(fan_mode)));
      this->fan_mode_.reset();
    }
  }
-  if (this->custom_preset_ != nullptr) {
-    if (!traits.supports_custom_preset(this->custom_preset_)) {
-      ESP_LOGW(TAG, "  Preset %s not supported", this->custom_preset_);
-      this->custom_preset_ = nullptr;
+  if (this->custom_preset_.has_value()) {
+    auto custom_preset = *this->custom_preset_;
+    if (!traits.supports_custom_preset(custom_preset)) {
+      ESP_LOGW(TAG, "  Preset %s is not supported by this device!", custom_preset.c_str());
+      this->custom_preset_.reset();
    }
  } else if (this->preset_.has_value()) {
    auto preset = *this->preset_;
    if (!traits.supports_preset(preset)) {
-      ESP_LOGW(TAG, "  Preset %s not supported", LOG_STR_ARG(climate_preset_to_string(preset)));
+      ESP_LOGW(TAG, "  Preset %s is not supported by this device!", LOG_STR_ARG(climate_preset_to_string(preset)));
      this->preset_.reset();
    }
  }
  if (this->swing_mode_.has_value()) {
    auto swing_mode = *this->swing_mode_;
    if (!traits.supports_swing_mode(swing_mode)) {
-      ESP_LOGW(TAG, "  Swing Mode %s not supported", LOG_STR_ARG(climate_swing_mode_to_string(swing_mode)));
+      ESP_LOGW(TAG, "  Swing Mode %s is not supported by this device!",
+               LOG_STR_ARG(climate_swing_mode_to_string(swing_mode)));
      this->swing_mode_.reset();
    }
  }
@@ -132,133 +99,159 @@ void ClimateCall::validate_() {
    if (traits.has_feature_flags(CLIMATE_SUPPORTS_TWO_POINT_TARGET_TEMPERATURE |
                                 CLIMATE_REQUIRES_TWO_POINT_TARGET_TEMPERATURE)) {
      ESP_LOGW(TAG, "  Cannot set target temperature for climate device "
-                    "with two-point target temperature");
+                    "with two-point target temperature!");
      this->target_temperature_.reset();
    } else if (std::isnan(target)) {
-      ESP_LOGW(TAG, "  Target temperature must not be NAN");
+      ESP_LOGW(TAG, "  Target temperature must not be NAN!");
      this->target_temperature_.reset();
    }
  }
  if (this->target_temperature_low_.has_value() || this->target_temperature_high_.has_value()) {
    if (!traits.has_feature_flags(CLIMATE_SUPPORTS_TWO_POINT_TARGET_TEMPERATURE |
                                  CLIMATE_REQUIRES_TWO_POINT_TARGET_TEMPERATURE)) {
-      ESP_LOGW(TAG, "  Cannot set low/high target temperature");
+      ESP_LOGW(TAG, "  Cannot set low/high target temperature for this device!");
      this->target_temperature_low_.reset();
      this->target_temperature_high_.reset();
    }
  }
  if (this->target_temperature_low_.has_value() && std::isnan(*this->target_temperature_low_)) {
-    ESP_LOGW(TAG, "  Target temperature low must not be NAN");
+    ESP_LOGW(TAG, "  Target temperature low must not be NAN!");
    this->target_temperature_low_.reset();
  }
  if (this->target_temperature_high_.has_value() && std::isnan(*this->target_temperature_high_)) {
-    ESP_LOGW(TAG, "  Target temperature high must not be NAN");
+    ESP_LOGW(TAG, "  Target temperature low must not be NAN!");
    this->target_temperature_high_.reset();
  }
  if (this->target_temperature_low_.has_value() && this->target_temperature_high_.has_value()) {
    float low = *this->target_temperature_low_;
    float high = *this->target_temperature_high_;
    if (low > high) {
-      ESP_LOGW(TAG, "  Target temperature low %.2f must be less than target temperature high %.2f", low, high);
+      ESP_LOGW(TAG, "  Target temperature low %.2f must be smaller than target temperature high %.2f!", low, high);
      this->target_temperature_low_.reset();
      this->target_temperature_high_.reset();
    }
  }
 }
-
 ClimateCall &ClimateCall::set_mode(ClimateMode mode) {
  this->mode_ = mode;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_mode(const std::string &mode) {
-  for (const auto &mode_entry : CLIMATE_MODES_BY_STR) {
-    if (str_equals_case_insensitive(mode, mode_entry.str)) {
-      this->set_mode(static_cast<ClimateMode>(mode_entry.value));
-      return *this;
-    }
+  if (str_equals_case_insensitive(mode, "OFF")) {
+    this->set_mode(CLIMATE_MODE_OFF);
+  } else if (str_equals_case_insensitive(mode, "AUTO")) {
+    this->set_mode(CLIMATE_MODE_AUTO);
+  } else if (str_equals_case_insensitive(mode, "COOL")) {
+    this->set_mode(CLIMATE_MODE_COOL);
+  } else if (str_equals_case_insensitive(mode, "HEAT")) {
+    this->set_mode(CLIMATE_MODE_HEAT);
+  } else if (str_equals_case_insensitive(mode, "FAN_ONLY")) {
+    this->set_mode(CLIMATE_MODE_FAN_ONLY);
+  } else if (str_equals_case_insensitive(mode, "DRY")) {
+    this->set_mode(CLIMATE_MODE_DRY);
+  } else if (str_equals_case_insensitive(mode, "HEAT_COOL")) {
+    this->set_mode(CLIMATE_MODE_HEAT_COOL);
+  } else {
+    ESP_LOGW(TAG, "'%s' - Unrecognized mode %s", this->parent_->get_name().c_str(), mode.c_str());
  }
-  ESP_LOGW(TAG, "'%s' - Unrecognized mode %s", this->parent_->get_name().c_str(), mode.c_str());
  return *this;
 }
-
 ClimateCall &ClimateCall::set_fan_mode(ClimateFanMode fan_mode) {
  this->fan_mode_ = fan_mode;
-  this->custom_fan_mode_ = nullptr;
+  this->custom_fan_mode_.reset();
  return *this;
 }
-
-ClimateCall &ClimateCall::set_fan_mode(const char *custom_fan_mode) {
-  // Check if it's a standard enum mode first
-  for (const auto &mode_entry : CLIMATE_FAN_MODES_BY_STR) {
-    if (str_equals_case_insensitive(custom_fan_mode, mode_entry.str)) {
-      return this->set_fan_mode(static_cast<ClimateFanMode>(mode_entry.value));
+ClimateCall &ClimateCall::set_fan_mode(const std::string &fan_mode) {
+  if (str_equals_case_insensitive(fan_mode, "ON")) {
+    this->set_fan_mode(CLIMATE_FAN_ON);
+  } else if (str_equals_case_insensitive(fan_mode, "OFF")) {
+    this->set_fan_mode(CLIMATE_FAN_OFF);
+  } else if (str_equals_case_insensitive(fan_mode, "AUTO")) {
+    this->set_fan_mode(CLIMATE_FAN_AUTO);
+  } else if (str_equals_case_insensitive(fan_mode, "LOW")) {
+    this->set_fan_mode(CLIMATE_FAN_LOW);
+  } else if (str_equals_case_insensitive(fan_mode, "MEDIUM")) {
+    this->set_fan_mode(CLIMATE_FAN_MEDIUM);
+  } else if (str_equals_case_insensitive(fan_mode, "HIGH")) {
+    this->set_fan_mode(CLIMATE_FAN_HIGH);
+  } else if (str_equals_case_insensitive(fan_mode, "MIDDLE")) {
+    this->set_fan_mode(CLIMATE_FAN_MIDDLE);
+  } else if (str_equals_case_insensitive(fan_mode, "FOCUS")) {
+    this->set_fan_mode(CLIMATE_FAN_FOCUS);
+  } else if (str_equals_case_insensitive(fan_mode, "DIFFUSE")) {
+    this->set_fan_mode(CLIMATE_FAN_DIFFUSE);
+  } else if (str_equals_case_insensitive(fan_mode, "QUIET")) {
+    this->set_fan_mode(CLIMATE_FAN_QUIET);
+  } else {
+    if (this->parent_->get_traits().supports_custom_fan_mode(fan_mode)) {
+      this->custom_fan_mode_ = fan_mode;
+      this->fan_mode_.reset();
+    } else {
+      ESP_LOGW(TAG, "'%s' - Unrecognized fan mode %s", this->parent_->get_name().c_str(), fan_mode.c_str());
    }
  }
-  // Find the matching pointer from parent climate device
-  if (const char *mode_ptr = this->parent_->find_custom_fan_mode_(custom_fan_mode)) {
-    this->custom_fan_mode_ = mode_ptr;
-    this->fan_mode_.reset();
-    return *this;
-  }
-  ESP_LOGW(TAG, "'%s' - Unrecognized fan mode %s", this->parent_->get_name().c_str(), custom_fan_mode);
  return *this;
 }
-
-ClimateCall &ClimateCall::set_fan_mode(const std::string &fan_mode) { return this->set_fan_mode(fan_mode.c_str()); }
-
 ClimateCall &ClimateCall::set_fan_mode(optional<std::string> fan_mode) {
  if (fan_mode.has_value()) {
    this->set_fan_mode(fan_mode.value());
  }
  return *this;
 }
-
 ClimateCall &ClimateCall::set_preset(ClimatePreset preset) {
  this->preset_ = preset;
-  this->custom_preset_ = nullptr;
+  this->custom_preset_.reset();
  return *this;
 }
-
-ClimateCall &ClimateCall::set_preset(const char *custom_preset) {
-  // Check if it's a standard enum preset first
-  for (const auto &preset_entry : CLIMATE_PRESETS_BY_STR) {
-    if (str_equals_case_insensitive(custom_preset, preset_entry.str)) {
-      return this->set_preset(static_cast<ClimatePreset>(preset_entry.value));
+ClimateCall &ClimateCall::set_preset(const std::string &preset) {
+  if (str_equals_case_insensitive(preset, "ECO")) {
+    this->set_preset(CLIMATE_PRESET_ECO);
+  } else if (str_equals_case_insensitive(preset, "AWAY")) {
+    this->set_preset(CLIMATE_PRESET_AWAY);
+  } else if (str_equals_case_insensitive(preset, "BOOST")) {
+    this->set_preset(CLIMATE_PRESET_BOOST);
+  } else if (str_equals_case_insensitive(preset, "COMFORT")) {
+    this->set_preset(CLIMATE_PRESET_COMFORT);
+  } else if (str_equals_case_insensitive(preset, "HOME")) {
+    this->set_preset(CLIMATE_PRESET_HOME);
+  } else if (str_equals_case_insensitive(preset, "SLEEP")) {
+    this->set_preset(CLIMATE_PRESET_SLEEP);
+  } else if (str_equals_case_insensitive(preset, "ACTIVITY")) {
+    this->set_preset(CLIMATE_PRESET_ACTIVITY);
+  } else if (str_equals_case_insensitive(preset, "NONE")) {
+    this->set_preset(CLIMATE_PRESET_NONE);
+  } else {
+    if (this->parent_->get_traits().supports_custom_preset(preset)) {
+      this->custom_preset_ = preset;
+      this->preset_.reset();
+    } else {
+      ESP_LOGW(TAG, "'%s' - Unrecognized preset %s", this->parent_->get_name().c_str(), preset.c_str());
    }
  }
-  // Find the matching pointer from parent climate device
-  if (const char *preset_ptr = this->parent_->find_custom_preset_(custom_preset)) {
-    this->custom_preset_ = preset_ptr;
-    this->preset_.reset();
-    return *this;
-  }
-  ESP_LOGW(TAG, "'%s' - Unrecognized preset %s", this->parent_->get_name().c_str(), custom_preset);
  return *this;
 }
-
-ClimateCall &ClimateCall::set_preset(const std::string &preset) { return this->set_preset(preset.c_str()); }
-
 ClimateCall &ClimateCall::set_preset(optional<std::string> preset) {
  if (preset.has_value()) {
    this->set_preset(preset.value());
  }
  return *this;
 }
-
 ClimateCall &ClimateCall::set_swing_mode(ClimateSwingMode swing_mode) {
  this->swing_mode_ = swing_mode;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_swing_mode(const std::string &swing_mode) {
-  for (const auto &mode_entry : CLIMATE_SWING_MODES_BY_STR) {
-    if (str_equals_case_insensitive(swing_mode, mode_entry.str)) {
-      this->set_swing_mode(static_cast<ClimateSwingMode>(mode_entry.value));
-      return *this;
-    }
+  if (str_equals_case_insensitive(swing_mode, "OFF")) {
+    this->set_swing_mode(CLIMATE_SWING_OFF);
+  } else if (str_equals_case_insensitive(swing_mode, "BOTH")) {
+    this->set_swing_mode(CLIMATE_SWING_BOTH);
+  } else if (str_equals_case_insensitive(swing_mode, "VERTICAL")) {
+    this->set_swing_mode(CLIMATE_SWING_VERTICAL);
+  } else if (str_equals_case_insensitive(swing_mode, "HORIZONTAL")) {
+    this->set_swing_mode(CLIMATE_SWING_HORIZONTAL);
+  } else {
+    ESP_LOGW(TAG, "'%s' - Unrecognized swing mode %s", this->parent_->get_name().c_str(), swing_mode.c_str());
  }
-  ESP_LOGW(TAG, "'%s' - Unrecognized swing mode %s", this->parent_->get_name().c_str(), swing_mode.c_str());
  return *this;
 }

@@ -266,69 +259,59 @@ ClimateCall &ClimateCall::set_target_temperature(float target_temperature) {
  this->target_temperature_ = target_temperature;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_target_temperature_low(float target_temperature_low) {
  this->target_temperature_low_ = target_temperature_low;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_target_temperature_high(float target_temperature_high) {
  this->target_temperature_high_ = target_temperature_high;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_target_humidity(float target_humidity) {
  this->target_humidity_ = target_humidity;
  return *this;
 }

+const optional<ClimateMode> &ClimateCall::get_mode() const { return this->mode_; }
 const optional<float> &ClimateCall::get_target_temperature() const { return this->target_temperature_; }
 const optional<float> &ClimateCall::get_target_temperature_low() const { return this->target_temperature_low_; }
 const optional<float> &ClimateCall::get_target_temperature_high() const { return this->target_temperature_high_; }
 const optional<float> &ClimateCall::get_target_humidity() const { return this->target_humidity_; }
-
-const optional<ClimateMode> &ClimateCall::get_mode() const { return this->mode_; }
 const optional<ClimateFanMode> &ClimateCall::get_fan_mode() const { return this->fan_mode_; }
-const optional<ClimateSwingMode> &ClimateCall::get_swing_mode() const { return this->swing_mode_; }
+const optional<std::string> &ClimateCall::get_custom_fan_mode() const { return this->custom_fan_mode_; }
 const optional<ClimatePreset> &ClimateCall::get_preset() const { return this->preset_; }
-
+const optional<std::string> &ClimateCall::get_custom_preset() const { return this->custom_preset_; }
+const optional<ClimateSwingMode> &ClimateCall::get_swing_mode() const { return this->swing_mode_; }
 ClimateCall &ClimateCall::set_target_temperature_high(optional<float> target_temperature_high) {
  this->target_temperature_high_ = target_temperature_high;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_target_temperature_low(optional<float> target_temperature_low) {
  this->target_temperature_low_ = target_temperature_low;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_target_temperature(optional<float> target_temperature) {
  this->target_temperature_ = target_temperature;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_target_humidity(optional<float> target_humidity) {
  this->target_humidity_ = target_humidity;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_mode(optional<ClimateMode> mode) {
  this->mode_ = mode;
  return *this;
 }
-
 ClimateCall &ClimateCall::set_fan_mode(optional<ClimateFanMode> fan_mode) {
  this->fan_mode_ = fan_mode;
-  this->custom_fan_mode_ = nullptr;
+  this->custom_fan_mode_.reset();
  return *this;
 }
-
 ClimateCall &ClimateCall::set_preset(optional<ClimatePreset> preset) {
  this->preset_ = preset;
-  this->custom_preset_ = nullptr;
+  this->custom_preset_.reset();
  return *this;
 }
-
 ClimateCall &ClimateCall::set_swing_mode(optional<ClimateSwingMode> swing_mode) {
  this->swing_mode_ = swing_mode;
  return *this;
@@ -353,7 +336,6 @@ optional<ClimateDeviceRestoreState> Climate::restore_state_() {
    return {};
  return recovered;
 }
-
 void Climate::save_state_() {
 #if (defined(USE_ESP_IDF) || (defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(3, 0, 0))) && \
    !defined(CLANG_TIDY)
@@ -384,34 +366,30 @@ void Climate::save_state_() {
    state.uses_custom_fan_mode = false;
    state.fan_mode = this->fan_mode.value();
  }
-  if (!traits.get_supported_custom_fan_modes().empty() && this->has_custom_fan_mode()) {
+  if (!traits.get_supported_custom_fan_modes().empty() && custom_fan_mode.has_value()) {
    state.uses_custom_fan_mode = true;
    const auto &supported = traits.get_supported_custom_fan_modes();
-    // std::vector maintains insertion order
-    size_t i = 0;
-    for (const char *mode : supported) {
-      if (strcmp(mode, this->custom_fan_mode_) == 0) {
+    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;
      }
-      i++;
    }
  }
  if (traits.get_supports_presets() && preset.has_value()) {
    state.uses_custom_preset = false;
    state.preset = this->preset.value();
  }
-  if (!traits.get_supported_custom_presets().empty() && this->has_custom_preset()) {
+  if (!traits.get_supported_custom_presets().empty() && custom_preset.has_value()) {
    state.uses_custom_preset = true;
    const auto &supported = traits.get_supported_custom_presets();
-    // std::vector maintains insertion order
-    size_t i = 0;
-    for (const char *preset : supported) {
-      if (strcmp(preset, this->custom_preset_) == 0) {
+    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;
      }
-      i++;
    }
  }
  if (traits.get_supports_swing_modes()) {
@@ -420,7 +398,6 @@ void Climate::save_state_() {

  this->rtc_.save(&state);
 }
-
 void Climate::publish_state() {
  ESP_LOGD(TAG, "'%s' - Sending state:", this->name_.c_str());
  auto traits = this->get_traits();
@@ -432,14 +409,14 @@ void Climate::publish_state() {
  if (traits.get_supports_fan_modes() && this->fan_mode.has_value()) {
    ESP_LOGD(TAG, "  Fan Mode: %s", LOG_STR_ARG(climate_fan_mode_to_string(this->fan_mode.value())));
  }
-  if (!traits.get_supported_custom_fan_modes().empty() && this->has_custom_fan_mode()) {
-    ESP_LOGD(TAG, "  Custom Fan Mode: %s", this->custom_fan_mode_);
+  if (!traits.get_supported_custom_fan_modes().empty() && this->custom_fan_mode.has_value()) {
+    ESP_LOGD(TAG, "  Custom Fan Mode: %s", this->custom_fan_mode.value().c_str());
  }
  if (traits.get_supports_presets() && this->preset.has_value()) {
    ESP_LOGD(TAG, "  Preset: %s", LOG_STR_ARG(climate_preset_to_string(this->preset.value())));
  }
-  if (!traits.get_supported_custom_presets().empty() && this->has_custom_preset()) {
-    ESP_LOGD(TAG, "  Custom Preset: %s", this->custom_preset_);
+  if (!traits.get_supported_custom_presets().empty() && this->custom_preset.has_value()) {
+    ESP_LOGD(TAG, "  Custom Preset: %s", this->custom_preset.value().c_str());
  }
  if (traits.get_supports_swing_modes()) {
    ESP_LOGD(TAG, "  Swing Mode: %s", LOG_STR_ARG(climate_swing_mode_to_string(this->swing_mode)));
@@ -492,20 +469,16 @@ ClimateTraits Climate::get_traits() {
 void Climate::set_visual_min_temperature_override(float visual_min_temperature_override) {
  this->visual_min_temperature_override_ = visual_min_temperature_override;
 }
-
 void Climate::set_visual_max_temperature_override(float visual_max_temperature_override) {
  this->visual_max_temperature_override_ = visual_max_temperature_override;
 }
-
 void Climate::set_visual_temperature_step_override(float target, float current) {
  this->visual_target_temperature_step_override_ = target;
  this->visual_current_temperature_step_override_ = current;
 }
-
 void Climate::set_visual_min_humidity_override(float visual_min_humidity_override) {
  this->visual_min_humidity_override_ = visual_min_humidity_override;
 }
-
 void Climate::set_visual_max_humidity_override(float visual_max_humidity_override) {
  this->visual_max_humidity_override_ = visual_max_humidity_override;
 }
@@ -526,28 +499,17 @@ ClimateCall ClimateDeviceRestoreState::to_call(Climate *climate) {
  if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY)) {
    call.set_target_humidity(this->target_humidity);
  }
-  if (this->uses_custom_fan_mode) {
-    if (this->custom_fan_mode < traits.get_supported_custom_fan_modes().size()) {
-      call.fan_mode_.reset();
-      call.custom_fan_mode_ = traits.get_supported_custom_fan_modes()[this->custom_fan_mode];
-    }
-  } else if (traits.supports_fan_mode(this->fan_mode)) {
+  if (traits.get_supports_fan_modes() || !traits.get_supported_custom_fan_modes().empty()) {
    call.set_fan_mode(this->fan_mode);
  }
-  if (this->uses_custom_preset) {
-    if (this->custom_preset < traits.get_supported_custom_presets().size()) {
-      call.preset_.reset();
-      call.custom_preset_ = traits.get_supported_custom_presets()[this->custom_preset];
-    }
-  } else if (traits.supports_preset(this->preset)) {
+  if (traits.get_supports_presets() || !traits.get_supported_custom_presets().empty()) {
    call.set_preset(this->preset);
  }
-  if (traits.supports_swing_mode(this->swing_mode)) {
+  if (traits.get_supports_swing_modes()) {
    call.set_swing_mode(this->swing_mode);
  }
  return call;
 }
-
 void ClimateDeviceRestoreState::apply(Climate *climate) {
  auto traits = climate->get_traits();
  climate->mode = this->mode;
@@ -561,199 +523,124 @@ void ClimateDeviceRestoreState::apply(Climate *climate) {
  if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY)) {
    climate->target_humidity = this->target_humidity;
  }
-  if (this->uses_custom_fan_mode) {
-    if (this->custom_fan_mode < traits.get_supported_custom_fan_modes().size()) {
-      climate->fan_mode.reset();
-      climate->custom_fan_mode_ = traits.get_supported_custom_fan_modes()[this->custom_fan_mode];
-    }
-  } else if (traits.supports_fan_mode(this->fan_mode)) {
+  if (traits.get_supports_fan_modes() && !this->uses_custom_fan_mode) {
    climate->fan_mode = this->fan_mode;
-    climate->clear_custom_fan_mode_();
  }
-  if (this->uses_custom_preset) {
-    if (this->custom_preset < traits.get_supported_custom_presets().size()) {
-      climate->preset.reset();
-      climate->custom_preset_ = traits.get_supported_custom_presets()[this->custom_preset];
+  if (!traits.get_supported_custom_fan_modes().empty() && this->uses_custom_fan_mode) {
+    // std::set has consistent order (lexicographic for strings), so this is ok
+    const auto &modes = traits.get_supported_custom_fan_modes();
+    std::vector<std::string> modes_vec{modes.begin(), modes.end()};
+    if (custom_fan_mode < modes_vec.size()) {
+      climate->custom_fan_mode = modes_vec[this->custom_fan_mode];
    }
-  } else if (traits.supports_preset(this->preset)) {
-    climate->preset = this->preset;
-    climate->clear_custom_preset_();
  }
-  if (traits.supports_swing_mode(this->swing_mode)) {
+  if (traits.get_supports_presets() && !this->uses_custom_preset) {
+    climate->preset = this->preset;
+  }
+  if (!traits.get_supported_custom_presets().empty() && uses_custom_preset) {
+    // std::set has consistent order (lexicographic for strings), so this is ok
+    const auto &presets = traits.get_supported_custom_presets();
+    std::vector<std::string> presets_vec{presets.begin(), presets.end()};
+    if (custom_preset < presets_vec.size()) {
+      climate->custom_preset = presets_vec[this->custom_preset];
+    }
+  }
+  if (traits.get_supports_swing_modes()) {
    climate->swing_mode = this->swing_mode;
  }
  climate->publish_state();
 }

-/** Template helper for setting primary modes (fan_mode, preset) with mutual exclusion.
- *
- * Climate devices have mutually exclusive mode pairs:
- *   - fan_mode (enum) vs custom_fan_mode_ (const char*)
- *   - preset (enum) vs custom_preset_ (const char*)
- *
- * Only one mode in each pair can be active at a time. This helper ensures setting a primary
- * mode automatically clears its corresponding custom mode.
- *
- * Example state transitions:
- *   Before: custom_fan_mode_="Turbo", fan_mode=nullopt
- *   Call:   set_fan_mode_(CLIMATE_FAN_HIGH)
- *   After:  custom_fan_mode_=nullptr,   fan_mode=CLIMATE_FAN_HIGH
- *
- * @param primary The primary mode optional (fan_mode or preset)
- * @param custom_ptr Reference to the custom mode pointer (custom_fan_mode_ or custom_preset_)
- * @param value The new primary mode value to set
- * @return true if state changed, false if already set to this value
- */
-template<typename T> bool set_primary_mode(optional<T> &primary, const char *&custom_ptr, T value) {
-  // Clear the custom mode (mutual exclusion)
-  bool changed = custom_ptr != nullptr;
-  custom_ptr = nullptr;
-  // Set the primary mode
-  if (changed || !primary.has_value() || primary.value() != value) {
-    primary = value;
-    return true;
+template<typename T1, typename T2> bool set_alternative(optional<T1> &dst, optional<T2> &alt, const T1 &src) {
+  bool is_changed = alt.has_value();
+  alt.reset();
+  if (is_changed || dst != src) {
+    dst = src;
+    is_changed = true;
  }
-  return false;
-}
-
-/** Template helper for setting custom modes (custom_fan_mode_, custom_preset_) with mutual exclusion.
- *
- * This helper ensures setting a custom mode automatically clears its corresponding primary mode.
- * It also validates that the custom mode exists in the device's supported modes (lifetime safety).
- *
- * Example state transitions:
- *   Before: fan_mode=CLIMATE_FAN_HIGH, custom_fan_mode_=nullptr
- *   Call:   set_custom_fan_mode_("Turbo")
- *   After:  fan_mode=nullopt,          custom_fan_mode_="Turbo" (pointer from traits)
- *
- * Lifetime Safety:
- *   - found_ptr must come from traits.find_custom_*_mode_()
- *   - Only pointers found in traits are stored, ensuring they remain valid
- *   - Prevents dangling pointers from temporary strings
- *
- * @param custom_ptr Reference to the custom mode pointer to set
- * @param primary The primary mode optional to clear
- * @param found_ptr The validated pointer from traits (nullptr if not found)
- * @param has_custom Whether a custom mode is currently active
- * @return true if state changed, false otherwise
- */
-template<typename T>
-bool set_custom_mode(const char *&custom_ptr, optional<T> &primary, const char *found_ptr, bool has_custom) {
-  if (found_ptr != nullptr) {
-    // Clear the primary mode (mutual exclusion)
-    bool changed = primary.has_value();
-    primary.reset();
-    // Set the custom mode (pointer is validated by caller from traits)
-    if (changed || custom_ptr != found_ptr) {
-      custom_ptr = found_ptr;
-      return true;
-    }
-    return false;
-  }
-  // Mode not found in supported modes, clear it if currently set
-  if (has_custom) {
-    custom_ptr = nullptr;
-    return true;
-  }
-  return false;
+  return is_changed;
 }

 bool Climate::set_fan_mode_(ClimateFanMode mode) {
-  return set_primary_mode(this->fan_mode, this->custom_fan_mode_, mode);
+  return set_alternative(this->fan_mode, this->custom_fan_mode, mode);
 }

-bool Climate::set_custom_fan_mode_(const char *mode) {
-  auto traits = this->get_traits();
-  return set_custom_mode<ClimateFanMode>(this->custom_fan_mode_, this->fan_mode, traits.find_custom_fan_mode_(mode),
-                                         this->has_custom_fan_mode());
+bool Climate::set_custom_fan_mode_(const std::string &mode) {
+  return set_alternative(this->custom_fan_mode, this->fan_mode, mode);
 }

-void Climate::clear_custom_fan_mode_() { this->custom_fan_mode_ = nullptr; }
+bool Climate::set_preset_(ClimatePreset preset) { return set_alternative(this->preset, this->custom_preset, preset); }

-bool Climate::set_preset_(ClimatePreset preset) { return set_primary_mode(this->preset, this->custom_preset_, preset); }
-
-bool Climate::set_custom_preset_(const char *preset) {
-  auto traits = this->get_traits();
-  return set_custom_mode<ClimatePreset>(this->custom_preset_, this->preset, traits.find_custom_preset_(preset),
-                                        this->has_custom_preset());
-}
-
-void Climate::clear_custom_preset_() { this->custom_preset_ = nullptr; }
-
-const char *Climate::find_custom_fan_mode_(const char *custom_fan_mode) {
-  return this->get_traits().find_custom_fan_mode_(custom_fan_mode);
-}
-
-const char *Climate::find_custom_preset_(const char *custom_preset) {
-  return this->get_traits().find_custom_preset_(custom_preset);
+bool Climate::set_custom_preset_(const std::string &preset) {
+  return set_alternative(this->custom_preset, this->preset, preset);
 }

 void Climate::dump_traits_(const char *tag) {
  auto traits = this->get_traits();
  ESP_LOGCONFIG(tag, "ClimateTraits:");
  ESP_LOGCONFIG(tag,
-                "  Visual settings:\n"
-                "  - Min temperature: %.1f\n"
-                "  - Max temperature: %.1f\n"
-                "  - Temperature step:\n"
-                "      Target: %.1f",
+                "  [x] Visual settings:\n"
+                "      - Min temperature: %.1f\n"
+                "      - Max temperature: %.1f\n"
+                "      - Temperature step:\n"
+                "          Target: %.1f",
                traits.get_visual_min_temperature(), traits.get_visual_max_temperature(),
                traits.get_visual_target_temperature_step());
  if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE)) {
-    ESP_LOGCONFIG(tag, "      Current: %.1f", traits.get_visual_current_temperature_step());
+    ESP_LOGCONFIG(tag, "          Current: %.1f", traits.get_visual_current_temperature_step());
  }
  if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY |
                               climate::CLIMATE_SUPPORTS_CURRENT_HUMIDITY)) {
    ESP_LOGCONFIG(tag,
-                  "  - Min humidity: %.0f\n"
-                  "  - Max humidity: %.0f",
+                  "      - Min humidity: %.0f\n"
+                  "      - Max humidity: %.0f",
                  traits.get_visual_min_humidity(), traits.get_visual_max_humidity());
  }
  if (traits.has_feature_flags(CLIMATE_SUPPORTS_TWO_POINT_TARGET_TEMPERATURE |
                               CLIMATE_REQUIRES_TWO_POINT_TARGET_TEMPERATURE)) {
-    ESP_LOGCONFIG(tag, "  Supports two-point target temperature");
+    ESP_LOGCONFIG(tag, "  [x] Supports two-point target temperature");
  }
  if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE)) {
-    ESP_LOGCONFIG(tag, "  Supports current temperature");
+    ESP_LOGCONFIG(tag, "  [x] Supports current temperature");
  }
  if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY)) {
-    ESP_LOGCONFIG(tag, "  Supports target humidity");
+    ESP_LOGCONFIG(tag, "  [x] Supports target humidity");
  }
  if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_HUMIDITY)) {
-    ESP_LOGCONFIG(tag, "  Supports current humidity");
+    ESP_LOGCONFIG(tag, "  [x] Supports current humidity");
  }
  if (traits.has_feature_flags(climate::CLIMATE_SUPPORTS_ACTION)) {
-    ESP_LOGCONFIG(tag, "  Supports action");
+    ESP_LOGCONFIG(tag, "  [x] Supports action");
  }
  if (!traits.get_supported_modes().empty()) {
-    ESP_LOGCONFIG(tag, "  Supported modes:");
+    ESP_LOGCONFIG(tag, "  [x] Supported modes:");
    for (ClimateMode m : traits.get_supported_modes())
-      ESP_LOGCONFIG(tag, "  - %s", LOG_STR_ARG(climate_mode_to_string(m)));
+      ESP_LOGCONFIG(tag, "      - %s", LOG_STR_ARG(climate_mode_to_string(m)));
  }
  if (!traits.get_supported_fan_modes().empty()) {
-    ESP_LOGCONFIG(tag, "  Supported fan modes:");
+    ESP_LOGCONFIG(tag, "  [x] Supported fan modes:");
    for (ClimateFanMode m : traits.get_supported_fan_modes())
-      ESP_LOGCONFIG(tag, "  - %s", LOG_STR_ARG(climate_fan_mode_to_string(m)));
+      ESP_LOGCONFIG(tag, "      - %s", LOG_STR_ARG(climate_fan_mode_to_string(m)));
  }
  if (!traits.get_supported_custom_fan_modes().empty()) {
-    ESP_LOGCONFIG(tag, "  Supported custom fan modes:");
-    for (const char *s : traits.get_supported_custom_fan_modes())
-      ESP_LOGCONFIG(tag, "  - %s", s);
+    ESP_LOGCONFIG(tag, "  [x] Supported custom fan modes:");
+    for (const std::string &s : traits.get_supported_custom_fan_modes())
+      ESP_LOGCONFIG(tag, "      - %s", s.c_str());
  }
  if (!traits.get_supported_presets().empty()) {
-    ESP_LOGCONFIG(tag, "  Supported presets:");
+    ESP_LOGCONFIG(tag, "  [x] Supported presets:");
    for (ClimatePreset p : traits.get_supported_presets())
-      ESP_LOGCONFIG(tag, "  - %s", LOG_STR_ARG(climate_preset_to_string(p)));
+      ESP_LOGCONFIG(tag, "      - %s", LOG_STR_ARG(climate_preset_to_string(p)));
  }
  if (!traits.get_supported_custom_presets().empty()) {
-    ESP_LOGCONFIG(tag, "  Supported custom presets:");
-    for (const char *s : traits.get_supported_custom_presets())
-      ESP_LOGCONFIG(tag, "  - %s", s);
+    ESP_LOGCONFIG(tag, "  [x] Supported custom presets:");
+    for (const std::string &s : traits.get_supported_custom_presets())
+      ESP_LOGCONFIG(tag, "      - %s", s.c_str());
  }
  if (!traits.get_supported_swing_modes().empty()) {
-    ESP_LOGCONFIG(tag, "  Supported swing modes:");
+    ESP_LOGCONFIG(tag, "  [x] Supported swing modes:");
    for (ClimateSwingMode m : traits.get_supported_swing_modes())
-      ESP_LOGCONFIG(tag, "  - %s", LOG_STR_ARG(climate_swing_mode_to_string(m)));
+      ESP_LOGCONFIG(tag, "      - %s", LOG_STR_ARG(climate_swing_mode_to_string(m)));
  }
 }

--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -33,7 +33,6 @@ class Climate;
 class ClimateCall {
 public:
  explicit ClimateCall(Climate *parent) : parent_(parent) {}
-  friend struct ClimateDeviceRestoreState;

  /// Set the mode of the climate device.
  ClimateCall &set_mode(ClimateMode mode);
@@ -77,8 +76,6 @@ class ClimateCall {
  ClimateCall &set_fan_mode(const std::string &fan_mode);
  /// Set the fan mode of the climate device based on a string.
  ClimateCall &set_fan_mode(optional<std::string> fan_mode);
-  /// Set the custom fan mode of the climate device.
-  ClimateCall &set_fan_mode(const char *custom_fan_mode);
  /// Set the swing mode of the climate device.
  ClimateCall &set_swing_mode(ClimateSwingMode swing_mode);
  /// Set the swing mode of the climate device.
@@ -93,41 +90,34 @@ class ClimateCall {
  ClimateCall &set_preset(const std::string &preset);
  /// Set the preset of the climate device based on a string.
  ClimateCall &set_preset(optional<std::string> preset);
-  /// Set the custom preset of the climate device.
-  ClimateCall &set_preset(const char *custom_preset);

  void perform();

+  const optional<ClimateMode> &get_mode() const;
  const optional<float> &get_target_temperature() const;
  const optional<float> &get_target_temperature_low() const;
  const optional<float> &get_target_temperature_high() const;
  const optional<float> &get_target_humidity() const;
-
-  const optional<ClimateMode> &get_mode() const;
  const optional<ClimateFanMode> &get_fan_mode() const;
  const optional<ClimateSwingMode> &get_swing_mode() const;
+  const optional<std::string> &get_custom_fan_mode() const;
  const optional<ClimatePreset> &get_preset() const;
-  const char *get_custom_fan_mode() const { return this->custom_fan_mode_; }
-  const char *get_custom_preset() const { return this->custom_preset_; }
-  bool has_custom_fan_mode() const { return this->custom_fan_mode_ != nullptr; }
-  bool has_custom_preset() const { return this->custom_preset_ != nullptr; }
+  const optional<std::string> &get_custom_preset() const;

 protected:
  void validate_();

  Climate *const parent_;
+  optional<ClimateMode> mode_;
  optional<float> target_temperature_;
  optional<float> target_temperature_low_;
  optional<float> target_temperature_high_;
  optional<float> target_humidity_;
-  optional<ClimateMode> mode_;
  optional<ClimateFanMode> fan_mode_;
  optional<ClimateSwingMode> swing_mode_;
+  optional<std::string> custom_fan_mode_;
  optional<ClimatePreset> preset_;
-
- private:
-  const char *custom_fan_mode_{nullptr};
-  const char *custom_preset_{nullptr};
+  optional<std::string> custom_preset_;
 };

 /// Struct used to save the state of the climate device in restore memory.
@@ -179,6 +169,47 @@ class Climate : public EntityBase {
 public:
  Climate() {}

+  /// The active mode of the climate device.
+  ClimateMode mode{CLIMATE_MODE_OFF};
+
+  /// The active state of the climate device.
+  ClimateAction action{CLIMATE_ACTION_OFF};
+
+  /// The current temperature of the climate device, as reported from the integration.
+  float current_temperature{NAN};
+
+  /// The current humidity of the climate device, as reported from the integration.
+  float current_humidity{NAN};
+
+  union {
+    /// The target temperature of the climate device.
+    float target_temperature;
+    struct {
+      /// The minimum target temperature of the climate device, for climate devices with split target temperature.
+      float target_temperature_low{NAN};
+      /// The maximum target temperature of the climate device, for climate devices with split target temperature.
+      float target_temperature_high{NAN};
+    };
+  };
+
+  /// The target humidity of the climate device.
+  float target_humidity;
+
+  /// The active fan mode of the climate device.
+  optional<ClimateFanMode> fan_mode;
+
+  /// The active swing mode of the climate device.
+  ClimateSwingMode swing_mode;
+
+  /// The active custom fan mode of the climate device.
+  optional<std::string> custom_fan_mode;
+
+  /// The active preset of the climate device.
+  optional<ClimatePreset> preset;
+
+  /// The active custom preset mode of the climate device.
+  optional<std::string> custom_preset;
+
  /** Add a callback for the climate device state, each time the state of the climate device is updated
   * (using publish_state), this callback will be called.
   *
@@ -220,78 +251,20 @@ class Climate : public EntityBase {
  void set_visual_min_humidity_override(float visual_min_humidity_override);
  void set_visual_max_humidity_override(float visual_max_humidity_override);

-  /// Check if a custom fan mode is currently active.
-  bool has_custom_fan_mode() const { return this->custom_fan_mode_ != nullptr; }
-
-  /// Check if a custom preset is currently active.
-  bool has_custom_preset() const { return this->custom_preset_ != nullptr; }
-
-  /// The current temperature of the climate device, as reported from the integration.
-  float current_temperature{NAN};
-
-  /// The current humidity of the climate device, as reported from the integration.
-  float current_humidity{NAN};
-
-  union {
-    /// The target temperature of the climate device.
-    float target_temperature;
-    struct {
-      /// The minimum target temperature of the climate device, for climate devices with split target temperature.
-      float target_temperature_low{NAN};
-      /// The maximum target temperature of the climate device, for climate devices with split target temperature.
-      float target_temperature_high{NAN};
-    };
-  };
-
-  /// The target humidity of the climate device.
-  float target_humidity;
-
-  /// The active fan mode of the climate device.
-  optional<ClimateFanMode> fan_mode;
-
-  /// The active preset of the climate device.
-  optional<ClimatePreset> preset;
-
-  /// The active mode of the climate device.
-  ClimateMode mode{CLIMATE_MODE_OFF};
-
-  /// The active state of the climate device.
-  ClimateAction action{CLIMATE_ACTION_OFF};
-
-  /// The active swing mode of the climate device.
-  ClimateSwingMode swing_mode{CLIMATE_SWING_OFF};
-
-  /// Get the active custom fan mode (read-only access).
-  const char *get_custom_fan_mode() const { return this->custom_fan_mode_; }
-
-  /// Get the active custom preset (read-only access).
-  const char *get_custom_preset() const { return this->custom_preset_; }
-
 protected:
  friend ClimateCall;
-  friend struct ClimateDeviceRestoreState;

  /// Set fan mode. Reset custom fan mode. Return true if fan mode has been changed.
  bool set_fan_mode_(ClimateFanMode mode);

  /// Set custom fan mode. Reset primary fan mode. Return true if fan mode has been changed.
-  bool set_custom_fan_mode_(const char *mode);
-  /// Clear custom fan mode.
-  void clear_custom_fan_mode_();
+  bool set_custom_fan_mode_(const std::string &mode);

  /// Set preset. Reset custom preset. Return true if preset has been changed.
  bool set_preset_(ClimatePreset preset);

  /// Set custom preset. Reset primary preset. Return true if preset has been changed.
-  bool set_custom_preset_(const char *preset);
-  /// Clear custom preset.
-  void clear_custom_preset_();
-
-  /// Find and return the matching custom fan mode pointer from traits, or nullptr if not found.
-  const char *find_custom_fan_mode_(const char *custom_fan_mode);
-
-  /// Find and return the matching custom preset pointer from traits, or nullptr if not found.
-  const char *find_custom_preset_(const char *custom_preset);
+  bool set_custom_preset_(const std::string &preset);

  /** Get the default traits of this climate device.
   *
@@ -328,21 +301,6 @@ class Climate : public EntityBase {
  optional<float> visual_current_temperature_step_override_{};
  optional<float> visual_min_humidity_override_{};
  optional<float> visual_max_humidity_override_{};
-
- private:
-  /** The active custom fan mode (private - enforces use of safe setters).
-   *
-   * Points to an entry in traits.supported_custom_fan_modes_ or nullptr.
-   * Use get_custom_fan_mode() to read, set_custom_fan_mode_() to modify.
-   */
-  const char *custom_fan_mode_{nullptr};
-
-  /** The active custom preset (private - enforces use of safe setters).
-   *
-   * Points to an entry in traits.supported_custom_presets_ or nullptr.
-   * Use get_custom_preset() to read, set_custom_preset_() to modify.
-   */
-  const char *custom_preset_{nullptr};
 };

 }  // namespace climate
--- a/esphome/components/climate/climate_mode.h
+++ b/esphome/components/climate/climate_mode.h
@@ -7,7 +7,6 @@ namespace esphome {
 namespace climate {

 /// Enum for all modes a climate device can be in.
-/// NOTE: If adding values, update ClimateModeMask in climate_traits.h to use the new last value
 enum ClimateMode : uint8_t {
  /// The climate device is off
  CLIMATE_MODE_OFF = 0,
@@ -25,7 +24,7 @@ enum ClimateMode : uint8_t {
   * For example, the target temperature can be adjusted based on a schedule, or learned behavior.
   * The target temperature can't be adjusted when in this mode.
   */
-  CLIMATE_MODE_AUTO = 6  // Update ClimateModeMask in climate_traits.h if adding values after this
+  CLIMATE_MODE_AUTO = 6
 };

 /// Enum for the current action of the climate device. Values match those of ClimateMode.
@@ -44,7 +43,6 @@ enum ClimateAction : uint8_t {
  CLIMATE_ACTION_FAN = 6,
 };

-/// NOTE: If adding values, update ClimateFanModeMask in climate_traits.h to use the new last value
 enum ClimateFanMode : uint8_t {
  /// The fan mode is set to On
  CLIMATE_FAN_ON = 0,
@@ -65,11 +63,10 @@ enum ClimateFanMode : uint8_t {
  /// The fan mode is set to Diffuse
  CLIMATE_FAN_DIFFUSE = 8,
  /// The fan mode is set to Quiet
-  CLIMATE_FAN_QUIET = 9,  // Update ClimateFanModeMask in climate_traits.h if adding values after this
+  CLIMATE_FAN_QUIET = 9,
 };

 /// Enum for all modes a climate swing can be in
-/// NOTE: If adding values, update ClimateSwingModeMask in climate_traits.h to use the new last value
 enum ClimateSwingMode : uint8_t {
  /// The swing mode is set to Off
  CLIMATE_SWING_OFF = 0,
@@ -78,11 +75,10 @@ enum ClimateSwingMode : uint8_t {
  /// The fan mode is set to Vertical
  CLIMATE_SWING_VERTICAL = 2,
  /// The fan mode is set to Horizontal
-  CLIMATE_SWING_HORIZONTAL = 3,  // Update ClimateSwingModeMask in climate_traits.h if adding values after this
+  CLIMATE_SWING_HORIZONTAL = 3,
 };

 /// Enum for all preset modes
-/// NOTE: If adding values, update ClimatePresetMask in climate_traits.h to use the new last value
 enum ClimatePreset : uint8_t {
  /// No preset is active
  CLIMATE_PRESET_NONE = 0,
@@ -99,7 +95,7 @@ enum ClimatePreset : uint8_t {
  /// Device is prepared for sleep
  CLIMATE_PRESET_SLEEP = 6,
  /// Device is reacting to activity (e.g., movement sensors)
-  CLIMATE_PRESET_ACTIVITY = 7,  // Update ClimatePresetMask in climate_traits.h if adding values after this
+  CLIMATE_PRESET_ACTIVITY = 7,
 };

 enum ClimateFeature : uint32_t {
--- a/esphome/components/climate/climate_traits.h
+++ b/esphome/components/climate/climate_traits.h
@@ -1,43 +1,19 @@
 #pragma once

-#include <cstring>
-#include <vector>
-#include "climate_mode.h"
-#include "esphome/core/finite_set_mask.h"
 #include "esphome/core/helpers.h"
+#include "climate_mode.h"
+#include <set>

 namespace esphome {
+
+#ifdef USE_API
+namespace api {
+class APIConnection;
+}  // namespace api
+#endif
+
 namespace climate {

-// Type aliases for climate enum bitmasks
-// These replace std::set<EnumType> to eliminate red-black tree overhead
-// For contiguous enums starting at 0, DefaultBitPolicy provides 1:1 mapping (enum value = bit position)
-// Bitmask size is automatically calculated from the last enum value
-using ClimateModeMask = FiniteSetMask<ClimateMode, DefaultBitPolicy<ClimateMode, CLIMATE_MODE_AUTO + 1>>;
-using ClimateFanModeMask = FiniteSetMask<ClimateFanMode, DefaultBitPolicy<ClimateFanMode, CLIMATE_FAN_QUIET + 1>>;
-using ClimateSwingModeMask =
-    FiniteSetMask<ClimateSwingMode, DefaultBitPolicy<ClimateSwingMode, CLIMATE_SWING_HORIZONTAL + 1>>;
-using ClimatePresetMask = FiniteSetMask<ClimatePreset, DefaultBitPolicy<ClimatePreset, CLIMATE_PRESET_ACTIVITY + 1>>;
-
-// Lightweight linear search for small vectors (1-20 items) of const char* pointers
-// Avoids std::find template overhead
-inline bool vector_contains(const std::vector<const char *> &vec, const char *value) {
-  for (const char *item : vec) {
-    if (strcmp(item, value) == 0)
-      return true;
-  }
-  return false;
-}
-
-// Find and return matching pointer from vector, or nullptr if not found
-inline const char *vector_find(const std::vector<const char *> &vec, const char *value) {
-  for (const char *item : vec) {
-    if (strcmp(item, value) == 0)
-      return item;
-  }
-  return nullptr;
-}
-
 /** This class contains all static data for climate devices.
 *
 * All climate devices must support these features:
@@ -65,11 +41,7 @@ inline const char *vector_find(const std::vector<const char *> &vec, const char
 *  - temperature step - the step with which to increase/decrease target temperature.
 *     This also affects with how many decimal places the temperature is shown
 */
-class Climate;  // Forward declaration
-
 class ClimateTraits {
-  friend class Climate;  // Allow Climate to access protected find methods
-
 public:
  /// Get/set feature flags (see ClimateFeatures enum in climate_mode.h)
  uint32_t get_feature_flags() const { return this->feature_flags_; }
@@ -135,74 +107,90 @@ class ClimateTraits {
    }
  }

-  void set_supported_modes(ClimateModeMask modes) { this->supported_modes_ = modes; }
+  void set_supported_modes(std::set<ClimateMode> modes) { this->supported_modes_ = std::move(modes); }
  void add_supported_mode(ClimateMode mode) { this->supported_modes_.insert(mode); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20")
+  void set_supports_auto_mode(bool supports_auto_mode) { set_mode_support_(CLIMATE_MODE_AUTO, supports_auto_mode); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20")
+  void set_supports_cool_mode(bool supports_cool_mode) { set_mode_support_(CLIMATE_MODE_COOL, supports_cool_mode); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20")
+  void set_supports_heat_mode(bool supports_heat_mode) { set_mode_support_(CLIMATE_MODE_HEAT, supports_heat_mode); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20")
+  void set_supports_heat_cool_mode(bool supported) { set_mode_support_(CLIMATE_MODE_HEAT_COOL, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20")
+  void set_supports_fan_only_mode(bool supports_fan_only_mode) {
+    set_mode_support_(CLIMATE_MODE_FAN_ONLY, supports_fan_only_mode);
+  }
+  ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20")
+  void set_supports_dry_mode(bool supports_dry_mode) { set_mode_support_(CLIMATE_MODE_DRY, supports_dry_mode); }
  bool supports_mode(ClimateMode mode) const { return this->supported_modes_.count(mode); }
-  const ClimateModeMask &get_supported_modes() const { return this->supported_modes_; }
+  const std::set<ClimateMode> &get_supported_modes() const { return this->supported_modes_; }

-  void set_supported_fan_modes(ClimateFanModeMask modes) { this->supported_fan_modes_ = modes; }
+  void set_supported_fan_modes(std::set<ClimateFanMode> modes) { this->supported_fan_modes_ = std::move(modes); }
  void add_supported_fan_mode(ClimateFanMode mode) { this->supported_fan_modes_.insert(mode); }
+  void add_supported_custom_fan_mode(const std::string &mode) { this->supported_custom_fan_modes_.insert(mode); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20")
+  void set_supports_fan_mode_on(bool supported) { set_fan_mode_support_(CLIMATE_FAN_ON, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20")
+  void set_supports_fan_mode_off(bool supported) { set_fan_mode_support_(CLIMATE_FAN_OFF, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20")
+  void set_supports_fan_mode_auto(bool supported) { set_fan_mode_support_(CLIMATE_FAN_AUTO, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20")
+  void set_supports_fan_mode_low(bool supported) { set_fan_mode_support_(CLIMATE_FAN_LOW, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20")
+  void set_supports_fan_mode_medium(bool supported) { set_fan_mode_support_(CLIMATE_FAN_MEDIUM, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20")
+  void set_supports_fan_mode_high(bool supported) { set_fan_mode_support_(CLIMATE_FAN_HIGH, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20")
+  void set_supports_fan_mode_middle(bool supported) { set_fan_mode_support_(CLIMATE_FAN_MIDDLE, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20")
+  void set_supports_fan_mode_focus(bool supported) { set_fan_mode_support_(CLIMATE_FAN_FOCUS, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_fan_modes() instead", "v1.20")
+  void set_supports_fan_mode_diffuse(bool supported) { set_fan_mode_support_(CLIMATE_FAN_DIFFUSE, supported); }
  bool supports_fan_mode(ClimateFanMode fan_mode) const { return this->supported_fan_modes_.count(fan_mode); }
  bool get_supports_fan_modes() const {
    return !this->supported_fan_modes_.empty() || !this->supported_custom_fan_modes_.empty();
  }
-  const ClimateFanModeMask &get_supported_fan_modes() const { return this->supported_fan_modes_; }
+  const std::set<ClimateFanMode> &get_supported_fan_modes() const { return this->supported_fan_modes_; }

-  void set_supported_custom_fan_modes(std::initializer_list<const char *> modes) {
-    this->supported_custom_fan_modes_ = modes;
-  }
-  void set_supported_custom_fan_modes(const std::vector<const char *> &modes) {
-    this->supported_custom_fan_modes_ = modes;
-  }
-  template<size_t N> void set_supported_custom_fan_modes(const char *const (&modes)[N]) {
-    this->supported_custom_fan_modes_.assign(modes, modes + N);
-  }
-
-  // Deleted overloads to catch incorrect std::string usage at compile time with clear error messages
-  void set_supported_custom_fan_modes(const std::vector<std::string> &modes) = delete;
-  void set_supported_custom_fan_modes(std::initializer_list<std::string> modes) = delete;
-
-  const std::vector<const char *> &get_supported_custom_fan_modes() const { return this->supported_custom_fan_modes_; }
-  bool supports_custom_fan_mode(const char *custom_fan_mode) const {
-    return vector_contains(this->supported_custom_fan_modes_, custom_fan_mode);
+  void set_supported_custom_fan_modes(std::set<std::string> supported_custom_fan_modes) {
+    this->supported_custom_fan_modes_ = std::move(supported_custom_fan_modes);
  }
+  const std::set<std::string> &get_supported_custom_fan_modes() const { return this->supported_custom_fan_modes_; }
  bool supports_custom_fan_mode(const std::string &custom_fan_mode) const {
-    return this->supports_custom_fan_mode(custom_fan_mode.c_str());
+    return this->supported_custom_fan_modes_.count(custom_fan_mode);
  }

-  void set_supported_presets(ClimatePresetMask presets) { this->supported_presets_ = presets; }
+  void set_supported_presets(std::set<ClimatePreset> presets) { this->supported_presets_ = std::move(presets); }
  void add_supported_preset(ClimatePreset preset) { this->supported_presets_.insert(preset); }
+  void add_supported_custom_preset(const std::string &preset) { this->supported_custom_presets_.insert(preset); }
  bool supports_preset(ClimatePreset preset) const { return this->supported_presets_.count(preset); }
  bool get_supports_presets() const { return !this->supported_presets_.empty(); }
-  const ClimatePresetMask &get_supported_presets() const { return this->supported_presets_; }
+  const std::set<climate::ClimatePreset> &get_supported_presets() const { return this->supported_presets_; }

-  void set_supported_custom_presets(std::initializer_list<const char *> presets) {
-    this->supported_custom_presets_ = presets;
-  }
-  void set_supported_custom_presets(const std::vector<const char *> &presets) {
-    this->supported_custom_presets_ = presets;
-  }
-  template<size_t N> void set_supported_custom_presets(const char *const (&presets)[N]) {
-    this->supported_custom_presets_.assign(presets, presets + N);
-  }
-
-  // Deleted overloads to catch incorrect std::string usage at compile time with clear error messages
-  void set_supported_custom_presets(const std::vector<std::string> &presets) = delete;
-  void set_supported_custom_presets(std::initializer_list<std::string> presets) = delete;
-
-  const std::vector<const char *> &get_supported_custom_presets() const { return this->supported_custom_presets_; }
-  bool supports_custom_preset(const char *custom_preset) const {
-    return vector_contains(this->supported_custom_presets_, custom_preset);
+  void set_supported_custom_presets(std::set<std::string> supported_custom_presets) {
+    this->supported_custom_presets_ = std::move(supported_custom_presets);
  }
+  const std::set<std::string> &get_supported_custom_presets() const { return this->supported_custom_presets_; }
  bool supports_custom_preset(const std::string &custom_preset) const {
-    return this->supports_custom_preset(custom_preset.c_str());
+    return this->supported_custom_presets_.count(custom_preset);
  }

-  void set_supported_swing_modes(ClimateSwingModeMask modes) { this->supported_swing_modes_ = modes; }
+  void set_supported_swing_modes(std::set<ClimateSwingMode> modes) { this->supported_swing_modes_ = std::move(modes); }
  void add_supported_swing_mode(ClimateSwingMode mode) { this->supported_swing_modes_.insert(mode); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_swing_modes() instead", "v1.20")
+  void set_supports_swing_mode_off(bool supported) { set_swing_mode_support_(CLIMATE_SWING_OFF, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_swing_modes() instead", "v1.20")
+  void set_supports_swing_mode_both(bool supported) { set_swing_mode_support_(CLIMATE_SWING_BOTH, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_swing_modes() instead", "v1.20")
+  void set_supports_swing_mode_vertical(bool supported) { set_swing_mode_support_(CLIMATE_SWING_VERTICAL, supported); }
+  ESPDEPRECATED("This method is deprecated, use set_supported_swing_modes() instead", "v1.20")
+  void set_supports_swing_mode_horizontal(bool supported) {
+    set_swing_mode_support_(CLIMATE_SWING_HORIZONTAL, supported);
+  }
  bool supports_swing_mode(ClimateSwingMode swing_mode) const { return this->supported_swing_modes_.count(swing_mode); }
  bool get_supports_swing_modes() const { return !this->supported_swing_modes_.empty(); }
-  const ClimateSwingModeMask &get_supported_swing_modes() const { return this->supported_swing_modes_; }
+  const std::set<ClimateSwingMode> &get_supported_swing_modes() const { return this->supported_swing_modes_; }

  float get_visual_min_temperature() const { return this->visual_min_temperature_; }
  void set_visual_min_temperature(float visual_min_temperature) {
@@ -233,6 +221,23 @@ class ClimateTraits {
  void set_visual_max_humidity(float visual_max_humidity) { this->visual_max_humidity_ = visual_max_humidity; }

 protected:
+#ifdef USE_API
+  // The API connection is a friend class to access internal methods
+  friend class api::APIConnection;
+  // These methods return references to internal data structures.
+  // They are used by the API to avoid copying data when encoding messages.
+  // Warning: Do not use these methods outside of the API connection code.
+  // They return references to internal data that can be invalidated.
+  const std::set<ClimateMode> &get_supported_modes_for_api_() const { return this->supported_modes_; }
+  const std::set<ClimateFanMode> &get_supported_fan_modes_for_api_() const { return this->supported_fan_modes_; }
+  const std::set<std::string> &get_supported_custom_fan_modes_for_api_() const {
+    return this->supported_custom_fan_modes_;
+  }
+  const std::set<climate::ClimatePreset> &get_supported_presets_for_api_() const { return this->supported_presets_; }
+  const std::set<std::string> &get_supported_custom_presets_for_api_() const { return this->supported_custom_presets_; }
+  const std::set<ClimateSwingMode> &get_supported_swing_modes_for_api_() const { return this->supported_swing_modes_; }
+#endif
+
  void set_mode_support_(climate::ClimateMode mode, bool supported) {
    if (supported) {
      this->supported_modes_.insert(mode);
@@ -255,18 +260,6 @@ class ClimateTraits {
    }
  }

-  /// Find and return the matching custom fan mode pointer from supported modes, or nullptr if not found
-  /// This is protected as it's an implementation detail - use Climate::find_custom_fan_mode_() instead
-  const char *find_custom_fan_mode_(const char *custom_fan_mode) const {
-    return vector_find(this->supported_custom_fan_modes_, custom_fan_mode);
-  }
-
-  /// Find and return the matching custom preset pointer from supported presets, or nullptr if not found
-  /// This is protected as it's an implementation detail - use Climate::find_custom_preset_() instead
-  const char *find_custom_preset_(const char *custom_preset) const {
-    return vector_find(this->supported_custom_presets_, custom_preset);
-  }
-
  uint32_t feature_flags_{0};
  float visual_min_temperature_{10};
  float visual_max_temperature_{30};
@@ -275,21 +268,12 @@ class ClimateTraits {
  float visual_min_humidity_{30};
  float visual_max_humidity_{99};

-  climate::ClimateModeMask supported_modes_{climate::CLIMATE_MODE_OFF};
-  climate::ClimateFanModeMask supported_fan_modes_;
-  climate::ClimateSwingModeMask supported_swing_modes_;
-  climate::ClimatePresetMask supported_presets_;
-
-  /** Custom mode storage using const char* pointers to eliminate std::string overhead.
-   *
-   * Pointers must remain valid for the ClimateTraits lifetime. Safe patterns:
-   *  - String literals: set_supported_custom_fan_modes({"Turbo", "Silent"})
-   *  - Static const data: static const char* MODE = "Eco";
-   *
-   * Climate class setters validate pointers are from these vectors before storing.
-   */
-  std::vector<const char *> supported_custom_fan_modes_;
-  std::vector<const char *> supported_custom_presets_;
+  std::set<climate::ClimateMode> supported_modes_ = {climate::CLIMATE_MODE_OFF};
+  std::set<climate::ClimateFanMode> supported_fan_modes_;
+  std::set<climate::ClimateSwingMode> supported_swing_modes_;
+  std::set<climate::ClimatePreset> supported_presets_;
+  std::set<std::string> supported_custom_fan_modes_;
+  std::set<std::string> supported_custom_presets_;
 };

 }  // namespace climate
--- a/esphome/components/climate_ir/init.py
+++ b/esphome/components/climate_ir/init.py
@@ -1,9 +1,10 @@
 import logging

+from esphome import core
 import esphome.codegen as cg
 from esphome.components import climate, remote_base, sensor
 import esphome.config_validation as cv
-from esphome.const import CONF_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
+from esphome.const import CONF_ID, CONF_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
 from esphome.cpp_generator import MockObjClass

 _LOGGER = logging.getLogger(__name__)
@@ -51,6 +52,26 @@ def climate_ir_with_receiver_schema(
    )


+# Remove before 2025.11.0
+def deprecated_schema_constant(config):
+    type: str = "unknown"
+    if (id := config.get(CONF_ID)) is not None and isinstance(id, core.ID):
+        type = str(id.type).split("::", maxsplit=1)[0]
+    _LOGGER.warning(
+        "Using `climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA` is deprecated and will be removed in ESPHome 2025.11.0. "
+        "Please use `climate_ir.climate_ir_with_receiver_schema(...)` instead. "
+        "If you are seeing this, report an issue to the external_component author and ask them to update it. "
+        "https://developers.esphome.io/blog/2025/05/14/_schema-deprecations/. "
+        "Component using this schema: %s",
+        type,
+    )
+    return config
+
+
+CLIMATE_IR_WITH_RECEIVER_SCHEMA = climate_ir_with_receiver_schema(ClimateIR)
+CLIMATE_IR_WITH_RECEIVER_SCHEMA.add_extra(deprecated_schema_constant)
+
+
 async def register_climate_ir(var, config):
    await cg.register_component(var, config)
    await remote_base.register_transmittable(var, config)
--- a/esphome/components/climate_ir/climate_ir.cpp
+++ b/esphome/components/climate_ir/climate_ir.cpp
@@ -8,10 +8,7 @@ static const char *const TAG = "climate_ir";

 climate::ClimateTraits ClimateIR::traits() {
  auto traits = climate::ClimateTraits();
-  if (this->sensor_ != nullptr) {
-    traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE);
-  }
-
+  traits.set_supports_current_temperature(this->sensor_ != nullptr);
  traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::CLIMATE_MODE_HEAT_COOL});
  if (this->supports_cool_)
    traits.add_supported_mode(climate::CLIMATE_MODE_COOL);
@@ -22,6 +19,7 @@ climate::ClimateTraits ClimateIR::traits() {
  if (this->supports_fan_only_)
    traits.add_supported_mode(climate::CLIMATE_MODE_FAN_ONLY);

+  traits.set_supports_two_point_target_temperature(false);
  traits.set_visual_min_temperature(this->minimum_temperature_);
  traits.set_visual_max_temperature(this->maximum_temperature_);
  traits.set_visual_temperature_step(this->temperature_step_);
--- a/esphome/components/climate_ir/climate_ir.h
+++ b/esphome/components/climate_ir/climate_ir.h
@@ -24,18 +24,16 @@ class ClimateIR : public Component,
                  public remote_base::RemoteTransmittable {
 public:
  ClimateIR(float minimum_temperature, float maximum_temperature, float temperature_step = 1.0f,
-            bool supports_dry = false, bool supports_fan_only = false,
-            climate::ClimateFanModeMask fan_modes = climate::ClimateFanModeMask(),
-            climate::ClimateSwingModeMask swing_modes = climate::ClimateSwingModeMask(),
-            climate::ClimatePresetMask presets = climate::ClimatePresetMask()) {
+            bool supports_dry = false, bool supports_fan_only = false, std::set<climate::ClimateFanMode> fan_modes = {},
+            std::set<climate::ClimateSwingMode> swing_modes = {}, std::set<climate::ClimatePreset> presets = {}) {
    this->minimum_temperature_ = minimum_temperature;
    this->maximum_temperature_ = maximum_temperature;
    this->temperature_step_ = temperature_step;
    this->supports_dry_ = supports_dry;
    this->supports_fan_only_ = supports_fan_only;
-    this->fan_modes_ = fan_modes;
-    this->swing_modes_ = swing_modes;
-    this->presets_ = presets;
+    this->fan_modes_ = std::move(fan_modes);
+    this->swing_modes_ = std::move(swing_modes);
+    this->presets_ = std::move(presets);
  }

  void setup() override;
@@ -62,9 +60,9 @@ class ClimateIR : public Component,
  bool supports_heat_{true};
  bool supports_dry_{false};
  bool supports_fan_only_{false};
-  climate::ClimateFanModeMask fan_modes_{};
-  climate::ClimateSwingModeMask swing_modes_{};
-  climate::ClimatePresetMask presets_{};
+  std::set<climate::ClimateFanMode> fan_modes_ = {};
+  std::set<climate::ClimateSwingMode> swing_modes_ = {};
+  std::set<climate::ClimatePreset> presets_ = {};

  sensor::Sensor *sensor_{nullptr};
 };
--- a/esphome/components/cm1106/cm1106.h
+++ b/esphome/components/cm1106/cm1106.h
@@ -30,7 +30,7 @@ template<typename... Ts> class CM1106CalibrateZeroAction : public Action<Ts...>
 public:
  CM1106CalibrateZeroAction(CM1106Component *cm1106) : cm1106_(cm1106) {}

-  void play(const Ts &...x) override { this->cm1106_->calibrate_zero(400); }
+  void play(Ts... x) override { this->cm1106_->calibrate_zero(400); }

 protected:
  CM1106Component *cm1106_;
--- a/esphome/components/const/init.py
+++ b/esphome/components/const/init.py
@@ -8,9 +8,7 @@ BYTE_ORDER_BIG = "big_endian"

 CONF_COLOR_DEPTH = "color_depth"
 CONF_DRAW_ROUNDING = "draw_rounding"
-CONF_ENABLED = "enabled"
 CONF_ON_RECEIVE = "on_receive"
 CONF_ON_STATE_CHANGE = "on_state_change"
 CONF_REQUEST_HEADERS = "request_headers"
-CONF_ROWS = "rows"
 CONF_USE_PSRAM = "use_psram"
--- a/esphome/components/copy/fan/copy_fan.cpp
+++ b/esphome/components/copy/fan/copy_fan.cpp
@@ -12,7 +12,7 @@ void CopyFan::setup() {
    this->oscillating = source_->oscillating;
    this->speed = source_->speed;
    this->direction = source_->direction;
-    this->set_preset_mode_(source_->get_preset_mode());
+    this->preset_mode = source_->preset_mode;
    this->publish_state();
  });

@@ -20,7 +20,7 @@ void CopyFan::setup() {
  this->oscillating = source_->oscillating;
  this->speed = source_->speed;
  this->direction = source_->direction;
-  this->set_preset_mode_(source_->get_preset_mode());
+  this->preset_mode = source_->preset_mode;
  this->publish_state();
 }

@@ -49,7 +49,7 @@ void CopyFan::control(const fan::FanCall &call) {
    call2.set_speed(*call.get_speed());
  if (call.get_direction().has_value())
    call2.set_direction(*call.get_direction());
-  if (call.has_preset_mode())
+  if (!call.get_preset_mode().empty())
    call2.set_preset_mode(call.get_preset_mode());
  call2.perform();
 }
--- a/esphome/components/copy/select/copy_select.cpp
+++ b/esphome/components/copy/select/copy_select.cpp
@@ -7,19 +7,19 @@ namespace copy {
 static const char *const TAG = "copy.select";

 void CopySelect::setup() {
-  source_->add_on_state_callback([this](const std::string &value, size_t index) { this->publish_state(index); });
+  source_->add_on_state_callback([this](const std::string &value, size_t index) { this->publish_state(value); });

  traits.set_options(source_->traits.get_options());

  if (source_->has_state())
-    this->publish_state(source_->active_index().value());
+    this->publish_state(source_->state);
 }

 void CopySelect::dump_config() { LOG_SELECT("", "Copy Select", this); }

-void CopySelect::control(size_t index) {
+void CopySelect::control(const std::string &value) {
  auto call = source_->make_call();
-  call.set_index(index);
+  call.set_option(value);
  call.perform();
 }

--- a/esphome/components/copy/select/copy_select.h
+++ b/esphome/components/copy/select/copy_select.h
@@ -13,7 +13,7 @@ class CopySelect : public select::Select, public Component {
  void dump_config() override;

 protected:
-  void control(size_t index) override;
+  void control(const std::string &value) override;

  select::Select *source_;
 };
--- a/esphome/components/cover/init.py
+++ b/esphome/components/cover/init.py
@@ -151,6 +151,11 @@ def cover_schema(
    return _COVER_SCHEMA.extend(schema)


+# Remove before 2025.11.0
+COVER_SCHEMA = cover_schema(Cover)
+COVER_SCHEMA.add_extra(cv.deprecated_schema_constant("cover"))
+
+
 async def setup_cover_core_(var, config):
    await setup_entity(var, config, "cover")

--- a/esphome/components/cover/automation.h
+++ b/esphome/components/cover/automation.h
@@ -11,7 +11,7 @@ template<typename... Ts> class OpenAction : public Action<Ts...> {
 public:
  explicit OpenAction(Cover *cover) : cover_(cover) {}

-  void play(const Ts &...x) override { this->cover_->make_call().set_command_open().perform(); }
+  void play(Ts... x) override { this->cover_->make_call().set_command_open().perform(); }

 protected:
  Cover *cover_;
@@ -21,7 +21,7 @@ template<typename... Ts> class CloseAction : public Action<Ts...> {
 public:
  explicit CloseAction(Cover *cover) : cover_(cover) {}

-  void play(const Ts &...x) override { this->cover_->make_call().set_command_close().perform(); }
+  void play(Ts... x) override { this->cover_->make_call().set_command_close().perform(); }

 protected:
  Cover *cover_;
@@ -31,7 +31,7 @@ template<typename... Ts> class StopAction : public Action<Ts...> {
 public:
  explicit StopAction(Cover *cover) : cover_(cover) {}

-  void play(const Ts &...x) override { this->cover_->make_call().set_command_stop().perform(); }
+  void play(Ts... x) override { this->cover_->make_call().set_command_stop().perform(); }

 protected:
  Cover *cover_;
@@ -41,7 +41,7 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
 public:
  explicit ToggleAction(Cover *cover) : cover_(cover) {}

-  void play(const Ts &...x) override { this->cover_->make_call().set_command_toggle().perform(); }
+  void play(Ts... x) override { this->cover_->make_call().set_command_toggle().perform(); }

 protected:
  Cover *cover_;
@@ -55,7 +55,7 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
  TEMPLATABLE_VALUE(float, position)
  TEMPLATABLE_VALUE(float, tilt)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto call = this->cover_->make_call();
    if (this->stop_.has_value())
      call.set_stop(this->stop_.value(x...));
@@ -77,7 +77,7 @@ template<typename... Ts> class CoverPublishAction : public Action<Ts...> {
  TEMPLATABLE_VALUE(float, tilt)
  TEMPLATABLE_VALUE(CoverOperation, current_operation)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    if (this->position_.has_value())
      this->cover_->position = this->position_.value(x...);
    if (this->tilt_.has_value())
@@ -94,7 +94,7 @@ template<typename... Ts> class CoverPublishAction : public Action<Ts...> {
 template<typename... Ts> class CoverIsOpenCondition : public Condition<Ts...> {
 public:
  CoverIsOpenCondition(Cover *cover) : cover_(cover) {}
-  bool check(const Ts &...x) override { return this->cover_->is_fully_open(); }
+  bool check(Ts... x) override { return this->cover_->is_fully_open(); }

 protected:
  Cover *cover_;
@@ -103,7 +103,7 @@ template<typename... Ts> class CoverIsOpenCondition : public Condition<Ts...> {
 template<typename... Ts> class CoverIsClosedCondition : public Condition<Ts...> {
 public:
  CoverIsClosedCondition(Cover *cover) : cover_(cover) {}
-  bool check(const Ts &...x) override { return this->cover_->is_fully_closed(); }
+  bool check(Ts... x) override { return this->cover_->is_fully_closed(); }

 protected:
  Cover *cover_;
--- a/esphome/components/cover/cover.cpp
+++ b/esphome/components/cover/cover.cpp
@@ -1,6 +1,6 @@
 #include "cover.h"
-#include <strings.h>
 #include "esphome/core/log.h"
+#include <strings.h>

 namespace esphome {
 namespace cover {
@@ -144,7 +144,21 @@ CoverCall &CoverCall::set_stop(bool stop) {
 bool CoverCall::get_stop() const { return this->stop_; }

 CoverCall Cover::make_call() { return {this}; }
-
+void Cover::open() {
+  auto call = this->make_call();
+  call.set_command_open();
+  call.perform();
+}
+void Cover::close() {
+  auto call = this->make_call();
+  call.set_command_close();
+  call.perform();
+}
+void Cover::stop() {
+  auto call = this->make_call();
+  call.set_command_stop();
+  call.perform();
+}
 void Cover::add_on_state_callback(std::function<void()> &&f) { this->state_callback_.add(std::move(f)); }
 void Cover::publish_state(bool save) {
  this->position = clamp(this->position, 0.0f, 1.0f);
--- a/esphome/components/cover/cover.h
+++ b/esphome/components/cover/cover.h
@@ -4,7 +4,6 @@
 #include "esphome/core/entity_base.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/preferences.h"
-
 #include "cover_traits.h"

 namespace esphome {
@@ -126,6 +125,25 @@ class Cover : public EntityBase, public EntityBase_DeviceClass {

  /// Construct a new cover call used to control the cover.
  CoverCall make_call();
+  /** Open the cover.
+   *
+   * This is a legacy method and may be removed later, please use `.make_call()` instead.
+   */
+  ESPDEPRECATED("open() is deprecated, use make_call().set_command_open().perform() instead.", "2021.9")
+  void open();
+  /** Close the cover.
+   *
+   * This is a legacy method and may be removed later, please use `.make_call()` instead.
+   */
+  ESPDEPRECATED("close() is deprecated, use make_call().set_command_close().perform() instead.", "2021.9")
+  void close();
+  /** Stop the cover.
+   *
+   * This is a legacy method and may be removed later, please use `.make_call()` instead.
+   * As per solution from issue #2885 the call should include perform()
+   */
+  ESPDEPRECATED("stop() is deprecated, use make_call().set_command_stop().perform() instead.", "2021.9")
+  void stop();

  void add_on_state_callback(std::function<void()> &&f);

--- a/esphome/components/cs5460a/cs5460a.h
+++ b/esphome/components/cs5460a/cs5460a.h
@@ -114,7 +114,7 @@ template<typename... Ts> class CS5460ARestartAction : public Action<Ts...> {
 public:
  CS5460ARestartAction(CS5460AComponent *cs5460a) : cs5460a_(cs5460a) {}

-  void play(const Ts &...x) override { cs5460a_->restart(); }
+  void play(Ts... x) override { cs5460a_->restart(); }

 protected:
  CS5460AComponent *cs5460a_;
--- a/esphome/components/daikin_arc/daikin_arc.cpp
+++ b/esphome/components/daikin_arc/daikin_arc.cpp
@@ -241,7 +241,9 @@ uint8_t DaikinArcClimate::humidity_() {

 climate::ClimateTraits DaikinArcClimate::traits() {
  climate::ClimateTraits traits = climate_ir::ClimateIR::traits();
-  traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE | climate::CLIMATE_SUPPORTS_TARGET_HUMIDITY);
+  traits.set_supports_current_temperature(true);
+  traits.set_supports_current_humidity(false);
+  traits.set_supports_target_humidity(true);
  traits.set_visual_min_humidity(38);
  traits.set_visual_max_humidity(52);
  return traits;
--- a/esphome/components/dallas_temp/dallas_temp.cpp
+++ b/esphome/components/dallas_temp/dallas_temp.cpp
@@ -70,7 +70,7 @@ bool DallasTemperatureSensor::read_scratch_pad_() {
 }

 void DallasTemperatureSensor::setup() {
-  if (!this->check_address_or_index_())
+  if (!this->check_address_())
    return;
  if (!this->read_scratch_pad_())
    return;
--- a/esphome/components/datetime/date_entity.h
+++ b/esphome/components/datetime/date_entity.h
@@ -101,7 +101,7 @@ template<typename... Ts> class DateSetAction : public Action<Ts...>, public Pare
 public:
  TEMPLATABLE_VALUE(ESPTime, date)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto call = this->parent_->make_call();

    if (this->date_.has_value()) {
--- a/esphome/components/datetime/datetime_entity.h
+++ b/esphome/components/datetime/datetime_entity.h
@@ -124,7 +124,7 @@ template<typename... Ts> class DateTimeSetAction : public Action<Ts...>, public
 public:
  TEMPLATABLE_VALUE(ESPTime, datetime)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto call = this->parent_->make_call();

    if (this->datetime_.has_value()) {
--- a/esphome/components/datetime/time_entity.h
+++ b/esphome/components/datetime/time_entity.h
@@ -103,7 +103,7 @@ template<typename... Ts> class TimeSetAction : public Action<Ts...>, public Pare
 public:
  TEMPLATABLE_VALUE(ESPTime, time)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto call = this->parent_->make_call();

    if (this->time_.has_value()) {
--- a/esphome/components/debug/debug_zephyr.cpp
+++ b/esphome/components/debug/debug_zephyr.cpp
@@ -8,7 +8,8 @@

 #define BOOTLOADER_VERSION_REGISTER NRF_TIMER2->CC[0]

-namespace esphome::debug {
+namespace esphome {
+namespace debug {

 static const char *const TAG = "debug";
 constexpr std::uintptr_t MBR_PARAM_PAGE_ADDR = 0xFFC;
@@ -280,18 +281,14 @@ void DebugComponent::get_device_info_(std::string &device_info) {
           NRF_FICR->INFO.VARIANT & 0xFF, package(NRF_FICR->INFO.PACKAGE));
  ESP_LOGD(TAG, "RAM: %ukB, Flash: %ukB, production test: %sdone", NRF_FICR->INFO.RAM, NRF_FICR->INFO.FLASH,
           (NRF_FICR->PRODTEST[0] == 0xBB42319F ? "" : "not "));
-  bool n_reset_enabled = NRF_UICR->PSELRESET[0] == NRF_UICR->PSELRESET[1] &&
-                         (NRF_UICR->PSELRESET[0] & UICR_PSELRESET_CONNECT_Msk) == UICR_PSELRESET_CONNECT_Connected
-                                                                                      << UICR_PSELRESET_CONNECT_Pos;
  ESP_LOGD(
      TAG, "GPIO as NFC pins: %s, GPIO as nRESET pin: %s",
      YESNO((NRF_UICR->NFCPINS & UICR_NFCPINS_PROTECT_Msk) == (UICR_NFCPINS_PROTECT_NFC << UICR_NFCPINS_PROTECT_Pos)),
-      YESNO(n_reset_enabled));
-  if (n_reset_enabled) {
-    uint8_t port = (NRF_UICR->PSELRESET[0] & UICR_PSELRESET_PORT_Msk) >> UICR_PSELRESET_PORT_Pos;
-    uint8_t pin = (NRF_UICR->PSELRESET[0] & UICR_PSELRESET_PIN_Msk) >> UICR_PSELRESET_PIN_Pos;
-    ESP_LOGD(TAG, "nRESET port P%u.%02u", port, pin);
-  }
+      YESNO(((NRF_UICR->PSELRESET[0] & UICR_PSELRESET_CONNECT_Msk) !=
+             (UICR_PSELRESET_CONNECT_Connected << UICR_PSELRESET_CONNECT_Pos)) ||
+            ((NRF_UICR->PSELRESET[1] & UICR_PSELRESET_CONNECT_Msk) !=
+             (UICR_PSELRESET_CONNECT_Connected << UICR_PSELRESET_CONNECT_Pos))));
+
 #ifdef USE_BOOTLOADER_MCUBOOT
  ESP_LOGD(TAG, "bootloader: mcuboot");
 #else
@@ -325,22 +322,10 @@ void DebugComponent::get_device_info_(std::string &device_info) {
 #endif
  }
 #endif
-  auto uicr = [](volatile uint32_t *data, uint8_t size) {
-    std::string res;
-    char buf[sizeof(uint32_t) * 2 + 1];
-    for (size_t i = 0; i < size; i++) {
-      if (i > 0) {
-        res += ' ';
-      }
-      res += format_hex_pretty<uint32_t>(data[i], '\0', false);
-    }
-    return res;
-  };
-  ESP_LOGD(TAG, "NRFFW %s", uicr(NRF_UICR->NRFFW, 13).c_str());
-  ESP_LOGD(TAG, "NRFHW %s", uicr(NRF_UICR->NRFHW, 12).c_str());
 }

 void DebugComponent::update_platform_() {}

-}  // namespace esphome::debug
+}  // namespace debug
+}  // namespace esphome
 #endif
--- a/esphome/components/deep_sleep/deep_sleep_component.h
+++ b/esphome/components/deep_sleep/deep_sleep_component.h
@@ -148,7 +148,7 @@ template<typename... Ts> class EnterDeepSleepAction : public Action<Ts...> {
  void set_time(time::RealTimeClock *time) { this->time_ = time; }
 #endif

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    if (this->sleep_duration_.has_value()) {
      this->deep_sleep_->set_sleep_duration(this->sleep_duration_.value(x...));
    }
@@ -207,12 +207,12 @@ template<typename... Ts> class EnterDeepSleepAction : public Action<Ts...> {

 template<typename... Ts> class PreventDeepSleepAction : public Action<Ts...>, public Parented<DeepSleepComponent> {
 public:
-  void play(const Ts &...x) override { this->parent_->prevent_deep_sleep(); }
+  void play(Ts... x) override { this->parent_->prevent_deep_sleep(); }
 };

 template<typename... Ts> class AllowDeepSleepAction : public Action<Ts...>, public Parented<DeepSleepComponent> {
 public:
-  void play(const Ts &...x) override { this->parent_->allow_deep_sleep(); }
+  void play(Ts... x) override { this->parent_->allow_deep_sleep(); }
 };

 }  // namespace deep_sleep
--- a/esphome/components/demo/demo_climate.h
+++ b/esphome/components/demo/demo_climate.h
@@ -28,16 +28,16 @@ class DemoClimate : public climate::Climate, public Component {
        this->mode = climate::CLIMATE_MODE_AUTO;
        this->action = climate::CLIMATE_ACTION_COOLING;
        this->fan_mode = climate::CLIMATE_FAN_HIGH;
-        this->set_custom_preset_("My Preset");
+        this->custom_preset = {"My Preset"};
        break;
      case DemoClimateType::TYPE_3:
        this->current_temperature = 21.5;
        this->target_temperature_low = 21.0;
        this->target_temperature_high = 22.5;
        this->mode = climate::CLIMATE_MODE_HEAT_COOL;
-        this->set_custom_fan_mode_("Auto Low");
+        this->custom_fan_mode = {"Auto Low"};
        this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;
-        this->set_preset_(climate::CLIMATE_PRESET_AWAY);
+        this->preset = climate::CLIMATE_PRESET_AWAY;
        break;
    }
    this->publish_state();
@@ -58,19 +58,23 @@ class DemoClimate : public climate::Climate, public Component {
      this->target_temperature_high = *call.get_target_temperature_high();
    }
    if (call.get_fan_mode().has_value()) {
-      this->set_fan_mode_(*call.get_fan_mode());
+      this->fan_mode = *call.get_fan_mode();
+      this->custom_fan_mode.reset();
    }
    if (call.get_swing_mode().has_value()) {
      this->swing_mode = *call.get_swing_mode();
    }
-    if (call.has_custom_fan_mode()) {
-      this->set_custom_fan_mode_(call.get_custom_fan_mode());
+    if (call.get_custom_fan_mode().has_value()) {
+      this->custom_fan_mode = *call.get_custom_fan_mode();
+      this->fan_mode.reset();
    }
    if (call.get_preset().has_value()) {
-      this->set_preset_(*call.get_preset());
+      this->preset = *call.get_preset();
+      this->custom_preset.reset();
    }
-    if (call.has_custom_preset()) {
-      this->set_custom_preset_(call.get_custom_preset());
+    if (call.get_custom_preset().has_value()) {
+      this->custom_preset = *call.get_custom_preset();
+      this->preset.reset();
    }
    this->publish_state();
  }
@@ -78,14 +82,16 @@ class DemoClimate : public climate::Climate, public Component {
    climate::ClimateTraits traits{};
    switch (type_) {
      case DemoClimateType::TYPE_1:
-        traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE | climate::CLIMATE_SUPPORTS_ACTION);
+        traits.set_supports_current_temperature(true);
        traits.set_supported_modes({
            climate::CLIMATE_MODE_OFF,
            climate::CLIMATE_MODE_HEAT,
        });
+        traits.set_supports_action(true);
        traits.set_visual_temperature_step(0.5);
        break;
      case DemoClimateType::TYPE_2:
+        traits.set_supports_current_temperature(false);
        traits.set_supported_modes({
            climate::CLIMATE_MODE_OFF,
            climate::CLIMATE_MODE_HEAT,
@@ -94,7 +100,7 @@ class DemoClimate : public climate::Climate, public Component {
            climate::CLIMATE_MODE_DRY,
            climate::CLIMATE_MODE_FAN_ONLY,
        });
-        traits.add_feature_flags(climate::CLIMATE_SUPPORTS_ACTION);
+        traits.set_supports_action(true);
        traits.set_supported_fan_modes({
            climate::CLIMATE_FAN_ON,
            climate::CLIMATE_FAN_OFF,
@@ -117,8 +123,8 @@ class DemoClimate : public climate::Climate, public Component {
        traits.set_supported_custom_presets({"My Preset"});
        break;
      case DemoClimateType::TYPE_3:
-        traits.add_feature_flags(climate::CLIMATE_SUPPORTS_CURRENT_TEMPERATURE |
-                                 climate::CLIMATE_SUPPORTS_TWO_POINT_TARGET_TEMPERATURE);
+        traits.set_supports_current_temperature(true);
+        traits.set_supports_two_point_target_temperature(true);
        traits.set_supported_modes({
            climate::CLIMATE_MODE_OFF,
            climate::CLIMATE_MODE_COOL,
--- a/esphome/components/dfplayer/dfplayer.h
+++ b/esphome/components/dfplayer/dfplayer.h
@@ -77,7 +77,7 @@ class DFPlayer : public uart::UARTDevice, public Component {
  class ACTION_CLASS : /* NOLINT */ \
                       public Action<Ts...>, \
                       public Parented<DFPlayer> { \
-    void play(const Ts &...x) override { this->parent_->ACTION_METHOD(); } \
+    void play(Ts... x) override { this->parent_->ACTION_METHOD(); } \
  };

 DFPLAYER_SIMPLE_ACTION(NextAction, next)
@@ -87,7 +87,7 @@ template<typename... Ts> class PlayMp3Action : public Action<Ts...>, public Pare
 public:
  TEMPLATABLE_VALUE(uint16_t, file)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto file = this->file_.value(x...);
    this->parent_->play_mp3(file);
  }
@@ -98,7 +98,7 @@ template<typename... Ts> class PlayFileAction : public Action<Ts...>, public Par
  TEMPLATABLE_VALUE(uint16_t, file)
  TEMPLATABLE_VALUE(bool, loop)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto file = this->file_.value(x...);
    auto loop = this->loop_.value(x...);
    if (loop) {
@@ -115,7 +115,7 @@ template<typename... Ts> class PlayFolderAction : public Action<Ts...>, public P
  TEMPLATABLE_VALUE(uint16_t, file)
  TEMPLATABLE_VALUE(bool, loop)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto folder = this->folder_.value(x...);
    auto file = this->file_.value(x...);
    auto loop = this->loop_.value(x...);
@@ -131,7 +131,7 @@ template<typename... Ts> class SetDeviceAction : public Action<Ts...>, public Pa
 public:
  TEMPLATABLE_VALUE(Device, device)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto device = this->device_.value(x...);
    this->parent_->set_device(device);
  }
@@ -141,7 +141,7 @@ template<typename... Ts> class SetVolumeAction : public Action<Ts...>, public Pa
 public:
  TEMPLATABLE_VALUE(uint8_t, volume)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto volume = this->volume_.value(x...);
    this->parent_->set_volume(volume);
  }
@@ -151,7 +151,7 @@ template<typename... Ts> class SetEqAction : public Action<Ts...>, public Parent
 public:
  TEMPLATABLE_VALUE(EqPreset, eq)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto eq = this->eq_.value(x...);
    this->parent_->set_eq(eq);
  }
@@ -168,7 +168,7 @@ DFPLAYER_SIMPLE_ACTION(VolumeDownAction, volume_down)

 template<typename... Ts> class DFPlayerIsPlayingCondition : public Condition<Ts...>, public Parented<DFPlayer> {
 public:
-  bool check(const Ts &...x) override { return this->parent_->is_playing(); }
+  bool check(Ts... x) override { return this->parent_->is_playing(); }
 };

 class DFPlayerFinishedPlaybackTrigger : public Trigger<> {
--- a/esphome/components/dfrobot_sen0395/automation.h
+++ b/esphome/components/dfrobot_sen0395/automation.h
@@ -11,7 +11,7 @@ namespace dfrobot_sen0395 {
 template<typename... Ts>
 class DfrobotSen0395ResetAction : public Action<Ts...>, public Parented<DfrobotSen0395Component> {
 public:
-  void play(const Ts &...x) { this->parent_->enqueue(make_unique<ResetSystemCommand>()); }
+  void play(Ts... x) { this->parent_->enqueue(make_unique<ResetSystemCommand>()); }
 };

 template<typename... Ts>
@@ -33,7 +33,7 @@ class DfrobotSen0395SettingsAction : public Action<Ts...>, public Parented<Dfrob
  TEMPLATABLE_VALUE(float, det_min4)
  TEMPLATABLE_VALUE(float, det_max4)

-  void play(const Ts &...x) {
+  void play(Ts... x) {
    this->parent_->enqueue(make_unique<PowerCommand>(0));
    if (this->factory_reset_.has_value() && this->factory_reset_.value(x...) == true) {
      this->parent_->enqueue(make_unique<FactoryResetCommand>());
--- a/esphome/components/display/display.h
+++ b/esphome/components/display/display.h
@@ -176,117 +176,7 @@ class Display;
 class DisplayPage;
 class DisplayOnPageChangeTrigger;

-/** Optimized display writer that uses function pointers for stateless lambdas.
- *
- * Similar to TemplatableValue but specialized for display writer callbacks.
- * Saves ~8 bytes per stateless lambda on 32-bit platforms (16 bytes std::function → ~8 bytes discriminator+pointer).
- *
- * Supports both:
- * - Stateless lambdas (from YAML) → function pointer (4 bytes)
- * - Stateful lambdas/std::function (from C++ code) → std::function* (heap allocated)
- *
- * @tparam T The display type (e.g., Display, Nextion, GPIOLCDDisplay)
- */
-template<typename T> class DisplayWriter {
- public:
-  DisplayWriter() : type_(NONE) {}
-
-  // For stateless lambdas (convertible to function pointer): use function pointer (4 bytes)
-  template<typename F>
-  DisplayWriter(F f) requires std::invocable<F, T &> && std::convertible_to<F, void (*)(T &)>
-      : type_(STATELESS_LAMBDA) {
-    this->stateless_f_ = f;  // Implicit conversion to function pointer
-  }
-
-  // For stateful lambdas and std::function (not convertible to function pointer): use std::function* (heap allocated)
-  // This handles backwards compatibility with external components
-  template<typename F>
-  DisplayWriter(F f) requires std::invocable<F, T &> &&(!std::convertible_to<F, void (*)(T &)>) : type_(LAMBDA) {
-    this->f_ = new std::function<void(T &)>(std::move(f));
-  }
-
-  // Copy constructor
-  DisplayWriter(const DisplayWriter &other) : type_(other.type_) {
-    if (type_ == LAMBDA) {
-      this->f_ = new std::function<void(T &)>(*other.f_);
-    } else if (type_ == STATELESS_LAMBDA) {
-      this->stateless_f_ = other.stateless_f_;
-    }
-  }
-
-  // Move constructor
-  DisplayWriter(DisplayWriter &&other) noexcept : type_(other.type_) {
-    if (type_ == LAMBDA) {
-      this->f_ = other.f_;
-      other.f_ = nullptr;
-    } else if (type_ == STATELESS_LAMBDA) {
-      this->stateless_f_ = other.stateless_f_;
-    }
-    other.type_ = NONE;
-  }
-
-  // Assignment operators
-  DisplayWriter &operator=(const DisplayWriter &other) {
-    if (this != &other) {
-      this->~DisplayWriter();
-      new (this) DisplayWriter(other);
-    }
-    return *this;
-  }
-
-  DisplayWriter &operator=(DisplayWriter &&other) noexcept {
-    if (this != &other) {
-      this->~DisplayWriter();
-      new (this) DisplayWriter(std::move(other));
-    }
-    return *this;
-  }
-
-  ~DisplayWriter() {
-    if (type_ == LAMBDA) {
-      delete this->f_;
-    }
-    // STATELESS_LAMBDA/NONE: no cleanup needed (function pointer or empty)
-  }
-
-  bool has_value() const { return this->type_ != NONE; }
-
-  void call(T &display) const {
-    switch (this->type_) {
-      case STATELESS_LAMBDA:
-        this->stateless_f_(display);  // Direct function pointer call
-        break;
-      case LAMBDA:
-        (*this->f_)(display);  // std::function call
-        break;
-      case NONE:
-      default:
-        break;
-    }
-  }
-
-  // Operator() for convenience
-  void operator()(T &display) const { this->call(display); }
-
-  // Operator* for backwards compatibility with (*writer_)(*this) pattern
-  DisplayWriter &operator*() { return *this; }
-  const DisplayWriter &operator*() const { return *this; }
-
- protected:
-  enum : uint8_t {
-    NONE,
-    LAMBDA,
-    STATELESS_LAMBDA,
-  } type_;
-
-  union {
-    std::function<void(T &)> *f_;
-    void (*stateless_f_)(T &);
-  };
-};
-
-// Type alias for Display writer - uses optimized DisplayWriter instead of std::function
-using display_writer_t = DisplayWriter<Display>;
+using display_writer_t = std::function<void(Display &)>;

 #define LOG_DISPLAY(prefix, type, obj) \
  if ((obj) != nullptr) { \
@@ -320,7 +210,7 @@ class Display : public PollingComponent {
  /// Fill the entire screen with the given color.
  virtual void fill(Color color);
  /// Clear the entire screen by filling it with OFF pixels.
-  virtual void clear();
+  void clear();

  /// Get the calculated width of the display in pixels with rotation applied.
  virtual int get_width() { return this->get_width_internal(); }
@@ -788,7 +678,7 @@ class Display : public PollingComponent {
  void sort_triangle_points_by_y_(int *x1, int *y1, int *x2, int *y2, int *x3, int *y3);

  DisplayRotation rotation_{DISPLAY_ROTATION_0_DEGREES};
-  display_writer_t writer_{};
+  optional<display_writer_t> writer_{};
  DisplayPage *page_{nullptr};
  DisplayPage *previous_page_{nullptr};
  std::vector<DisplayOnPageChangeTrigger *> on_page_change_triggers_;
@@ -819,7 +709,7 @@ template<typename... Ts> class DisplayPageShowAction : public Action<Ts...> {
 public:
  TEMPLATABLE_VALUE(DisplayPage *, page)

-  void play(const Ts &...x) override {
+  void play(Ts... x) override {
    auto *page = this->page_.value(x...);
    if (page != nullptr) {
      page->show();
@@ -831,7 +721,7 @@ template<typename... Ts> class DisplayPageShowNextAction : public Action<Ts...>
 public:
  DisplayPageShowNextAction(Display *buffer) : buffer_(buffer) {}

-  void play(const Ts &...x) override { this->buffer_->show_next_page(); }
+  void play(Ts... x) override { this->buffer_->show_next_page(); }

  Display *buffer_;
 };
@@ -840,7 +730,7 @@ template<typename... Ts> class DisplayPageShowPrevAction : public Action<Ts...>
 public:
  DisplayPageShowPrevAction(Display *buffer) : buffer_(buffer) {}

-  void play(const Ts &...x) override { this->buffer_->show_prev_page(); }
+  void play(Ts... x) override { this->buffer_->show_prev_page(); }

  Display *buffer_;
 };
@@ -850,7 +740,7 @@ template<typename... Ts> class DisplayIsDisplayingPageCondition : public Conditi
  DisplayIsDisplayingPageCondition(Display *parent) : parent_(parent) {}

  void set_page(DisplayPage *page) { this->page_ = page; }
-  bool check(const Ts &...x) override { return this->parent_->get_active_page() == this->page_; }
+  bool check(Ts... x) override { return this->parent_->get_active_page() == this->page_; }

 protected:
  Display *parent_;
--- a/esphome/components/display_menu_base/automation.h
+++ b/esphome/components/display_menu_base/automation.h
@@ -10,7 +10,7 @@ template<typename... Ts> class UpAction : public Action<Ts...> {
 public:
  explicit UpAction(DisplayMenuComponent *menu) : menu_(menu) {}

-  void play(const Ts &...x) override { this->menu_->up(); }
+  void play(Ts... x) override { this->menu_->up(); }

 protected:
  DisplayMenuComponent *menu_;
@@ -20,7 +20,7 @@ template<typename... Ts> class DownAction : public Action<Ts...> {
 public:
  explicit DownAction(DisplayMenuComponent *menu) : menu_(menu) {}

-  void play(const Ts &...x) override { this->menu_->down(); }
+  void play(Ts... x) override { this->menu_->down(); }

 protected:
  DisplayMenuComponent *menu_;
@@ -30,7 +30,7 @@ template<typename... Ts> class LeftAction : public Action<Ts...> {
 public:
  explicit LeftAction(DisplayMenuComponent *menu) : menu_(menu) {}

-  void play(const Ts &...x) override { this->menu_->left(); }
+  void play(Ts... x) override { this->menu_->left(); }

 protected:
  DisplayMenuComponent *menu_;
@@ -40,7 +40,7 @@ template<typename... Ts> class RightAction : public Action<Ts...> {
 public:
  explicit RightAction(DisplayMenuComponent *menu) : menu_(menu) {}

-  void play(const Ts &...x) override { this->menu_->right(); }
+  void play(Ts... x) override { this->menu_->right(); }

 protected:
  DisplayMenuComponent *menu_;
@@ -50,7 +50,7 @@ template<typename... Ts> class EnterAction : public Action<Ts...> {
 public:
  explicit EnterAction(DisplayMenuComponent *menu) : menu_(menu) {}

-  void play(const Ts &...x) override { this->menu_->enter(); }
+  void play(Ts... x) override { this->menu_->enter(); }

 protected:
  DisplayMenuComponent *menu_;
@@ -60,7 +60,7 @@ template<typename... Ts> class ShowAction : public Action<Ts...> {
 public:
  explicit ShowAction(DisplayMenuComponent *menu) : menu_(menu) {}

-  void play(const Ts &...x) override { this->menu_->show(); }
+  void play(Ts... x) override { this->menu_->show(); }

 protected:
  DisplayMenuComponent *menu_;
@@ -70,7 +70,7 @@ template<typename... Ts> class HideAction : public Action<Ts...> {
 public:
  explicit HideAction(DisplayMenuComponent *menu) : menu_(menu) {}

-  void play(const Ts &...x) override { this->menu_->hide(); }
+  void play(Ts... x) override { this->menu_->hide(); }

 protected:
  DisplayMenuComponent *menu_;
@@ -80,7 +80,7 @@ template<typename... Ts> class ShowMainAction : public Action<Ts...> {
 public:
  explicit ShowMainAction(DisplayMenuComponent *menu) : menu_(menu) {}

-  void play(const Ts &...x) override { this->menu_->show_main(); }
+  void play(Ts... x) override { this->menu_->show_main(); }

 protected:
  DisplayMenuComponent *menu_;
@@ -88,7 +88,7 @@ template<typename... Ts> class ShowMainAction : public Action<Ts...> {
 template<typename... Ts> class IsActiveCondition : public Condition<Ts...> {
 public:
  explicit IsActiveCondition(DisplayMenuComponent *menu) : menu_(menu) {}
-  bool check(const Ts &...x) override { return this->menu_->is_active(); }
+  bool check(Ts... x) override { return this->menu_->is_active(); }

 protected:
  DisplayMenuComponent *menu_;
--- a/esphome/components/display_menu_base/menu_item.cpp
+++ b/esphome/components/display_menu_base/menu_item.cpp
@@ -42,7 +42,7 @@ std::string MenuItemSelect::get_value_text() const {
    result = this->value_getter_.value()(this);
  } else {
    if (this->select_var_ != nullptr) {
-      result = this->select_var_->current_option();
+      result = this->select_var_->state;
    }
  }

--- a/esphome/components/ds1307/ds1307.h
+++ b/esphome/components/ds1307/ds1307.h
@@ -59,12 +59,12 @@ class DS1307Component : public time::RealTimeClock, public i2c::I2CDevice {

 template<typename... Ts> class WriteAction : public Action<Ts...>, public Parented<DS1307Component> {
 public:
-  void play(const Ts &...x) override { this->parent_->write_time(); }
+  void play(Ts... x) override { this->parent_->write_time(); }
 };

 template<typename... Ts> class ReadAction : public Action<Ts...>, public Parented<DS1307Component> {
 public:
-  void play(const Ts &...x) override { this->parent_->read_time(); }
+  void play(Ts... x) override { this->parent_->read_time(); }
 };
 }  // namespace ds1307
 }  // namespace esphome
--- a/esphome/components/duty_time/duty_time_sensor.h
+++ b/esphome/components/duty_time/duty_time_sensor.h
@@ -51,15 +51,15 @@ class DutyTimeSensor : public sensor::Sensor, public PollingComponent {
 template<typename... Ts> class BaseAction : public Action<Ts...>, public Parented<DutyTimeSensor> {};

 template<typename... Ts> class StartAction : public BaseAction<Ts...> {
-  void play(const Ts &...x) override { this->parent_->start(); }
+  void play(Ts... x) override { this->parent_->start(); }
 };

 template<typename... Ts> class StopAction : public BaseAction<Ts...> {
-  void play(const Ts &...x) override { this->parent_->stop(); }
+  void play(Ts... x) override { this->parent_->stop(); }
 };

 template<typename... Ts> class ResetAction : public BaseAction<Ts...> {
-  void play(const Ts &...x) override { this->parent_->reset(); }
+  void play(Ts... x) override { this->parent_->reset(); }
 };

 template<typename... Ts> class RunningCondition : public Condition<Ts...>, public Parented<DutyTimeSensor> {
@@ -67,7 +67,7 @@ template<typename... Ts> class RunningCondition : public Condition<Ts...>, publi
  explicit RunningCondition(DutyTimeSensor *parent, bool state) : Parented(parent), state_(state) {}

 protected:
-  bool check(const Ts &...x) override { return this->parent_->is_running() == this->state_; }
+  bool check(Ts... x) override { return this->parent_->is_running() == this->state_; }
  bool state_;
 };

--- a/esphome/components/e131/e131.cpp
+++ b/esphome/components/e131/e131.cpp
@@ -3,8 +3,6 @@
 #include "e131_addressable_light_effect.h"
 #include "esphome/core/log.h"

-#include <algorithm>
-
 namespace esphome {
 namespace e131 {

@@ -78,14 +76,14 @@ void E131Component::loop() {
 }

 void E131Component::add_effect(E131AddressableLightEffect *light_effect) {
-  if (std::find(light_effects_.begin(), light_effects_.end(), light_effect) != light_effects_.end()) {
+  if (light_effects_.count(light_effect)) {
    return;
  }

-  ESP_LOGD(TAG, "Registering '%s' for universes %d-%d.", light_effect->get_name(), light_effect->get_first_universe(),
-           light_effect->get_last_universe());
+  ESP_LOGD(TAG, "Registering '%s' for universes %d-%d.", light_effect->get_name().c_str(),
+           light_effect->get_first_universe(), light_effect->get_last_universe());

-  light_effects_.push_back(light_effect);
+  light_effects_.insert(light_effect);

  for (auto universe = light_effect->get_first_universe(); universe <= light_effect->get_last_universe(); ++universe) {
    join_(universe);
@@ -93,17 +91,14 @@ void E131Component::add_effect(E131AddressableLightEffect *light_effect) {
 }

 void E131Component::remove_effect(E131AddressableLightEffect *light_effect) {
-  auto it = std::find(light_effects_.begin(), light_effects_.end(), light_effect);
-  if (it == light_effects_.end()) {
+  if (!light_effects_.count(light_effect)) {
    return;
  }

-  ESP_LOGD(TAG, "Unregistering '%s' for universes %d-%d.", light_effect->get_name(), light_effect->get_first_universe(),
-           light_effect->get_last_universe());
+  ESP_LOGD(TAG, "Unregistering '%s' for universes %d-%d.", light_effect->get_name().c_str(),
+           light_effect->get_first_universe(), light_effect->get_last_universe());

-  // Swap with last element and pop for O(1) removal (order doesn't matter)
-  *it = light_effects_.back();
-  light_effects_.pop_back();
+  light_effects_.erase(light_effect);

  for (auto universe = light_effect->get_first_universe(); universe <= light_effect->get_last_universe(); ++universe) {
    leave_(universe);
--- a/Show More
+++ b/Show More