fix

.ai/instructions.md

@@ -124,28 +124,6 @@ This document provides essential context for AI models interacting with this pro
     *   **Indentation:** Use spaces (two per indentation level), not tabs
     *   **Type aliases:** Prefer `using type_t = int;` over `typedef int type_t;`
     *   **Line length:** Wrap lines at no more than 120 characters
-    *   **Constructor parameters vs setters:** Component properties that are both **required** and **invariant**
-        (never change after construction) should be constructor parameters rather than set via setter methods.
-        This makes the dependency explicit and prevents use of the object in an incompletely-initialized state.
-        In code generation, when calling `cg.new_Pvariable()` or the relevant helper function to create the component, pass these as arguments.
-        ```cpp
-        // Good - required invariant dependency as constructor parameter
-        class SourceTextSensor : public text_sensor::TextSensor, public Component {
-         public:
-          explicit SourceTextSensor(text::Text *source) : source_(source) {}
-         protected:
-          text::Text *source_;
-        };
-        ```
-        ```cpp
-        // Bad - required invariant dependency as setter
-        class SourceTextSensor : public text_sensor::TextSensor, public Component {
-         public:
-          void set_source(text::Text *source) { this->source_ = source; }
-         protected:
-          text::Text *source_{nullptr};
-        };
-        ```
 
 *   **Component Structure:**
     *   **Standard Files:**
@@ -239,123 +217,6 @@ This document provides essential context for AI models interacting with this pro
               var = await switch.new_switch(config)
           ```
 
-*   **Automations (Triggers, Actions, Conditions):**
-
-    Automations have three building blocks: **Triggers** (fire when something happens), **Actions** (do something), and **Conditions** (check if something is true).
-
-    *   **Triggers -- Callback method (preferred):**
-
-        Use `build_callback_automation()` for simple triggers. This eliminates the need for a C++ Trigger class by using a lightweight pointer-sized forwarder struct registered directly as a callback. No `CONF_TRIGGER_ID` in the schema.
-
-        **Python:**
-        ```python
-        from esphome import automation
-
-        CONFIG_SCHEMA = cv.Schema({
-            cv.GenerateID(): cv.declare_id(MyComponent),
-            cv.Optional(CONF_ON_STATE): automation.validate_automation({}),
-        }).extend(cv.COMPONENT_SCHEMA)
-
-        async def to_code(config):
-            var = cg.new_Pvariable(config[CONF_ID])
-            await cg.register_component(var, config)
-            for conf in config.get(CONF_ON_STATE, []):
-                await automation.build_callback_automation(
-                    var, "add_on_state_callback", [(bool, "x")], conf
-                )
-        ```
-
-        `build_callback_automation` arguments: `parent`, `callback_method` (C++ method name), `args` (template args as `[(type, name)]` tuples), `config`, and optional `forwarder` (defaults to `TriggerForwarder<Ts...>`).
-
-        For boolean filtering (e.g. `on_press`/`on_release`), use built-in forwarders with `args=[]`:
-        ```python
-        for conf_key, forwarder in (
-            (CONF_ON_PRESS, automation.TriggerOnTrueForwarder),
-            (CONF_ON_RELEASE, automation.TriggerOnFalseForwarder),
-        ):
-            for conf in config.get(conf_key, []):
-                await automation.build_callback_automation(
-                    var, "add_on_state_callback", [], conf, forwarder=forwarder
-                )
-        ```
-
-        **C++ -- no trigger class needed.** The callback registration method must be templatized to accept both `std::function` and lightweight forwarder structs (which avoid heap allocation):
-        ```cpp
-        class MyComponent : public Component {
-         public:
-          // Must be a template -- accepts both std::function and pointer-sized forwarder structs
-          template<typename F> void add_on_state_callback(F &&callback) {
-            this->state_callback_.add(std::forward<F>(callback));
-          }
-         protected:
-          // Use CallbackManager when callbacks are always registered (e.g. core components)
-          CallbackManager<void(bool)> state_callback_;
-          // Use LazyCallbackManager when callbacks are often not registered -- saves 8 bytes
-          // (nullptr vs empty std::vector) per instance when no callbacks are added
-          // LazyCallbackManager<void(bool)> state_callback_;
-        };
-        ```
-
-    *   **Triggers -- Trigger class method:**
-
-        Use `build_automation()` with a `Trigger<Ts...>` subclass only when the forwarder needs **mutable state beyond a single `Automation*` pointer** (e.g. edge detection tracking previous state, timing logic).
-
-        **Python:**
-        ```python
-        TurnOnTrigger = my_ns.class_("TurnOnTrigger", automation.Trigger.template())
-
-        CONFIG_SCHEMA = cv.Schema({
-            cv.Optional(CONF_ON_TURN_ON): automation.validate_automation(
-                {cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TurnOnTrigger)}
-            ),
-        })
-
-        async def to_code(config):
-            for conf in config.get(CONF_ON_TURN_ON, []):
-                trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-                await automation.build_automation(trigger, [], conf)
-        ```
-
-        **C++:**
-        ```cpp
-        class TurnOnTrigger : public Trigger<> {
-         public:
-          explicit TurnOnTrigger(MyComponent *parent) : last_on_{false} {
-            parent->add_on_state_callback([this](bool state) {
-              if (state && !this->last_on_)
-                this->trigger();
-              this->last_on_ = state;
-            });
-          }
-         protected:
-          bool last_on_;
-        };
-        ```
-
-    *   **Actions:**
-        ```cpp
-        template<typename... Ts> class MyAction : public Action<Ts...> {
-         public:
-          explicit MyAction(MyComponent *parent) : parent_(parent) {}
-          void play(const Ts &...) override { this->parent_->do_something(); }
-         protected:
-          MyComponent *parent_;
-        };
-        ```
-        Register with `@automation.register_action("my_component.do_something", MyAction, schema, synchronous=True)`. Use `synchronous=True` for actions that run to completion inside `play()` without deferring. Use `synchronous=False` if the action may suspend/defer execution (e.g. `delay`, `wait_until`, `script.wait`) or store trigger arguments for later use.
-
-    *   **Conditions:**
-        ```cpp
-        template<typename... Ts> class MyCondition : public Condition<Ts...> {
-         public:
-          explicit MyCondition(MyComponent *parent) : parent_(parent) {}
-          bool check(const Ts &...) override { return this->parent_->is_active(); }
-         protected:
-          MyComponent *parent_;
-        };
-        ```
-        Register with `@automation.register_condition("my_component.is_active", MyCondition, schema)`.
-
 *   **Configuration Validation:**
     *   **Common Validators:** `cv.int_`, `cv.float_`, `cv.string`, `cv.boolean`, `cv.int_range(min=0, max=100)`, `cv.positive_int`, `cv.percentage`.
     *   **Complex Validation:** `cv.All(cv.string, cv.Length(min=1, max=50))`, `cv.Any(cv.int_, cv.string)`.
@@ -391,39 +252,10 @@ This document provides essential context for AI models interacting with this pro
     *   **Component Tests:** YAML-based compilation tests are located in `tests/`. The structure is as follows:
         ```
         tests/
-        ├── test_build_components/
-        │   └── common/          # Shared bus packages (uart, i2c, spi, etc.)
-        │       ├── uart/        # UART at default baud rate
-        │       ├── uart_115200/ # UART at 115200 baud
-        │       ├── i2c/         # I2C bus
-        │       └── spi/         # SPI bus
-        └── components/[component]/
-            ├── common.yaml      # Component-only config (no bus definitions)
-            ├── test.esp32-idf.yaml
-            ├── test.esp8266-ard.yaml
-            └── test.rp2040-ard.yaml
+        ├── test_build_components/ # Base test configurations
+        └── components/[component]/ # Component-specific tests
         ```
         Run them using `script/test_build_components`. Use `-c <component>` to test specific components and `-t <target>` for specific platforms.
-
-    *   **Test Grouping with Packages:** Components that use shared bus packages can be grouped together in CI to reduce build count. **Never define buses (uart, i2c, spi, modbus) directly in test YAML files** — always use packages from `test_build_components/common/`:
-        ```yaml
-        # test.esp32-idf.yaml — use packages for buses
-        packages:
-          uart: !include ../../test_build_components/common/uart_115200/esp32-idf.yaml
-
-        <<: !include common.yaml
-        ```
-        ```yaml
-        # common.yaml — component config only, NO bus definitions
-        my_component:
-          id: my_instance
-
-        sensor:
-          - platform: my_component
-            name: My Sensor
-        ```
-        Components that define buses directly are flagged as "NEEDS MIGRATION" and cannot be grouped, increasing CI build time.
-
     *   **Testing All Components Together:** To verify that all components can be tested together without ID conflicts or configuration issues, use:
         ```bash
         ./script/test_component_grouping.py -e config --all
@@ -563,30 +395,6 @@ This document provides essential context for AI models interacting with this pro
 
         Note: Avoiding heap allocation after `setup()` is always required regardless of component type. The prioritization above is about the effort spent on container optimization (e.g., migrating from `std::vector` to `StaticVector`).
 
-        **Callback Managers:**
-
-        ESPHome provides two callback manager types in `esphome/core/helpers.h` for the observer pattern. Both support `std::function`, lambdas, and lightweight forwarder structs via their templatized `add()` method.
-
-        | Type | Idle overhead (32-bit) | When to use |
-        |------|----------------------|-------------|
-        | `CallbackManager<void(Ts...)>` | 12 bytes (empty `std::vector`) | Callbacks are always or almost always registered |
-        | `LazyCallbackManager<void(Ts...)>` | 4 bytes (`nullptr`) | Callbacks are often not registered (common case) |
-
-        `LazyCallbackManager` is a drop-in replacement for `CallbackManager` that defers allocation until the first callback is added. Prefer it for entity-level callbacks where most instances have no subscribers.
-
-        **Important:** Registration methods that add to a callback manager **must always be templatized** to accept both `std::function` and pointer-sized forwarder structs (used by `build_callback_automation`). Never use `std::function` in the method signature:
-        ```cpp
-        // Bad -- forces heap allocation for forwarder structs
-        void add_on_state_callback(std::function<void(bool)> &&callback) {
-          this->state_callback_.add(std::move(callback));
-        }
-
-        // Good -- accepts any callable without forcing std::function wrapping
-        template<typename F> void add_on_state_callback(F &&callback) {
-          this->state_callback_.add(std::forward<F>(callback));
-        }
-        ```
-
     *   **State Management:** Use `CORE.data` for component state that needs to persist during configuration generation. Avoid module-level mutable globals.
 
         **Bad Pattern (Module-Level Globals):**

.clang-tidy.hash

@@ -1 +1 @@
-10c432ae818f9ed7fd4a0176a04467b1f2634363f5ec985045a6d72747f60b90
+8e48e836c6fc196d3da000d46eb09db243b87fe33518a74e49c8e009d756074a

.github/actions/restore-python/action.yml

@@ -22,7 +22,7 @@ runs:
         python-version: ${{ inputs.python-version }}
     - name: Restore Python virtual environment
       id: cache-venv
-      uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+      uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
       with:
         path: venv
         # yamllint disable-line rule:line-length

.github/scripts/auto-label-pr/detectors.js

@@ -235,20 +235,19 @@ async function detectDeprecatedComponents(github, context, changedFiles) {
     }
   }
 
-  // Get base branch ref to check if deprecation already exists for the component
-  // This prevents flagging a PR that simply adds deprecation
-  const baseRef = context.payload.pull_request.base.ref;
+  // Get PR head to fetch files from the PR branch
+  const prNumber = context.payload.pull_request.number;
 
   // Check each component's __init__.py for DEPRECATED_COMPONENT constant
   for (const component of components) {
     const initFile = `esphome/components/${component}/__init__.py`;
     try {
-      // Fetch file content from base branch using GitHub API
+      // Fetch file content from PR head using GitHub API
       const { data: fileData } = await github.rest.repos.getContent({
         owner,
         repo,
         path: initFile,
-        ref: baseRef
+        ref: `refs/pull/${prNumber}/head`
       });
 
       // Decode base64 content

.github/workflows/auto-label-pr.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v2
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2
         with:
           app-id: ${{ secrets.ESPHOME_GITHUB_APP_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}

.github/workflows/ci-clang-tidy-hash.yml

@@ -40,7 +40,7 @@ jobs:
           echo "You have modified clang-tidy configuration but have not updated the hash." | tee -a $GITHUB_STEP_SUMMARY
           echo "Please run 'script/clang_tidy_hash.py --update' and commit the changes." | tee -a $GITHUB_STEP_SUMMARY
 
-      - if: failure() && github.event.pull_request.head.repo.full_name == github.repository
+      - if: failure()
         name: Request changes
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
@@ -53,7 +53,7 @@ jobs:
               body: 'You have modified clang-tidy configuration but have not updated the hash.\nPlease run `script/clang_tidy_hash.py --update` and commit the changes.'
             })
 
-      - if: success() && github.event.pull_request.head.repo.full_name == github.repository
+      - if: success()
         name: Dismiss review
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           # yamllint disable-line rule:line-length
@@ -106,7 +106,6 @@ jobs:
           script/build_codeowners.py --check
           script/build_language_schema.py --check
           script/generate-esp32-boards.py --check
-          script/generate-rp2040-boards.py --check
 
   pytest:
     name: Run pytest
@@ -154,12 +153,12 @@ jobs:
           . venv/bin/activate
           pytest -vv --cov-report=xml --tb=native -n auto tests --ignore=tests/integration/
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
+        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
       - name: Save Python virtual environment cache
         if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -171,8 +170,6 @@ jobs:
       - common
     outputs:
       integration-tests: ${{ steps.determine.outputs.integration-tests }}
-      integration-tests-run-all: ${{ steps.determine.outputs.integration-tests-run-all }}
-      integration-test-files: ${{ steps.determine.outputs.integration-test-files }}
       clang-tidy: ${{ steps.determine.outputs.clang-tidy }}
       clang-tidy-mode: ${{ steps.determine.outputs.clang-tidy-mode }}
       python-linters: ${{ steps.determine.outputs.python-linters }}
@@ -185,7 +182,6 @@ jobs:
       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 }}
-      benchmarks: ${{ steps.determine.outputs.benchmarks }}
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -198,7 +194,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
       - name: Restore components graph cache
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: .temp/components_graph.json
           key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}
@@ -214,8 +210,6 @@ jobs:
 
           # Extract individual fields
           echo "integration-tests=$(echo "$output" | jq -r '.integration_tests')" >> $GITHUB_OUTPUT
-          echo "integration-tests-run-all=$(echo "$output" | jq -r '.integration_tests_run_all')" >> $GITHUB_OUTPUT
-          echo "integration-test-files=$(echo "$output" | jq -c '.integration_test_files')" >> $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
@@ -228,10 +222,9 @@ jobs:
           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
-          echo "benchmarks=$(echo "$output" | jq -r '.benchmarks')" >> $GITHUB_OUTPUT
       - name: Save components graph cache
         if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: .temp/components_graph.json
           key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}
@@ -253,7 +246,7 @@ jobs:
           python-version: "3.13"
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: venv
           key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -268,20 +261,9 @@ jobs:
       - name: Register matcher
         run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
       - name: Run integration tests
-        env:
-          INTEGRATION_TEST_FILES: ${{ needs.determine-jobs.outputs.integration-test-files }}
-          INTEGRATION_TESTS_RUN_ALL: ${{ needs.determine-jobs.outputs.integration-tests-run-all }}
         run: |
           . venv/bin/activate
-          if [[ "$INTEGRATION_TESTS_RUN_ALL" == "true" ]]; then
-            echo "Running all integration tests"
-            pytest -vv --no-cov --tb=native -n auto tests/integration/
-          else
-            # Parse JSON array into bash array to avoid shell expansion issues
-            mapfile -t test_files < <(echo "$INTEGRATION_TEST_FILES" | jq -r '.[]')
-            echo "Running ${#test_files[@]} specific integration tests"
-            pytest -vv --no-cov --tb=native -n auto "${test_files[@]}"
-          fi
+          pytest -vv --no-cov --tb=native -n auto tests/integration/
 
   cpp-unit-tests:
     name: Run C++ unit tests
@@ -310,40 +292,6 @@ jobs:
             script/cpp_unit_test.py $ARGS
           fi
 
-  benchmarks:
-    name: Run CodSpeed benchmarks
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: >-
-      (github.event_name == 'push' && github.ref_name == 'dev') ||
-      (github.event_name == 'pull_request' && needs.determine-jobs.outputs.benchmarks == 'true')
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-
-      - name: Build benchmarks
-        id: build
-        run: |
-          . venv/bin/activate
-          export BENCHMARK_LIB_CONFIG=$(python script/setup_codspeed_lib.py)
-          # --build-only prints BUILD_BINARY=<path> to stdout
-          BINARY=$(script/cpp_benchmark.py --all --build-only | grep '^BUILD_BINARY=' | tail -1 | cut -d= -f2-)
-          echo "binary=$BINARY" >> $GITHUB_OUTPUT
-
-      - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@db35df748deb45fdef0960669f57d627c1956c30 # v4
-        with:
-          run: ${{ steps.build.outputs.binary }}
-          mode: simulation
-
   clang-tidy-single:
     name: ${{ matrix.name }}
     runs-on: ubuntu-24.04
@@ -387,14 +335,14 @@ jobs:
 
       - name: Cache platformio
         if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.platformio
           key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
 
       - name: Cache platformio
         if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.platformio
           key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
@@ -466,14 +414,14 @@ jobs:
 
       - name: Cache platformio
         if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.platformio
           key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
 
       - name: Cache platformio
         if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.platformio
           key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
@@ -555,14 +503,14 @@ jobs:
 
       - name: Cache platformio
         if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.platformio
           key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
 
       - name: Cache platformio
         if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.platformio
           key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
@@ -723,7 +671,7 @@ jobs:
           cache-key: ${{ needs.common.outputs.cache-key }}
       - uses: esphome/pre-commit-action@43cd1109c09c544d97196f7730ee5b2e0cc6d81e # v3.0.1 fork with pinned actions/cache
         env:
-          SKIP: pylint,clang-tidy-hash,ci-custom
+          SKIP: pylint,clang-tidy-hash
       - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
         if: always()
 
@@ -817,7 +765,7 @@ jobs:
       - name: Restore cached memory analysis
         id: cache-memory-analysis
         if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true'
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: memory-analysis-target.json
           key: ${{ steps.cache-key.outputs.cache-key }}
@@ -841,7 +789,7 @@ jobs:
 
       - name: Cache platformio
         if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true'
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.platformio
           key: platformio-memory-${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}-${{ hashFiles('platformio.ini') }}
@@ -882,7 +830,7 @@ jobs:
 
       - name: Save memory analysis to cache
         if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true' && steps.build.outcome == 'success'
-        uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: memory-analysis-target.json
           key: ${{ steps.cache-key.outputs.cache-key }}
@@ -929,7 +877,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
       - name: Cache platformio
-        uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: ~/.platformio
           key: platformio-memory-${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}-${{ hashFiles('platformio.ini') }}

.github/workflows/codeql.yml

@@ -58,7 +58,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         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@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/pr-title-check.yml

@@ -3,9 +3,6 @@ name: PR Title Check
 on:
   pull_request:
     types: [opened, edited, synchronize, reopened]
-    branches-ignore:
-      - release
-      - beta
 
 permissions:
   contents: read

.github/workflows/release.yml

@@ -70,7 +70,7 @@ jobs:
           pip3 install build
           python3 -m build
       - name: Publish
-        uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
+        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
         with:
           skip-existing: true
 
@@ -102,12 +102,12 @@ jobs:
         uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
 
       - name: Log in to docker hub
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -182,13 +182,13 @@ jobs:
 
       - name: Log in to docker hub
         if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the GitHub container registry
         if: matrix.registry == 'ghcr'
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -221,7 +221,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
         with:
           app-id: ${{ secrets.ESPHOME_GITHUB_APP_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -256,7 +256,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
         with:
           app-id: ${{ secrets.ESPHOME_GITHUB_APP_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
@@ -287,7 +287,7 @@ jobs:
     steps:
       - name: Generate a token
         id: generate-token
-        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1
         with:
           app-id: ${{ secrets.ESPHOME_GITHUB_APP_ID }}
           private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}

.github/workflows/sync-device-classes.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version: "3.14"
+          python-version: 3.13
 
       - name: Install Home Assistant
         run: |

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ ci:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.15.9
+    rev: v0.15.6
     hooks:
       # Run the linter.
       - id: ruff
@@ -65,7 +65,3 @@ repos:
         files: ^(\.clang-tidy|platformio\.ini|requirements_dev\.txt)$
         pass_filenames: false
         additional_dependencies: []
-      - id: ci-custom
-        name: ci-custom
-        entry: python3 script/run-in-env.py script/ci-custom.py
-        language: system

CODEOWNERS

@@ -92,7 +92,6 @@ esphome/components/bmp3xx_i2c/* @latonita
 esphome/components/bmp3xx_spi/* @latonita
 esphome/components/bmp581_base/* @danielkent-net @kahrendt
 esphome/components/bmp581_i2c/* @danielkent-net @kahrendt
-esphome/components/bmp581_spi/* @danielkent-net @kahrendt
 esphome/components/bp1658cj/* @Cossid
 esphome/components/bp5758d/* @Cossid
 esphome/components/bthome_mithermometer/* @nagyrobi
@@ -142,13 +141,12 @@ esphome/components/dlms_meter/* @SimonFischer04
 esphome/components/dps310/* @kbx81
 esphome/components/ds1307/* @badbadc0ffee
 esphome/components/ds2484/* @mrk-its
-esphome/components/dsmr/* @glmnet @PolarGoose
+esphome/components/dsmr/* @glmnet @PolarGoose @zuidwijk
 esphome/components/duty_time/* @dudanov
 esphome/components/ee895/* @Stock-M
 esphome/components/ektf2232/touchscreen/* @jesserockz
 esphome/components/emc2101/* @ellull
 esphome/components/emmeti/* @E440QF
-esphome/components/emontx/* @FredM67 @glynhudson @TrystanLea
 esphome/components/ens160/* @latonita
 esphome/components/ens160_base/* @latonita @vincentscode
 esphome/components/ens160_i2c/* @latonita
@@ -218,7 +216,6 @@ esphome/components/hbridge/light/* @DotNetDann
 esphome/components/hbridge/switch/* @dwmw2
 esphome/components/hc8/* @omartijn
 esphome/components/hdc2010/* @optimusprimespace @ssieb
-esphome/components/hdc2080/* @G-Pereira @jesserockz
 esphome/components/hdc302x/* @joshuasing
 esphome/components/he60r/* @clydebarrow
 esphome/components/heatpumpir/* @rob-deutsch
@@ -247,6 +244,7 @@ esphome/components/hyt271/* @Philippe12
 esphome/components/i2c/* @esphome/core
 esphome/components/i2c_device/* @gabest11
 esphome/components/i2s_audio/* @jesserockz
+esphome/components/i2s_audio/media_player/* @jesserockz
 esphome/components/i2s_audio/microphone/* @jesserockz
 esphome/components/i2s_audio/speaker/* @jesserockz @kahrendt
 esphome/components/iaqcore/* @yozik04
@@ -332,7 +330,6 @@ esphome/components/mipi_dsi/* @clydebarrow
 esphome/components/mipi_rgb/* @clydebarrow
 esphome/components/mipi_spi/* @clydebarrow
 esphome/components/mitsubishi/* @RubyBailey
-esphome/components/mitsubishi_cn105/* @crnjan
 esphome/components/mixer/speaker/* @kahrendt
 esphome/components/mlx90393/* @functionpointer
 esphome/components/mlx90614/* @jesserockz
@@ -461,9 +458,6 @@ esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
 esphome/components/sonoff_d1/* @anatoly-savchenkov
 esphome/components/sound_level/* @kahrendt
-esphome/components/spa06_base/* @danielkent-net
-esphome/components/spa06_i2c/* @danielkent-net
-esphome/components/spa06_spi/* @danielkent-net
 esphome/components/speaker/* @jesserockz @kahrendt
 esphome/components/speaker/media_player/* @kahrendt @synesthesiam
 esphome/components/speaker_source/* @kahrendt

Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = ESPHome
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2026.4.2
+PROJECT_NUMBER         = 2026.4.0-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

README.md

@@ -1,4 +1,4 @@
-# ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/) [![CodSpeed](https://img.shields.io/endpoint?url=https://codspeed.io/badge.json)](https://codspeed.io/esphome/esphome)
+# ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
 
 <a href="https://esphome.io/">
   <picture>

esphome/__main__.py

@@ -750,15 +750,8 @@ def upload_using_esptool(
             platformio_api.FlashImage(
                 path=idedata.firmware_bin_path, offset=firmware_offset
             ),
+            *idedata.extra_flash_images,
         ]
-        for image in idedata.extra_flash_images:
-            if not image.path.is_file():
-                _LOGGER.warning(
-                    "Skipping missing flash image declared by platform: %s",
-                    image.path,
-                )
-                continue
-            flash_images.append(image)
 
     mcu = "esp8266"
     if CORE.is_esp32:
@@ -1053,11 +1046,7 @@ def show_logs(config: ConfigType, args: ArgsProtocol, devices: list[str]) -> int
     ):
         from esphome.components.api.client import run_logs
 
-        return run_logs(
-            config,
-            network_devices,
-            subscribe_states=not getattr(args, "no_states", False),
-        )
+        return run_logs(config, network_devices)
 
     if port_type in (PortType.NETWORK, PortType.MQTT) and has_mqtt_logging():
         from esphome import mqtt
@@ -1090,7 +1079,7 @@ def command_config(args: ArgsProtocol, config: ConfigType) -> int | None:
     # add the console decoration so the front-end can hide the secrets
     if not args.show_secrets:
         output = re.sub(
-            r"(password|key|psk|ssid)\: (.+)", r"\1: \\033[8m\2\\033[28m", output
+            r"(password|key|psk|ssid)\: (.+)", r"\1: \\033[5m\2\\033[6m", output
         )
     if not CORE.quiet:
         safe_print(output)
@@ -1249,38 +1238,6 @@ def command_clean(args: ArgsProtocol, config: ConfigType) -> int | None:
     return 0
 
 
-def command_bundle(args: ArgsProtocol, config: ConfigType) -> int | None:
-    from esphome.bundle import BUNDLE_EXTENSION, ConfigBundleCreator
-
-    creator = ConfigBundleCreator(config)
-
-    if args.list_only:
-        files = creator.discover_files()
-        for bf in sorted(files, key=lambda f: f.path):
-            safe_print(f"  {bf.path}")
-        _LOGGER.info("Found %d files", len(files))
-        return 0
-
-    result = creator.create_bundle()
-
-    if args.output:
-        output_path = Path(args.output)
-    else:
-        stem = CORE.config_path.stem
-        output_path = CORE.config_dir / f"{stem}{BUNDLE_EXTENSION}"
-
-    output_path.parent.mkdir(parents=True, exist_ok=True)
-    output_path.write_bytes(result.data)
-
-    _LOGGER.info(
-        "Bundle created: %s (%d files, %.1f KB)",
-        output_path,
-        len(result.files),
-        len(result.data) / 1024,
-    )
-    return 0
-
-
 def command_dashboard(args: ArgsProtocol) -> int | None:
     from esphome.dashboard import dashboard
 
@@ -1556,7 +1513,6 @@ POST_CONFIG_ACTIONS = {
     "rename": command_rename,
     "discover": command_discover,
     "analyze-memory": command_analyze_memory,
-    "bundle": command_bundle,
 }
 
 SIMPLE_CONFIG_ACTIONS = [
@@ -1708,11 +1664,6 @@ def parse_args(argv):
         help="Reset the device before starting serial logs.",
         default=os.getenv("ESPHOME_SERIAL_LOGGING_RESET"),
     )
-    parser_logs.add_argument(
-        "--no-states",
-        action="store_true",
-        help="Do not show entity state changes in log output.",
-    )
 
     parser_discover = subparsers.add_parser(
         "discover",
@@ -1858,24 +1809,6 @@ def parse_args(argv):
         "configuration", help="Your YAML configuration file(s).", nargs="+"
     )
 
-    parser_bundle = subparsers.add_parser(
-        "bundle",
-        help="Create a self-contained config bundle for remote compilation.",
-    )
-    parser_bundle.add_argument(
-        "configuration", help="Your YAML configuration file(s).", nargs="+"
-    )
-    parser_bundle.add_argument(
-        "-o",
-        "--output",
-        help="Output path for the bundle archive.",
-    )
-    parser_bundle.add_argument(
-        "--list-only",
-        help="List discovered files without creating the archive.",
-        action="store_true",
-    )
-
     # Keep backward compatibility with the old command line format of
     # esphome <config> <command>.
     #
@@ -1954,16 +1887,6 @@ def run_esphome(argv):
         _LOGGER.warning("Skipping secrets file %s", conf_path)
         return 0
 
-    # Bundle support: if the configuration is a .esphomebundle, extract it
-    # and rewrite conf_path to the extracted YAML config.
-    from esphome.bundle import is_bundle_path, prepare_bundle_for_compile
-
-    if is_bundle_path(conf_path):
-        _LOGGER.info("Extracting config bundle %s...", conf_path)
-        conf_path = prepare_bundle_for_compile(conf_path)
-        # Update the argument so downstream code sees the extracted path
-        args.configuration[0] = str(conf_path)
-
     CORE.config_path = conf_path
     CORE.dashboard = args.dashboard
 

esphome/analyze_memory/__init__.py

@@ -1,6 +1,6 @@
 """Memory usage analyzer for ESPHome compiled binaries."""
 
-from collections import Counter, defaultdict
+from collections import defaultdict
 from dataclasses import dataclass, field
 import logging
 from pathlib import Path
@@ -40,15 +40,6 @@ _READELF_SECTION_PATTERN = re.compile(
     r"\s*\[\s*\d+\]\s+([\.\w]+)\s+\w+\s+[\da-fA-F]+\s+[\da-fA-F]+\s+([\da-fA-F]+)"
 )
 
-# Regex for extracting call targets from objdump disassembly
-# Matches direct call instructions across architectures:
-#   Xtensa: call0/call4/call8/call12/callx0/callx4/callx8/callx12 <addr> <symbol>
-#   ARM:    bl/blx <addr> <symbol>
-# Captures the mangled symbol name inside angle brackets.
-_CALL_TARGET_PATTERN = re.compile(
-    r"\t(?:call(?:0|4|8|12)|callx(?:0|4|8|12)|blx?)\s+[\da-fA-F]+ <([^>]+)>"
-)
-
 # Component category prefixes
 _COMPONENT_PREFIX_ESPHOME = "[esphome]"
 _COMPONENT_PREFIX_EXTERNAL = "[external]"
@@ -56,10 +47,6 @@ _COMPONENT_PREFIX_LIB = "[lib]"
 _COMPONENT_CORE = f"{_COMPONENT_PREFIX_ESPHOME}core"
 _COMPONENT_API = f"{_COMPONENT_PREFIX_ESPHOME}api"
 
-# Placement new storage suffix (generated by codegen Pvariable)
-_PSTORAGE_SUFFIX = "__pstorage"
-
-
 # C++ namespace prefixes
 _NAMESPACE_ESPHOME = "esphome::"
 _NAMESPACE_STD = "std::"
@@ -205,27 +192,20 @@ class MemoryAnalyzer:
         self._cswtch_symbols: list[tuple[str, int, str, str]] = []
         # Library symbol mapping: symbol_name -> library_name
         self._lib_symbol_map: dict[str, str] = {}
-        # Source file symbol mapping: symbol_name -> component_name
-        # Used for extern "C" and other symbols without C++ namespace
-        self._source_symbol_map: dict[str, str] = {}
         # Library dir to name mapping: "lib641" -> "espsoftwareserial",
         # "espressif__mdns" -> "mdns"
         self._lib_hash_to_name: dict[str, str] = {}
         # Heuristic category to library redirect: "mdns_lib" -> "[lib]mdns"
         self._heuristic_to_lib: dict[str, str] = {}
-        # Function call counts: mangled_name -> call_count
-        self._function_call_counts: Counter[str] = Counter()
 
     def analyze(self) -> dict[str, ComponentMemory]:
         """Analyze the ELF file and return component memory usage."""
         self._parse_sections()
         self._parse_symbols()
         self._scan_libraries()
-        self._scan_source_symbols()
         self._categorize_symbols()
         self._analyze_cswtch_symbols()
         self._analyze_sdk_libraries()
-        self._analyze_function_calls()
         return dict(self.components)
 
     def _parse_sections(self) -> None:
@@ -336,13 +316,6 @@ class MemoryAnalyzer:
         # Demangle C++ names if needed
         demangled = self._demangle_symbol(symbol_name)
 
-        # Check for placement new storage symbols (generated by codegen)
-        # Format: {component}__{id}__pstorage
-        if demangled.endswith(_PSTORAGE_SUFFIX) and (
-            component := self._match_pstorage_component(demangled)
-        ):
-            return component
-
         # Check for special component classes first (before namespace pattern)
         # This handles cases like esphome::ESPHomeOTAComponent which should map to ota
         if _NAMESPACE_ESPHOME in demangled:
@@ -378,11 +351,6 @@ class MemoryAnalyzer:
         if lib_name := self._lib_symbol_map.get(symbol_name):
             return f"{_COMPONENT_PREFIX_LIB}{lib_name}"
 
-        # Check source file mapping (catches extern "C" functions in ESPHome sources)
-        # Must be before heuristic patterns since source attribution is authoritative
-        if component := self._source_symbol_map.get(symbol_name):
-            return component
-
         # Check against symbol patterns
         for component, patterns in SYMBOL_PATTERNS.items():
             if any(pattern in symbol_name for pattern in patterns):
@@ -410,33 +378,14 @@ class MemoryAnalyzer:
         # Track uncategorized symbols for analysis
         return "other"
 
-    def _match_pstorage_component(self, symbol_name: str) -> str | None:
-        """Match a __pstorage symbol to its ESPHome component.
-
-        Symbol format: {component}__{id}__pstorage
-        The component namespace is embedded by codegen before the double underscore.
-        """
-        prefix = symbol_name[: -len(_PSTORAGE_SUFFIX)]
-        # Extract component namespace before the first double underscore
-        dunder_pos = prefix.find("__")
-        if dunder_pos == -1:
-            return None
-        component_name = prefix[:dunder_pos]
-        if component_name in get_esphome_components():
-            return f"{_COMPONENT_PREFIX_ESPHOME}{component_name}"
-        if component_name in self.external_components:
-            return f"{_COMPONENT_PREFIX_EXTERNAL}{component_name}"
-        return None
-
     def _batch_demangle_symbols(self, symbols: list[str]) -> None:
         """Batch demangle C++ symbol names for efficiency."""
         if not symbols:
             return
 
         _LOGGER.info("Demangling %d symbols", len(symbols))
-        demangled = batch_demangle(symbols, objdump_path=self.objdump_path)
-        self._demangle_cache.update(demangled)
-        _LOGGER.info("Successfully demangled %d symbols", len(demangled))
+        self._demangle_cache = batch_demangle(symbols, objdump_path=self.objdump_path)
+        _LOGGER.info("Successfully demangled %d symbols", len(self._demangle_cache))
 
     def _demangle_symbol(self, symbol: str) -> str:
         """Get demangled C++ symbol name from cache."""
@@ -691,7 +640,6 @@ class MemoryAnalyzer:
             return None
 
         symbol_map: dict[str, str] = {}
-        source_symbol_map: dict[str, str] = {}
         current_symbol: str | None = None
         section_prefixes = (".text.", ".rodata.", ".data.", ".bss.", ".literal.")
 
@@ -727,18 +675,9 @@ class MemoryAnalyzer:
                     if dir_key in source_path:
                         symbol_map[current_symbol] = lib_name
                         break
-                else:
-                    # Map ESPHome source files to components for extern "C"
-                    # and other symbols without C++ namespace
-                    component = self._source_file_to_component(source_path)
-                    if component.startswith(
-                        (_COMPONENT_PREFIX_ESPHOME, _COMPONENT_PREFIX_EXTERNAL)
-                    ):
-                        source_symbol_map[current_symbol] = component
 
             current_symbol = None
 
-        self._source_symbol_map = source_symbol_map
         return symbol_map or None
 
     def _scan_libraries(self) -> None:
@@ -789,112 +728,6 @@ class MemoryAnalyzer:
             len(libraries),
         )
 
-    def _scan_source_symbols(self) -> None:
-        """Scan ESPHome source object files to map extern "C" symbols to components.
-
-        When no linker map file is available, this uses ``nm`` to scan ``.o`` files
-        under ``src/esphome/`` and build a symbol-to-component mapping. This catches
-        ``extern "C"`` functions and other symbols that lack C++ namespace prefixes.
-
-        Skips scanning if ``_source_symbol_map`` was already populated by
-        ``_parse_map_file()``.
-        """
-        if self._source_symbol_map or not self.nm_path:
-            return
-
-        obj_dir = self._find_object_files_dir()
-        if obj_dir is None:
-            return
-
-        # Find ESPHome source object files
-        esphome_src_dir = obj_dir / "src" / "esphome"
-        if not esphome_src_dir.is_dir():
-            return
-
-        obj_files = sorted(esphome_src_dir.rglob("*.o"))
-        if not obj_files:
-            return
-
-        # Run nm with --print-file-name to get file:symbol mapping
-        result = run_tool(
-            [self.nm_path, "--print-file-name", "-g", "--defined-only"]
-            + [str(f) for f in obj_files],
-        )
-        if result is None or result.returncode != 0:
-            _LOGGER.debug("nm scan of source objects failed")
-            return
-
-        self._source_symbol_map = self._parse_nm_source_output(result.stdout, obj_dir)
-        if self._source_symbol_map:
-            _LOGGER.info(
-                "Built source symbol map from nm: %d symbols",
-                len(self._source_symbol_map),
-            )
-
-    def _parse_nm_source_output(self, output: str, base_dir: Path) -> dict[str, str]:
-        """Parse nm output to map non-namespaced symbols to ESPHome components.
-
-        Extracts global defined symbols from ESPHome source object files that
-        don't use C++ namespacing (e.g. ``extern "C"`` functions).
-
-        Args:
-            output: Raw stdout from ``nm --print-file-name -g --defined-only``
-                or ``nm --print-file-name -S``.
-            base_dir: Build directory for computing relative paths.
-
-        Returns:
-            Dict mapping symbol names to component names.
-        """
-        source_map: dict[str, str] = {}
-        for line in output.splitlines():
-            # Format: /path/to/file.o: addr type name
-            #     or: /path/to/file.o: addr size type name (with -S)
-            colon_idx = line.rfind(".o:")
-            if colon_idx == -1:
-                continue
-
-            file_path = line[: colon_idx + 2]
-            fields = line[colon_idx + 3 :].split()
-            if len(fields) < 3:
-                continue
-
-            # With -S flag, format is: addr size type name
-            # Without -S flag: addr type name
-            # type is a single char; size is hex digits
-            # Detect by checking if fields[1] is a single uppercase letter (type)
-            if len(fields[1]) == 1 and fields[1].isalpha():
-                # addr type name
-                sym_type = fields[1]
-                symbol_name = fields[2]
-            elif len(fields) >= 4:
-                # addr size type name
-                sym_type = fields[2]
-                symbol_name = fields[3]
-            else:
-                continue
-
-            # Only global defined symbols (uppercase type)
-            if not sym_type.isupper() or sym_type == "U":
-                continue
-
-            # Skip symbols already in esphome:: namespace
-            if symbol_name.startswith("_ZN7esphome"):
-                continue
-
-            # Make path relative to base_dir for _source_file_to_component
-            try:
-                rel_path = str(Path(file_path).relative_to(base_dir))
-            except ValueError:
-                continue
-
-            component = self._source_file_to_component(rel_path)
-            if component.startswith(
-                (_COMPONENT_PREFIX_ESPHOME, _COMPONENT_PREFIX_EXTERNAL)
-            ):
-                source_map[symbol_name] = component
-
-        return source_map
-
     def _find_object_files_dir(self) -> Path | None:
         """Find the directory containing object files for this build.
 
@@ -1178,43 +1011,6 @@ class MemoryAnalyzer:
             total_size,
         )
 
-    def _analyze_function_calls(self) -> None:
-        """Count function call sites by parsing disassembly output.
-
-        Parses direct call instructions (call0/call8/bl/blx) from objdump -d
-        to count how many times each function is called. This helps identify
-        inlining candidates — frequently called small functions benefit most
-        from inlining.
-        """
-        result = run_tool(
-            [self.objdump_path, "-d", str(self.elf_path)],
-            timeout=60,
-        )
-        if result is None or result.returncode != 0:
-            _LOGGER.debug("Failed to disassemble ELF for function call analysis")
-            return
-
-        self._function_call_counts = Counter(
-            match.group(1)
-            for line in result.stdout.splitlines()
-            if (match := _CALL_TARGET_PATTERN.search(line))
-        )
-
-        # Demangle any call targets not already in the cache
-        missing = [
-            name
-            for name in self._function_call_counts
-            if name not in self._demangle_cache
-        ]
-        if missing:
-            self._batch_demangle_symbols(missing)
-
-        _LOGGER.debug(
-            "Function call analysis: %d unique targets, %d total calls",
-            len(self._function_call_counts),
-            sum(self._function_call_counts.values()),
-        )
-
     def get_unattributed_ram(self) -> tuple[int, int, int]:
         """Get unattributed RAM sizes (SDK/framework overhead).
 

esphome/analyze_memory/cli.py

@@ -15,7 +15,6 @@ from . import (
     _COMPONENT_PREFIX_ESPHOME,
     _COMPONENT_PREFIX_EXTERNAL,
     _COMPONENT_PREFIX_LIB,
-    _PSTORAGE_SUFFIX,
     RAM_SECTIONS,
     MemoryAnalyzer,
 )
@@ -24,17 +23,6 @@ if TYPE_CHECKING:
     from . import ComponentMemory
 
 
-def _format_pstorage_name(name: str) -> str:
-    """Format a __pstorage symbol as 'storage for {id}'."""
-    if not name.endswith(_PSTORAGE_SUFFIX):
-        return name
-    prefix = name[: -len(_PSTORAGE_SUFFIX)]
-    # Strip component namespace prefix: {component}__{id} -> {id}
-    dunder_pos = prefix.find("__")
-    var_id = prefix[dunder_pos + 2 :] if dunder_pos != -1 else prefix
-    return f"storage for {var_id}"
-
-
 class MemoryAnalyzerCLI(MemoryAnalyzer):
     """Memory analyzer with CLI-specific report generation."""
 
@@ -160,14 +148,11 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
         If section is one of the RAM sections (.data or .bss), a label like
         " [data]" or " [bss]" is appended. For non-RAM sections or when
         section is None, no section label is added.
-
-        Placement new storage symbols are formatted as "storage for {id}".
         """
-        display_name = _format_pstorage_name(demangled)
         section_label = ""
         if section in RAM_SECTIONS:
             section_label = f" [{section[1:]}]"  # .data -> [data], .bss -> [bss]
-        return f"{display_name} ({size:,} B){section_label}"
+        return f"{demangled} ({size:,} B){section_label}"
 
     def _add_top_symbols(self, lines: list[str]) -> None:
         """Add a section showing the top largest symbols in the binary."""
@@ -190,13 +175,11 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
         for i, (_, demangled, size, section, component) in enumerate(top_symbols):
             # Format section label
             section_label = f"[{section[1:]}]" if section else ""
-            # Format storage symbols readably
-            display_name = _format_pstorage_name(demangled)
-            # Truncate if too long
+            # Truncate demangled name if too long
             demangled_display = (
-                f"{display_name[:truncate_limit]}..."
-                if len(display_name) > self.COL_TOP_SYMBOL_NAME
-                else display_name
+                f"{demangled[:truncate_limit]}..."
+                if len(demangled) > self.COL_TOP_SYMBOL_NAME
+                else demangled
             )
             lines.append(
                 f"{i + 1:>2}. {size:>7,} B {section_label:<8} {demangled_display:<{self.COL_TOP_SYMBOL_NAME}} {component}"
@@ -248,110 +231,6 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
                     lines.append(f"    {size:>6,} B  {sym_name}")
             lines.append("")
 
-    # Number of top called functions to show
-    TOP_CALLS_LIMIT: int = 50
-    # Number of inlining candidates to show
-    INLINE_CANDIDATES_LIMIT: int = 25
-    # Maximum function size in bytes to consider for inlining
-    INLINE_SIZE_THRESHOLD: int = 16
-
-    def _build_symbol_sizes(self) -> dict[str, int]:
-        """Build a size lookup from all component symbols: mangled_name -> size."""
-        return {
-            symbol: size
-            for symbols in self._component_symbols.values()
-            for symbol, _, size, _ in symbols
-        }
-
-    def _format_call_row(
-        self, index: int, mangled: str, count: int, symbol_sizes: dict[str, int]
-    ) -> str:
-        """Format a single row for call frequency tables."""
-        demangled = self._demangle_cache.get(mangled, mangled)
-        if len(demangled) > 80:
-            demangled = f"{demangled[:77]}..."
-        size = symbol_sizes.get(mangled)
-        size_str = f"{size:>5,} B" if size is not None else "      ?"
-        return f"{index:>3}  {count:>5}  {size_str}  {demangled}"
-
-    def _add_call_table_header(self, lines: list[str]) -> None:
-        """Add the header row for call frequency tables."""
-        lines.append(f"{'#':>3}  {'Calls':>5}  {'Size':>7}  Function")
-        lines.append(f"{'---':>3}  {'-----':>5}  {'-------':>7}  {'-' * 60}")
-
-    def _add_function_call_analysis(self, lines: list[str]) -> None:
-        """Add function call frequency analysis section.
-
-        Shows the most frequently called functions by call site count.
-        """
-        self._add_section_header(lines, "Top Called Functions")
-
-        symbol_sizes = self._build_symbol_sizes()
-
-        # Sort by call count descending
-        sorted_calls = sorted(
-            self._function_call_counts.items(), key=lambda x: x[1], reverse=True
-        )
-
-        self._add_call_table_header(lines)
-
-        for i, (mangled, count) in enumerate(sorted_calls[: self.TOP_CALLS_LIMIT]):
-            lines.append(self._format_call_row(i + 1, mangled, count, symbol_sizes))
-
-        total_calls = sum(self._function_call_counts.values())
-        lines.append("")
-        lines.append(
-            f"Total: {len(self._function_call_counts)} unique targets, "
-            f"{total_calls:,} call sites"
-        )
-        lines.append("")
-
-    def _add_inline_candidates(self, lines: list[str]) -> None:
-        """Add inlining candidates section.
-
-        Shows frequently called functions that are small enough to benefit
-        from inlining (< 16 bytes). These are the best candidates for
-        reducing call overhead.
-        """
-        self._add_section_header(
-            lines,
-            f"Inlining Candidates (<{self.INLINE_SIZE_THRESHOLD} B, by call count)",
-        )
-
-        symbol_sizes = self._build_symbol_sizes()
-
-        # Filter to small functions with known size, sort by call count
-        candidates = sorted(
-            (
-                (mangled, count)
-                for mangled, count in self._function_call_counts.items()
-                if mangled in symbol_sizes
-                and symbol_sizes[mangled] < self.INLINE_SIZE_THRESHOLD
-            ),
-            key=lambda x: x[1],
-            reverse=True,
-        )
-
-        if not candidates:
-            lines.append("No candidates found.")
-            lines.append("")
-            return
-
-        self._add_call_table_header(lines)
-
-        for i, (mangled, count) in enumerate(
-            candidates[: self.INLINE_CANDIDATES_LIMIT]
-        ):
-            lines.append(self._format_call_row(i + 1, mangled, count, symbol_sizes))
-
-        lines.append("")
-        lines.append(
-            f"Showing top {min(len(candidates), self.INLINE_CANDIDATES_LIMIT)} "
-            f"of {len(candidates)} functions under "
-            f"{self.INLINE_SIZE_THRESHOLD} B"
-        )
-        lines.append("")
-
     def generate_report(self, detailed: bool = False) -> str:
         """Generate a formatted memory report."""
         components = sorted(
@@ -590,16 +469,15 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
                 lines.append(f"Total size: {comp_mem.flash_total:,} B")
                 lines.append("")
 
-                # Show symbols above threshold, always include storage symbols
+                # Show all symbols above threshold for better visibility
                 large_symbols = [
                     (sym, dem, size, sec)
                     for sym, dem, size, sec in sorted_symbols
                     if size > self.SYMBOL_SIZE_THRESHOLD
-                    or dem.endswith(_PSTORAGE_SUFFIX)
                 ]
 
                 lines.append(
-                    f"{comp_name} Symbols > {self.SYMBOL_SIZE_THRESHOLD} B & storage ({len(large_symbols)} symbols):"
+                    f"{comp_name} Symbols > {self.SYMBOL_SIZE_THRESHOLD} B ({len(large_symbols)} symbols):"
                 )
                 for i, (symbol, demangled, size, section) in enumerate(large_symbols):
                     lines.append(
@@ -622,10 +500,7 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
             # Sort by size descending
             sorted_ram_syms = sorted(ram_syms, key=lambda x: x[2], reverse=True)
             large_ram_syms = [
-                s
-                for s in sorted_ram_syms
-                if s[2] > self.RAM_SYMBOL_SIZE_THRESHOLD
-                or s[1].endswith(_PSTORAGE_SUFFIX)
+                s for s in sorted_ram_syms if s[2] > self.RAM_SYMBOL_SIZE_THRESHOLD
             ]
 
             lines.append(f"{name} ({mem.ram_total:,} B total RAM):")
@@ -643,14 +518,13 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
                 for symbol, demangled, size, section in large_ram_syms[:10]:
                     # Format section label consistently by stripping leading dot
                     section_label = section.lstrip(".") if section else ""
-                    display_name = _format_pstorage_name(demangled)
                     # Add ellipsis if name is truncated
-                    display_name = (
-                        f"{display_name[:70]}..."
-                        if len(display_name) > 70
-                        else display_name
+                    demangled_display = (
+                        f"{demangled[:70]}..." if len(demangled) > 70 else demangled
+                    )
+                    lines.append(
+                        f"    {size:>6,} B [{section_label}] {demangled_display}"
                     )
-                    lines.append(f"    {size:>6,} B [{section_label}] {display_name}")
                 if len(large_ram_syms) > 10:
                     lines.append(f"    ... and {len(large_ram_syms) - 10} more")
             lines.append("")
@@ -659,11 +533,6 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
         if self._cswtch_symbols:
             self._add_cswtch_analysis(lines)
 
-        # Function call frequency analysis
-        if self._function_call_counts:
-            self._add_function_call_analysis(lines)
-            self._add_inline_candidates(lines)
-
         lines.append(
             "Note: This analysis covers symbols in the ELF file. Some runtime allocations may not be included."
         )

esphome/analyze_memory/const.py

@@ -408,6 +408,7 @@ SYMBOL_PATTERNS = {
     ],
     "arduino_core": [
         "pinMode",
+        "resetPins",
         "millis",
         "micros",
         "delay(",  # More specific - Arduino delay function with parenthesis

esphome/automation.py

@@ -1,4 +1,3 @@
-from dataclasses import dataclass, field
 import logging
 
 import esphome.codegen as cg
@@ -138,9 +137,6 @@ UpdateComponentAction = cg.esphome_ns.class_("UpdateComponentAction", Action)
 SuspendComponentAction = cg.esphome_ns.class_("SuspendComponentAction", Action)
 ResumeComponentAction = cg.esphome_ns.class_("ResumeComponentAction", Action)
 Automation = cg.esphome_ns.class_("Automation")
-TriggerForwarder = cg.esphome_ns.class_("TriggerForwarder")
-TriggerOnTrueForwarder = cg.esphome_ns.class_("TriggerOnTrueForwarder")
-TriggerOnFalseForwarder = cg.esphome_ns.class_("TriggerOnFalseForwarder")
 
 LambdaCondition = cg.esphome_ns.class_("LambdaCondition", Condition)
 StatelessLambdaCondition = cg.esphome_ns.class_("StatelessLambdaCondition", Condition)
@@ -251,9 +247,7 @@ async def and_condition_to_code(
     args: TemplateArgsType,
 ) -> MockObj:
     conditions = await build_condition_list(config, template_arg, args)
-    return cg.new_Pvariable(
-        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
-    )
+    return cg.new_Pvariable(condition_id, template_arg, conditions)
 
 
 @register_condition("or", OrCondition, validate_condition_list)
@@ -264,9 +258,7 @@ async def or_condition_to_code(
     args: TemplateArgsType,
 ) -> MockObj:
     conditions = await build_condition_list(config, template_arg, args)
-    return cg.new_Pvariable(
-        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
-    )
+    return cg.new_Pvariable(condition_id, template_arg, conditions)
 
 
 @register_condition("all", AndCondition, validate_condition_list)
@@ -277,9 +269,7 @@ async def all_condition_to_code(
     args: TemplateArgsType,
 ) -> MockObj:
     conditions = await build_condition_list(config, template_arg, args)
-    return cg.new_Pvariable(
-        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
-    )
+    return cg.new_Pvariable(condition_id, template_arg, conditions)
 
 
 @register_condition("any", OrCondition, validate_condition_list)
@@ -290,9 +280,7 @@ async def any_condition_to_code(
     args: TemplateArgsType,
 ) -> MockObj:
     conditions = await build_condition_list(config, template_arg, args)
-    return cg.new_Pvariable(
-        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
-    )
+    return cg.new_Pvariable(condition_id, template_arg, conditions)
 
 
 @register_condition("not", NotCondition, validate_potentially_and_condition)
@@ -314,9 +302,7 @@ async def xor_condition_to_code(
     args: TemplateArgsType,
 ) -> MockObj:
     conditions = await build_condition_list(config, template_arg, args)
-    return cg.new_Pvariable(
-        condition_id, cg.TemplateArguments(len(conditions), *template_arg), conditions
-    )
+    return cg.new_Pvariable(condition_id, template_arg, conditions)
 
 
 @register_condition("lambda", LambdaCondition, cv.returning_lambda)
@@ -427,16 +413,13 @@ async def if_action_to_code(
     template_arg: cg.TemplateArguments,
     args: TemplateArgsType,
 ) -> MockObj:
-    has_else = CONF_ELSE in config
-    # Prepend HasElse bool to template arguments: IfAction<HasElse, Ts...>
-    if_template_arg = cg.TemplateArguments(has_else, *template_arg)
     cond_conf = next(el for el in config if el in (CONF_ANY, CONF_ALL, CONF_CONDITION))
     condition = await build_condition(config[cond_conf], template_arg, args)
-    var = cg.new_Pvariable(action_id, if_template_arg, condition)
+    var = cg.new_Pvariable(action_id, template_arg, condition)
     if CONF_THEN in config:
         actions = await build_action_list(config[CONF_THEN], template_arg, args)
         cg.add(var.add_then(actions))
-    if has_else:
+    if CONF_ELSE in config:
         actions = await build_action_list(config[CONF_ELSE], template_arg, args)
         cg.add(var.add_else(actions))
     return var
@@ -675,76 +658,3 @@ async def build_automation(
     actions = await build_action_list(config[CONF_THEN], templ, args)
     cg.add(obj.add_actions(actions))
     return obj
-
-
-async def build_callback_automation(
-    parent: MockObj,
-    callback_method: str,
-    args: TemplateArgsType,
-    config: ConfigType,
-    forwarder: MockObj | MockObjClass | None = None,
-) -> None:
-    """Build an Automation and register it as a callback on the parent.
-
-    Eliminates the need for a Trigger wrapper object by registering the
-    automation's trigger() directly as a callback on the parent component.
-
-    Uses template forwarder structs so the compiler deduplicates the operator()
-    body across all call sites with the same signature. The forwarder must be
-    pointer-sized (single Automation* field) to fit inline in Callback::ctx_
-    and avoid heap allocation.
-
-    :param parent: The component object (e.g., button, sensor).
-    :param callback_method: Name of the callback method (e.g., "add_on_press_callback").
-    :param args: Automation template args as list of (type, name) tuples.
-    :param config: The automation config dict.
-    :param forwarder: Optional forwarder type to use instead of the default
-        TriggerForwarder<Ts...>. Pass any struct type whose aggregate init takes
-        a single Automation pointer (e.g., TriggerOnTrueForwarder).
-    """
-    arg_types = [arg[0] for arg in args]
-    templ = cg.TemplateArguments(*arg_types)
-    obj = cg.new_Pvariable(config[CONF_AUTOMATION_ID], templ)
-    actions = await build_action_list(config[CONF_THEN], templ, args)
-    cg.add(obj.add_actions(actions))
-    # Use template forwarder structs for deduplication. The compiler generates
-    # one operator() per forwarder type; different automation pointers are just
-    # data in the struct.
-    if forwarder is None:
-        forwarder = TriggerForwarder.template(templ)
-    # RawExpression for aggregate init — both forwarder and obj are codegen
-    # MockObjs (not user input), and there's no Expression type for positional
-    # aggregate initialization (StructInitializer uses named fields).
-    cg.add(getattr(parent, callback_method)(cg.RawExpression(f"{forwarder}{{{obj}}}")))
-
-
-@dataclass(frozen=True, slots=True)
-class CallbackAutomation:
-    """A single callback automation entry for build_callback_automations."""
-
-    conf_key: str
-    callback_method: str
-    args: TemplateArgsType = field(default_factory=list)
-    forwarder: MockObj | MockObjClass | None = None
-
-
-async def build_callback_automations(
-    parent: MockObj,
-    config: ConfigType,
-    entries: tuple[CallbackAutomation, ...],
-) -> None:
-    """Build multiple callback automations from a tuple of entries.
-
-    :param parent: The component object (e.g., button, sensor).
-    :param config: The full component config dict.
-    :param entries: Tuple of CallbackAutomation entries to process.
-    """
-    for entry in entries:
-        for conf in config.get(entry.conf_key, []):
-            await build_callback_automation(
-                parent,
-                entry.callback_method,
-                entry.args,
-                conf,
-                forwarder=entry.forwarder,
-            )

esphome/build_gen/espidf.py

@@ -53,13 +53,6 @@ def get_project_cmakelists() -> str:
     variant = get_esp32_variant()
     idf_target = variant.lower().replace("-", "")
 
-    # Extract compile definitions from build flags (-DXXX -> XXX)
-    compile_defs = [flag for flag in CORE.build_flags if flag.startswith("-D")]
-    extra_compile_options = "\n".join(
-        f'idf_build_set_property(COMPILE_OPTIONS "{compile_def}" APPEND)'
-        for compile_def in compile_defs
-    )
-
     return f"""\
 # Auto-generated by ESPHome
 cmake_minimum_required(VERSION 3.16)
@@ -68,9 +61,6 @@ set(IDF_TARGET {idf_target})
 set(EXTRA_COMPONENT_DIRS ${{CMAKE_SOURCE_DIR}}/src)
 
 include($ENV{{IDF_PATH}}/tools/cmake/project.cmake)
-
-{extra_compile_options}
-
 project({CORE.name})
 """
 
@@ -80,6 +70,10 @@ def get_component_cmakelists(minimal: bool = False) -> str:
     idf_requires = [] if minimal else (get_available_components() or [])
     requires_str = " ".join(idf_requires)
 
+    # Extract compile definitions from build flags (-DXXX -> XXX)
+    compile_defs = [flag[2:] for flag in CORE.build_flags if flag.startswith("-D")]
+    compile_defs_str = "\n    ".join(sorted(compile_defs)) if compile_defs else ""
+
     # Extract compile options (-W flags, excluding linker flags)
     compile_opts = [
         flag
@@ -110,6 +104,11 @@ idf_component_register(
 # Apply C++ standard
 target_compile_features(${{COMPONENT_LIB}} PUBLIC cxx_std_20)
 
+# ESPHome compile definitions
+target_compile_definitions(${{COMPONENT_LIB}} PUBLIC
+    {compile_defs_str}
+)
+
 # ESPHome compile options
 target_compile_options(${{COMPONENT_LIB}} PUBLIC
     {compile_opts_str}

esphome/bundle.py

@@ -1,765 +0,0 @@
-"""Config bundle creator and extractor for ESPHome.
-
-A bundle is a self-contained .tar.gz archive containing a YAML config
-and every local file it depends on. Bundles can be created from a config
-and compiled directly: ``esphome compile my_device.esphomebundle.tar.gz``
-"""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from enum import StrEnum
-import io
-import json
-import logging
-from pathlib import Path
-import re
-import shutil
-import tarfile
-from typing import Any
-
-from esphome import const, yaml_util
-from esphome.const import (
-    CONF_ESPHOME,
-    CONF_EXTERNAL_COMPONENTS,
-    CONF_INCLUDES,
-    CONF_INCLUDES_C,
-    CONF_PATH,
-    CONF_SOURCE,
-    CONF_TYPE,
-)
-from esphome.core import CORE, EsphomeError
-
-_LOGGER = logging.getLogger(__name__)
-
-BUNDLE_EXTENSION = ".esphomebundle.tar.gz"
-MANIFEST_FILENAME = "manifest.json"
-CURRENT_MANIFEST_VERSION = 1
-MAX_DECOMPRESSED_SIZE = 500 * 1024 * 1024  # 500 MB
-MAX_MANIFEST_SIZE = 1024 * 1024  # 1 MB
-
-# Directories preserved across bundle extractions (build caches)
-_PRESERVE_DIRS = (".esphome", ".pioenvs", ".pio")
-_BUNDLE_STAGING_DIR = ".bundle_staging"
-
-
-class ManifestKey(StrEnum):
-    """Keys used in bundle manifest.json."""
-
-    MANIFEST_VERSION = "manifest_version"
-    ESPHOME_VERSION = "esphome_version"
-    CONFIG_FILENAME = "config_filename"
-    FILES = "files"
-    HAS_SECRETS = "has_secrets"
-
-
-# String prefixes that are never local file paths
-_NON_PATH_PREFIXES = ("http://", "https://", "ftp://", "mdi:", "<")
-
-# File extensions recognized when resolving relative path strings.
-# A relative string with one of these extensions is resolved against the
-# config directory and included if the file exists.
-_KNOWN_FILE_EXTENSIONS = frozenset(
-    {
-        # Fonts
-        ".ttf",
-        ".otf",
-        ".woff",
-        ".woff2",
-        ".pcf",
-        ".bdf",
-        # Images
-        ".png",
-        ".jpg",
-        ".jpeg",
-        ".bmp",
-        ".gif",
-        ".svg",
-        ".ico",
-        ".webp",
-        # Certificates
-        ".pem",
-        ".crt",
-        ".key",
-        ".der",
-        ".p12",
-        ".pfx",
-        # C/C++ includes
-        ".h",
-        ".hpp",
-        ".c",
-        ".cpp",
-        ".ino",
-        # Web assets
-        ".css",
-        ".js",
-        ".html",
-    }
-)
-
-
-# Matches !secret references in YAML text.  This is intentionally a simple
-# regex scan rather than a YAML parse — it may match inside comments or
-# multi-line strings, which is the conservative direction (include more
-# secrets rather than fewer).
-_SECRET_RE = re.compile(r"!secret\s+(\S+)")
-
-
-def _find_used_secret_keys(yaml_files: list[Path]) -> set[str]:
-    """Scan YAML files for ``!secret <key>`` references."""
-    keys: set[str] = set()
-    for fpath in yaml_files:
-        try:
-            text = fpath.read_text(encoding="utf-8")
-        except (OSError, UnicodeDecodeError):
-            continue
-        for match in _SECRET_RE.finditer(text):
-            keys.add(match.group(1))
-    return keys
-
-
-@dataclass
-class BundleFile:
-    """A file to include in the bundle."""
-
-    path: str  # Relative path inside the archive
-    source: Path  # Absolute path on disk
-
-
-@dataclass
-class BundleResult:
-    """Result of creating a bundle."""
-
-    data: bytes
-    manifest: dict[str, Any]
-    files: list[BundleFile]
-
-
-@dataclass
-class BundleManifest:
-    """Parsed and validated bundle manifest."""
-
-    manifest_version: int
-    esphome_version: str
-    config_filename: str
-    files: list[str]
-    has_secrets: bool
-
-
-class ConfigBundleCreator:
-    """Creates a self-contained bundle from an ESPHome config."""
-
-    def __init__(self, config: dict[str, Any]) -> None:
-        self._config = config
-        self._config_dir = Path(CORE.config_dir).resolve()
-        self._config_path = Path(CORE.config_path).resolve()
-        self._files: list[BundleFile] = []
-        self._seen_paths: set[Path] = set()
-        self._secrets_paths: set[Path] = set()
-
-    def discover_files(self) -> list[BundleFile]:
-        """Discover all files needed for the bundle."""
-        self._files = []
-        self._seen_paths = set()
-        self._secrets_paths = set()
-
-        # The main config file
-        self._add_file(self._config_path)
-
-        # Phase 1: YAML includes (tracked during config loading)
-        self._discover_yaml_includes()
-
-        # Phase 2: Component-referenced files from validated config
-        self._discover_component_files()
-
-        return list(self._files)
-
-    def create_bundle(self) -> BundleResult:
-        """Create the bundle archive."""
-        files = self.discover_files()
-
-        # Determine which secret keys are actually referenced by the
-        # bundled YAML files so we only ship those, not the entire
-        # secrets.yaml which may contain secrets for other devices.
-        yaml_sources = [
-            bf.source for bf in files if bf.source.suffix in (".yaml", ".yml")
-        ]
-        used_secret_keys = _find_used_secret_keys(yaml_sources)
-        filtered_secrets = self._build_filtered_secrets(used_secret_keys)
-
-        has_secrets = bool(filtered_secrets)
-        if has_secrets:
-            _LOGGER.warning(
-                "Bundle contains secrets (e.g. Wi-Fi passwords). "
-                "Do not share it with untrusted parties."
-            )
-
-        manifest = self._build_manifest(files, has_secrets=has_secrets)
-
-        buf = io.BytesIO()
-        with tarfile.open(fileobj=buf, mode="w:gz") as tar:
-            # Add manifest first
-            manifest_data = json.dumps(manifest, indent=2).encode("utf-8")
-            _add_bytes_to_tar(tar, MANIFEST_FILENAME, manifest_data)
-
-            # Add filtered secrets files
-            for rel_path, data in sorted(filtered_secrets.items()):
-                _add_bytes_to_tar(tar, rel_path, data)
-
-            # Add files in sorted order for determinism, skipping secrets
-            # files which were already added above with filtered content
-            for bf in sorted(files, key=lambda f: f.path):
-                if bf.source in self._secrets_paths:
-                    continue
-                self._add_to_tar(tar, bf)
-
-        return BundleResult(data=buf.getvalue(), manifest=manifest, files=files)
-
-    def _add_file(self, abs_path: Path) -> bool:
-        """Add a file to the bundle. Returns False if already added."""
-        abs_path = abs_path.resolve()
-        if abs_path in self._seen_paths:
-            return False
-        if not abs_path.is_file():
-            _LOGGER.warning("Bundle: skipping missing file %s", abs_path)
-            return False
-
-        rel_path = self._relative_to_config_dir(abs_path)
-        if rel_path is None:
-            _LOGGER.warning(
-                "Bundle: skipping file outside config directory: %s", abs_path
-            )
-            return False
-
-        self._seen_paths.add(abs_path)
-        self._files.append(BundleFile(path=rel_path, source=abs_path))
-        return True
-
-    def _add_directory(self, abs_path: Path) -> None:
-        """Recursively add all files in a directory."""
-        abs_path = abs_path.resolve()
-        if not abs_path.is_dir():
-            _LOGGER.warning("Bundle: skipping missing directory %s", abs_path)
-            return
-        for child in sorted(abs_path.rglob("*")):
-            if child.is_file() and "__pycache__" not in child.parts:
-                self._add_file(child)
-
-    def _relative_to_config_dir(self, abs_path: Path) -> str | None:
-        """Get a path relative to the config directory. Returns None if outside.
-
-        Always uses forward slashes for consistency in tar archives.
-        """
-        try:
-            return abs_path.relative_to(self._config_dir).as_posix()
-        except ValueError:
-            return None
-
-    def _discover_yaml_includes(self) -> None:
-        """Discover YAML files loaded during config parsing.
-
-        Deliberately uses a fresh re-parse and force-loads every deferred
-        ``IncludeFile`` to include *all* potentially-reachable includes,
-        even branches not selected by the local substitutions. Bundles are
-        meant to be compiled on another system where command-line
-        substitution overrides may choose a different branch — e.g.
-        ``!include network/${eth_model}/config.yaml`` must ship every
-        candidate so the remote build can pick any one.
-
-        Entries with unresolved substitution variables in the filename
-        path are skipped with a warning (they cannot be resolved without
-        the substitution pass).
-
-        Secrets files are tracked separately so we can filter them to
-        only include the keys this config actually references.
-        """
-        # Must be a fresh parse: IncludeFile.load() caches its result in
-        # _content, and we discover files by listening for loader calls. On
-        # an already-parsed tree the cache is populated, .load() returns
-        # without calling the loader, the listener never fires, and the
-        # referenced files would be silently dropped from the bundle.
-        with yaml_util.track_yaml_loads() as loaded_files:
-            try:
-                data = yaml_util.load_yaml(self._config_path)
-            except EsphomeError:
-                _LOGGER.debug(
-                    "Bundle: re-loading YAML for include discovery failed, "
-                    "proceeding with partial file list"
-                )
-            else:
-                _force_load_include_files(data)
-
-        for fpath in loaded_files:
-            if fpath == self._config_path.resolve():
-                continue  # Already added as config
-            if fpath.name in const.SECRETS_FILES:
-                self._secrets_paths.add(fpath)
-            self._add_file(fpath)
-
-    def _discover_component_files(self) -> None:
-        """Walk the validated config for file references.
-
-        Uses a generic recursive walk to find file paths instead of
-        hardcoding per-component knowledge about config dict formats.
-        After validation, components typically resolve paths to absolute
-        using CORE.relative_config_path() or cv.file_(). Relative paths
-        with known file extensions are also resolved and checked.
-
-        Core ESPHome concepts that use relative paths or directories
-        are handled explicitly.
-        """
-        config = self._config
-
-        # Generic walk: find all file paths in the validated config
-        self._walk_config_for_files(config)
-
-        # --- Core ESPHome concepts needing explicit handling ---
-
-        # esphome.includes / includes_c - can be relative paths and directories
-        esphome_conf = config.get(CONF_ESPHOME, {})
-        for include_path in esphome_conf.get(CONF_INCLUDES, []):
-            resolved = _resolve_include_path(include_path)
-            if resolved is None:
-                continue
-            if resolved.is_dir():
-                self._add_directory(resolved)
-            else:
-                self._add_file(resolved)
-        for include_path in esphome_conf.get(CONF_INCLUDES_C, []):
-            resolved = _resolve_include_path(include_path)
-            if resolved is not None:
-                self._add_file(resolved)
-
-        # external_components with source: local - directories
-        for ext_conf in config.get(CONF_EXTERNAL_COMPONENTS, []):
-            source = ext_conf.get(CONF_SOURCE, {})
-            if not isinstance(source, dict):
-                continue
-            if source.get(CONF_TYPE) != "local":
-                continue
-            path = source.get(CONF_PATH)
-            if not path:
-                continue
-            p = Path(path)
-            if not p.is_absolute():
-                p = CORE.relative_config_path(p)
-            self._add_directory(p)
-
-    def _walk_config_for_files(self, obj: Any) -> None:
-        """Recursively walk the config dict looking for file path references."""
-        if isinstance(obj, dict):
-            for value in obj.values():
-                self._walk_config_for_files(value)
-        elif isinstance(obj, (list, tuple)):
-            for item in obj:
-                self._walk_config_for_files(item)
-        elif isinstance(obj, Path):
-            if obj.is_absolute() and obj.is_file():
-                self._add_file(obj)
-        elif isinstance(obj, str):
-            self._check_string_path(obj)
-
-    def _check_string_path(self, value: str) -> None:
-        """Check if a string value is a local file reference."""
-        # Fast exits for strings that cannot be file paths
-        if len(value) < 2 or "\n" in value:
-            return
-        if value.startswith(_NON_PATH_PREFIXES):
-            return
-        # File paths must contain a path separator or a dot (for extension)
-        if "/" not in value and "\\" not in value and "." not in value:
-            return
-
-        p = Path(value)
-
-        # Absolute path - check if it points to an existing file
-        if p.is_absolute():
-            if p.is_file():
-                self._add_file(p)
-            return
-
-        # Relative path with a known file extension - likely a component
-        # validator that forgot to resolve to absolute via cv.file_() or
-        # CORE.relative_config_path(). Warn and try to resolve.
-        if p.suffix.lower() in _KNOWN_FILE_EXTENSIONS:
-            _LOGGER.warning(
-                "Bundle: non-absolute path in validated config: %s "
-                "(component validator should return absolute paths)",
-                value,
-            )
-            resolved = CORE.relative_config_path(p)
-            if resolved.is_file():
-                self._add_file(resolved)
-
-    def _build_filtered_secrets(self, used_keys: set[str]) -> dict[str, bytes]:
-        """Build filtered secrets files containing only the referenced keys.
-
-        Returns a dict mapping relative archive path to YAML bytes.
-        """
-        if not used_keys or not self._secrets_paths:
-            return {}
-
-        result: dict[str, bytes] = {}
-        for secrets_path in self._secrets_paths:
-            rel_path = self._relative_to_config_dir(secrets_path)
-            if rel_path is None:
-                continue
-            try:
-                all_secrets = yaml_util.load_yaml(secrets_path, clear_secrets=False)
-            except EsphomeError:
-                _LOGGER.warning("Bundle: failed to load secrets file %s", secrets_path)
-                continue
-            if not isinstance(all_secrets, dict):
-                continue
-            filtered = {k: v for k, v in all_secrets.items() if k in used_keys}
-            if filtered:
-                data = yaml_util.dump(filtered, show_secrets=True).encode("utf-8")
-                result[rel_path] = data
-        return result
-
-    def _build_manifest(
-        self, files: list[BundleFile], *, has_secrets: bool
-    ) -> dict[str, Any]:
-        """Build the manifest.json content."""
-        return {
-            ManifestKey.MANIFEST_VERSION: CURRENT_MANIFEST_VERSION,
-            ManifestKey.ESPHOME_VERSION: const.__version__,
-            ManifestKey.CONFIG_FILENAME: self._config_path.name,
-            ManifestKey.FILES: [f.path for f in files],
-            ManifestKey.HAS_SECRETS: has_secrets,
-        }
-
-    @staticmethod
-    def _add_to_tar(tar: tarfile.TarFile, bf: BundleFile) -> None:
-        """Add a BundleFile to the tar archive with deterministic metadata."""
-        with open(bf.source, "rb") as f:
-            _add_bytes_to_tar(tar, bf.path, f.read())
-
-
-def extract_bundle(
-    bundle_path: Path,
-    target_dir: Path | None = None,
-) -> Path:
-    """Extract a bundle archive and return the path to the config YAML.
-
-    Sanity checks reject path traversal, symlinks, absolute paths, and
-    oversized archives to prevent accidental file overwrites or extraction
-    outside the target directory.  These are **not** a security boundary —
-    bundles are assumed to come from the user's own machine or a trusted
-    build pipeline.
-
-    Args:
-        bundle_path: Path to the .tar.gz bundle file.
-        target_dir: Directory to extract into. If None, extracts next to
-                     the bundle file in a directory named after it.
-
-    Returns:
-        Absolute path to the extracted config YAML file.
-
-    Raises:
-        EsphomeError: If the bundle is invalid or extraction fails.
-    """
-
-    bundle_path = bundle_path.resolve()
-    if not bundle_path.is_file():
-        raise EsphomeError(f"Bundle file not found: {bundle_path}")
-
-    if target_dir is None:
-        target_dir = _default_target_dir(bundle_path)
-
-    target_dir = target_dir.resolve()
-    target_dir.mkdir(parents=True, exist_ok=True)
-
-    # Read and validate the archive
-    try:
-        with tarfile.open(bundle_path, "r:gz") as tar:
-            manifest = _read_manifest_from_tar(tar)
-            _validate_tar_members(tar, target_dir)
-            tar.extractall(path=target_dir, filter="data")
-    except tarfile.TarError as err:
-        raise EsphomeError(f"Failed to extract bundle: {err}") from err
-
-    config_filename = manifest[ManifestKey.CONFIG_FILENAME]
-    config_path = target_dir / config_filename
-    if not config_path.is_file():
-        raise EsphomeError(
-            f"Bundle manifest references config '{config_filename}' "
-            f"but it was not found in the archive"
-        )
-
-    return config_path
-
-
-def read_bundle_manifest(bundle_path: Path) -> BundleManifest:
-    """Read and validate the manifest from a bundle without full extraction.
-
-    Args:
-        bundle_path: Path to the .tar.gz bundle file.
-
-    Returns:
-        Parsed BundleManifest.
-
-    Raises:
-        EsphomeError: If the manifest is missing, invalid, or version unsupported.
-    """
-
-    try:
-        with tarfile.open(bundle_path, "r:gz") as tar:
-            manifest = _read_manifest_from_tar(tar)
-    except tarfile.TarError as err:
-        raise EsphomeError(f"Failed to read bundle: {err}") from err
-
-    return BundleManifest(
-        manifest_version=manifest[ManifestKey.MANIFEST_VERSION],
-        esphome_version=manifest.get(ManifestKey.ESPHOME_VERSION, "unknown"),
-        config_filename=manifest[ManifestKey.CONFIG_FILENAME],
-        files=manifest.get(ManifestKey.FILES, []),
-        has_secrets=manifest.get(ManifestKey.HAS_SECRETS, False),
-    )
-
-
-def _read_manifest_from_tar(tar: tarfile.TarFile) -> dict[str, Any]:
-    """Read and validate manifest.json from an open tar archive."""
-
-    try:
-        member = tar.getmember(MANIFEST_FILENAME)
-    except KeyError:
-        raise EsphomeError("Invalid bundle: missing manifest.json") from None
-
-    f = tar.extractfile(member)
-    if f is None:
-        raise EsphomeError("Invalid bundle: manifest.json is not a regular file")
-
-    if member.size > MAX_MANIFEST_SIZE:
-        raise EsphomeError(
-            f"Invalid bundle: manifest.json too large "
-            f"({member.size} bytes, max {MAX_MANIFEST_SIZE})"
-        )
-
-    try:
-        manifest = json.loads(f.read())
-    except (json.JSONDecodeError, UnicodeDecodeError) as err:
-        raise EsphomeError(f"Invalid bundle: malformed manifest.json: {err}") from err
-
-    # Version check
-    version = manifest.get(ManifestKey.MANIFEST_VERSION)
-    if version is None:
-        raise EsphomeError("Invalid bundle: manifest.json missing 'manifest_version'")
-    if not isinstance(version, int) or version < 1:
-        raise EsphomeError(
-            f"Invalid bundle: manifest_version must be a positive integer, got {version!r}"
-        )
-    if version > CURRENT_MANIFEST_VERSION:
-        raise EsphomeError(
-            f"Bundle manifest version {version} is newer than this ESPHome "
-            f"version supports (max {CURRENT_MANIFEST_VERSION}). "
-            f"Please upgrade ESPHome to compile this bundle."
-        )
-
-    # Required fields
-    if ManifestKey.CONFIG_FILENAME not in manifest:
-        raise EsphomeError("Invalid bundle: manifest.json missing 'config_filename'")
-
-    return manifest
-
-
-def _validate_tar_members(tar: tarfile.TarFile, target_dir: Path) -> None:
-    """Sanity-check tar members to prevent mistakes and accidental overwrites.
-
-    This is not a security boundary — bundles are created locally or come
-    from a trusted build pipeline.  The checks catch malformed archives
-    and common mistakes (stray absolute paths, ``..`` components) that
-    could silently overwrite unrelated files.
-    """
-
-    total_size = 0
-    for member in tar.getmembers():
-        # Reject absolute paths (Unix and Windows)
-        if member.name.startswith(("/", "\\")):
-            raise EsphomeError(
-                f"Invalid bundle: absolute path in archive: {member.name}"
-            )
-
-        # Reject path traversal (split on both / and \ for cross-platform)
-        parts = re.split(r"[/\\]", member.name)
-        if ".." in parts:
-            raise EsphomeError(
-                f"Invalid bundle: path traversal in archive: {member.name}"
-            )
-
-        # Reject symlinks
-        if member.issym() or member.islnk():
-            raise EsphomeError(f"Invalid bundle: symlink in archive: {member.name}")
-
-        # Ensure extraction stays within target_dir
-        target_path = (target_dir / member.name).resolve()
-        if not target_path.is_relative_to(target_dir):
-            raise EsphomeError(
-                f"Invalid bundle: file would extract outside target: {member.name}"
-            )
-
-        # Track total decompressed size
-        total_size += member.size
-        if total_size > MAX_DECOMPRESSED_SIZE:
-            raise EsphomeError(
-                f"Invalid bundle: decompressed size exceeds "
-                f"{MAX_DECOMPRESSED_SIZE // (1024 * 1024)}MB limit"
-            )
-
-
-def is_bundle_path(path: Path) -> bool:
-    """Check if a path looks like a bundle file."""
-    return path.name.lower().endswith(BUNDLE_EXTENSION)
-
-
-def _add_bytes_to_tar(tar: tarfile.TarFile, name: str, data: bytes) -> None:
-    """Add in-memory bytes to a tar archive with deterministic metadata."""
-    info = tarfile.TarInfo(name=name)
-    info.size = len(data)
-    info.mtime = 0
-    info.uid = 0
-    info.gid = 0
-    info.mode = 0o644
-    tar.addfile(info, io.BytesIO(data))
-
-
-def _force_load_include_files(obj: Any, _seen: set[int] | None = None) -> None:
-    """Recursively resolve any ``IncludeFile`` instances in a YAML tree.
-
-    Nested ``!include`` returns a deferred ``IncludeFile`` that is only
-    resolved during the substitution pass. During bundle discovery we need
-    the referenced files to actually load so the ``track_yaml_loads``
-    listener fires for them.
-
-    ``IncludeFile`` instances with unresolved substitution variables in the
-    filename cannot be loaded — we skip and warn about those.
-    """
-    if _seen is None:
-        _seen = set()
-
-    if isinstance(obj, yaml_util.IncludeFile):
-        if id(obj) in _seen:
-            return
-        _seen.add(id(obj))
-        if obj.has_unresolved_expressions():
-            _LOGGER.warning(
-                "Bundle: cannot resolve !include %s (referenced from %s) "
-                "with substitutions in path",
-                obj.file,
-                obj.parent_file,
-            )
-            return
-        try:
-            loaded = obj.load()
-        except EsphomeError as err:
-            _LOGGER.warning(
-                "Bundle: failed to load !include %s (referenced from %s): %s",
-                obj.file,
-                obj.parent_file,
-                err,
-            )
-            return
-        _force_load_include_files(loaded, _seen)
-    elif isinstance(obj, dict):
-        if id(obj) in _seen:
-            return
-        _seen.add(id(obj))
-        for value in obj.values():
-            _force_load_include_files(value, _seen)
-    elif isinstance(obj, (list, tuple)):
-        if id(obj) in _seen:
-            return
-        _seen.add(id(obj))
-        for item in obj:
-            _force_load_include_files(item, _seen)
-
-
-def _resolve_include_path(include_path: Any) -> Path | None:
-    """Resolve an include path to absolute, skipping system includes."""
-    if isinstance(include_path, str) and include_path.startswith("<"):
-        return None  # System include, not a local file
-    p = Path(include_path)
-    if not p.is_absolute():
-        p = CORE.relative_config_path(p)
-    return p
-
-
-def _default_target_dir(bundle_path: Path) -> Path:
-    """Compute the default extraction directory for a bundle."""
-    name = bundle_path.name
-    if name.lower().endswith(BUNDLE_EXTENSION):
-        name = name[: -len(BUNDLE_EXTENSION)]
-    return bundle_path.parent / name
-
-
-def _restore_preserved_dirs(preserved: dict[str, Path], target_dir: Path) -> None:
-    """Move preserved build cache directories back into target_dir.
-
-    If the bundle contained entries under a preserved directory name,
-    the extracted copy is removed so the original cache always wins.
-    """
-    for dirname, src in preserved.items():
-        dst = target_dir / dirname
-        if dst.exists():
-            shutil.rmtree(dst)
-        shutil.move(str(src), str(dst))
-
-
-def prepare_bundle_for_compile(
-    bundle_path: Path,
-    target_dir: Path | None = None,
-) -> Path:
-    """Extract a bundle for compilation, preserving build caches.
-
-    Unlike extract_bundle(), this preserves .esphome/ and .pioenvs/
-    directories in the target if they already exist (for incremental builds).
-
-    Args:
-        bundle_path: Path to the .tar.gz bundle file.
-        target_dir: Directory to extract into. Must be specified for
-                     build server use.
-
-    Returns:
-        Absolute path to the extracted config YAML file.
-    """
-
-    bundle_path = bundle_path.resolve()
-    if not bundle_path.is_file():
-        raise EsphomeError(f"Bundle file not found: {bundle_path}")
-
-    if target_dir is None:
-        target_dir = _default_target_dir(bundle_path)
-
-    target_dir = target_dir.resolve()
-    target_dir.mkdir(parents=True, exist_ok=True)
-
-    preserved: dict[str, Path] = {}
-
-    # Temporarily move preserved dirs out of the way
-    staging = target_dir / _BUNDLE_STAGING_DIR
-    for dirname in _PRESERVE_DIRS:
-        src = target_dir / dirname
-        if src.is_dir():
-            dst = staging / dirname
-            dst.parent.mkdir(parents=True, exist_ok=True)
-            shutil.move(str(src), str(dst))
-            preserved[dirname] = dst
-
-    try:
-        # Clean non-preserved content and extract fresh
-        for item in target_dir.iterdir():
-            if item.name == _BUNDLE_STAGING_DIR:
-                continue
-            if item.is_dir():
-                shutil.rmtree(item)
-            else:
-                item.unlink()
-
-        config_path = extract_bundle(bundle_path, target_dir)
-    finally:
-        # Restore preserved dirs (idempotent) and clean staging
-        _restore_preserved_dirs(preserved, target_dir)
-        if staging.is_dir():
-            shutil.rmtree(staging)
-
-    return config_path

esphome/codegen.py

@@ -79,7 +79,6 @@ from esphome.cpp_types import (  # noqa: F401
     float_,
     global_ns,
     gpio_Flags,
-    int8,
     int16,
     int32,
     int64,

esphome/components/absolute_humidity/absolute_humidity.cpp

@@ -1,29 +1,22 @@
 #include "esphome/core/log.h"
 #include "absolute_humidity.h"
 
-namespace esphome::absolute_humidity {
+namespace esphome {
+namespace absolute_humidity {
 
-static const char *const TAG{"absolute_humidity.sensor"};
+static const char *const TAG = "absolute_humidity.sensor";
 
 void AbsoluteHumidityComponent::setup() {
-  this->temperature_sensor_->add_on_state_callback([this](float state) {
-    this->temperature_ = state;
-    this->enable_loop();
-  });
   ESP_LOGD(TAG, "  Added callback for temperature '%s'", this->temperature_sensor_->get_name().c_str());
-  // Get initial value
+  this->temperature_sensor_->add_on_state_callback([this](float state) { this->temperature_callback_(state); });
   if (this->temperature_sensor_->has_state()) {
-    this->temperature_ = this->temperature_sensor_->get_state();
+    this->temperature_callback_(this->temperature_sensor_->get_state());
   }
 
-  this->humidity_sensor_->add_on_state_callback([this](float state) {
-    this->humidity_ = state;
-    this->enable_loop();
-  });
   ESP_LOGD(TAG, "  Added callback for relative humidity '%s'", this->humidity_sensor_->get_name().c_str());
-  // Get initial value
+  this->humidity_sensor_->add_on_state_callback([this](float state) { this->humidity_callback_(state); });
   if (this->humidity_sensor_->has_state()) {
-    this->humidity_ = this->humidity_sensor_->get_state();
+    this->humidity_callback_(this->humidity_sensor_->get_state());
   }
 }
 
@@ -53,12 +46,14 @@ void AbsoluteHumidityComponent::dump_config() {
 }
 
 void AbsoluteHumidityComponent::loop() {
-  // Only run once
-  this->disable_loop();
+  if (!this->next_update_) {
+    return;
+  }
+  this->next_update_ = false;
 
   // Ensure we have source data
-  const bool no_temperature{std::isnan(this->temperature_)};
-  const bool no_humidity{std::isnan(this->humidity_)};
+  const bool no_temperature = std::isnan(this->temperature_);
+  const bool no_humidity = std::isnan(this->humidity_);
   if (no_temperature || no_humidity) {
     if (no_temperature) {
       ESP_LOGW(TAG, "No valid state from temperature sensor!");
@@ -72,9 +67,9 @@ void AbsoluteHumidityComponent::loop() {
   }
 
   // Convert to desired units
-  const float temperature_c{this->temperature_};
-  const float temperature_k{temperature_c + 273.15f};
-  const float hr{this->humidity_ / 100.0f};
+  const float temperature_c = this->temperature_;
+  const float temperature_k = temperature_c + 273.15;
+  const float hr = this->humidity_ / 100;
 
   // Calculate saturation vapor pressure
   float es;
@@ -95,7 +90,7 @@ void AbsoluteHumidityComponent::loop() {
   }
 
   // Calculate absolute humidity
-  const float absolute_humidity{vapor_density(es, hr, temperature_k)};
+  const float absolute_humidity = vapor_density(es, hr, temperature_k);
 
   ESP_LOGD(TAG, "Saturation vapor pressure %f kPa, absolute humidity %f g/m³", es, absolute_humidity);
 
@@ -108,16 +103,16 @@ void AbsoluteHumidityComponent::loop() {
 // More accurate than Tetens in normal meteorologic conditions
 float AbsoluteHumidityComponent::es_buck(float temperature_c) {
   float a, b, c, d;
-  if (temperature_c >= 0.0f) {
-    a = 0.61121f;
-    b = 18.678f;
-    c = 234.5f;
-    d = 257.14f;
+  if (temperature_c >= 0) {
+    a = 0.61121;
+    b = 18.678;
+    c = 234.5;
+    d = 257.14;
   } else {
-    a = 0.61115f;
-    b = 18.678f;
-    c = 233.7f;
-    d = 279.82f;
+    a = 0.61115;
+    b = 18.678;
+    c = 233.7;
+    d = 279.82;
   }
   return a * expf((b - (temperature_c / c)) * (temperature_c / (d + temperature_c)));
 }
@@ -125,14 +120,14 @@ float AbsoluteHumidityComponent::es_buck(float temperature_c) {
 // Tetens equation (https://en.wikipedia.org/wiki/Tetens_equation)
 float AbsoluteHumidityComponent::es_tetens(float temperature_c) {
   float a, b;
-  if (temperature_c >= 0.0f) {
-    a = 17.27f;
-    b = 237.3f;
+  if (temperature_c >= 0) {
+    a = 17.27;
+    b = 237.3;
   } else {
-    a = 21.875f;
-    b = 265.5f;
+    a = 21.875;
+    b = 265.5;
   }
-  return 0.61078f * expf((a * temperature_c) / (temperature_c + b));
+  return 0.61078 * expf((a * temperature_c) / (temperature_c + b));
 }
 
 // Wobus equation
@@ -151,18 +146,18 @@ float AbsoluteHumidityComponent::es_wobus(float t) {
   //
   //     Baker, Schlatter  17-MAY-1982     Original version.
 
-  constexpr float c0{+0.99999683e+00f};
-  constexpr float c1{-0.90826951e-02f};
-  constexpr float c2{+0.78736169e-04f};
-  constexpr float c3{-0.61117958e-06f};
-  constexpr float c4{+0.43884187e-08f};
-  constexpr float c5{-0.29883885e-10f};
-  constexpr float c6{+0.21874425e-12f};
-  constexpr float c7{-0.17892321e-14f};
-  constexpr float c8{+0.11112018e-16f};
-  constexpr float c9{-0.30994571e-19f};
-  const float p{c0 + t * (c1 + t * (c2 + t * (c3 + t * (c4 + t * (c5 + t * (c6 + t * (c7 + t * (c8 + t * (c9)))))))))};
-  return 0.61078f / powf(p, 8.0f);
+  const float c0 = +0.99999683e00;
+  const float c1 = -0.90826951e-02;
+  const float c2 = +0.78736169e-04;
+  const float c3 = -0.61117958e-06;
+  const float c4 = +0.43884187e-08;
+  const float c5 = -0.29883885e-10;
+  const float c6 = +0.21874425e-12;
+  const float c7 = -0.17892321e-14;
+  const float c8 = +0.11112018e-16;
+  const float c9 = -0.30994571e-19;
+  const float p = c0 + t * (c1 + t * (c2 + t * (c3 + t * (c4 + t * (c5 + t * (c6 + t * (c7 + t * (c8 + t * (c9)))))))));
+  return 0.61078 / pow(p, 8);
 }
 
 // From https://www.environmentalbiophysics.org/chalk-talk-how-to-calculate-absolute-humidity/
@@ -173,10 +168,11 @@ float AbsoluteHumidityComponent::vapor_density(float es, float hr, float ta) {
   // hr = relative humidity [0-1]
   // ta = absolute temperature (K)
 
-  const float ea{hr * es * 1000.0f};  // vapor pressure of the air (Pa)
-  const float mw{18.01528f};          // molar mass of water (g⋅mol⁻¹)
-  const float r{8.31446261815324f};   // molar gas constant (J⋅K⁻¹)
+  const float ea = hr * es * 1000;   // vapor pressure of the air (Pa)
+  const float mw = 18.01528;         // molar mass of water (g⋅mol⁻¹)
+  const float r = 8.31446261815324;  // molar gas constant (J⋅K⁻¹)
   return (ea * mw) / (r * ta);
 }
 
-}  // namespace esphome::absolute_humidity
+}  // namespace absolute_humidity
+}  // namespace esphome

esphome/components/absolute_humidity/absolute_humidity.h

@@ -3,7 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 
-namespace esphome::absolute_humidity {
+namespace esphome {
+namespace absolute_humidity {
 
 /// Enum listing all implemented saturation vapor pressure equations.
 enum SaturationVaporPressureEquation {
@@ -15,6 +16,8 @@ enum SaturationVaporPressureEquation {
 /// This class implements calculation of absolute humidity from temperature and relative humidity.
 class AbsoluteHumidityComponent : public sensor::Sensor, public Component {
  public:
+  AbsoluteHumidityComponent() = default;
+
   void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
   void set_humidity_sensor(sensor::Sensor *humidity_sensor) { this->humidity_sensor_ = humidity_sensor; }
   void set_equation(SaturationVaporPressureEquation equation) { this->equation_ = equation; }
@@ -24,6 +27,15 @@ class AbsoluteHumidityComponent : public sensor::Sensor, public Component {
   void loop() override;
 
  protected:
+  void temperature_callback_(float state) {
+    this->next_update_ = true;
+    this->temperature_ = state;
+  }
+  void humidity_callback_(float state) {
+    this->next_update_ = true;
+    this->humidity_ = state;
+  }
+
   /** Buck equation for saturation vapor pressure in kPa.
    *
    * @param temperature_c Air temperature in °C.
@@ -45,15 +57,19 @@ class AbsoluteHumidityComponent : public sensor::Sensor, public Component {
    * @param es Saturation vapor pressure in kPa.
    * @param hr Relative humidity 0 to 1.
    * @param ta Absolute temperature in K.
+   * @param heater_duration The duration in ms that the heater should turn on for when measuring.
    */
   static float vapor_density(float es, float hr, float ta);
 
   sensor::Sensor *temperature_sensor_{nullptr};
   sensor::Sensor *humidity_sensor_{nullptr};
 
+  bool next_update_{false};
+
   float temperature_{NAN};
   float humidity_{NAN};
   SaturationVaporPressureEquation equation_;
 };
 
-}  // namespace esphome::absolute_humidity
+}  // namespace absolute_humidity
+}  // namespace esphome

esphome/components/adc/adc_sensor.h

@@ -22,8 +22,7 @@ namespace adc {
 
 #ifdef USE_ESP32
 // clang-format off
-#if ESP_IDF_VERSION_MAJOR >= 6 || \
-    (ESP_IDF_VERSION_MAJOR == 5 && \
+#if (ESP_IDF_VERSION_MAJOR == 5 && \
      ((ESP_IDF_VERSION_MINOR == 0 && ESP_IDF_VERSION_PATCH >= 5) || \
       (ESP_IDF_VERSION_MINOR == 1 && ESP_IDF_VERSION_PATCH >= 3) || \
       (ESP_IDF_VERSION_MINOR >= 2)) \

esphome/components/adc/adc_sensor_esp32.cpp

@@ -2,7 +2,6 @@
 
 #include "adc_sensor.h"
 #include "esphome/core/log.h"
-#include <cinttypes>
 
 namespace esphome {
 namespace adc {
@@ -347,8 +346,7 @@ float ADCSensor::sample_autorange_() {
   ESP_LOGVV(TAG, "Autorange summary:");
   ESP_LOGVV(TAG, "  Raw readings: 12db=%d, 6db=%d, 2.5db=%d, 0db=%d", raw12, raw6, raw2, raw0);
   ESP_LOGVV(TAG, "  Voltages: 12db=%.6f, 6db=%.6f, 2.5db=%.6f, 0db=%.6f", mv12, mv6, mv2, mv0);
-  ESP_LOGVV(TAG, "  Coefficients: c12=%" PRIu32 ", c6=%" PRIu32 ", c2=%" PRIu32 ", c0=%" PRIu32 ", sum=%" PRIu32, c12,
-            c6, c2, c0, csum);
+  ESP_LOGVV(TAG, "  Coefficients: c12=%u, c6=%u, c2=%u, c0=%u, sum=%u", c12, c6, c2, c0, csum);
 
   if (csum == 0) {
     ESP_LOGE(TAG, "Invalid weight sum in autorange calculation");
@@ -356,10 +354,8 @@ float ADCSensor::sample_autorange_() {
   }
 
   const float final_result = (mv12 * c12 + mv6 * c6 + mv2 * c2 + mv0 * c0) / csum;
-  ESP_LOGV(TAG,
-           "Autorange final: (%.6f*%" PRIu32 " + %.6f*%" PRIu32 " + %.6f*%" PRIu32 " + %.6f*%" PRIu32 ")/%" PRIu32
-           " = %.6fV",
-           mv12, c12, mv6, c6, mv2, c2, mv0, c0, csum, final_result);
+  ESP_LOGV(TAG, "Autorange final: (%.6f*%u + %.6f*%u + %.6f*%u + %.6f*%u)/%u = %.6fV", mv12, c12, mv6, c6, mv2, c2, mv0,
+           c0, csum, final_result);
 
   return final_result;
 }

esphome/components/adc/sensor.py

@@ -2,11 +2,7 @@ import logging
 
 import esphome.codegen as cg
 from esphome.components import sensor, voltage_sampler
-from esphome.components.esp32 import (
-    get_esp32_variant,
-    include_builtin_idf_component,
-    require_adc_oneshot_iram,
-)
+from esphome.components.esp32 import get_esp32_variant, include_builtin_idf_component
 from esphome.components.nrf52.const import AIN_TO_GPIO, EXTRA_ADC
 from esphome.components.zephyr import (
     zephyr_add_overlay,
@@ -28,7 +24,6 @@ from esphome.const import (
     PlatformFramework,
 )
 from esphome.core import CORE
-from esphome.types import ConfigType
 
 from . import (
     ATTENUATION_MODES,
@@ -70,13 +65,6 @@ def validate_config(config):
     return config
 
 
-def _require_adc_iram(config: ConfigType) -> ConfigType:
-    """Register ADC oneshot IRAM requirement during config validation."""
-    if CORE.is_esp32:
-        require_adc_oneshot_iram()
-    return config
-
-
 ADCSensor = adc_ns.class_(
     "ADCSensor", sensor.Sensor, cg.PollingComponent, voltage_sampler.VoltageSampler
 )
@@ -107,7 +95,6 @@ CONFIG_SCHEMA = cv.All(
     )
     .extend(cv.polling_component_schema("60s")),
     validate_config,
-    _require_adc_iram,
 )
 
 CONF_ADC_CHANNEL_ID = "adc_channel_id"

esphome/components/ads1118/__init__.py

@@ -12,15 +12,11 @@ CONF_ADS1118_ID = "ads1118_id"
 ads1118_ns = cg.esphome_ns.namespace("ads1118")
 ADS1118 = ads1118_ns.class_("ADS1118", cg.Component, spi.SPIDevice)
 
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(ADS1118),
-        }
-    )
-    .extend(spi.spi_device_schema(cs_pin_required=True))
-    .extend(cv.COMPONENT_SCHEMA)
-)
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.declare_id(ADS1118),
+    }
+).extend(spi.spi_device_schema(cs_pin_required=True))
 
 
 async def to_code(config):

esphome/components/ags10/sensor.py

@@ -35,7 +35,7 @@ CONFIG_SCHEMA = (
     cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(AGS10Component),
-            cv.Required(CONF_TVOC): sensor.sensor_schema(
+            cv.Optional(CONF_TVOC): sensor.sensor_schema(
                 unit_of_measurement=UNIT_PARTS_PER_BILLION,
                 icon=ICON_RADIATOR,
                 accuracy_decimals=0,
@@ -97,7 +97,7 @@ AGS10_NEW_I2C_ADDRESS_SCHEMA = cv.maybe_simple_value(
 async def ags10newi2caddress_to_code(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
-    address = await cg.templatable(config[CONF_ADDRESS], args, cg.uint8)
+    address = await cg.templatable(config[CONF_ADDRESS], args, int)
     cg.add(var.set_new_address(address))
     return var
 
@@ -112,9 +112,7 @@ AGS10_SET_ZERO_POINT_ACTION_MODE = {
 AGS10_SET_ZERO_POINT_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.use_id(AGS10Component),
-        cv.Required(CONF_MODE): cv.templatable(
-            cv.enum(AGS10_SET_ZERO_POINT_ACTION_MODE, upper=True)
-        ),
+        cv.Required(CONF_MODE): cv.enum(AGS10_SET_ZERO_POINT_ACTION_MODE, upper=True),
         cv.Optional(CONF_VALUE, default=0xFFFF): cv.templatable(cv.uint16_t),
     },
 )
@@ -129,10 +127,8 @@ AGS10_SET_ZERO_POINT_SCHEMA = cv.Schema(
 async def ags10setzeropoint_to_code(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])
-    mode = await cg.templatable(
-        config.get(CONF_MODE), args, AGS10SetZeroPointActionMode
-    )
+    mode = await cg.templatable(config.get(CONF_MODE), args, enumerate)
     cg.add(var.set_mode(mode))
-    value = await cg.templatable(config[CONF_VALUE], args, cg.uint16)
+    value = await cg.templatable(config[CONF_VALUE], args, int)
     cg.add(var.set_value(value))
     return var

esphome/components/aic3204/audio_dac.py

@@ -43,7 +43,7 @@ async def aic3204_set_volume_to_code(config, action_id, template_arg, args):
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
-    template_ = await cg.templatable(config.get(CONF_MODE), args, cg.uint8)
+    template_ = await cg.templatable(config.get(CONF_MODE), args, int)
     cg.add(var.set_auto_mute_mode(template_))
 
     return var

esphome/components/alarm_control_panel/__init__.py

@@ -10,6 +10,7 @@ from esphome.const import (
     CONF_ID,
     CONF_MQTT_ID,
     CONF_ON_STATE,
+    CONF_TRIGGER_ID,
     CONF_WEB_SERVER,
 )
 from esphome.core import CORE, CoroPriority, coroutine_with_priority
@@ -33,9 +34,39 @@ CONF_ON_READY = "on_ready"
 alarm_control_panel_ns = cg.esphome_ns.namespace("alarm_control_panel")
 AlarmControlPanel = alarm_control_panel_ns.class_("AlarmControlPanel", cg.EntityBase)
 
-StateAnyForwarder = alarm_control_panel_ns.class_("StateAnyForwarder")
-StateEnterForwarder = alarm_control_panel_ns.class_("StateEnterForwarder")
-AlarmControlPanelState = alarm_control_panel_ns.enum("AlarmControlPanelState")
+StateTrigger = alarm_control_panel_ns.class_(
+    "StateTrigger", automation.Trigger.template()
+)
+TriggeredTrigger = alarm_control_panel_ns.class_(
+    "TriggeredTrigger", automation.Trigger.template()
+)
+ClearedTrigger = alarm_control_panel_ns.class_(
+    "ClearedTrigger", automation.Trigger.template()
+)
+ArmingTrigger = alarm_control_panel_ns.class_(
+    "ArmingTrigger", automation.Trigger.template()
+)
+PendingTrigger = alarm_control_panel_ns.class_(
+    "PendingTrigger", automation.Trigger.template()
+)
+ArmedHomeTrigger = alarm_control_panel_ns.class_(
+    "ArmedHomeTrigger", automation.Trigger.template()
+)
+ArmedNightTrigger = alarm_control_panel_ns.class_(
+    "ArmedNightTrigger", automation.Trigger.template()
+)
+ArmedAwayTrigger = alarm_control_panel_ns.class_(
+    "ArmedAwayTrigger", automation.Trigger.template()
+)
+DisarmedTrigger = alarm_control_panel_ns.class_(
+    "DisarmedTrigger", automation.Trigger.template()
+)
+ChimeTrigger = alarm_control_panel_ns.class_(
+    "ChimeTrigger", automation.Trigger.template()
+)
+ReadyTrigger = alarm_control_panel_ns.class_(
+    "ReadyTrigger", automation.Trigger.template()
+)
 
 ArmAwayAction = alarm_control_panel_ns.class_("ArmAwayAction", automation.Action)
 ArmHomeAction = alarm_control_panel_ns.class_("ArmHomeAction", automation.Action)
@@ -58,17 +89,61 @@ _ALARM_CONTROL_PANEL_SCHEMA = (
             cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(
                 mqtt.MQTTAlarmControlPanelComponent
             ),
-            cv.Optional(CONF_ON_STATE): automation.validate_automation({}),
-            cv.Optional(CONF_ON_TRIGGERED): automation.validate_automation({}),
-            cv.Optional(CONF_ON_ARMING): automation.validate_automation({}),
-            cv.Optional(CONF_ON_PENDING): automation.validate_automation({}),
-            cv.Optional(CONF_ON_ARMED_HOME): automation.validate_automation({}),
-            cv.Optional(CONF_ON_ARMED_NIGHT): automation.validate_automation({}),
-            cv.Optional(CONF_ON_ARMED_AWAY): automation.validate_automation({}),
-            cv.Optional(CONF_ON_DISARMED): automation.validate_automation({}),
-            cv.Optional(CONF_ON_CLEARED): automation.validate_automation({}),
-            cv.Optional(CONF_ON_CHIME): automation.validate_automation({}),
-            cv.Optional(CONF_ON_READY): automation.validate_automation({}),
+            cv.Optional(CONF_ON_STATE): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(StateTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_TRIGGERED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TriggeredTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_ARMING): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmingTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_PENDING): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PendingTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_ARMED_HOME): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedHomeTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_ARMED_NIGHT): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedNightTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_ARMED_AWAY): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ArmedAwayTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_DISARMED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DisarmedTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_CLEARED): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ClearedTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_CHIME): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ChimeTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_READY): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ReadyTrigger),
+                }
+            ),
         }
     )
 )
@@ -111,66 +186,41 @@ ALARM_CONTROL_PANEL_CONDITION_SCHEMA = maybe_simple_id(
 )
 
 
-_CALLBACK_AUTOMATIONS = (
-    automation.CallbackAutomation(
-        CONF_ON_STATE, "add_on_state_callback", forwarder=StateAnyForwarder
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_TRIGGERED,
-        "add_on_state_callback",
-        forwarder=StateEnterForwarder.template(
-            AlarmControlPanelState.ACP_STATE_TRIGGERED
-        ),
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_ARMING,
-        "add_on_state_callback",
-        forwarder=StateEnterForwarder.template(AlarmControlPanelState.ACP_STATE_ARMING),
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_PENDING,
-        "add_on_state_callback",
-        forwarder=StateEnterForwarder.template(
-            AlarmControlPanelState.ACP_STATE_PENDING
-        ),
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_ARMED_HOME,
-        "add_on_state_callback",
-        forwarder=StateEnterForwarder.template(
-            AlarmControlPanelState.ACP_STATE_ARMED_HOME
-        ),
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_ARMED_NIGHT,
-        "add_on_state_callback",
-        forwarder=StateEnterForwarder.template(
-            AlarmControlPanelState.ACP_STATE_ARMED_NIGHT
-        ),
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_ARMED_AWAY,
-        "add_on_state_callback",
-        forwarder=StateEnterForwarder.template(
-            AlarmControlPanelState.ACP_STATE_ARMED_AWAY
-        ),
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_DISARMED,
-        "add_on_state_callback",
-        forwarder=StateEnterForwarder.template(
-            AlarmControlPanelState.ACP_STATE_DISARMED
-        ),
-    ),
-    automation.CallbackAutomation(CONF_ON_CLEARED, "add_on_cleared_callback"),
-    automation.CallbackAutomation(CONF_ON_CHIME, "add_on_chime_callback"),
-    automation.CallbackAutomation(CONF_ON_READY, "add_on_ready_callback"),
-)
-
-
 @setup_entity("alarm_control_panel")
 async def setup_alarm_control_panel_core_(var, config):
-    await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
+    for conf in config.get(CONF_ON_STATE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_TRIGGERED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_ARMING, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_PENDING, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_ARMED_HOME, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_ARMED_NIGHT, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_ARMED_AWAY, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_DISARMED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_CLEARED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_CHIME, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_READY, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
     if web_server_config := config.get(CONF_WEB_SERVER):
         await web_server.add_entity_config(var, web_server_config)
     if mqtt_id := config.get(CONF_MQTT_ID):

esphome/components/alarm_control_panel/alarm_control_panel.cpp

@@ -31,12 +31,12 @@ void AlarmControlPanel::publish_state(AlarmControlPanelState state) {
   this->last_update_ = millis();
   if (state != this->current_state_) {
     auto prev_state = this->current_state_;
-    ESP_LOGV(TAG, "'%s' >> %s (was %s)", this->get_name().c_str(),
+    ESP_LOGD(TAG, "'%s' >> %s (was %s)", this->get_name().c_str(),
              LOG_STR_ARG(alarm_control_panel_state_to_string(state)),
              LOG_STR_ARG(alarm_control_panel_state_to_string(prev_state)));
     this->current_state_ = state;
-    // Single state callback - listeners receive the new state as an argument
-    this->state_callback_.call(state);
+    // Single state callback - triggers check get_state() for specific states
+    this->state_callback_.call();
 #if defined(USE_ALARM_CONTROL_PANEL) && defined(USE_CONTROLLER_REGISTRY)
     ControllerRegistry::notify_alarm_control_panel_update(this);
 #endif
@@ -51,6 +51,22 @@ void AlarmControlPanel::publish_state(AlarmControlPanelState state) {
   }
 }
 
+void AlarmControlPanel::add_on_state_callback(std::function<void()> &&callback) {
+  this->state_callback_.add(std::move(callback));
+}
+
+void AlarmControlPanel::add_on_cleared_callback(std::function<void()> &&callback) {
+  this->cleared_callback_.add(std::move(callback));
+}
+
+void AlarmControlPanel::add_on_chime_callback(std::function<void()> &&callback) {
+  this->chime_callback_.add(std::move(callback));
+}
+
+void AlarmControlPanel::add_on_ready_callback(std::function<void()> &&callback) {
+  this->ready_callback_.add(std::move(callback));
+}
+
 void AlarmControlPanel::arm_with_code_(AlarmControlPanelCall &(AlarmControlPanelCall::*arm_method)(),
                                        const char *code) {
   auto call = this->make_call();

esphome/components/alarm_control_panel/alarm_control_panel.h

@@ -37,24 +37,25 @@ class AlarmControlPanel : public EntityBase {
    *
    * @param callback The callback function
    */
-  template<typename F> void add_on_state_callback(F &&callback) {
-    this->state_callback_.add(std::forward<F>(callback));
-  }
+  void add_on_state_callback(std::function<void()> &&callback);
 
-  /** Add a callback for when the state of the alarm_control_panel clears from triggered. */
-  template<typename F> void add_on_cleared_callback(F &&callback) {
-    this->cleared_callback_.add(std::forward<F>(callback));
-  }
+  /** Add a callback for when the state of the alarm_control_panel clears from triggered
+   *
+   * @param callback The callback function
+   */
+  void add_on_cleared_callback(std::function<void()> &&callback);
 
-  /** Add a callback for when a chime zone goes from closed to open. */
-  template<typename F> void add_on_chime_callback(F &&callback) {
-    this->chime_callback_.add(std::forward<F>(callback));
-  }
+  /** Add a callback for when a chime zone goes from closed to open
+   *
+   * @param callback The callback function
+   */
+  void add_on_chime_callback(std::function<void()> &&callback);
 
-  /** Add a callback for when a ready state changes. */
-  template<typename F> void add_on_ready_callback(F &&callback) {
-    this->ready_callback_.add(std::forward<F>(callback));
-  }
+  /** Add a callback for when a ready state changes
+   *
+   * @param callback The callback function
+   */
+  void add_on_ready_callback(std::function<void()> &&callback);
 
   /** A numeric representation of the supported features as per HomeAssistant
    *
@@ -145,8 +146,8 @@ class AlarmControlPanel : public EntityBase {
   uint32_t last_update_;
   // the call control function
   virtual void control(const AlarmControlPanelCall &call) = 0;
-  // state callback - passes the new state to listeners
-  LazyCallbackManager<void(AlarmControlPanelState)> state_callback_{};
+  // state callback - triggers check get_state() for specific state
+  LazyCallbackManager<void()> state_callback_{};
   // clear callback - fires when leaving TRIGGERED state
   LazyCallbackManager<void()> cleared_callback_{};
   // chime callback

esphome/components/alarm_control_panel/automation.h

@@ -5,27 +5,60 @@
 
 namespace esphome::alarm_control_panel {
 
-/// Callback forwarder that triggers an Automation<> on any state change.
-/// Pointer-sized (single Automation* field) to fit inline in Callback::ctx_.
-struct StateAnyForwarder {
-  Automation<> *automation;
-  void operator()(AlarmControlPanelState /*state*/) const { this->automation->trigger(); }
-};
-
-/// Callback forwarder that triggers an Automation<> only when the alarm enters a specific state.
-/// Pointer-sized (single Automation* field) to fit inline in Callback::ctx_.
-template<AlarmControlPanelState State> struct StateEnterForwarder {
-  Automation<> *automation;
-  void operator()(AlarmControlPanelState state) const {
-    if (state == State)
-      this->automation->trigger();
+/// Trigger on any state change
+class StateTrigger : public Trigger<> {
+ public:
+  explicit StateTrigger(AlarmControlPanel *alarm_control_panel) {
+    alarm_control_panel->add_on_state_callback([this]() { this->trigger(); });
   }
 };
 
-static_assert(sizeof(StateAnyForwarder) <= sizeof(void *));
-static_assert(std::is_trivially_copyable_v<StateAnyForwarder>);
-static_assert(sizeof(StateEnterForwarder<ACP_STATE_TRIGGERED>) <= sizeof(void *));
-static_assert(std::is_trivially_copyable_v<StateEnterForwarder<ACP_STATE_TRIGGERED>>);
+/// Template trigger that fires when entering a specific state
+template<AlarmControlPanelState State> class StateEnterTrigger : public Trigger<> {
+ public:
+  explicit StateEnterTrigger(AlarmControlPanel *alarm_control_panel) : alarm_control_panel_(alarm_control_panel) {
+    alarm_control_panel->add_on_state_callback([this]() {
+      if (this->alarm_control_panel_->get_state() == State)
+        this->trigger();
+    });
+  }
+
+ protected:
+  AlarmControlPanel *alarm_control_panel_;
+};
+
+// Type aliases for state-specific triggers
+using TriggeredTrigger = StateEnterTrigger<ACP_STATE_TRIGGERED>;
+using ArmingTrigger = StateEnterTrigger<ACP_STATE_ARMING>;
+using PendingTrigger = StateEnterTrigger<ACP_STATE_PENDING>;
+using ArmedHomeTrigger = StateEnterTrigger<ACP_STATE_ARMED_HOME>;
+using ArmedNightTrigger = StateEnterTrigger<ACP_STATE_ARMED_NIGHT>;
+using ArmedAwayTrigger = StateEnterTrigger<ACP_STATE_ARMED_AWAY>;
+using DisarmedTrigger = StateEnterTrigger<ACP_STATE_DISARMED>;
+
+/// Trigger when leaving TRIGGERED state (alarm cleared)
+class ClearedTrigger : public Trigger<> {
+ public:
+  explicit ClearedTrigger(AlarmControlPanel *alarm_control_panel) {
+    alarm_control_panel->add_on_cleared_callback([this]() { this->trigger(); });
+  }
+};
+
+/// Trigger on chime event (zone opened while disarmed)
+class ChimeTrigger : public Trigger<> {
+ public:
+  explicit ChimeTrigger(AlarmControlPanel *alarm_control_panel) {
+    alarm_control_panel->add_on_chime_callback([this]() { this->trigger(); });
+  }
+};
+
+/// Trigger on ready state change
+class ReadyTrigger : public Trigger<> {
+ public:
+  explicit ReadyTrigger(AlarmControlPanel *alarm_control_panel) {
+    alarm_control_panel->add_on_ready_callback([this]() { this->trigger(); });
+  }
+};
 
 template<typename... Ts> class ArmAwayAction : public Action<Ts...> {
  public:

esphome/components/alpha3/sensor.py

@@ -9,10 +9,6 @@ from esphome.const import (
     CONF_POWER,
     CONF_SPEED,
     CONF_VOLTAGE,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    STATE_CLASS_MEASUREMENT,
     UNIT_AMPERE,
     UNIT_CUBIC_METER_PER_HOUR,
     UNIT_METER,
@@ -31,35 +27,26 @@ CONFIG_SCHEMA = (
             cv.Optional(CONF_FLOW): sensor.sensor_schema(
                 unit_of_measurement=UNIT_CUBIC_METER_PER_HOUR,
                 accuracy_decimals=2,
-                state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_HEAD): sensor.sensor_schema(
                 unit_of_measurement=UNIT_METER,
                 accuracy_decimals=2,
-                state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_POWER): sensor.sensor_schema(
                 unit_of_measurement=UNIT_WATT,
                 accuracy_decimals=2,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_CURRENT): sensor.sensor_schema(
                 unit_of_measurement=UNIT_AMPERE,
                 accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_SPEED): sensor.sensor_schema(
                 unit_of_measurement=UNIT_REVOLUTIONS_PER_MINUTE,
                 accuracy_decimals=2,
-                state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_VOLT,
                 accuracy_decimals=2,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
             ),
         }
     )

esphome/components/am43/sensor/__init__.py

@@ -8,7 +8,6 @@ from esphome.const import (
     DEVICE_CLASS_BATTERY,
     ENTITY_CATEGORY_DIAGNOSTIC,
     ICON_BRIGHTNESS_5,
-    STATE_CLASS_MEASUREMENT,
     UNIT_PERCENT,
 )
 
@@ -27,13 +26,11 @@ CONFIG_SCHEMA = (
                 device_class=DEVICE_CLASS_BATTERY,
                 accuracy_decimals=0,
                 entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-                state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_ILLUMINANCE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_PERCENT,
                 icon=ICON_BRIGHTNESS_5,
                 accuracy_decimals=0,
-                state_class=STATE_CLASS_MEASUREMENT,
             ),
         }
     )

esphome/components/am43/sensor/am43_sensor.h

@@ -35,7 +35,7 @@ class Am43 : public esphome::ble_client::BLEClientNode, public PollingComponent
   uint8_t current_sensor_;
   // The AM43 often gets into a state where it spams loads of battery update
   // notifications. Here we will limit to no more than every 10s.
-  uint32_t last_battery_update_;
+  uint8_t last_battery_update_;
 };
 
 }  // namespace am43

esphome/components/analog_threshold/analog_threshold_binary_sensor.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/sensor/sensor.h"
@@ -19,8 +18,8 @@ class AnalogThresholdBinarySensor : public Component, public binary_sensor::Bina
 
  protected:
   sensor::Sensor *sensor_{nullptr};
-  TemplatableFn<float> upper_threshold_{};
-  TemplatableFn<float> lower_threshold_{};
+  TemplatableValue<float> upper_threshold_{};
+  TemplatableValue<float> lower_threshold_{};
   bool raw_state_{false};  // Pre-filter state for hysteresis logic
 };
 

esphome/components/analog_threshold/binary_sensor.py

@@ -40,10 +40,10 @@ async def to_code(config):
     cg.add(var.set_sensor(sens))
 
     if isinstance(config[CONF_THRESHOLD], dict):
-        lower = await cg.templatable(config[CONF_THRESHOLD][CONF_LOWER], [], cg.float_)
-        upper = await cg.templatable(config[CONF_THRESHOLD][CONF_UPPER], [], cg.float_)
+        lower = await cg.templatable(config[CONF_THRESHOLD][CONF_LOWER], [], float)
+        upper = await cg.templatable(config[CONF_THRESHOLD][CONF_UPPER], [], float)
     else:
-        lower = await cg.templatable(config[CONF_THRESHOLD], [], cg.float_)
+        lower = await cg.templatable(config[CONF_THRESHOLD], [], float)
         upper = lower
     cg.add(var.set_upper_threshold(upper))
     cg.add(var.set_lower_threshold(lower))

esphome/components/apds9960/apds9960.cpp

@@ -251,11 +251,11 @@ void APDS9960::read_gesture_data_() {
 
   uint8_t buf[128];
   for (uint8_t pos = 0; pos < fifo_level * 4; pos += 32) {
-    // Read in 32-byte chunks due to ESP8266 I2C buffer limit.
-    // Always read from 0xFC — the FIFO auto-increments through 0xFC-0xFF
-    // and advances its internal pointer after every 4th byte.
+    // The ESP's i2c driver has a limited buffer size.
+    // This way of retrieving the data should be wrong according to the datasheet
+    // but it seems to work.
     uint8_t read = std::min(32, fifo_level * 4 - pos);
-    APDS9960_WARNING_CHECK(this->read_bytes(0xFC, buf + pos, read), "Reading FIFO buffer failed.");
+    APDS9960_WARNING_CHECK(this->read_bytes(0xFC + pos, buf + pos, read), "Reading FIFO buffer failed.");
   }
 
   if (millis() - this->gesture_start_ > 500) {

esphome/components/api/__init__.py

@@ -301,12 +301,11 @@ CONFIG_SCHEMA = cv.All(
             # Maximum queued send buffers per connection before dropping connection
             # Each buffer uses ~8-12 bytes overhead plus actual message size
             # Platform defaults based on available RAM and typical message rates:
-            # CONF_MAX_SEND_QUEUE defaults are power of 2 for efficient modulo
             cv.SplitDefault(
                 CONF_MAX_SEND_QUEUE,
-                esp8266=4,  # Limited RAM, need to fail fast
+                esp8266=5,  # Limited RAM, need to fail fast
                 esp32=8,  # More RAM, can buffer more
-                rp2040=8,  # Moderate RAM
+                rp2040=5,  # Limited RAM
                 bk72xx=8,  # Moderate RAM
                 nrf52=8,  # Moderate RAM
                 rtl87xx=8,  # Moderate RAM
@@ -455,9 +454,6 @@ async def to_code(config: ConfigType) -> None:
             cg.add_define("USE_API_PLAINTEXT")
         cg.add_define("USE_API_NOISE")
         cg.add_library("esphome/noise-c", "0.1.11")
-        # Enable optimized memzero/memcmp in libsodium instead of volatile byte loops
-        cg.add_build_flag("-DHAVE_WEAK_SYMBOLS=1")
-        cg.add_build_flag("-DHAVE_INLINE_ASM=1")
     else:
         cg.add_define("USE_API_PLAINTEXT")
 

esphome/components/api/api_buffer.h

@@ -44,12 +44,6 @@ class APIBuffer {
     this->reserve(n);
     this->size_ = n;  // no zero-fill
   }
-  /// Reserve capacity for max(reserve_size, new_size) bytes, then set size to new_size.
-  /// Single grow_ check regardless of argument order.
-  inline void reserve_and_resize(size_t reserve_size, size_t new_size) ESPHOME_ALWAYS_INLINE {
-    this->reserve(std::max(reserve_size, new_size));
-    this->size_ = new_size;
-  }
   uint8_t *data() { return this->data_.get(); }
   const uint8_t *data() const { return this->data_.get(); }
   size_t size() const { return this->size_; }

esphome/components/api/api_connection.cpp

@@ -43,6 +43,9 @@
 #ifdef USE_ZWAVE_PROXY
 #include "esphome/components/zwave_proxy/zwave_proxy.h"
 #endif
+#ifdef USE_ZIGBEE_PROXY
+#include "esphome/components/zigbee_proxy/zigbee_proxy.h"
+#endif
 #ifdef USE_WATER_HEATER
 #include "esphome/components/water_heater/water_heater.h"
 #endif
@@ -52,11 +55,11 @@
 
 namespace esphome::api {
 
-// Maximum messages to read per loop iteration to prevent starving other components.
+// Read a maximum of 5 messages per loop iteration to prevent starving other components.
 // This is a balance between API responsiveness and allowing other components to run.
 // Since each message could contain multiple protobuf messages when using packet batching,
 // this limits the number of messages processed, not the number of TCP packets.
-static constexpr uint8_t MAX_MESSAGES_PER_LOOP = 10;
+static constexpr uint8_t MAX_MESSAGES_PER_LOOP = 5;
 static constexpr uint8_t MAX_PING_RETRIES = 60;
 static constexpr uint16_t PING_RETRY_INTERVAL = 1000;
 static constexpr uint32_t KEEPALIVE_DISCONNECT_TIMEOUT = (KEEPALIVE_TIMEOUT_MS * 5) / 2;
@@ -64,22 +67,10 @@ static constexpr uint32_t KEEPALIVE_DISCONNECT_TIMEOUT = (KEEPALIVE_TIMEOUT_MS *
 // A stalled handshake from a buggy client or network glitch holds a connection
 // slot, which can prevent legitimate clients from reconnecting. Also hardens
 // against the less likely case of intentional connection slot exhaustion.
-//
-// 60s is intentionally high: on ESP8266 with power_save_mode: LIGHT and weak
-// WiFi (-70 dBm+), TCP retransmissions push real-world handshake times to
-// 28-30s. See https://github.com/esphome/esphome/issues/14999
-static constexpr uint32_t HANDSHAKE_TIMEOUT_MS = 60000;
+static constexpr uint32_t HANDSHAKE_TIMEOUT_MS = 15000;
 
 static constexpr auto ESPHOME_VERSION_REF = StringRef::from_lit(ESPHOME_VERSION);
 
-// Cross-validate C++ constants against proto max_data_length annotations in api.proto
-static_assert(MAC_ADDRESS_PRETTY_BUFFER_SIZE - 1 == 17,
-              "Update max_data_length for mac_address/bluetooth_mac_address in api.proto");
-static_assert(Application::BUILD_TIME_STR_SIZE - 1 == 25, "Update max_data_length for compilation_time in api.proto");
-static_assert(sizeof(ESPHOME_VERSION) - 1 <= 32, "Update max_data_length for esphome_version in api.proto");
-static_assert(ESPHOME_DEVICE_NAME_MAX_LEN <= 31, "Update max_data_length for name in api.proto");
-static_assert(ESPHOME_FRIENDLY_NAME_MAX_LEN <= 120, "Update max_data_length for friendly_name in api.proto");
-
 static const char *const TAG = "api.connection";
 #ifdef USE_CAMERA
 static const int CAMERA_STOP_STREAM = 5000;
@@ -140,6 +131,8 @@ APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *pa
 #endif
 }
 
+uint32_t APIConnection::get_batch_delay_ms_() const { return this->parent_->get_batch_delay(); }
+
 void APIConnection::start() {
   this->last_traffic_ = App.get_loop_component_start_time();
 
@@ -220,17 +213,10 @@ void APIConnection::loop() {
   }
 
   const uint32_t now = App.get_loop_component_start_time();
-  // Check if socket has data ready before attempting to read.
-  // Also try reading if we hit the message limit last time — LWIP's rcvevent
-  // (used by is_socket_ready) tracks pbuf dequeues, not bytes. When multiple
-  // messages share a TCP segment, the last message's data stays in LWIP's
-  // lastdata cache after rcvevent hits 0, making is_socket_ready() return false
-  // even though data remains.
-  if (this->helper_->is_socket_ready() || this->flags_.may_have_remaining_data) {
-    this->flags_.may_have_remaining_data = false;
+  // Check if socket has data ready before attempting to read
+  if (this->helper_->is_socket_ready()) {
     // Read up to MAX_MESSAGES_PER_LOOP messages per loop to improve throughput
-    uint8_t message_count = 0;
-    for (; message_count < MAX_MESSAGES_PER_LOOP; message_count++) {
+    for (uint8_t message_count = 0; message_count < MAX_MESSAGES_PER_LOOP; message_count++) {
       ReadPacketBuffer buffer;
       err = this->helper_->read_packet(&buffer);
       if (err == APIError::WOULD_BLOCK) {
@@ -247,16 +233,11 @@ void APIConnection::loop() {
           this->last_traffic_ = now;
         }
         // read a packet
-        this->read_message_(buffer.data_len, buffer.type, buffer.data);
+        this->read_message(buffer.data_len, buffer.type, buffer.data);
         if (this->flags_.remove)
           return;
       }
     }
-    // If we hit the limit, there may be more data remaining in LWIP's
-    // lastdata cache that rcvevent doesn't account for.
-    if (message_count == MAX_MESSAGES_PER_LOOP) {
-      this->flags_.may_have_remaining_data = true;
-    }
   }
 
   // Process deferred batch if scheduled and timer has expired
@@ -327,8 +308,6 @@ void APIConnection::process_active_iterator_() {
       this->destroy_active_iterator_();
       if (this->flags_.state_subscription) {
         this->begin_iterator_(ActiveIterator::INITIAL_STATE);
-      } else {
-        this->finalize_iterator_sync_();
       }
     } else {
       this->process_iterator_batch_(this->iterator_storage_.list_entities);
@@ -336,27 +315,21 @@ void APIConnection::process_active_iterator_() {
   } else {  // INITIAL_STATE
     if (this->iterator_storage_.initial_state.completed()) {
       this->destroy_active_iterator_();
-      this->finalize_iterator_sync_();
+      // Process any remaining batched messages immediately
+      if (!this->deferred_batch_.empty()) {
+        this->process_batch_();
+      }
+      // Now that everything is sent, enable immediate sending for future state changes
+      this->flags_.should_try_send_immediately = true;
+      // Release excess memory from buffers that grew during initial sync
+      this->deferred_batch_.release_buffer();
+      this->helper_->release_buffers();
     } else {
       this->process_iterator_batch_(this->iterator_storage_.initial_state);
     }
   }
 }
 
-void APIConnection::finalize_iterator_sync_() {
-  // Flush any remaining batched messages immediately so clients
-  // receive completion responses (e.g. ListEntitiesDoneResponse)
-  // without waiting for the batch timer.
-  if (!this->deferred_batch_.empty()) {
-    this->process_batch_();
-  }
-  // Enable immediate sending for future state changes
-  this->flags_.should_try_send_immediately = true;
-  // Release excess memory from buffers that grew during initial sync
-  this->deferred_batch_.release_buffer();
-  this->helper_->release_buffers();
-}
-
 void APIConnection::process_iterator_batch_(ComponentIterator &iterator) {
   size_t initial_size = this->deferred_batch_.size();
   size_t max_batch = this->get_max_batch_size_();
@@ -426,7 +399,7 @@ uint16_t APIConnection::fill_and_encode_entity_info(EntityBase *entity, InfoResp
 #ifdef USE_DEVICES
   msg.device_id = entity->get_device_id();
 #endif
-  return encode_to_buffer_slow(size_fn(&msg), encode_fn, &msg, conn, remaining_size);
+  return encode_to_buffer(size_fn(&msg), encode_fn, &msg, conn, remaining_size);
 }
 
 uint16_t APIConnection::fill_and_encode_entity_info_with_device_class(EntityBase *entity, InfoResponseProtoMessage &msg,
@@ -1347,6 +1320,16 @@ void APIConnection::on_z_wave_proxy_request(const ZWaveProxyRequest &msg) {
 }
 #endif
 
+#ifdef USE_ZIGBEE_PROXY
+void APIConnection::on_zigbee_proxy_frame(const ZigbeeProxyFrame &msg) {
+  zigbee_proxy::global_zigbee_proxy->zigbee_proxy_frame(this, msg);
+}
+
+void APIConnection::on_zigbee_proxy_request(const ZigbeeProxyRequest &msg) {
+  zigbee_proxy::global_zigbee_proxy->zigbee_proxy_request(this, msg);
+}
+#endif
+
 #ifdef USE_ALARM_CONTROL_PANEL
 bool APIConnection::send_alarm_control_panel_state(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel) {
   return this->send_message_smart_(a_alarm_control_panel, AlarmControlPanelStateResponse::MESSAGE_TYPE,
@@ -1491,7 +1474,7 @@ void APIConnection::send_infrared_rf_receive_event(const InfraredRFReceiveEvent
 void APIConnection::on_serial_proxy_configure_request(const SerialProxyConfigureRequest &msg) {
   auto &proxies = App.get_serial_proxies();
   if (msg.instance >= proxies.size()) {
-    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range (max %" PRIu32 ")", msg.instance,
+    ESP_LOGW(TAG, "Serial proxy instance %u out of range (max %u)", msg.instance,
              static_cast<uint32_t>(proxies.size()));
     return;
   }
@@ -1502,7 +1485,7 @@ void APIConnection::on_serial_proxy_configure_request(const SerialProxyConfigure
 void APIConnection::on_serial_proxy_write_request(const SerialProxyWriteRequest &msg) {
   auto &proxies = App.get_serial_proxies();
   if (msg.instance >= proxies.size()) {
-    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
+    ESP_LOGW(TAG, "Serial proxy instance %u out of range", msg.instance);
     return;
   }
   proxies[msg.instance]->write_from_client(msg.data, msg.data_len);
@@ -1511,7 +1494,7 @@ void APIConnection::on_serial_proxy_write_request(const SerialProxyWriteRequest
 void APIConnection::on_serial_proxy_set_modem_pins_request(const SerialProxySetModemPinsRequest &msg) {
   auto &proxies = App.get_serial_proxies();
   if (msg.instance >= proxies.size()) {
-    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
+    ESP_LOGW(TAG, "Serial proxy instance %u out of range", msg.instance);
     return;
   }
   proxies[msg.instance]->set_modem_pins(msg.line_states);
@@ -1520,7 +1503,7 @@ void APIConnection::on_serial_proxy_set_modem_pins_request(const SerialProxySetM
 void APIConnection::on_serial_proxy_get_modem_pins_request(const SerialProxyGetModemPinsRequest &msg) {
   auto &proxies = App.get_serial_proxies();
   if (msg.instance >= proxies.size()) {
-    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
+    ESP_LOGW(TAG, "Serial proxy instance %u out of range", msg.instance);
     return;
   }
   SerialProxyGetModemPinsResponse resp{};
@@ -1532,7 +1515,7 @@ void APIConnection::on_serial_proxy_get_modem_pins_request(const SerialProxyGetM
 void APIConnection::on_serial_proxy_request(const SerialProxyRequest &msg) {
   auto &proxies = App.get_serial_proxies();
   if (msg.instance >= proxies.size()) {
-    ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
+    ESP_LOGW(TAG, "Serial proxy instance %u out of range", msg.instance);
     return;
   }
   switch (msg.type) {
@@ -1545,16 +1528,16 @@ void APIConnection::on_serial_proxy_request(const SerialProxyRequest &msg) {
       resp.instance = msg.instance;
       resp.type = enums::SERIAL_PROXY_REQUEST_TYPE_FLUSH;
       switch (proxies[msg.instance]->flush_port()) {
-        case uart::UARTFlushResult::UART_FLUSH_RESULT_SUCCESS:
+        case uart::FlushResult::SUCCESS:
           resp.status = enums::SERIAL_PROXY_STATUS_OK;
           break;
-        case uart::UARTFlushResult::UART_FLUSH_RESULT_ASSUMED_SUCCESS:
+        case uart::FlushResult::ASSUMED_SUCCESS:
           resp.status = enums::SERIAL_PROXY_STATUS_ASSUMED_SUCCESS;
           break;
-        case uart::UARTFlushResult::UART_FLUSH_RESULT_TIMEOUT:
+        case uart::FlushResult::TIMEOUT:
           resp.status = enums::SERIAL_PROXY_STATUS_TIMEOUT;
           break;
-        case uart::UARTFlushResult::UART_FLUSH_RESULT_FAILED:
+        case uart::FlushResult::FAILED:
           resp.status = enums::SERIAL_PROXY_STATUS_ERROR;
           break;
       }
@@ -1562,7 +1545,7 @@ void APIConnection::on_serial_proxy_request(const SerialProxyRequest &msg) {
       break;
     }
     default:
-      ESP_LOGW(TAG, "Unknown serial proxy request type: %" PRIu32, static_cast<uint32_t>(msg.type));
+      ESP_LOGW(TAG, "Unknown serial proxy request type: %u", static_cast<uint32_t>(msg.type));
       break;
   }
 }
@@ -1575,7 +1558,6 @@ uint16_t APIConnection::try_send_infrared_info(EntityBase *entity, APIConnection
   auto *infrared = static_cast<infrared::Infrared *>(entity);
   ListEntitiesInfraredResponse msg;
   msg.capabilities = infrared->get_capability_flags();
-  msg.receiver_frequency = infrared->get_traits().get_receiver_frequency_hz();
   return fill_and_encode_entity_info(infrared, msg, conn, remaining_size);
 }
 #endif
@@ -1661,6 +1643,11 @@ void APIConnection::complete_authentication_() {
     zwave_proxy::global_zwave_proxy->api_connection_authenticated(this);
   }
 #endif
+#ifdef USE_ZIGBEE_PROXY
+  if (zigbee_proxy::global_zigbee_proxy != nullptr) {
+    zigbee_proxy::global_zigbee_proxy->api_connection_authenticated(this);
+  }
+#endif
 }
 
 bool APIConnection::send_hello_response_(const HelloRequest &msg) {
@@ -1744,7 +1731,6 @@ bool APIConnection::send_device_info_response_() {
   static constexpr auto MANUFACTURER = StringRef::from_lit(ESPHOME_MANUFACTURER);
   resp.manufacturer = MANUFACTURER;
 #endif
-  static_assert(sizeof(ESPHOME_MANUFACTURER) - 1 <= 20, "Update max_data_length for manufacturer in api.proto");
 #undef ESPHOME_MANUFACTURER
 
 #ifdef USE_ESP8266
@@ -1803,6 +1789,10 @@ bool APIConnection::send_device_info_response_() {
     info.port_type = proxy->get_port_type();
   }
 #endif
+#ifdef USE_ZIGBEE_PROXY
+  resp.zigbee_proxy_feature_flags = zigbee_proxy::global_zigbee_proxy->get_feature_flags();
+  resp.zigbee_ieee_address = zigbee_proxy::global_zigbee_proxy->get_ieee_address();
+#endif
 #ifdef USE_API_NOISE
   resp.api_encryption_supported = true;
 #endif
@@ -2022,15 +2012,53 @@ bool APIConnection::send_message_(uint32_t payload_size, uint8_t message_type, M
   size_t write_start = shared_buf.size();
   shared_buf.resize(write_start + payload_size);
   ProtoWriteBuffer buffer{&shared_buf, write_start};
-  encode_fn(msg, buffer PROTO_ENCODE_DEBUG_INIT(&shared_buf));
+  encode_fn(msg, buffer);
   return this->send_buffer(ProtoWriteBuffer{&shared_buf}, message_type);
 }
-// encode_to_buffer is defined inline in api_connection.h (ESPHOME_ALWAYS_INLINE)
+// Encodes a message to the buffer and returns the total number of bytes used,
+// including header and footer overhead. Returns 0 if the message doesn't fit.
+uint16_t APIConnection::encode_to_buffer(uint32_t calculated_size, MessageEncodeFn encode_fn, const void *msg,
+                                         APIConnection *conn, uint32_t remaining_size) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  if (conn->flags_.log_only_mode) {
+    auto *proto_msg = static_cast<const ProtoMessage *>(msg);
+    DumpBuffer dump_buf;
+    conn->log_send_message_(proto_msg->message_name(), proto_msg->dump_to(dump_buf));
+    return 1;
+  }
+#endif
+  // Cache frame sizes to avoid repeated virtual calls
+  const uint8_t header_padding = conn->helper_->frame_header_padding();
+  const uint8_t footer_size = conn->helper_->frame_footer_size();
 
-// Noinline version for cold paths — single shared copy
-uint16_t APIConnection::encode_to_buffer_slow(uint32_t calculated_size, MessageEncodeFn encode_fn, const void *msg,
-                                              APIConnection *conn, uint32_t remaining_size) {
-  return encode_to_buffer(calculated_size, encode_fn, msg, conn, remaining_size);
+  // Calculate total size with padding for buffer allocation
+  size_t total_calculated_size = calculated_size + header_padding + footer_size;
+
+  // Check if it fits
+  if (total_calculated_size > remaining_size)
+    return 0;  // Doesn't fit
+
+  auto &shared_buf = conn->parent_->get_shared_buffer_ref();
+
+  if (conn->flags_.batch_first_message) {
+    // First message - buffer already prepared by caller, just clear flag
+    conn->flags_.batch_first_message = false;
+  } else {
+    // Batch message second or later
+    // Add padding for previous message footer + this message header
+    size_t current_size = shared_buf.size();
+    shared_buf.reserve(current_size + total_calculated_size);
+    shared_buf.resize(current_size + footer_size + header_padding);
+  }
+
+  // Pre-resize buffer to include payload, then encode through raw pointer
+  size_t write_start = shared_buf.size();
+  shared_buf.resize(write_start + calculated_size);
+  ProtoWriteBuffer buffer{&shared_buf, write_start};
+  encode_fn(msg, buffer);
+
+  // Return total size (header + payload + footer)
+  return static_cast<uint16_t>(header_padding + calculated_size + footer_size);
 }
 bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) {
   const bool is_log_message = (message_type == SubscribeLogsResponse::MESSAGE_TYPE);
@@ -2062,9 +2090,37 @@ void APIConnection::on_fatal_error() {
   this->flags_.remove = true;
 }
 
-bool APIConnection::schedule_message_front_(EntityBase *entity, uint8_t message_type, uint8_t estimated_size) {
-  this->deferred_batch_.add_item_front(entity, message_type, estimated_size);
-  return this->schedule_batch_();
+void __attribute__((flatten)) APIConnection::DeferredBatch::push_item(const BatchItem &item) { items.push_back(item); }
+
+void APIConnection::DeferredBatch::add_item(EntityBase *entity, uint8_t message_type, uint8_t estimated_size,
+                                            uint8_t aux_data_index) {
+  // Check if we already have a message of this type for this entity
+  // This provides deduplication per entity/message_type combination
+  // O(n) but optimized for RAM and not performance.
+  // Skip deduplication for events - they are edge-triggered, every occurrence matters
+#ifdef USE_EVENT
+  if (message_type != EventResponse::MESSAGE_TYPE)
+#endif
+  {
+    for (const auto &item : items) {
+      if (item.entity == entity && item.message_type == message_type)
+        return;  // Already queued
+    }
+  }
+  // No existing item found (or event), add new one
+  this->push_item({entity, message_type, estimated_size, aux_data_index});
+}
+
+void APIConnection::DeferredBatch::add_item_front(EntityBase *entity, uint8_t message_type, uint8_t estimated_size) {
+  // Add high priority message and swap to front
+  // This avoids expensive vector::insert which shifts all elements
+  // Note: We only ever have one high-priority message at a time (ping OR disconnect)
+  // If we're disconnecting, pings are blocked, so this simple swap is sufficient
+  this->push_item({entity, message_type, estimated_size, AUX_DATA_UNUSED});
+  if (items.size() > 1) {
+    // Swap the new high-priority item to the front
+    std::swap(items.front(), items.back());
+  }
 }
 
 bool APIConnection::send_message_smart_(EntityBase *entity, uint8_t message_type, uint8_t estimated_size,
@@ -2098,13 +2154,6 @@ void APIConnection::process_batch_() {
     return;
   }
 
-  // Ensure TCP_NODELAY is on before draining overflow and writing batch data.
-  // Log messages enable Nagle (NODELAY off) to coalesce small packets.
-  // If Nagle is still on when we try to drain, LWIP holds data in the
-  // Nagle buffer, the TCP send buffer stays full, and the overflow
-  // buffer can never drain — blocking the batch write indefinitely.
-  this->helper_->set_nodelay_for_message(false);
-
   // Try to clear buffer first
   if (!this->try_to_clear_buffer(true)) {
     // Can't write now, we'll try again later
@@ -2164,15 +2213,17 @@ void APIConnection::process_batch_multi_(APIBuffer &shared_buf, size_t num_items
                 "MessageInfo must remain trivially destructible with this placement-new approach");
 
   const size_t messages_to_process = std::min(num_items, MAX_MESSAGES_PER_BATCH);
+  const uint8_t frame_overhead = header_padding + footer_size;
 
   // Stack-allocated array for message info
   alignas(MessageInfo) char message_info_storage[MAX_MESSAGES_PER_BATCH * sizeof(MessageInfo)];
   MessageInfo *message_info = reinterpret_cast<MessageInfo *>(message_info_storage);
   size_t items_processed = 0;
   uint16_t remaining_size = std::numeric_limits<uint16_t>::max();
-  // Track where each message's header begins in the buffer
-  // First message: offset 0 (max padding, may have unused leading bytes)
-  // Subsequent messages: offset points to exact header start (no gaps)
+  // Track where each message's header padding begins in the buffer
+  // For plaintext: this is where the 6-byte header padding starts
+  // For noise: this is where the 7-byte header padding starts
+  // The actual message data follows after the header padding
   uint32_t current_offset = 0;
 
   // Process items and encode directly to buffer (up to our limit)
@@ -2188,14 +2239,13 @@ void APIConnection::process_batch_multi_(APIBuffer &shared_buf, size_t num_items
     }
 
     // Message was encoded successfully
-    // payload_size = header_size + proto_payload_size + footer_size
-    uint16_t proto_payload_size = payload_size - this->batch_header_size_ - footer_size;
+    // payload_size is header_padding + actual payload size + footer_size
+    uint16_t proto_payload_size = payload_size - frame_overhead;
     // Use placement new to construct MessageInfo in pre-allocated stack array
     // This avoids default-constructing all MAX_MESSAGES_PER_BATCH elements
     // Explicit destruction is not needed because MessageInfo is trivially destructible,
     // as ensured by the static_assert in its definition.
-    new (&message_info[items_processed++])
-        MessageInfo(item.message_type, current_offset, proto_payload_size, this->batch_header_size_);
+    new (&message_info[items_processed++]) MessageInfo(item.message_type, current_offset, proto_payload_size);
     // After first message, set remaining size to MAX_BATCH_PACKET_SIZE to avoid fragmentation
     if (items_processed == 1) {
       remaining_size = MAX_BATCH_PACKET_SIZE;
@@ -2245,7 +2295,6 @@ void APIConnection::process_batch_multi_(APIBuffer &shared_buf, size_t num_items
 uint16_t APIConnection::dispatch_message_(const DeferredBatch::BatchItem &item, uint32_t remaining_size,
                                           bool batch_first) {
   this->flags_.batch_first_message = batch_first;
-  this->batch_message_type_ = item.message_type;
 #ifdef USE_EVENT
   // Events need aux_data_index to look up event type from entity
   if (item.message_type == EventResponse::MESSAGE_TYPE) {

esphome/components/api/api_connection.h

@@ -20,9 +20,6 @@
 #ifdef USE_RP2040_CRASH_HANDLER
 #include "esphome/components/rp2040/crash_handler.h"
 #endif
-#ifdef USE_ESP8266_CRASH_HANDLER
-#include "esphome/components/esp8266/crash_handler.h"
-#endif
 #include "esphome/core/entity_base.h"
 #include "esphome/core/string_ref.h"
 
@@ -47,46 +44,16 @@ static constexpr size_t MAX_INITIAL_PER_BATCH = 34;         // For clients >= AP
 static_assert(MAX_MESSAGES_PER_BATCH >= MAX_INITIAL_PER_BATCH,
               "MAX_MESSAGES_PER_BATCH must be >= MAX_INITIAL_PER_BATCH");
 
-#ifdef USE_BENCHMARK
-class APIConnection;
-void bench_enable_immediate_send(APIConnection *conn);
-void bench_clear_batch(APIConnection *conn);
-void bench_process_batch(APIConnection *conn);
-#endif
-
 class APIConnection final : public APIServerConnectionBase {
  public:
   friend class APIServer;
   friend class ListEntitiesIterator;
-#ifdef USE_BENCHMARK
-  friend void bench_enable_immediate_send(APIConnection *conn);
-  friend void bench_clear_batch(APIConnection *conn);
-  friend void bench_process_batch(APIConnection *conn);
-#endif
   APIConnection(std::unique_ptr<socket::Socket> socket, APIServer *parent);
-  ~APIConnection();
+  virtual ~APIConnection();
 
   void start();
   void loop();
 
- protected:
-  // read_message_ is defined here (instead of in APIServerConnectionBase) so the
-  // compiler can devirtualize and inline on_* handler calls within this final class.
-  void read_message_(uint32_t msg_size, uint32_t msg_type, const uint8_t *msg_data);
-
-  // Auth helpers defined here (not in ProtoService) so the compiler can
-  // devirtualize is_connection_setup()/on_no_setup_connection() calls
-  // within this final class.
-  inline bool check_connection_setup_() {
-    if (!this->is_connection_setup()) {
-      this->on_no_setup_connection();
-      return false;
-    }
-    return true;
-  }
-  inline bool check_authenticated_() { return this->check_connection_setup_(); }
-
- public:
   bool send_list_info_done() {
     return this->schedule_message_(nullptr, ListEntitiesDoneResponse::MESSAGE_TYPE,
                                    ListEntitiesDoneResponse::ESTIMATED_SIZE);
@@ -96,72 +63,72 @@ class APIConnection final : public APIServerConnectionBase {
 #endif
 #ifdef USE_COVER
   bool send_cover_state(cover::Cover *cover);
-  void on_cover_command_request(const CoverCommandRequest &msg);
+  void on_cover_command_request(const CoverCommandRequest &msg) override;
 #endif
 #ifdef USE_FAN
   bool send_fan_state(fan::Fan *fan);
-  void on_fan_command_request(const FanCommandRequest &msg);
+  void on_fan_command_request(const FanCommandRequest &msg) override;
 #endif
 #ifdef USE_LIGHT
   bool send_light_state(light::LightState *light);
-  void on_light_command_request(const LightCommandRequest &msg);
+  void on_light_command_request(const LightCommandRequest &msg) override;
 #endif
 #ifdef USE_SENSOR
   bool send_sensor_state(sensor::Sensor *sensor);
 #endif
 #ifdef USE_SWITCH
   bool send_switch_state(switch_::Switch *a_switch);
-  void on_switch_command_request(const SwitchCommandRequest &msg);
+  void on_switch_command_request(const SwitchCommandRequest &msg) override;
 #endif
 #ifdef USE_TEXT_SENSOR
   bool send_text_sensor_state(text_sensor::TextSensor *text_sensor);
 #endif
 #ifdef USE_CAMERA
   void set_camera_state(std::shared_ptr<camera::CameraImage> image);
-  void on_camera_image_request(const CameraImageRequest &msg);
+  void on_camera_image_request(const CameraImageRequest &msg) override;
 #endif
 #ifdef USE_CLIMATE
   bool send_climate_state(climate::Climate *climate);
-  void on_climate_command_request(const ClimateCommandRequest &msg);
+  void on_climate_command_request(const ClimateCommandRequest &msg) override;
 #endif
 #ifdef USE_NUMBER
   bool send_number_state(number::Number *number);
-  void on_number_command_request(const NumberCommandRequest &msg);
+  void on_number_command_request(const NumberCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_DATE
   bool send_date_state(datetime::DateEntity *date);
-  void on_date_command_request(const DateCommandRequest &msg);
+  void on_date_command_request(const DateCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_TIME
   bool send_time_state(datetime::TimeEntity *time);
-  void on_time_command_request(const TimeCommandRequest &msg);
+  void on_time_command_request(const TimeCommandRequest &msg) override;
 #endif
 #ifdef USE_DATETIME_DATETIME
   bool send_datetime_state(datetime::DateTimeEntity *datetime);
-  void on_date_time_command_request(const DateTimeCommandRequest &msg);
+  void on_date_time_command_request(const DateTimeCommandRequest &msg) override;
 #endif
 #ifdef USE_TEXT
   bool send_text_state(text::Text *text);
-  void on_text_command_request(const TextCommandRequest &msg);
+  void on_text_command_request(const TextCommandRequest &msg) override;
 #endif
 #ifdef USE_SELECT
   bool send_select_state(select::Select *select);
-  void on_select_command_request(const SelectCommandRequest &msg);
+  void on_select_command_request(const SelectCommandRequest &msg) override;
 #endif
 #ifdef USE_BUTTON
-  void on_button_command_request(const ButtonCommandRequest &msg);
+  void on_button_command_request(const ButtonCommandRequest &msg) override;
 #endif
 #ifdef USE_LOCK
   bool send_lock_state(lock::Lock *a_lock);
-  void on_lock_command_request(const LockCommandRequest &msg);
+  void on_lock_command_request(const LockCommandRequest &msg) override;
 #endif
 #ifdef USE_VALVE
   bool send_valve_state(valve::Valve *valve);
-  void on_valve_command_request(const ValveCommandRequest &msg);
+  void on_valve_command_request(const ValveCommandRequest &msg) override;
 #endif
 #ifdef USE_MEDIA_PLAYER
   bool send_media_player_state(media_player::MediaPlayer *media_player);
-  void on_media_player_command_request(const MediaPlayerCommandRequest &msg);
+  void on_media_player_command_request(const MediaPlayerCommandRequest &msg) override;
 #endif
   bool try_send_log_message(int level, const char *tag, const char *line, size_t message_len);
 #ifdef USE_API_HOMEASSISTANT_SERVICES
@@ -171,23 +138,23 @@ class APIConnection final : public APIServerConnectionBase {
     this->send_message(call);
   }
 #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES
-  void on_homeassistant_action_response(const HomeassistantActionResponse &msg);
+  void on_homeassistant_action_response(const HomeassistantActionResponse &msg) override;
 #endif  // USE_API_HOMEASSISTANT_ACTION_RESPONSES
 #endif  // USE_API_HOMEASSISTANT_SERVICES
 #ifdef USE_BLUETOOTH_PROXY
-  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg);
-  void on_unsubscribe_bluetooth_le_advertisements_request();
+  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &msg) override;
+  void on_unsubscribe_bluetooth_le_advertisements_request() override;
 
-  void on_bluetooth_device_request(const BluetoothDeviceRequest &msg);
-  void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg);
-  void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg);
-  void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &msg);
-  void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &msg);
-  void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg);
-  void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg);
-  void on_subscribe_bluetooth_connections_free_request();
-  void on_bluetooth_scanner_set_mode_request(const BluetoothScannerSetModeRequest &msg);
-  void on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &msg);
+  void on_bluetooth_device_request(const BluetoothDeviceRequest &msg) override;
+  void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &msg) override;
+  void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &msg) override;
+  void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &msg) override;
+  void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &msg) override;
+  void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &msg) override;
+  void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &msg) override;
+  void on_subscribe_bluetooth_connections_free_request() override;
+  void on_bluetooth_scanner_set_mode_request(const BluetoothScannerSetModeRequest &msg) override;
+  void on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &msg) override;
 
 #endif
 #ifdef USE_HOMEASSISTANT_TIME
@@ -198,42 +165,48 @@ class APIConnection final : public APIServerConnectionBase {
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-  void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &msg);
-  void on_voice_assistant_response(const VoiceAssistantResponse &msg);
-  void on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg);
-  void on_voice_assistant_audio(const VoiceAssistantAudio &msg);
-  void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &msg);
-  void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &msg);
-  void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg);
-  void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg);
+  void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &msg) override;
+  void on_voice_assistant_response(const VoiceAssistantResponse &msg) override;
+  void on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) override;
+  void on_voice_assistant_audio(const VoiceAssistantAudio &msg) override;
+  void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &msg) override;
+  void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &msg) override;
+  void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &msg) override;
+  void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &msg) override;
 #endif
 
 #ifdef USE_ZWAVE_PROXY
-  void on_z_wave_proxy_frame(const ZWaveProxyFrame &msg);
-  void on_z_wave_proxy_request(const ZWaveProxyRequest &msg);
+  void on_z_wave_proxy_frame(const ZWaveProxyFrame &msg) override;
+  void on_z_wave_proxy_request(const ZWaveProxyRequest &msg) override;
+#endif
+
+#ifdef USE_ZIGBEE_PROXY
+  void on_zigbee_proxy_frame(const ZigbeeProxyFrame &msg) override;
+  void on_zigbee_proxy_request(const ZigbeeProxyRequest &msg) override;
+  void send_zigbee_proxy_frame(const ZigbeeProxyFrame &msg) { this->send_message(msg); }
 #endif
 
 #ifdef USE_ALARM_CONTROL_PANEL
   bool send_alarm_control_panel_state(alarm_control_panel::AlarmControlPanel *a_alarm_control_panel);
-  void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg);
+  void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &msg) override;
 #endif
 
 #ifdef USE_WATER_HEATER
   bool send_water_heater_state(water_heater::WaterHeater *water_heater);
-  void on_water_heater_command_request(const WaterHeaterCommandRequest &msg);
+  void on_water_heater_command_request(const WaterHeaterCommandRequest &msg) override;
 #endif
 
 #ifdef USE_IR_RF
-  void on_infrared_rf_transmit_raw_timings_request(const InfraredRFTransmitRawTimingsRequest &msg);
+  void on_infrared_rf_transmit_raw_timings_request(const InfraredRFTransmitRawTimingsRequest &msg) override;
   void send_infrared_rf_receive_event(const InfraredRFReceiveEvent &msg);
 #endif
 
 #ifdef USE_SERIAL_PROXY
-  void on_serial_proxy_configure_request(const SerialProxyConfigureRequest &msg);
-  void on_serial_proxy_write_request(const SerialProxyWriteRequest &msg);
-  void on_serial_proxy_set_modem_pins_request(const SerialProxySetModemPinsRequest &msg);
-  void on_serial_proxy_get_modem_pins_request(const SerialProxyGetModemPinsRequest &msg);
-  void on_serial_proxy_request(const SerialProxyRequest &msg);
+  void on_serial_proxy_configure_request(const SerialProxyConfigureRequest &msg) override;
+  void on_serial_proxy_write_request(const SerialProxyWriteRequest &msg) override;
+  void on_serial_proxy_set_modem_pins_request(const SerialProxySetModemPinsRequest &msg) override;
+  void on_serial_proxy_get_modem_pins_request(const SerialProxyGetModemPinsRequest &msg) override;
+  void on_serial_proxy_request(const SerialProxyRequest &msg) override;
   void send_serial_proxy_data(const SerialProxyDataReceived &msg);
 #endif
 
@@ -243,26 +216,26 @@ class APIConnection final : public APIServerConnectionBase {
 
 #ifdef USE_UPDATE
   bool send_update_state(update::UpdateEntity *update);
-  void on_update_command_request(const UpdateCommandRequest &msg);
+  void on_update_command_request(const UpdateCommandRequest &msg) override;
 #endif
 
-  void on_disconnect_response();
-  void on_ping_response() {
+  void on_disconnect_response() override;
+  void on_ping_response() override {
     // we initiated ping
     this->flags_.sent_ping = false;
   }
 #ifdef USE_API_HOMEASSISTANT_STATES
-  void on_home_assistant_state_response(const HomeAssistantStateResponse &msg);
+  void on_home_assistant_state_response(const HomeAssistantStateResponse &msg) override;
 #endif
 #ifdef USE_HOMEASSISTANT_TIME
-  void on_get_time_response(const GetTimeResponse &value);
+  void on_get_time_response(const GetTimeResponse &value) override;
 #endif
-  void on_hello_request(const HelloRequest &msg);
-  void on_disconnect_request();
-  void on_ping_request();
-  void on_device_info_request();
-  void on_list_entities_request() { this->begin_iterator_(ActiveIterator::LIST_ENTITIES); }
-  void on_subscribe_states_request() {
+  void on_hello_request(const HelloRequest &msg) override;
+  void on_disconnect_request() override;
+  void on_ping_request() override;
+  void on_device_info_request() override;
+  void on_list_entities_request() override { this->begin_iterator_(ActiveIterator::LIST_ENTITIES); }
+  void on_subscribe_states_request() override {
     this->flags_.state_subscription = true;
     // Start initial state iterator only if no iterator is active
     // If list_entities is running, we'll start initial_state when it completes
@@ -270,29 +243,25 @@ class APIConnection final : public APIServerConnectionBase {
       this->begin_iterator_(ActiveIterator::INITIAL_STATE);
     }
   }
-  void on_subscribe_logs_request(const SubscribeLogsRequest &msg) {
+  void on_subscribe_logs_request(const SubscribeLogsRequest &msg) override {
     this->flags_.log_subscription = msg.level;
     if (msg.dump_config)
       App.schedule_dump_config();
 #ifdef USE_ESP32_CRASH_HANDLER
     esp32::crash_handler_log();
-    esp32::crash_handler_clear();
 #endif
 #ifdef USE_RP2040_CRASH_HANDLER
     rp2040::crash_handler_log();
-#endif
-#ifdef USE_ESP8266_CRASH_HANDLER
-    esp8266::crash_handler_log();
 #endif
   }
 #ifdef USE_API_HOMEASSISTANT_SERVICES
-  void on_subscribe_homeassistant_services_request() { this->flags_.service_call_subscription = true; }
+  void on_subscribe_homeassistant_services_request() override { this->flags_.service_call_subscription = true; }
 #endif
 #ifdef USE_API_HOMEASSISTANT_STATES
-  void on_subscribe_home_assistant_states_request();
+  void on_subscribe_home_assistant_states_request() override;
 #endif
 #ifdef USE_API_USER_DEFINED_ACTIONS
-  void on_execute_service_request(const ExecuteServiceRequest &msg);
+  void on_execute_service_request(const ExecuteServiceRequest &msg) override;
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES
   void send_execute_service_response(uint32_t call_id, bool success, StringRef error_message);
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES_JSON
@@ -302,13 +271,13 @@ class APIConnection final : public APIServerConnectionBase {
 #endif  // USE_API_USER_DEFINED_ACTION_RESPONSES
 #endif
 #ifdef USE_API_NOISE
-  void on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &msg);
+  void on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &msg) override;
 #endif
 
-  bool is_authenticated() {
+  bool is_authenticated() override {
     return static_cast<ConnectionState>(this->flags_.connection_state) == ConnectionState::AUTHENTICATED;
   }
-  bool is_connection_setup() {
+  bool is_connection_setup() override {
     return static_cast<ConnectionState>(this->flags_.connection_state) == ConnectionState::CONNECTED ||
            this->is_authenticated();
   }
@@ -321,11 +290,11 @@ class APIConnection final : public APIServerConnectionBase {
            (this->client_api_version_major_ == major && this->client_api_version_minor_ >= minor);
   }
 
-  void on_fatal_error();
-  void on_no_setup_connection();
+  void on_fatal_error() override;
+  void on_no_setup_connection() override;
 
   // Function pointer type for type-erased message encoding
-  using MessageEncodeFn = uint8_t *(*) (const void *, ProtoWriteBuffer &PROTO_ENCODE_DEBUG_PARAM);
+  using MessageEncodeFn = void (*)(const void *, ProtoWriteBuffer &);
   // Function pointer type for type-erased size calculation
   using CalculateSizeFn = uint32_t (*)(const void *);
 
@@ -342,9 +311,9 @@ class APIConnection final : public APIServerConnectionBase {
     // Reserve space for header padding + message + footer
     // - Header padding: space for protocol headers (7 bytes for Noise, 6 for Plaintext)
     // - Footer: space for MAC (16 bytes for Noise, 0 for Plaintext)
-    // Reserve full size but only set initial size to header padding
-    // so message encoding starts at the correct position
-    shared_buf.reserve_and_resize(total_size, header_padding);
+    shared_buf.reserve(total_size);
+    // Resize to add header padding so message encoding starts at the correct position
+    shared_buf.resize(header_padding);
   }
 
   // Convenience overload - computes frame overhead internally
@@ -361,7 +330,7 @@ class APIConnection final : public APIServerConnectionBase {
       return true;
     return this->try_to_clear_buffer_slow_(log_out_of_space);
   }
-  bool send_buffer(ProtoWriteBuffer buffer, uint8_t message_type);
+  bool send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) override;
 
   const char *get_name() const { return this->helper_->get_client_name(); }
   /// Get peer name (IP address) into caller-provided buffer, returns buf for convenience
@@ -404,66 +373,21 @@ class APIConnection final : public APIServerConnectionBase {
   }
 
   // Shared no-op encode thunk for empty messages (ESTIMATED_SIZE == 0)
-  static uint8_t *encode_msg_noop(const void *, ProtoWriteBuffer &buf PROTO_ENCODE_DEBUG_PARAM) {
-    return buf.get_pos();
-  }
+  static void encode_msg_noop(const void *, ProtoWriteBuffer &) {}
 
   // Non-template buffer management for send_message
   bool send_message_(uint32_t payload_size, uint8_t message_type, MessageEncodeFn encode_fn, const void *msg);
 
-  // Core batch encoding logic. Computes header size, checks fit, resizes buffer, encodes.
-  // ALWAYS_INLINE so the compiler can devirtualize encode_fn at hot call sites.
-  static inline uint16_t ESPHOME_ALWAYS_INLINE encode_to_buffer(uint32_t calculated_size, MessageEncodeFn encode_fn,
-                                                                const void *msg, APIConnection *conn,
-                                                                uint32_t remaining_size) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-    if (conn->flags_.log_only_mode) {
-      auto *proto_msg = static_cast<const ProtoMessage *>(msg);
-      DumpBuffer dump_buf;
-      conn->log_send_message_(proto_msg->message_name(), proto_msg->dump_to(dump_buf));
-      return 1;
-    }
-#endif
-    const uint8_t footer_size = conn->helper_->frame_footer_size();
+  // Non-template buffer management for batch encoding
+  static uint16_t encode_to_buffer(uint32_t calculated_size, MessageEncodeFn encode_fn, const void *msg,
+                                   APIConnection *conn, uint32_t remaining_size);
 
-    // First message uses max padding (already in buffer), subsequent use exact header size
-    size_t to_add;
-    if (conn->flags_.batch_first_message) {
-      conn->flags_.batch_first_message = false;
-      conn->batch_header_size_ = conn->helper_->frame_header_padding();
-      to_add = calculated_size;
-    } else {
-      conn->batch_header_size_ = conn->helper_->frame_header_size(calculated_size, conn->batch_message_type_);
-      to_add = calculated_size + conn->batch_header_size_ + footer_size;
-    }
-
-    // Check if it fits (using actual header size, not max padding)
-    uint16_t total_calculated_size = calculated_size + conn->batch_header_size_ + footer_size;
-    if (total_calculated_size > remaining_size)
-      return 0;
-
-    auto &shared_buf = conn->parent_->get_shared_buffer_ref();
-    shared_buf.resize(shared_buf.size() + to_add);
-    ProtoWriteBuffer buffer{&shared_buf, shared_buf.size() - calculated_size};
-    encode_fn(msg, buffer PROTO_ENCODE_DEBUG_INIT(&shared_buf));
-
-    return total_calculated_size;
-  }
-
-  // Noinline version of encode_to_buffer for cold paths (entity info, zero-payload messages).
-  // All cold callers share this single copy instead of each getting an ALWAYS_INLINE expansion.
-  static uint16_t encode_to_buffer_slow(uint32_t calculated_size, MessageEncodeFn encode_fn, const void *msg,
-                                        APIConnection *conn, uint32_t remaining_size);
-
-  // Thin template wrapper — uses noinline encode_to_buffer_slow since
-  // encode_message_to_buffer callers are cold paths (zero-payload control messages).
-  // Hot paths (state/info) go through fill_and_encode_entity_state/info instead.
-  // batch_message_type_ is already set by dispatch_message_ before reaching here.
+  // Thin template wrapper — computes size, delegates buffer work to non-template helper
   template<typename T> static uint16_t encode_message_to_buffer(T &msg, APIConnection *conn, uint32_t remaining_size) {
     if constexpr (T::ESTIMATED_SIZE == 0) {
-      return encode_to_buffer_slow(0, &encode_msg_noop, &msg, conn, remaining_size);
+      return encode_to_buffer(0, &encode_msg_noop, &msg, conn, remaining_size);
     } else {
-      return encode_to_buffer_slow(msg.calculate_size(), &proto_encode_msg<T>, &msg, conn, remaining_size);
+      return encode_to_buffer(msg.calculate_size(), &proto_encode_msg<T>, &msg, conn, remaining_size);
     }
   }
 
@@ -662,7 +586,6 @@ class APIConnection final : public APIServerConnectionBase {
   // Helper methods for iterator lifecycle management
   void destroy_active_iterator_();
   void begin_iterator_(ActiveIterator type);
-  void finalize_iterator_sync_();
 #ifdef USE_CAMERA
   std::unique_ptr<camera::CameraImageReader> image_reader_;
 #endif
@@ -697,28 +620,11 @@ class APIConnection final : public APIServerConnectionBase {
 
     // Add item to the batch (with deduplication)
     void add_item(EntityBase *entity, uint8_t message_type, uint8_t estimated_size,
-                  uint8_t aux_data_index = AUX_DATA_UNUSED) {
-      // Dedup: O(n) scan but optimized for RAM over performance
-      // Skip deduplication for events - they are edge-triggered, every occurrence matters
-#ifdef USE_EVENT
-      if (message_type != EventResponse::MESSAGE_TYPE)
-#endif
-      {
-        for (const auto &item : this->items) {
-          if (item.entity == entity && item.message_type == message_type)
-            return;  // Already queued
-        }
-      }
-      this->items.push_back({entity, message_type, estimated_size, aux_data_index});
-    }
+                  uint8_t aux_data_index = AUX_DATA_UNUSED);
     // Add item to the front of the batch (for high priority messages like ping)
-    void add_item_front(EntityBase *entity, uint8_t message_type, uint8_t estimated_size) {
-      // Swap to front avoids expensive vector::insert which shifts all elements
-      this->items.push_back({entity, message_type, estimated_size, AUX_DATA_UNUSED});
-      if (this->items.size() > 1) {
-        std::swap(this->items.front(), this->items.back());
-      }
-    }
+    void add_item_front(EntityBase *entity, uint8_t message_type, uint8_t estimated_size);
+    // Single push_back site to avoid duplicate _M_realloc_insert instantiation
+    void push_item(const BatchItem &item);
 
     // Clear all items
     void clear() {
@@ -771,7 +677,6 @@ class APIConnection final : public APIServerConnectionBase {
     uint8_t batch_scheduled : 1;
     uint8_t batch_first_message : 1;          // For batch buffer allocation
     uint8_t should_try_send_immediately : 1;  // True after initial states are sent
-    uint8_t may_have_remaining_data : 1;      // Read loop hit limit, retry without ready check
 #ifdef HAS_PROTO_MESSAGE_DUMP
     uint8_t log_only_mode : 1;
 #endif
@@ -780,16 +685,11 @@ class APIConnection final : public APIServerConnectionBase {
   // 2-byte types immediately after flags_ (no padding between them)
   uint16_t client_api_version_major_{0};
   uint16_t client_api_version_minor_{0};
-  // 1-byte types to fill remaining space before next 4-byte boundary
+  // 1-byte type to fill padding
   ActiveIterator active_iterator_{ActiveIterator::NONE};
-  uint8_t batch_message_type_{0};  // Current message type during batch encoding
-  // Total: 2 (flags) + 2 + 2 + 1 + 1 = 8 bytes, aligned to 4-byte boundary
+  // Total: 2 (flags) + 2 + 2 + 1 = 7 bytes, then 1 byte padding to next 4-byte boundary
 
-  // Actual header size used by encode_to_buffer for the current message.
-  // Read by process_batch_multi_ to pass into MessageInfo.
-  uint8_t batch_header_size_{0};
-
-  uint32_t get_batch_delay_ms_() const { return this->parent_->get_batch_delay(); }
+  uint32_t get_batch_delay_ms_() const;
   // Message will use 8 more bytes than the minimum size, and typical
   // MTU is 1500. Sometimes users will see as low as 1460 MTU.
   // If its IPv6 the header is 40 bytes, and if its IPv4
@@ -856,8 +756,10 @@ class APIConnection final : public APIServerConnectionBase {
   }
 
   // Helper function to schedule a high priority message at the front of the batch
-  // Out-of-line: callers (on_shutdown, check_keepalive_) are cold paths
-  bool schedule_message_front_(EntityBase *entity, uint8_t message_type, uint8_t estimated_size);
+  bool schedule_message_front_(EntityBase *entity, uint8_t message_type, uint8_t estimated_size) {
+    this->deferred_batch_.add_item_front(entity, message_type, estimated_size);
+    return this->schedule_batch_();
+  }
 
   // Helper function to log client messages with name and peername
   void log_client_(int level, const LogString *message);

esphome/components/api/api_frame_helper.cpp

@@ -100,81 +100,149 @@ const LogString *api_error_to_logstr(APIError err) {
   return LOG_STR("UNKNOWN");
 }
 
-#ifdef HELPER_LOG_PACKETS
-void APIFrameHelper::log_packet_sending_(const void *data, uint16_t len) {
-  LOG_PACKET_SENDING(reinterpret_cast<const uint8_t *>(data), len);
-}
-#endif
-
-APIError APIFrameHelper::drain_overflow_and_handle_errors_() {
-  if (this->overflow_buf_.try_drain(this->socket_.get()) == -1) {
-    int err = errno;
-    if (err != EWOULDBLOCK && err != EAGAIN) {
-      this->state_ = State::FAILED;
-      HELPER_LOG("Socket write failed with errno %d", err);
-      return APIError::SOCKET_WRITE_FAILED;
+// Default implementation for loop - handles sending buffered data
+APIError APIFrameHelper::loop() {
+  if (this->tx_buf_count_ > 0) {
+    APIError err = try_send_tx_buf_();
+    if (err != APIError::OK && err != APIError::WOULD_BLOCK) {
+      return err;
     }
   }
-  return APIError::OK;
+  return APIError::OK;  // Convert WOULD_BLOCK to OK to avoid connection termination
 }
 
-// Single-buffer write path: wraps in iovec and delegates.
-APIError APIFrameHelper::write_raw_buf_(const void *data, uint16_t len, ssize_t sent) {
-  struct iovec iov = {const_cast<void *>(data), len};
-  APIError err = this->write_raw_iov_(&iov, 1, len, sent);
-#ifdef HELPER_LOG_PACKETS
-  // Log after write/enqueue so re-entrant log sends can't corrupt data before it's sent
-  if (err == APIError::OK)
-    LOG_PACKET_SENDING(reinterpret_cast<const uint8_t *>(data), len);
-#endif
-  return err;
-}
-
-// Handles partial writes, errors, and overflow buffering.
-// Called when the inline fast path couldn't complete the write,
-// or directly from cold paths (handshake, error handling).
-APIError APIFrameHelper::write_raw_iov_(const struct iovec *iov, int iovcnt, uint16_t total_write_len, ssize_t sent) {
-  if (sent <= 0) {
-    if (sent == WRITE_NOT_ATTEMPTED) {
-      // Cold path: no write attempted yet, drain overflow and try
-      if (!this->overflow_buf_.empty()) {
-        APIError err = this->drain_overflow_and_handle_errors_();
-        if (err != APIError::OK)
-          return err;
-      }
-      if (this->overflow_buf_.empty()) {
-        sent = this->write_iov_to_socket_(iov, iovcnt);
-        if (sent == static_cast<ssize_t>(total_write_len))
-          return APIError::OK;
-        // Partial write or -1: fall through to error check / enqueue below
-      } else {
-        // Overflow backlog remains after drain; skip socket write, enqueue everything
-        sent = 0;
-      }
-    }
-    // WRITE_FAILED (-1): fast path or retry write returned -1, check errno
-    if (sent == WRITE_FAILED) {
-      int err = errno;
-      if (err != EWOULDBLOCK && err != EAGAIN) {
-        this->state_ = State::FAILED;
-        HELPER_LOG("Socket write failed with errno %d", err);
-        return APIError::SOCKET_WRITE_FAILED;
-      }
-      sent = 0;  // Treat WOULD_BLOCK as zero bytes sent
-    }
+// Common socket write error handling
+APIError APIFrameHelper::handle_socket_write_error_() {
+  if (errno == EWOULDBLOCK || errno == EAGAIN) {
+    return APIError::WOULD_BLOCK;
   }
+  HELPER_LOG("Socket write failed with errno %d", errno);
+  this->state_ = State::FAILED;
+  return APIError::SOCKET_WRITE_FAILED;
+}
 
-  // Full write completed (possible when called directly, not via write_raw_fast_buf_)
-  if (sent == static_cast<ssize_t>(total_write_len))
-    return APIError::OK;
-
-  // Queue unsent data into overflow buffer
-  if (!this->overflow_buf_.enqueue_iov(iov, iovcnt, total_write_len, static_cast<uint16_t>(sent))) {
-    HELPER_LOG("Overflow buffer full, dropping connection");
+// Helper method to buffer data from IOVs
+void APIFrameHelper::buffer_data_from_iov_(const struct iovec *iov, int iovcnt, uint16_t total_write_len,
+                                           uint16_t offset) {
+  // Check if queue is full
+  if (this->tx_buf_count_ >= API_MAX_SEND_QUEUE) {
+    HELPER_LOG("Send queue full (%u buffers), dropping connection", this->tx_buf_count_);
     this->state_ = State::FAILED;
-    return APIError::SOCKET_WRITE_FAILED;
+    return;
   }
-  return APIError::OK;
+
+  uint16_t buffer_size = total_write_len - offset;
+  auto &buffer = this->tx_buf_[this->tx_buf_tail_];
+  buffer = std::make_unique<SendBuffer>(SendBuffer{
+      .data = std::make_unique<uint8_t[]>(buffer_size),
+      .size = buffer_size,
+      .offset = 0,
+  });
+
+  uint16_t to_skip = offset;
+  uint16_t write_pos = 0;
+
+  for (int i = 0; i < iovcnt; i++) {
+    if (to_skip >= iov[i].iov_len) {
+      // Skip this entire segment
+      to_skip -= static_cast<uint16_t>(iov[i].iov_len);
+    } else {
+      // Include this segment (partially or fully)
+      const uint8_t *src = reinterpret_cast<uint8_t *>(iov[i].iov_base) + to_skip;
+      uint16_t len = static_cast<uint16_t>(iov[i].iov_len) - to_skip;
+      std::memcpy(buffer->data.get() + write_pos, src, len);
+      write_pos += len;
+      to_skip = 0;
+    }
+  }
+
+  // Update circular buffer tracking
+  this->tx_buf_tail_ = (this->tx_buf_tail_ + 1) % API_MAX_SEND_QUEUE;
+  this->tx_buf_count_++;
+}
+
+// This method writes data to socket or buffers it
+APIError APIFrameHelper::write_raw_(const struct iovec *iov, int iovcnt, uint16_t total_write_len) {
+  // Returns APIError::OK if successful (or would block, but data has been buffered)
+  // Returns APIError::SOCKET_WRITE_FAILED if socket write failed, and sets state to FAILED
+
+  if (iovcnt == 0)
+    return APIError::OK;  // Nothing to do, success
+
+#ifdef HELPER_LOG_PACKETS
+  for (int i = 0; i < iovcnt; i++) {
+    LOG_PACKET_SENDING(reinterpret_cast<uint8_t *>(iov[i].iov_base), iov[i].iov_len);
+  }
+#endif
+
+  // Try to send any existing buffered data first if there is any
+  if (this->tx_buf_count_ > 0) {
+    APIError send_result = try_send_tx_buf_();
+    // If real error occurred (not just WOULD_BLOCK), return it
+    if (send_result != APIError::OK && send_result != APIError::WOULD_BLOCK) {
+      return send_result;
+    }
+
+    // If there is still data in the buffer, we can't send, buffer
+    // the new data and return
+    if (this->tx_buf_count_ > 0) {
+      this->buffer_data_from_iov_(iov, iovcnt, total_write_len, 0);
+      return APIError::OK;  // Success, data buffered
+    }
+  }
+
+  // Try to send directly if no buffered data
+  // Optimize for single iovec case (common for plaintext API)
+  ssize_t sent =
+      (iovcnt == 1) ? this->socket_->write(iov[0].iov_base, iov[0].iov_len) : this->socket_->writev(iov, iovcnt);
+
+  if (sent == -1) {
+    APIError err = this->handle_socket_write_error_();
+    if (err == APIError::WOULD_BLOCK) {
+      // Socket would block, buffer the data
+      this->buffer_data_from_iov_(iov, iovcnt, total_write_len, 0);
+      return APIError::OK;  // Success, data buffered
+    }
+    return err;  // Socket write failed
+  } else if (static_cast<uint16_t>(sent) < total_write_len) {
+    // Partially sent, buffer the remaining data
+    this->buffer_data_from_iov_(iov, iovcnt, total_write_len, static_cast<uint16_t>(sent));
+  }
+
+  return APIError::OK;  // Success, all data sent or buffered
+}
+
+// Common implementation for trying to send buffered data
+// IMPORTANT: Caller MUST ensure tx_buf_count_ > 0 before calling this method
+APIError APIFrameHelper::try_send_tx_buf_() {
+  // Try to send from tx_buf - we assume it's not empty as it's the caller's responsibility to check
+  while (this->tx_buf_count_ > 0) {
+    // Get the first buffer in the queue
+    SendBuffer *front_buffer = this->tx_buf_[this->tx_buf_head_].get();
+
+    // Try to send the remaining data in this buffer
+    ssize_t sent = this->socket_->write(front_buffer->current_data(), front_buffer->remaining());
+
+    if (sent == -1) {
+      return this->handle_socket_write_error_();
+    } else if (sent == 0) {
+      // Nothing sent but not an error
+      return APIError::WOULD_BLOCK;
+    } else if (static_cast<uint16_t>(sent) < front_buffer->remaining()) {
+      // Partially sent, update offset
+      // Cast to ensure no overflow issues with uint16_t
+      front_buffer->offset += static_cast<uint16_t>(sent);
+      return APIError::WOULD_BLOCK;  // Stop processing more buffers if we couldn't send a complete buffer
+    } else {
+      // Buffer completely sent, remove it from the queue
+      this->tx_buf_[this->tx_buf_head_].reset();
+      this->tx_buf_head_ = (this->tx_buf_head_ + 1) % API_MAX_SEND_QUEUE;
+      this->tx_buf_count_--;
+      // Continue loop to try sending the next buffer
+    }
+  }
+
+  return APIError::OK;  // All buffers sent successfully
 }
 
 const char *APIFrameHelper::get_peername_to(std::span<char, socket::SOCKADDR_STR_LEN> buf) const {
@@ -210,12 +278,11 @@ APIError APIFrameHelper::init_common_() {
 
 APIError APIFrameHelper::handle_socket_read_result_(ssize_t received) {
   if (received == -1) {
-    const int err = errno;
-    if (err == EWOULDBLOCK || err == EAGAIN) {
+    if (errno == EWOULDBLOCK || errno == EAGAIN) {
       return APIError::WOULD_BLOCK;
     }
     state_ = State::FAILED;
-    HELPER_LOG("Socket read failed with errno %d", err);
+    HELPER_LOG("Socket read failed with errno %d", errno);
     return APIError::SOCKET_READ_FAILED;
   } else if (received == 0) {
     state_ = State::FAILED;

esphome/components/api/api_frame_helper.h

@@ -9,11 +9,9 @@
 #include "esphome/core/defines.h"
 #ifdef USE_API
 #include "esphome/components/api/api_buffer.h"
-#include "esphome/components/api/api_overflow_buffer.h"
 #include "esphome/components/socket/socket.h"
 #include "esphome/core/application.h"
 #include "esphome/core/log.h"
-#include "proto.h"
 
 namespace esphome::api {
 
@@ -39,6 +37,8 @@ static constexpr uint16_t RX_BUF_NULL_TERMINATOR = 1;
 // Must be >= MAX_INITIAL_PER_BATCH in api_connection.h (enforced by static_assert there)
 static constexpr size_t MAX_MESSAGES_PER_BATCH = 34;
 
+class ProtoWriteBuffer;
+
 // Max client name length (e.g., "Home Assistant 2026.1.0.dev0" = 28 chars)
 static constexpr size_t CLIENT_INFO_NAME_MAX_LEN = 32;
 
@@ -49,17 +49,12 @@ struct ReadPacketBuffer {
 };
 
 // Packed message info structure to minimize memory usage
-// Note: message_type is uint8_t — all current protobuf message types fit in 8 bits.
-// The noise wire format encodes types as 16-bit, but the high byte is always 0.
-// If message types ever exceed 255, this and encrypt_noise_message_ must be updated.
 struct MessageInfo {
   uint16_t offset;        // Offset in buffer where message starts
   uint16_t payload_size;  // Size of the message payload
   uint8_t message_type;   // Message type (0-255)
-  uint8_t header_size;    // Actual header size used (avoids recomputation in write path)
 
-  MessageInfo(uint8_t type, uint16_t off, uint16_t size, uint8_t hdr)
-      : offset(off), payload_size(size), message_type(type), header_size(hdr) {}
+  MessageInfo(uint8_t type, uint16_t off, uint16_t size) : offset(off), payload_size(size), message_type(type) {}
 };
 
 enum class APIError : uint16_t {
@@ -110,9 +105,9 @@ class APIFrameHelper {
   }
   virtual ~APIFrameHelper() = default;
   virtual APIError init() = 0;
-  virtual APIError loop() = 0;
+  virtual APIError loop();
   virtual APIError read_packet(ReadPacketBuffer *buffer) = 0;
-  bool can_write_without_blocking() { return this->state_ == State::DATA && this->overflow_buf_.empty(); }
+  bool can_write_without_blocking() { return this->state_ == State::DATA && this->tx_buf_count_ == 0; }
   int getpeername(struct sockaddr *addr, socklen_t *addrlen) { return socket_->getpeername(addr, addrlen); }
   APIError close() {
     if (state_ == State::CLOSED)
@@ -152,47 +147,31 @@ class APIFrameHelper {
   //
   void set_nodelay_for_message(bool is_log_message) {
     if (!is_log_message) {
-      if (this->nodelay_counter_) {
+      if (this->nodelay_state_ != NODELAY_ON) {
         this->set_nodelay_raw_(true);
-        this->nodelay_counter_ = 0;
+        this->nodelay_state_ = NODELAY_ON;
       }
       return;
     }
-    // Log message: enable Nagle on first, flush after LOG_NAGLE_COUNT
-    if (!this->nodelay_counter_)
+
+    // Log messages: state transitions -1 -> 1 -> ... -> LOG_NAGLE_COUNT -> -1 (flush)
+    if (this->nodelay_state_ == NODELAY_ON) {
       this->set_nodelay_raw_(false);
-    if (++this->nodelay_counter_ > LOG_NAGLE_COUNT) {
+      this->nodelay_state_ = 1;
+    } else if (this->nodelay_state_ >= LOG_NAGLE_COUNT) {
       this->set_nodelay_raw_(true);
-      this->nodelay_counter_ = 0;
+      this->nodelay_state_ = NODELAY_ON;
+    } else {
+      this->nodelay_state_++;
     }
   }
-  // Write a single protobuf message - the hot path (87-100% of all writes).
-  // Caller must ensure state is DATA before calling.
   virtual APIError write_protobuf_packet(uint8_t type, ProtoWriteBuffer buffer) = 0;
-  // Write multiple protobuf messages in a single batched operation.
-  // Caller must ensure state is DATA and messages is not empty.
-  // messages contains (message_type, offset, length) for each message in the buffer.
-  // The buffer contains all messages with appropriate padding before each.
+  // Write multiple protobuf messages in a single operation
+  // messages contains (message_type, offset, length) for each message in the buffer
+  // The buffer contains all messages with appropriate padding before each
   virtual APIError write_protobuf_messages(ProtoWriteBuffer buffer, std::span<const MessageInfo> messages) = 0;
-  // Get the maximum frame header padding required by this protocol (worst case)
+  // Get the frame header padding required by this protocol
   uint8_t frame_header_padding() const { return frame_header_padding_; }
-  // Get the actual frame header size for a specific message.
-  // For noise: always returns frame_header_padding_ (fixed 7-byte header).
-  // For plaintext: computes actual size from varint lengths (3-6 bytes).
-  // Distinguishes protocols via frame_footer_size_ (noise always has a non-zero MAC
-  // footer, plaintext has footer=0). If a protocol with a plaintext footer is ever
-  // added, this should become a virtual method.
-  uint8_t frame_header_size(uint16_t payload_size, uint8_t message_type) const {
-#if defined(USE_API_NOISE) && defined(USE_API_PLAINTEXT)
-    return this->frame_footer_size_
-               ? this->frame_header_padding_
-               : static_cast<uint8_t>(1 + ProtoSize::varint16(payload_size) + ProtoSize::varint8(message_type));
-#elif defined(USE_API_NOISE)
-    return this->frame_header_padding_;
-#else  // USE_API_PLAINTEXT only
-    return static_cast<uint8_t>(1 + ProtoSize::varint16(payload_size) + ProtoSize::varint8(message_type));
-#endif
-  }
   // Get the frame footer size required by this protocol
   uint8_t frame_footer_size() const { return frame_footer_size_; }
   // Check if socket has data ready to read
@@ -208,46 +187,28 @@ class APIFrameHelper {
   }
 
  protected:
-  // Drain backlogged overflow data to the socket and handle errors.
-  // Called when overflow_buf_.empty() is false. Out-of-line to keep the
-  // fast path (empty check) inline at call sites.
-  // Returns OK for transient errors (WOULD_BLOCK), SOCKET_WRITE_FAILED for hard errors.
-  APIError drain_overflow_and_handle_errors_();
+  // Buffer containing data to be sent
+  struct SendBuffer {
+    std::unique_ptr<uint8_t[]> data;
+    uint16_t size{0};    // Total size of the buffer
+    uint16_t offset{0};  // Current offset within the buffer
 
-  // Sentinel values for the sent parameter in write_raw_ methods
-  static constexpr ssize_t WRITE_FAILED = -1;         // Fast path: write()/writev() returned -1
-  static constexpr ssize_t WRITE_NOT_ATTEMPTED = -2;  // Cold path: no write attempted yet
+    // Using uint16_t reduces memory usage since ESPHome API messages are limited to UINT16_MAX (65535) bytes
+    uint16_t remaining() const { return size - offset; }
+    const uint8_t *current_data() const { return data.get() + offset; }
+  };
 
-  // Dispatch to write() or writev() based on iovec count
-  inline ssize_t ESPHOME_ALWAYS_INLINE write_iov_to_socket_(const struct iovec *iov, int iovcnt) {
-    return (iovcnt == 1) ? this->socket_->write(iov[0].iov_base, iov[0].iov_len) : this->socket_->writev(iov, iovcnt);
-  }
+  // Common implementation for writing raw data to socket
+  APIError write_raw_(const struct iovec *iov, int iovcnt, uint16_t total_write_len);
 
-  // Inlined write methods — used by hot paths (write_protobuf_packet, write_protobuf_messages)
-  // These inline the fast path (overflow empty + full write) and tail-call the out-of-line
-  // slow path only on failure/partial write.
-  inline APIError ESPHOME_ALWAYS_INLINE write_raw_fast_buf_(const void *data, uint16_t len) {
-    if (this->overflow_buf_.empty()) [[likely]] {
-      ssize_t sent = this->socket_->write(data, len);
-      if (sent == static_cast<ssize_t>(len)) [[likely]] {
-#ifdef HELPER_LOG_PACKETS
-        this->log_packet_sending_(data, len);
-#endif
-        return APIError::OK;
-      }
-      // sent is -1 (WRITE_FAILED) or partial write count
-      return this->write_raw_buf_(data, len, sent);
-    }
-    return this->write_raw_buf_(data, len, WRITE_NOT_ATTEMPTED);
-  }
-  // Out-of-line write paths: handle partial writes, errors, overflow buffering
-  // sent: WRITE_NOT_ATTEMPTED (cold path), WRITE_FAILED (fast path write returned -1), or bytes sent (partial write)
-  APIError write_raw_buf_(const void *data, uint16_t len, ssize_t sent = WRITE_NOT_ATTEMPTED);
-  APIError write_raw_iov_(const struct iovec *iov, int iovcnt, uint16_t total_write_len,
-                          ssize_t sent = WRITE_NOT_ATTEMPTED);
-#ifdef HELPER_LOG_PACKETS
-  void log_packet_sending_(const void *data, uint16_t len);
-#endif
+  // Try to send data from the tx buffer
+  APIError try_send_tx_buf_();
+
+  // Helper method to buffer data from IOVs
+  void buffer_data_from_iov_(const struct iovec *iov, int iovcnt, uint16_t total_write_len, uint16_t offset);
+
+  // Common socket write error handling
+  APIError handle_socket_write_error_();
 
   // Socket ownership (4 bytes on 32-bit, 8 bytes on 64-bit)
   std::unique_ptr<socket::Socket> socket_;
@@ -282,8 +243,8 @@ class APIFrameHelper {
     return APIError::WOULD_BLOCK;
   }
 
-  // Backlog for unsent data when TCP send buffer is full (rarely used in production)
-  APIOverflowBuffer overflow_buf_;
+  // Containers (size varies, but typically 12+ bytes on 32-bit)
+  std::array<std::unique_ptr<SendBuffer>, API_MAX_SEND_QUEUE> tx_buf_;
   APIBuffer rx_buf_;
 
   // Client name buffer - stores name from Hello message or initial peername
@@ -294,17 +255,21 @@ class APIFrameHelper {
   State state_{State::INITIALIZE};
   uint8_t frame_header_padding_{0};
   uint8_t frame_footer_size_{0};
-  // Nagle batching counter for log messages. 0 means NODELAY is enabled (immediate send).
-  // Values 1..LOG_NAGLE_COUNT count log messages in the current Nagle batch.
-  // After LOG_NAGLE_COUNT logs, we flush by re-enabling NODELAY and resetting to 0.
+  uint8_t tx_buf_head_{0};
+  uint8_t tx_buf_tail_{0};
+  uint8_t tx_buf_count_{0};
+  // Nagle batching state for log messages. NODELAY_ON (-1) means NODELAY is enabled
+  // (immediate send). Values 1..LOG_NAGLE_COUNT count log messages in the current Nagle batch.
+  // After LOG_NAGLE_COUNT logs, we switch to NODELAY to flush and reset.
   // ESP8266 has the tightest TCP send buffer (2×MSS) and needs conservative batching.
   // ESP32 (4×MSS+), RP2040 (8×MSS), and LibreTiny (4×MSS) can coalesce more.
+  static constexpr int8_t NODELAY_ON = -1;
 #ifdef USE_ESP8266
-  static constexpr uint8_t LOG_NAGLE_COUNT = 2;
+  static constexpr int8_t LOG_NAGLE_COUNT = 2;
 #else
-  static constexpr uint8_t LOG_NAGLE_COUNT = 3;
+  static constexpr int8_t LOG_NAGLE_COUNT = 3;
 #endif
-  uint8_t nodelay_counter_{0};
+  int8_t nodelay_state_{NODELAY_ON};
 
   // Internal helper to set TCP_NODELAY socket option
   void set_nodelay_raw_(bool enable) {

esphome/components/api/api_frame_helper_noise.cpp

@@ -47,8 +47,15 @@ static constexpr size_t API_MAX_LOG_BYTES = 168;
               format_hex_pretty_to(hex_buf_, (buffer).data(), \
                                    (buffer).size() < API_MAX_LOG_BYTES ? (buffer).size() : API_MAX_LOG_BYTES)); \
   } while (0)
+#define LOG_PACKET_SENDING(data, len) \
+  do { \
+    char hex_buf_[format_hex_pretty_size(API_MAX_LOG_BYTES)]; \
+    ESP_LOGVV(TAG, "Sending raw: %s", \
+              format_hex_pretty_to(hex_buf_, data, (len) < API_MAX_LOG_BYTES ? (len) : API_MAX_LOG_BYTES)); \
+  } while (0)
 #else
 #define LOG_PACKET_RECEIVED(buffer) ((void) 0)
+#define LOG_PACKET_SENDING(data, len) ((void) 0)
 #endif
 
 /// Convert a noise error code to a readable error
@@ -146,10 +153,8 @@ APIError APINoiseFrameHelper::loop() {
     }
   }
 
-  if (!this->overflow_buf_.empty()) [[unlikely]] {
-    return this->drain_overflow_and_handle_errors_();
-  }
-  return APIError::OK;
+  // Use base class implementation for buffer sending
+  return APIFrameHelper::loop();
 }
 
 /** Read a packet into the rx_buf_.
@@ -237,144 +242,132 @@ APIError APINoiseFrameHelper::try_read_frame_() {
  * If an error occurred, returns that error. Only returns OK if the transport is ready for data
  * traffic.
  */
-// Split into per-state methods so the compiler doesn't allocate stack space
-// for all branches simultaneously. On RP2040 the core0 stack lives in a 4KB
-// scratch RAM bank; the Noise crypto path (curve25519) needs ~2KB+ of stack,
-// so every byte saved in the caller matters.
 APIError APINoiseFrameHelper::state_action_() {
-  switch (this->state_) {
-    case State::INITIALIZE:
-      HELPER_LOG("Bad state for method: %d", (int) this->state_);
-      return APIError::BAD_STATE;
-    case State::CLIENT_HELLO:
-      return this->state_action_client_hello_();
-    case State::SERVER_HELLO:
-      return this->state_action_server_hello_();
-    case State::HANDSHAKE:
-      return this->state_action_handshake_();
-    case State::CLOSED:
-    case State::FAILED:
-      return APIError::BAD_STATE;
-    default:
-      return APIError::OK;
-  }
-}
-APIError APINoiseFrameHelper::state_action_client_hello_() {
-  // waiting for client hello
-  APIError aerr = this->try_read_frame_();
-  if (aerr != APIError::OK) {
-    return handle_handshake_frame_error_(aerr);
-  }
-  // ignore contents, may be used in future for flags
-  // Resize for: existing prologue + 2 size bytes + frame data
-  size_t old_size = this->prologue_.size();
-  size_t rx_size = this->rx_buf_.size();
-  this->prologue_.resize(old_size + 2 + rx_size);
-  this->prologue_[old_size] = (uint8_t) (rx_size >> 8);
-  this->prologue_[old_size + 1] = (uint8_t) rx_size;
-  if (rx_size > 0) {
-    std::memcpy(this->prologue_.data() + old_size + 2, this->rx_buf_.data(), rx_size);
+  int err;
+  APIError aerr;
+  if (state_ == State::INITIALIZE) {
+    HELPER_LOG("Bad state for method: %d", (int) state_);
+    return APIError::BAD_STATE;
   }
+  if (state_ == State::CLIENT_HELLO) {
+    // waiting for client hello
+    aerr = this->try_read_frame_();
+    if (aerr != APIError::OK) {
+      return handle_handshake_frame_error_(aerr);
+    }
+    // ignore contents, may be used in future for flags
+    // Resize for: existing prologue + 2 size bytes + frame data
+    size_t old_size = this->prologue_.size();
+    size_t rx_size = this->rx_buf_.size();
+    this->prologue_.resize(old_size + 2 + rx_size);
+    this->prologue_[old_size] = (uint8_t) (rx_size >> 8);
+    this->prologue_[old_size + 1] = (uint8_t) rx_size;
+    if (rx_size > 0) {
+      std::memcpy(this->prologue_.data() + old_size + 2, this->rx_buf_.data(), rx_size);
+    }
 
-  state_ = State::SERVER_HELLO;
+    state_ = State::SERVER_HELLO;
+  }
+  if (state_ == State::SERVER_HELLO) {
+    // send server hello
+    const auto &name = App.get_name();
+    char mac[MAC_ADDRESS_BUFFER_SIZE];
+    get_mac_address_into_buffer(mac);
+
+    // Calculate positions and sizes
+    size_t name_len = name.size() + 1;  // including null terminator
+    size_t name_offset = 1;
+    size_t mac_offset = name_offset + name_len;
+    size_t total_size = 1 + name_len + MAC_ADDRESS_BUFFER_SIZE;
+
+    // 1 (proto) + name (max ESPHOME_DEVICE_NAME_MAX_LEN) + 1 (name null)
+    // + mac (MAC_ADDRESS_BUFFER_SIZE - 1) + 1 (mac null)
+    constexpr size_t max_msg_size = 1 + ESPHOME_DEVICE_NAME_MAX_LEN + 1 + MAC_ADDRESS_BUFFER_SIZE;
+    uint8_t msg[max_msg_size];
+
+    // chosen proto
+    msg[0] = 0x01;
+
+    // node name, terminated by null byte
+    std::memcpy(msg + name_offset, name.c_str(), name_len);
+    // node mac, terminated by null byte
+    std::memcpy(msg + mac_offset, mac, MAC_ADDRESS_BUFFER_SIZE);
+
+    aerr = write_frame_(msg, total_size);
+    if (aerr != APIError::OK)
+      return aerr;
+
+    // start handshake
+    aerr = init_handshake_();
+    if (aerr != APIError::OK)
+      return aerr;
+
+    state_ = State::HANDSHAKE;
+  }
+  if (state_ == State::HANDSHAKE) {
+    int action = noise_handshakestate_get_action(handshake_);
+    if (action == NOISE_ACTION_READ_MESSAGE) {
+      // waiting for handshake msg
+      aerr = this->try_read_frame_();
+      if (aerr != APIError::OK) {
+        return handle_handshake_frame_error_(aerr);
+      }
+
+      if (this->rx_buf_.empty()) {
+        send_explicit_handshake_reject_(LOG_STR("Empty handshake message"));
+        return APIError::BAD_HANDSHAKE_ERROR_BYTE;
+      } else if (this->rx_buf_[0] != 0x00) {
+        HELPER_LOG("Bad handshake error byte: %u", this->rx_buf_[0]);
+        send_explicit_handshake_reject_(LOG_STR("Bad handshake error byte"));
+        return APIError::BAD_HANDSHAKE_ERROR_BYTE;
+      }
+
+      NoiseBuffer mbuf;
+      noise_buffer_init(mbuf);
+      noise_buffer_set_input(mbuf, this->rx_buf_.data() + 1, this->rx_buf_.size() - 1);
+      err = noise_handshakestate_read_message(handshake_, &mbuf, nullptr);
+      if (err != 0) {
+        // Special handling for MAC failure
+        send_explicit_handshake_reject_(err == NOISE_ERROR_MAC_FAILURE ? LOG_STR("Handshake MAC failure")
+                                                                       : LOG_STR("Handshake error"));
+        return handle_noise_error_(err, LOG_STR("noise_handshakestate_read_message"),
+                                   APIError::HANDSHAKESTATE_READ_FAILED);
+      }
+
+      aerr = check_handshake_finished_();
+      if (aerr != APIError::OK)
+        return aerr;
+    } else if (action == NOISE_ACTION_WRITE_MESSAGE) {
+      uint8_t buffer[65];
+      NoiseBuffer mbuf;
+      noise_buffer_init(mbuf);
+      noise_buffer_set_output(mbuf, buffer + 1, sizeof(buffer) - 1);
+
+      err = noise_handshakestate_write_message(handshake_, &mbuf, nullptr);
+      APIError aerr_write = handle_noise_error_(err, LOG_STR("noise_handshakestate_write_message"),
+                                                APIError::HANDSHAKESTATE_WRITE_FAILED);
+      if (aerr_write != APIError::OK)
+        return aerr_write;
+      buffer[0] = 0x00;  // success
+
+      aerr = write_frame_(buffer, mbuf.size + 1);
+      if (aerr != APIError::OK)
+        return aerr;
+      aerr = check_handshake_finished_();
+      if (aerr != APIError::OK)
+        return aerr;
+    } else {
+      // bad state for action
+      state_ = State::FAILED;
+      HELPER_LOG("Bad action for handshake: %d", action);
+      return APIError::HANDSHAKESTATE_BAD_STATE;
+    }
+  }
+  if (state_ == State::CLOSED || state_ == State::FAILED) {
+    return APIError::BAD_STATE;
+  }
   return APIError::OK;
 }
-APIError APINoiseFrameHelper::state_action_server_hello_() {
-  // send server hello
-  const auto &name = App.get_name();
-  char mac[MAC_ADDRESS_BUFFER_SIZE];
-  get_mac_address_into_buffer(mac);
-
-  // Calculate positions and sizes
-  size_t name_len = name.size() + 1;  // including null terminator
-  size_t name_offset = 1;
-  size_t mac_offset = name_offset + name_len;
-  size_t total_size = 1 + name_len + MAC_ADDRESS_BUFFER_SIZE;
-
-  // 1 (proto) + name (max ESPHOME_DEVICE_NAME_MAX_LEN) + 1 (name null)
-  // + mac (MAC_ADDRESS_BUFFER_SIZE - 1) + 1 (mac null)
-  constexpr size_t max_msg_size = 1 + ESPHOME_DEVICE_NAME_MAX_LEN + 1 + MAC_ADDRESS_BUFFER_SIZE;
-  uint8_t msg[max_msg_size];
-
-  // chosen proto
-  msg[0] = 0x01;
-
-  // node name, terminated by null byte
-  std::memcpy(msg + name_offset, name.c_str(), name_len);
-  // node mac, terminated by null byte
-  std::memcpy(msg + mac_offset, mac, MAC_ADDRESS_BUFFER_SIZE);
-
-  APIError aerr = write_frame_(msg, total_size);
-  if (aerr != APIError::OK)
-    return aerr;
-
-  // start handshake
-  aerr = init_handshake_();
-  if (aerr != APIError::OK)
-    return aerr;
-
-  state_ = State::HANDSHAKE;
-  return APIError::OK;
-}
-APIError APINoiseFrameHelper::state_action_handshake_() {
-  int action = noise_handshakestate_get_action(this->handshake_);
-  if (action == NOISE_ACTION_READ_MESSAGE) {
-    return this->state_action_handshake_read_();
-  } else if (action == NOISE_ACTION_WRITE_MESSAGE) {
-    return this->state_action_handshake_write_();
-  }
-  // bad state for action
-  this->state_ = State::FAILED;
-  HELPER_LOG("Bad action for handshake: %d", action);
-  return APIError::HANDSHAKESTATE_BAD_STATE;
-}
-APIError APINoiseFrameHelper::state_action_handshake_read_() {
-  APIError aerr = this->try_read_frame_();
-  if (aerr != APIError::OK) {
-    return this->handle_handshake_frame_error_(aerr);
-  }
-
-  if (this->rx_buf_.empty()) {
-    this->send_explicit_handshake_reject_(LOG_STR("Empty handshake message"));
-    return APIError::BAD_HANDSHAKE_ERROR_BYTE;
-  } else if (this->rx_buf_[0] != 0x00) {
-    HELPER_LOG("Bad handshake error byte: %u", this->rx_buf_[0]);
-    this->send_explicit_handshake_reject_(LOG_STR("Bad handshake error byte"));
-    return APIError::BAD_HANDSHAKE_ERROR_BYTE;
-  }
-
-  NoiseBuffer mbuf;
-  noise_buffer_init(mbuf);
-  noise_buffer_set_input(mbuf, this->rx_buf_.data() + 1, this->rx_buf_.size() - 1);
-  int err = noise_handshakestate_read_message(this->handshake_, &mbuf, nullptr);
-  if (err != 0) {
-    // Special handling for MAC failure
-    this->send_explicit_handshake_reject_(err == NOISE_ERROR_MAC_FAILURE ? LOG_STR("Handshake MAC failure")
-                                                                         : LOG_STR("Handshake error"));
-    return this->handle_noise_error_(err, LOG_STR("noise_handshakestate_read_message"),
-                                     APIError::HANDSHAKESTATE_READ_FAILED);
-  }
-
-  return this->check_handshake_finished_();
-}
-APIError APINoiseFrameHelper::state_action_handshake_write_() {
-  uint8_t buffer[65];
-  NoiseBuffer mbuf;
-  noise_buffer_init(mbuf);
-  noise_buffer_set_output(mbuf, buffer + 1, sizeof(buffer) - 1);
-
-  int err = noise_handshakestate_write_message(this->handshake_, &mbuf, nullptr);
-  APIError aerr = this->handle_noise_error_(err, LOG_STR("noise_handshakestate_write_message"),
-                                            APIError::HANDSHAKESTATE_WRITE_FAILED);
-  if (aerr != APIError::OK)
-    return aerr;
-  buffer[0] = 0x00;  // success
-
-  aerr = this->write_frame_(buffer, mbuf.size + 1);
-  if (aerr != APIError::OK)
-    return aerr;
-  return this->check_handshake_finished_();
-}
 void APINoiseFrameHelper::send_explicit_handshake_reject_(const LogString *reason) {
   // Max reject message: "Bad handshake packet len" (24) + 1 (failure byte) = 25 bytes
   uint8_t data[32];
@@ -457,83 +450,73 @@ APIError APINoiseFrameHelper::read_packet(ReadPacketBuffer *buffer) {
   buffer->type = type;
   return APIError::OK;
 }
-// Encrypt a single noise message in place and return the encrypted frame length.
-// Returns APIError::OK on success.
-APIError APINoiseFrameHelper::encrypt_noise_message_(uint8_t *buf_start, uint16_t payload_size, uint8_t message_type,
-                                                     uint16_t &encrypted_len_out) {
-  // Write noise header
-  buf_start[0] = 0x01;  // indicator
-  // buf_start[1], buf_start[2] to be set after encryption
-
-  // Write message header (to be encrypted)
-  constexpr uint8_t msg_offset = 3;
-  buf_start[msg_offset] = static_cast<uint8_t>(message_type >> 8);      // type high byte
-  buf_start[msg_offset + 1] = static_cast<uint8_t>(message_type);       // type low byte
-  buf_start[msg_offset + 2] = static_cast<uint8_t>(payload_size >> 8);  // data_len high byte
-  buf_start[msg_offset + 3] = static_cast<uint8_t>(payload_size);       // data_len low byte
-  // payload data is already in the buffer starting at offset + 7
-
-  // Encrypt the message in place
-  NoiseBuffer mbuf;
-  noise_buffer_init(mbuf);
-  noise_buffer_set_inout(mbuf, buf_start + msg_offset, 4 + payload_size, 4 + payload_size + this->frame_footer_size_);
-
-  int err = noise_cipherstate_encrypt(this->send_cipher_, &mbuf);
-  APIError aerr =
-      this->handle_noise_error_(err, LOG_STR("noise_cipherstate_encrypt"), APIError::CIPHERSTATE_ENCRYPT_FAILED);
-  if (aerr != APIError::OK)
-    return aerr;
-
-  // Fill in the encrypted size
-  buf_start[1] = static_cast<uint8_t>(mbuf.size >> 8);
-  buf_start[2] = static_cast<uint8_t>(mbuf.size);
-
-  encrypted_len_out = static_cast<uint16_t>(3 + mbuf.size);  // indicator + size + encrypted data
-  return APIError::OK;
-}
-
 APIError APINoiseFrameHelper::write_protobuf_packet(uint8_t type, ProtoWriteBuffer buffer) {
-#ifdef ESPHOME_DEBUG_API
-  assert(this->state_ == State::DATA);
-#endif
-
-  // Resize buffer to include footer space for Noise MAC
-  if (this->frame_footer_size_)
-    buffer.get_buffer()->resize(buffer.get_buffer()->size() + this->frame_footer_size_);
-
-  uint16_t payload_size =
-      static_cast<uint16_t>(buffer.get_buffer()->size() - HEADER_PADDING - this->frame_footer_size_);
-  uint8_t *buf_start = buffer.get_buffer()->data();
-  uint16_t encrypted_len;
-  APIError aerr = this->encrypt_noise_message_(buf_start, payload_size, type, encrypted_len);
-  if (aerr != APIError::OK)
-    return aerr;
-  return this->write_raw_fast_buf_(buf_start, encrypted_len);
+  // Resize to include MAC space (required for Noise encryption)
+  buffer.get_buffer()->resize(buffer.get_buffer()->size() + frame_footer_size_);
+  MessageInfo msg{type, 0,
+                  static_cast<uint16_t>(buffer.get_buffer()->size() - frame_header_padding_ - frame_footer_size_)};
+  return write_protobuf_messages(buffer, std::span<const MessageInfo>(&msg, 1));
 }
 
 APIError APINoiseFrameHelper::write_protobuf_messages(ProtoWriteBuffer buffer, std::span<const MessageInfo> messages) {
-#ifdef ESPHOME_DEBUG_API
-  assert(this->state_ == State::DATA);
-  assert(!messages.empty());
-#endif
+  APIError aerr = this->check_data_state_();
+  if (aerr != APIError::OK)
+    return aerr;
 
-  // Noise messages are already contiguous in the buffer:
-  // HEADER_PADDING (7) exactly matches the fixed header size, and
-  // footer space (16) is consumed by the encryption MAC.
-  uint8_t *buffer_data = buffer.get_buffer()->data();
-  uint8_t *write_start = buffer_data + messages[0].offset;
-  uint16_t total_write_len = 0;
-
-  for (const auto &msg : messages) {
-    uint8_t *buf_start = buffer_data + msg.offset;
-    uint16_t encrypted_len;
-    APIError aerr = this->encrypt_noise_message_(buf_start, msg.payload_size, msg.message_type, encrypted_len);
-    if (aerr != APIError::OK)
-      return aerr;
-    total_write_len += encrypted_len;
+  if (messages.empty()) {
+    return APIError::OK;
   }
 
-  return this->write_raw_fast_buf_(write_start, total_write_len);
+  uint8_t *buffer_data = buffer.get_buffer()->data();
+
+  // Stack-allocated iovec array - no heap allocation
+  StaticVector<struct iovec, MAX_MESSAGES_PER_BATCH> iovs;
+  uint16_t total_write_len = 0;
+
+  // We need to encrypt each message in place
+  for (const auto &msg : messages) {
+    // The buffer already has padding at offset
+    uint8_t *buf_start = buffer_data + msg.offset;
+
+    // Write noise header
+    buf_start[0] = 0x01;  // indicator
+    // buf_start[1], buf_start[2] to be set after encryption
+
+    // Write message header (to be encrypted)
+    constexpr uint8_t msg_offset = 3;
+    buf_start[msg_offset] = static_cast<uint8_t>(msg.message_type >> 8);      // type high byte
+    buf_start[msg_offset + 1] = static_cast<uint8_t>(msg.message_type);       // type low byte
+    buf_start[msg_offset + 2] = static_cast<uint8_t>(msg.payload_size >> 8);  // data_len high byte
+    buf_start[msg_offset + 3] = static_cast<uint8_t>(msg.payload_size);       // data_len low byte
+    // payload data is already in the buffer starting at offset + 7
+
+    // Make sure we have space for MAC
+    // The buffer should already have been sized appropriately
+
+    // Encrypt the message in place
+    NoiseBuffer mbuf;
+    noise_buffer_init(mbuf);
+    noise_buffer_set_inout(mbuf, buf_start + msg_offset, 4 + msg.payload_size,
+                           4 + msg.payload_size + frame_footer_size_);
+
+    int err = noise_cipherstate_encrypt(send_cipher_, &mbuf);
+    APIError aerr =
+        handle_noise_error_(err, LOG_STR("noise_cipherstate_encrypt"), APIError::CIPHERSTATE_ENCRYPT_FAILED);
+    if (aerr != APIError::OK)
+      return aerr;
+
+    // Fill in the encrypted size
+    buf_start[1] = static_cast<uint8_t>(mbuf.size >> 8);
+    buf_start[2] = static_cast<uint8_t>(mbuf.size);
+
+    // Add iovec for this encrypted message
+    size_t msg_len = static_cast<size_t>(3 + mbuf.size);  // indicator + size + encrypted data
+    iovs.push_back({buf_start, msg_len});
+    total_write_len += msg_len;
+  }
+
+  // Send all encrypted messages in one writev call
+  return this->write_raw_(iovs.data(), iovs.size(), total_write_len);
 }
 
 APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) {
@@ -542,16 +525,16 @@ APIError APINoiseFrameHelper::write_frame_(const uint8_t *data, uint16_t len) {
   header[1] = (uint8_t) (len >> 8);
   header[2] = (uint8_t) len;
 
-  if (len == 0) {
-    return this->write_raw_buf_(header, 3);
-  }
   struct iovec iov[2];
   iov[0].iov_base = header;
   iov[0].iov_len = 3;
+  if (len == 0) {
+    return this->write_raw_(iov, 1, 3);  // Just header
+  }
   iov[1].iov_base = const_cast<uint8_t *>(data);
   iov[1].iov_len = len;
 
-  return this->write_raw_iov_(iov, 2, 3 + len);
+  return this->write_raw_(iov, 2, 3 + len);  // Header + data
 }
 
 /** Initiate the data structures for the handshake.
@@ -617,7 +600,7 @@ APIError APINoiseFrameHelper::check_handshake_finished_() {
   if (aerr != APIError::OK)
     return aerr;
 
-  this->frame_footer_size_ = noise_cipherstate_get_mac_length(send_cipher_);
+  frame_footer_size_ = noise_cipherstate_get_mac_length(send_cipher_);
 
   HELPER_LOG("Handshake complete!");
   noise_handshakestate_free(handshake_);

esphome/components/api/api_frame_helper_noise.h

@@ -9,16 +9,14 @@ namespace esphome::api {
 
 class APINoiseFrameHelper final : public APIFrameHelper {
  public:
-  // Noise header structure:
-  // Pos 0: indicator (0x01)
-  // Pos 1-2: encrypted payload size (16-bit big-endian)
-  // Pos 3-6: encrypted type (16-bit) + data_len (16-bit)
-  // Pos 7+: actual payload data
-  static constexpr uint8_t HEADER_PADDING = 1 + 2 + 2 + 2;  // indicator + size + type + data_len
-
   APINoiseFrameHelper(std::unique_ptr<socket::Socket> socket, APINoiseContext &ctx)
       : APIFrameHelper(std::move(socket)), ctx_(ctx) {
-    frame_header_padding_ = HEADER_PADDING;
+    // Noise header structure:
+    // Pos 0: indicator (0x01)
+    // Pos 1-2: encrypted payload size (16-bit big-endian)
+    // Pos 3-6: encrypted type (16-bit) + data_len (16-bit)
+    // Pos 7+: actual payload data
+    frame_header_padding_ = 7;
   }
   ~APINoiseFrameHelper() override;
   APIError init() override;
@@ -29,15 +27,8 @@ class APINoiseFrameHelper final : public APIFrameHelper {
 
  protected:
   APIError state_action_();
-  APIError state_action_client_hello_();
-  APIError state_action_server_hello_();
-  APIError state_action_handshake_();
-  APIError state_action_handshake_read_();
-  APIError state_action_handshake_write_();
   APIError try_read_frame_();
   APIError write_frame_(const uint8_t *data, uint16_t len);
-  APIError encrypt_noise_message_(uint8_t *buf_start, uint16_t payload_size, uint8_t message_type,
-                                  uint16_t &encrypted_len_out);
   APIError init_handshake_();
   APIError check_handshake_finished_();
   void send_explicit_handshake_reject_(const LogString *reason);

esphome/components/api/api_frame_helper_plaintext.cpp

@@ -39,8 +39,15 @@ static constexpr size_t API_MAX_LOG_BYTES = 168;
               format_hex_pretty_to(hex_buf_, (buffer).data(), \
                                    (buffer).size() < API_MAX_LOG_BYTES ? (buffer).size() : API_MAX_LOG_BYTES)); \
   } while (0)
+#define LOG_PACKET_SENDING(data, len) \
+  do { \
+    char hex_buf_[format_hex_pretty_size(API_MAX_LOG_BYTES)]; \
+    ESP_LOGVV(TAG, "Sending raw: %s", \
+              format_hex_pretty_to(hex_buf_, data, (len) < API_MAX_LOG_BYTES ? (len) : API_MAX_LOG_BYTES)); \
+  } while (0)
 #else
 #define LOG_PACKET_RECEIVED(buffer) ((void) 0)
+#define LOG_PACKET_SENDING(data, len) ((void) 0)
 #endif
 
 /// Initialize the frame helper, returns OK if successful.
@@ -57,10 +64,8 @@ APIError APIPlaintextFrameHelper::loop() {
   if (state_ != State::DATA) {
     return APIError::BAD_STATE;
   }
-  if (!this->overflow_buf_.empty()) [[unlikely]] {
-    return this->drain_overflow_and_handle_errors_();
-  }
-  return APIError::OK;
+  // Use base class implementation for buffer sending
+  return APIFrameHelper::loop();
 }
 
 /** Read a packet into the rx_buf_.
@@ -198,6 +203,7 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
       // Make sure to tell the remote that we don't
       // understand the indicator byte so it knows
       // we do not support it.
+      struct iovec iov[1];
       // The \x00 first byte is the marker for plaintext.
       //
       // The remote will know how to handle the indicator byte,
@@ -212,12 +218,14 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
                                                 "Bad indicator byte";
       char msg[INDICATOR_MSG_SIZE];
       memcpy_P(msg, MSG_PROGMEM, INDICATOR_MSG_SIZE);
-      this->write_raw_buf_(msg, INDICATOR_MSG_SIZE);
+      iov[0].iov_base = (void *) msg;
 #else
       static const char MSG[] = "\x00"
                                 "Bad indicator byte";
-      this->write_raw_buf_(MSG, INDICATOR_MSG_SIZE);
+      iov[0].iov_base = (void *) MSG;
 #endif
+      iov[0].iov_len = INDICATOR_MSG_SIZE;
+      this->write_raw_(iov, 1, INDICATOR_MSG_SIZE);
     }
     return aerr;
   }
@@ -227,101 +235,76 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
   buffer->type = this->rx_header_parsed_type_;
   return APIError::OK;
 }
-
-// Encode a 16-bit varint (1-3 bytes) using pre-computed length.
-ESPHOME_ALWAYS_INLINE static inline void encode_varint_16(uint16_t value, uint8_t varint_len, uint8_t *p) {
-  if (varint_len >= 2) {
-    *p++ = static_cast<uint8_t>(value | 0x80);
-    value >>= 7;
-    if (varint_len == 3) {
-      *p++ = static_cast<uint8_t>(value | 0x80);
-      value >>= 7;
-    }
-  }
-  *p = static_cast<uint8_t>(value);
-}
-
-// Encode an 8-bit varint (1-2 bytes) using pre-computed length.
-ESPHOME_ALWAYS_INLINE static inline void encode_varint_8(uint8_t value, uint8_t varint_len, uint8_t *p) {
-  if (varint_len == 2) {
-    *p++ = static_cast<uint8_t>(value | 0x80);
-    *p = static_cast<uint8_t>(value >> 7);
-  } else {
-    *p = value;
-  }
-}
-
-// Write plaintext header into pre-allocated padding before payload.
-// padding_size: bytes reserved before payload (HEADER_PADDING for first/single msg,
-//               actual header size for contiguous batch messages).
-// Returns the total header length (indicator + varints).
-ESPHOME_ALWAYS_INLINE static inline uint8_t write_plaintext_header(uint8_t *buf_start, uint16_t payload_size,
-                                                                   uint8_t message_type, uint8_t padding_size) {
-  uint8_t size_varint_len = ProtoSize::varint16(payload_size);
-  uint8_t type_varint_len = ProtoSize::varint8(message_type);
-  uint8_t total_header_len = 1 + size_varint_len + type_varint_len;
-
-  // The header is right-justified within the padding so it sits immediately before payload.
-  //
-  // Single/first message (padding_size = HEADER_PADDING = 6):
-  //   Example (small, header=3): [0-2] unused | [3] 0x00 | [4] size | [5] type | [6...] payload
-  //   Example (medium, header=4): [0-1] unused | [2] 0x00 | [3-4] size | [5] type | [6...] payload
-  //   Example (large, header=6):  [0] 0x00 | [1-3] size | [4-5] type | [6...] payload
-  //
-  // Batch messages 2+ (padding_size = actual header size, no unused bytes):
-  //   Example (small, header=3): [0] 0x00 | [1] size | [2] type | [3...] payload
-  //   Example (medium, header=4): [0] 0x00 | [1-2] size | [3] type | [4...] payload
-#ifdef ESPHOME_DEBUG_API
-  assert(padding_size >= total_header_len);
-#endif
-  uint32_t header_offset = padding_size - total_header_len;
-
-  // Write the plaintext header
-  buf_start[header_offset] = 0x00;  // indicator
-
-  // Encode varints directly into buffer using pre-computed lengths
-  encode_varint_16(payload_size, size_varint_len, buf_start + header_offset + 1);
-  encode_varint_8(message_type, type_varint_len, buf_start + header_offset + 1 + size_varint_len);
-
-  return total_header_len;
-}
-
 APIError APIPlaintextFrameHelper::write_protobuf_packet(uint8_t type, ProtoWriteBuffer buffer) {
-#ifdef ESPHOME_DEBUG_API
-  assert(this->state_ == State::DATA);
-#endif
-
-  uint16_t payload_size = static_cast<uint16_t>(buffer.get_buffer()->size() - HEADER_PADDING);
-  uint8_t *buffer_data = buffer.get_buffer()->data();
-  uint8_t header_len = write_plaintext_header(buffer_data, payload_size, type, HEADER_PADDING);
-  return this->write_raw_fast_buf_(buffer_data + HEADER_PADDING - header_len,
-                                   static_cast<uint16_t>(header_len + payload_size));
+  MessageInfo msg{type, 0, static_cast<uint16_t>(buffer.get_buffer()->size() - frame_header_padding_)};
+  return write_protobuf_messages(buffer, std::span<const MessageInfo>(&msg, 1));
 }
 
 APIError APIPlaintextFrameHelper::write_protobuf_messages(ProtoWriteBuffer buffer,
                                                           std::span<const MessageInfo> messages) {
-#ifdef ESPHOME_DEBUG_API
-  assert(this->state_ == State::DATA);
-  assert(!messages.empty());
-#endif
-  uint8_t *buffer_data = buffer.get_buffer()->data();
+  APIError aerr = this->check_data_state_();
+  if (aerr != APIError::OK)
+    return aerr;
 
-  // First message has max padding (header_size = HEADER_PADDING), may have unused leading bytes.
-  // Subsequent messages were encoded with exact header sizes (header_size = actual header len).
-  // write_plaintext_header right-justifies the header within header_size bytes of padding.
-  const auto &first = messages[0];
-  uint8_t *first_start = buffer_data + first.offset;
-  uint8_t header_len = write_plaintext_header(first_start, first.payload_size, first.message_type, HEADER_PADDING);
-  uint8_t *write_start = first_start + HEADER_PADDING - header_len;
-  uint16_t total_len = header_len + first.payload_size;
-
-  for (size_t i = 1; i < messages.size(); i++) {
-    const auto &msg = messages[i];
-    header_len = write_plaintext_header(buffer_data + msg.offset, msg.payload_size, msg.message_type, msg.header_size);
-    total_len += header_len + msg.payload_size;
+  if (messages.empty()) {
+    return APIError::OK;
   }
 
-  return this->write_raw_fast_buf_(write_start, total_len);
+  uint8_t *buffer_data = buffer.get_buffer()->data();
+
+  // Stack-allocated iovec array - no heap allocation
+  StaticVector<struct iovec, MAX_MESSAGES_PER_BATCH> iovs;
+  uint16_t total_write_len = 0;
+
+  for (const auto &msg : messages) {
+    // Calculate varint sizes for header layout
+    uint8_t size_varint_len = api::ProtoSize::varint(static_cast<uint32_t>(msg.payload_size));
+    uint8_t type_varint_len = api::ProtoSize::varint(static_cast<uint32_t>(msg.message_type));
+    uint8_t total_header_len = 1 + size_varint_len + type_varint_len;
+
+    // Calculate where to start writing the header
+    // The header starts at the latest possible position to minimize unused padding
+    //
+    // Example 1 (small values): total_header_len = 3, header_offset = 6 - 3 = 3
+    // [0-2]  - Unused padding
+    // [3]    - 0x00 indicator byte
+    // [4]    - Payload size varint (1 byte, for sizes 0-127)
+    // [5]    - Message type varint (1 byte, for types 0-127)
+    // [6...] - Actual payload data
+    //
+    // Example 2 (medium values): total_header_len = 4, header_offset = 6 - 4 = 2
+    // [0-1]  - Unused padding
+    // [2]    - 0x00 indicator byte
+    // [3-4]  - Payload size varint (2 bytes, for sizes 128-16383)
+    // [5]    - Message type varint (1 byte, for types 0-127)
+    // [6...] - Actual payload data
+    //
+    // Example 3 (large values): total_header_len = 6, header_offset = 6 - 6 = 0
+    // [0]    - 0x00 indicator byte
+    // [1-3]  - Payload size varint (3 bytes, for sizes 16384-2097151)
+    // [4-5]  - Message type varint (2 bytes, for types 128-32767)
+    // [6...] - Actual payload data
+    //
+    // The message starts at offset + frame_header_padding_
+    // So we write the header starting at offset + frame_header_padding_ - total_header_len
+    uint8_t *buf_start = buffer_data + msg.offset;
+    uint32_t header_offset = frame_header_padding_ - total_header_len;
+
+    // Write the plaintext header
+    buf_start[header_offset] = 0x00;  // indicator
+
+    // Encode varints directly into buffer
+    encode_varint_to_buffer(msg.payload_size, buf_start + header_offset + 1);
+    encode_varint_to_buffer(msg.message_type, buf_start + header_offset + 1 + size_varint_len);
+
+    // Add iovec for this message (header + payload)
+    size_t msg_len = static_cast<size_t>(total_header_len + msg.payload_size);
+    iovs.push_back({buf_start + header_offset, msg_len});
+    total_write_len += msg_len;
+  }
+
+  // Send all messages in one writev call
+  return write_raw_(iovs.data(), iovs.size(), total_write_len);
 }
 
 }  // namespace esphome::api

esphome/components/api/api_frame_helper_plaintext.h

@@ -7,15 +7,13 @@ namespace esphome::api {
 
 class APIPlaintextFrameHelper final : public APIFrameHelper {
  public:
-  // Plaintext header structure (worst case):
-  // Pos 0: indicator (0x00)
-  // Pos 1-3: payload size varint (up to 3 bytes)
-  // Pos 4-5: message type varint (up to 2 bytes)
-  // Pos 6+: actual payload data
-  static constexpr uint8_t HEADER_PADDING = 1 + 3 + 2;  // indicator + size varint + type varint
-
   explicit APIPlaintextFrameHelper(std::unique_ptr<socket::Socket> socket) : APIFrameHelper(std::move(socket)) {
-    frame_header_padding_ = HEADER_PADDING;
+    // Plaintext header structure (worst case):
+    // Pos 0: indicator (0x00)
+    // Pos 1-3: payload size varint (up to 3 bytes)
+    // Pos 4-5: message type varint (up to 2 bytes)
+    // Pos 6+: actual payload data
+    frame_header_padding_ = 6;
   }
   ~APIPlaintextFrameHelper() override = default;
   APIError init() override;

esphome/components/api/api_options.proto

@@ -22,8 +22,6 @@ extend google.protobuf.MessageOptions {
     optional bool log = 1039 [default=true];
     optional bool no_delay = 1040 [default=false];
     optional string base_class = 1041;
-    optional bool inline_encode = 1042 [default=false];
-    optional bool speed_optimized = 1043 [default=false];
 }
 
 extend google.protobuf.FieldOptions {
@@ -98,16 +96,4 @@ extend google.protobuf.FieldOptions {
     // variant of the calc_ method. Use on fields that are almost always non-default
     // to eliminate dead branches on hot paths.
     optional bool force = 50016 [default=false];
-
-    // max_value: Maximum value a field can have.
-    // When max_value < 128, the code generator emits constant-size calculations
-    // and direct byte writes instead of varint branching, since the encoded varint
-    // is guaranteed to be 1 byte.
-    optional uint32 max_value = 50017;
-
-    // max_data_length: Maximum length of a string or bytes field.
-    // When max_data_length < 128, the code generator emits constant-size
-    // length varint calculations and direct byte writes, since the length
-    // varint is guaranteed to be 1 byte.
-    optional uint32 max_data_length = 50018;
 }

esphome/components/api/api_overflow_buffer.cpp

@@ -1,73 +0,0 @@
-#include "api_overflow_buffer.h"
-#ifdef USE_API
-#include <cstring>
-
-namespace esphome::api {
-
-APIOverflowBuffer::~APIOverflowBuffer() {
-  for (auto *entry : this->queue_) {
-    if (entry != nullptr)
-      Entry::destroy(entry);
-  }
-}
-
-ssize_t APIOverflowBuffer::try_drain(socket::Socket *socket) {
-  while (this->count_ > 0) {
-    Entry *front = this->queue_[this->head_];
-
-    ssize_t sent = socket->write(front->current_data(), front->remaining());
-
-    if (sent <= 0) {
-      // -1 = error (caller checks errno for EWOULDBLOCK vs hard error)
-      // 0 = nothing sent (treat as no progress)
-      return sent;
-    }
-
-    if (static_cast<uint16_t>(sent) < front->remaining()) {
-      // Partially sent, update offset and stop
-      front->offset += static_cast<uint16_t>(sent);
-      return sent;
-    }
-
-    // Entry fully sent — free it and advance
-    Entry::destroy(front);
-    this->queue_[this->head_] = nullptr;
-    this->head_ = (this->head_ + 1) % API_MAX_SEND_QUEUE;
-    this->count_--;
-  }
-
-  return 0;  // All drained
-}
-
-bool APIOverflowBuffer::enqueue_iov(const struct iovec *iov, int iovcnt, uint16_t total_len, uint16_t skip) {
-  if (this->count_ >= API_MAX_SEND_QUEUE)
-    return false;
-
-  uint16_t buffer_size = total_len - skip;
-  // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
-  auto *entry = new Entry{new uint8_t[buffer_size], buffer_size, 0};
-  this->queue_[this->tail_] = entry;
-
-  uint16_t to_skip = skip;
-  uint16_t write_pos = 0;
-
-  for (int i = 0; i < iovcnt; i++) {
-    if (to_skip >= iov[i].iov_len) {
-      to_skip -= static_cast<uint16_t>(iov[i].iov_len);
-    } else {
-      const uint8_t *src = reinterpret_cast<uint8_t *>(iov[i].iov_base) + to_skip;
-      uint16_t len = static_cast<uint16_t>(iov[i].iov_len) - to_skip;
-      std::memcpy(entry->data + write_pos, src, len);
-      write_pos += len;
-      to_skip = 0;
-    }
-  }
-
-  this->tail_ = (this->tail_ + 1) % API_MAX_SEND_QUEUE;
-  this->count_++;
-  return true;
-}
-
-}  // namespace esphome::api
-
-#endif  // USE_API

esphome/components/api/api_overflow_buffer.h

@@ -1,76 +0,0 @@
-#pragma once
-#include <array>
-#include <cstdint>
-#include <sys/types.h>
-
-#include "esphome/core/defines.h"
-#ifdef USE_API
-
-#include "esphome/components/socket/headers.h"
-#include "esphome/components/socket/socket.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome::api {
-
-/// Circular queue of heap-allocated byte buffers used as a TCP send backlog.
-///
-/// Under normal operation this buffer is **never used** — data goes straight
-/// from the frame helper to the socket.  It only fills when the LWIP TCP
-/// send buffer is full (slow client, congested network, heavy logging).
-/// The queue drains automatically on subsequent write/loop calls once the
-/// socket becomes writable again.
-///
-/// Capacity is compile-time-fixed via API_MAX_SEND_QUEUE (set from Python
-/// config).  If the queue fills completely the connection is marked failed.
-class APIOverflowBuffer {
- public:
-  /// A single heap-allocated send-backlog entry.
-  /// Lifetime is manually managed — see destroy().
-  struct Entry {
-    uint8_t *data;
-    uint16_t size;    // Total size of the buffer
-    uint16_t offset;  // Current send offset within the buffer
-
-    uint16_t remaining() const { return this->size - this->offset; }
-    const uint8_t *current_data() const { return this->data + this->offset; }
-
-    /// Free this entry and its data buffer.
-    static ESPHOME_ALWAYS_INLINE void destroy(Entry *entry) {
-      delete[] entry->data;
-      delete entry;  // NOLINT(cppcoreguidelines-owning-memory)
-    }
-  };
-
-  ~APIOverflowBuffer();
-
-  /// True when no backlogged data is waiting.
-  bool empty() const { return this->count_ == 0; }
-
-  /// True when the queue has no room for another entry.
-  bool full() const { return this->count_ >= API_MAX_SEND_QUEUE; }
-
-  /// Number of entries currently queued.
-  uint8_t count() const { return this->count_; }
-
-  /// Try to drain queued data to the socket.
-  /// Returns bytes-written > 0 on success/partial, 0 if all drained or no progress,
-  /// -1 on error (caller must check errno to distinguish EWOULDBLOCK from hard errors).
-  /// Callers only need to act on -1; 0 and positive values both mean "no error".
-  /// Frees entries as they are fully sent.
-  ssize_t try_drain(socket::Socket *socket);
-
-  /// Enqueue unsent IOV data into the backlog.
-  /// Copies iov data starting at byte offset `skip` into a new entry.
-  /// Returns false if the queue is full (caller should fail the connection).
-  bool enqueue_iov(const struct iovec *iov, int iovcnt, uint16_t total_len, uint16_t skip);
-
- protected:
-  std::array<Entry *, API_MAX_SEND_QUEUE> queue_{};
-  uint8_t head_{0};
-  uint8_t tail_{0};
-  uint8_t count_{0};
-};
-
-}  // namespace esphome::api
-
-#endif  // USE_API

esphome/components/api/api_pb2_defines.h

@@ -3,10 +3,8 @@
 #pragma once
 
 #include "esphome/core/defines.h"
-#ifdef USE_BLUETOOTH_PROXY
 #ifndef USE_API_VARINT64
 #define USE_API_VARINT64
 #endif
-#endif
 
 namespace esphome::api {}  // namespace esphome::api

esphome/components/api/api_pb2_service.cpp

@@ -1,7 +1,6 @@
 // This file was automatically generated with a tool.
 // See script/api_protobuf/api_protobuf.py
 #include "api_pb2_service.h"
-#include "api_connection.h"
 #include "esphome/core/log.h"
 
 namespace esphome::api {
@@ -9,8 +8,8 @@ namespace esphome::api {
 static const char *const TAG = "api.service";
 
 #ifdef HAS_PROTO_MESSAGE_DUMP
-void APIServerConnectionBase::log_send_message_(const LogString *name, const char *dump) {
-  ESP_LOGVV(TAG, "send_message %s: %s", LOG_STR_ARG(name), dump);
+void APIServerConnectionBase::log_send_message_(const char *name, const char *dump) {
+  ESP_LOGVV(TAG, "send_message %s: %s", name, dump);
 }
 void APIServerConnectionBase::log_receive_message_(const LogString *name, const ProtoMessage &msg) {
   DumpBuffer dump_buf;
@@ -21,7 +20,7 @@ void APIServerConnectionBase::log_receive_message_(const LogString *name) {
 }
 #endif
 
-void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const uint8_t *msg_data) {
+void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, const uint8_t *msg_data) {
   // Check authentication/connection requirements
   switch (msg_type) {
     case HelloRequest::MESSAGE_TYPE:       // No setup required
@@ -701,6 +700,28 @@ void APIConnection::read_message_(uint32_t msg_size, uint32_t msg_type, const ui
       this->on_bluetooth_set_connection_params_request(msg);
       break;
     }
+#endif
+#ifdef USE_ZIGBEE_PROXY
+    case ZigbeeProxyFrame::MESSAGE_TYPE: {
+      ZigbeeProxyFrame msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      this->log_receive_message_(LOG_STR("on_zigbee_proxy_frame"), msg);
+#endif
+      this->on_zigbee_proxy_frame(msg);
+      break;
+    }
+#endif
+#ifdef USE_ZIGBEE_PROXY
+    case ZigbeeProxyRequest::MESSAGE_TYPE: {
+      ZigbeeProxyRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      this->log_receive_message_(LOG_STR("on_zigbee_proxy_request"), msg);
+#endif
+      this->on_zigbee_proxy_request(msg);
+      break;
+    }
 #endif
     default:
       break;

esphome/components/api/api_pb2_service.h

@@ -8,234 +8,244 @@
 
 namespace esphome::api {
 
-class APIServerConnectionBase {
+class APIServerConnectionBase : public ProtoService {
  public:
 #ifdef HAS_PROTO_MESSAGE_DUMP
  protected:
-  void log_send_message_(const LogString *name, const char *dump);
+  void log_send_message_(const char *name, const char *dump);
   void log_receive_message_(const LogString *name, const ProtoMessage &msg);
   void log_receive_message_(const LogString *name);
 
  public:
 #endif
 
-  void on_hello_request(const HelloRequest &value){};
+  virtual void on_hello_request(const HelloRequest &value){};
 
-  void on_disconnect_request(){};
-  void on_disconnect_response(){};
-  void on_ping_request(){};
-  void on_ping_response(){};
-  void on_device_info_request(){};
+  virtual void on_disconnect_request(){};
+  virtual void on_disconnect_response(){};
+  virtual void on_ping_request(){};
+  virtual void on_ping_response(){};
+  virtual void on_device_info_request(){};
 
-  void on_list_entities_request(){};
+  virtual void on_list_entities_request(){};
 
-  void on_subscribe_states_request(){};
+  virtual void on_subscribe_states_request(){};
 
 #ifdef USE_COVER
-  void on_cover_command_request(const CoverCommandRequest &value){};
+  virtual void on_cover_command_request(const CoverCommandRequest &value){};
 #endif
 
 #ifdef USE_FAN
-  void on_fan_command_request(const FanCommandRequest &value){};
+  virtual void on_fan_command_request(const FanCommandRequest &value){};
 #endif
 
 #ifdef USE_LIGHT
-  void on_light_command_request(const LightCommandRequest &value){};
+  virtual void on_light_command_request(const LightCommandRequest &value){};
 #endif
 
 #ifdef USE_SWITCH
-  void on_switch_command_request(const SwitchCommandRequest &value){};
+  virtual void on_switch_command_request(const SwitchCommandRequest &value){};
 #endif
 
-  void on_subscribe_logs_request(const SubscribeLogsRequest &value){};
+  virtual void on_subscribe_logs_request(const SubscribeLogsRequest &value){};
 
 #ifdef USE_API_NOISE
-  void on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &value){};
+  virtual void on_noise_encryption_set_key_request(const NoiseEncryptionSetKeyRequest &value){};
 #endif
 
 #ifdef USE_API_HOMEASSISTANT_SERVICES
-  void on_subscribe_homeassistant_services_request(){};
+  virtual void on_subscribe_homeassistant_services_request(){};
 #endif
 
 #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES
-  void on_homeassistant_action_response(const HomeassistantActionResponse &value){};
+  virtual void on_homeassistant_action_response(const HomeassistantActionResponse &value){};
 #endif
 #ifdef USE_API_HOMEASSISTANT_STATES
-  void on_subscribe_home_assistant_states_request(){};
+  virtual void on_subscribe_home_assistant_states_request(){};
 #endif
 
 #ifdef USE_API_HOMEASSISTANT_STATES
-  void on_home_assistant_state_response(const HomeAssistantStateResponse &value){};
+  virtual void on_home_assistant_state_response(const HomeAssistantStateResponse &value){};
 #endif
 
-  void on_get_time_response(const GetTimeResponse &value){};
+  virtual void on_get_time_response(const GetTimeResponse &value){};
 
 #ifdef USE_API_USER_DEFINED_ACTIONS
-  void on_execute_service_request(const ExecuteServiceRequest &value){};
+  virtual void on_execute_service_request(const ExecuteServiceRequest &value){};
 #endif
 
 #ifdef USE_CAMERA
-  void on_camera_image_request(const CameraImageRequest &value){};
+  virtual void on_camera_image_request(const CameraImageRequest &value){};
 #endif
 
 #ifdef USE_CLIMATE
-  void on_climate_command_request(const ClimateCommandRequest &value){};
+  virtual void on_climate_command_request(const ClimateCommandRequest &value){};
 #endif
 
 #ifdef USE_WATER_HEATER
-  void on_water_heater_command_request(const WaterHeaterCommandRequest &value){};
+  virtual void on_water_heater_command_request(const WaterHeaterCommandRequest &value){};
 #endif
 
 #ifdef USE_NUMBER
-  void on_number_command_request(const NumberCommandRequest &value){};
+  virtual void on_number_command_request(const NumberCommandRequest &value){};
 #endif
 
 #ifdef USE_SELECT
-  void on_select_command_request(const SelectCommandRequest &value){};
+  virtual void on_select_command_request(const SelectCommandRequest &value){};
 #endif
 
 #ifdef USE_SIREN
-  void on_siren_command_request(const SirenCommandRequest &value){};
+  virtual void on_siren_command_request(const SirenCommandRequest &value){};
 #endif
 
 #ifdef USE_LOCK
-  void on_lock_command_request(const LockCommandRequest &value){};
+  virtual void on_lock_command_request(const LockCommandRequest &value){};
 #endif
 
 #ifdef USE_BUTTON
-  void on_button_command_request(const ButtonCommandRequest &value){};
+  virtual void on_button_command_request(const ButtonCommandRequest &value){};
 #endif
 
 #ifdef USE_MEDIA_PLAYER
-  void on_media_player_command_request(const MediaPlayerCommandRequest &value){};
+  virtual void on_media_player_command_request(const MediaPlayerCommandRequest &value){};
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  void on_subscribe_bluetooth_le_advertisements_request(const SubscribeBluetoothLEAdvertisementsRequest &value){};
+  virtual void on_subscribe_bluetooth_le_advertisements_request(
+      const SubscribeBluetoothLEAdvertisementsRequest &value){};
 #endif
 
 #ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_device_request(const BluetoothDeviceRequest &value){};
+  virtual void on_bluetooth_device_request(const BluetoothDeviceRequest &value){};
 #endif
 
 #ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &value){};
+  virtual void on_bluetooth_gatt_get_services_request(const BluetoothGATTGetServicesRequest &value){};
 #endif
 
 #ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &value){};
+  virtual void on_bluetooth_gatt_read_request(const BluetoothGATTReadRequest &value){};
 #endif
 
 #ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &value){};
+  virtual void on_bluetooth_gatt_write_request(const BluetoothGATTWriteRequest &value){};
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &value){};
+  virtual void on_bluetooth_gatt_read_descriptor_request(const BluetoothGATTReadDescriptorRequest &value){};
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &value){};
+  virtual void on_bluetooth_gatt_write_descriptor_request(const BluetoothGATTWriteDescriptorRequest &value){};
 #endif
 #ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &value){};
+  virtual void on_bluetooth_gatt_notify_request(const BluetoothGATTNotifyRequest &value){};
 #endif
 
 #ifdef USE_BLUETOOTH_PROXY
-  void on_subscribe_bluetooth_connections_free_request(){};
+  virtual void on_subscribe_bluetooth_connections_free_request(){};
 #endif
 
 #ifdef USE_BLUETOOTH_PROXY
-  void on_unsubscribe_bluetooth_le_advertisements_request(){};
+  virtual void on_unsubscribe_bluetooth_le_advertisements_request(){};
 #endif
 
 #ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_scanner_set_mode_request(const BluetoothScannerSetModeRequest &value){};
+  virtual void on_bluetooth_scanner_set_mode_request(const BluetoothScannerSetModeRequest &value){};
 #endif
 #ifdef USE_VOICE_ASSISTANT
-  void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &value){};
+  virtual void on_subscribe_voice_assistant_request(const SubscribeVoiceAssistantRequest &value){};
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_response(const VoiceAssistantResponse &value){};
+  virtual void on_voice_assistant_response(const VoiceAssistantResponse &value){};
 #endif
 #ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_event_response(const VoiceAssistantEventResponse &value){};
+  virtual void on_voice_assistant_event_response(const VoiceAssistantEventResponse &value){};
 #endif
 #ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_audio(const VoiceAssistantAudio &value){};
+  virtual void on_voice_assistant_audio(const VoiceAssistantAudio &value){};
 #endif
 #ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &value){};
+  virtual void on_voice_assistant_timer_event_response(const VoiceAssistantTimerEventResponse &value){};
 #endif
 #ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &value){};
+  virtual void on_voice_assistant_announce_request(const VoiceAssistantAnnounceRequest &value){};
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &value){};
+  virtual void on_voice_assistant_configuration_request(const VoiceAssistantConfigurationRequest &value){};
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-  void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &value){};
+  virtual void on_voice_assistant_set_configuration(const VoiceAssistantSetConfiguration &value){};
 #endif
 
 #ifdef USE_ALARM_CONTROL_PANEL
-  void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &value){};
+  virtual void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &value){};
 #endif
 
 #ifdef USE_TEXT
-  void on_text_command_request(const TextCommandRequest &value){};
+  virtual void on_text_command_request(const TextCommandRequest &value){};
 #endif
 
 #ifdef USE_DATETIME_DATE
-  void on_date_command_request(const DateCommandRequest &value){};
+  virtual void on_date_command_request(const DateCommandRequest &value){};
 #endif
 
 #ifdef USE_DATETIME_TIME
-  void on_time_command_request(const TimeCommandRequest &value){};
+  virtual void on_time_command_request(const TimeCommandRequest &value){};
 #endif
 
 #ifdef USE_VALVE
-  void on_valve_command_request(const ValveCommandRequest &value){};
+  virtual void on_valve_command_request(const ValveCommandRequest &value){};
 #endif
 
 #ifdef USE_DATETIME_DATETIME
-  void on_date_time_command_request(const DateTimeCommandRequest &value){};
+  virtual void on_date_time_command_request(const DateTimeCommandRequest &value){};
 #endif
 
 #ifdef USE_UPDATE
-  void on_update_command_request(const UpdateCommandRequest &value){};
+  virtual void on_update_command_request(const UpdateCommandRequest &value){};
 #endif
 #ifdef USE_ZWAVE_PROXY
-  void on_z_wave_proxy_frame(const ZWaveProxyFrame &value){};
+  virtual void on_z_wave_proxy_frame(const ZWaveProxyFrame &value){};
 #endif
 #ifdef USE_ZWAVE_PROXY
-  void on_z_wave_proxy_request(const ZWaveProxyRequest &value){};
+  virtual void on_z_wave_proxy_request(const ZWaveProxyRequest &value){};
 #endif
 
 #ifdef USE_IR_RF
-  void on_infrared_rf_transmit_raw_timings_request(const InfraredRFTransmitRawTimingsRequest &value){};
+  virtual void on_infrared_rf_transmit_raw_timings_request(const InfraredRFTransmitRawTimingsRequest &value){};
 #endif
 
 #ifdef USE_SERIAL_PROXY
-  void on_serial_proxy_configure_request(const SerialProxyConfigureRequest &value){};
+  virtual void on_serial_proxy_configure_request(const SerialProxyConfigureRequest &value){};
 #endif
 
 #ifdef USE_SERIAL_PROXY
-  void on_serial_proxy_write_request(const SerialProxyWriteRequest &value){};
+  virtual void on_serial_proxy_write_request(const SerialProxyWriteRequest &value){};
 #endif
 #ifdef USE_SERIAL_PROXY
-  void on_serial_proxy_set_modem_pins_request(const SerialProxySetModemPinsRequest &value){};
+  virtual void on_serial_proxy_set_modem_pins_request(const SerialProxySetModemPinsRequest &value){};
 #endif
 #ifdef USE_SERIAL_PROXY
-  void on_serial_proxy_get_modem_pins_request(const SerialProxyGetModemPinsRequest &value){};
+  virtual void on_serial_proxy_get_modem_pins_request(const SerialProxyGetModemPinsRequest &value){};
 #endif
 
 #ifdef USE_SERIAL_PROXY
-  void on_serial_proxy_request(const SerialProxyRequest &value){};
+  virtual void on_serial_proxy_request(const SerialProxyRequest &value){};
 #endif
 
 #ifdef USE_BLUETOOTH_PROXY
-  void on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &value){};
+  virtual void on_bluetooth_set_connection_params_request(const BluetoothSetConnectionParamsRequest &value){};
 #endif
+
+#ifdef USE_ZIGBEE_PROXY
+  virtual void on_zigbee_proxy_frame(const ZigbeeProxyFrame &value){};
+#endif
+#ifdef USE_ZIGBEE_PROXY
+  virtual void on_zigbee_proxy_request(const ZigbeeProxyRequest &value){};
+#endif
+ protected:
+  void read_message(uint32_t msg_size, uint32_t msg_type, const uint8_t *msg_data) override;
 };
 
 }  // namespace esphome::api

esphome/components/api/api_server.cpp

@@ -46,8 +46,10 @@ void APIServer::setup() {
 
 #ifndef USE_API_NOISE_PSK_FROM_YAML
   // Only load saved PSK if not set from YAML
-  if (this->load_and_apply_noise_psk_()) {
+  SavedNoisePsk noise_pref_saved{};
+  if (this->noise_pref_.load(&noise_pref_saved)) {
     ESP_LOGD(TAG, "Loaded saved Noise PSK");
+    this->set_noise_psk(noise_pref_saved.psk);
   }
 #endif
 #endif
@@ -108,7 +110,7 @@ void APIServer::setup() {
   this->last_connected_ = App.get_loop_component_start_time();
   // Set warning status if reboot timeout is enabled
   if (this->reboot_timeout_ != 0) {
-    this->status_set_warning(LOG_STR("waiting for client connection"));
+    this->status_set_warning();
   }
 }
 
@@ -187,7 +189,7 @@ void APIServer::remove_client_(size_t client_index) {
 
   // Last client disconnected - set warning and start tracking for reboot timeout
   if (this->clients_.empty() && this->reboot_timeout_ != 0) {
-    this->status_set_warning(LOG_STR("waiting for client connection"));
+    this->status_set_warning();
     this->last_connected_ = App.get_loop_component_start_time();
   }
 
@@ -512,7 +514,7 @@ void APIServer::set_reboot_timeout(uint32_t reboot_timeout) { this->reboot_timeo
 
 #ifdef USE_API_NOISE
 bool APIServer::update_noise_psk_(const SavedNoisePsk &new_psk, const LogString *save_log_msg,
-                                  const LogString *fail_log_msg, bool make_active) {
+                                  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;
@@ -524,14 +526,9 @@ bool APIServer::update_noise_psk_(const SavedNoisePsk &new_psk, const LogString
   }
   ESP_LOGD(TAG, "%s", LOG_STR_ARG(save_log_msg));
   if (make_active) {
-    this->set_timeout(100, [this]() {
-      // Re-read the PSK from preferences rather than capturing the 32-byte array
-      // in the lambda (which would exceed std::function SBO and heap-allocate).
-      if (!this->load_and_apply_noise_psk_()) {
-        ESP_LOGW(TAG, "Failed to load saved PSK for activation");
-        return;
-      }
+    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);
@@ -541,14 +538,6 @@ bool APIServer::update_noise_psk_(const SavedNoisePsk &new_psk, const LogString
   return true;
 }
 
-bool APIServer::load_and_apply_noise_psk_() {
-  SavedNoisePsk saved{};
-  if (!this->noise_pref_.load(&saved))
-    return false;
-  this->set_noise_psk(saved.psk);
-  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
@@ -563,7 +552,7 @@ 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"),
+  return this->update_noise_psk_(new_saved_psk, LOG_STR("Noise PSK saved"), LOG_STR("Failed to save Noise PSK"), psk,
                                  make_active);
 #endif
 }
@@ -575,7 +564,8 @@ bool APIServer::clear_noise_psk(bool make_active) {
   return false;
 #else
   SavedNoisePsk empty_psk{};
-  return this->update_noise_psk_(empty_psk, LOG_STR("Noise PSK cleared"), LOG_STR("Failed to clear Noise 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);
 #endif
 }

esphome/components/api/api_server.h

@@ -36,11 +36,11 @@ struct SavedNoisePsk {
 } PACKED;  // NOLINT
 #endif
 
-class APIServer final : public Component,
-                        public Controller
+class APIServer : public Component,
+                  public Controller
 #ifdef USE_CAMERA
     ,
-                        public camera::CameraListener
+                  public camera::CameraListener
 #endif
 {
  public:
@@ -239,9 +239,7 @@ class APIServer final : public Component,
 
 #ifdef USE_API_NOISE
   bool update_noise_psk_(const SavedNoisePsk &new_psk, const LogString *save_log_msg, const LogString *fail_log_msg,
-                         bool make_active);
-  // Load saved PSK from preferences and apply it. Returns true on success.
-  bool load_and_apply_noise_psk_();
+                         const psk_t &active_psk, bool make_active);
 #endif  // USE_API_NOISE
 #ifdef USE_API_HOMEASSISTANT_STATES
   // Helper methods to reduce code duplication

esphome/components/api/client.py

@@ -32,11 +32,7 @@ if TYPE_CHECKING:
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_run_logs(
-    config: dict[str, Any],
-    addresses: list[str],
-    subscribe_states: bool = True,
-) -> None:
+async def async_run_logs(config: dict[str, Any], addresses: list[str]) -> None:
     """Run the logs command in the event loop."""
     conf = config["api"]
     name = config["esphome"]["name"]
@@ -93,20 +89,14 @@ async def async_run_logs(
                     config, raw_line, backtrace_state=backtrace_state
                 )
 
-    stop = await async_run(cli, on_log, name=name, subscribe_states=subscribe_states)
+    stop = await async_run(cli, on_log, name=name)
     try:
         await asyncio.Event().wait()
     finally:
         await stop()
 
 
-def run_logs(
-    config: dict[str, Any],
-    addresses: list[str],
-    subscribe_states: bool = True,
-) -> None:
+def run_logs(config: dict[str, Any], addresses: list[str]) -> None:
     """Run the logs command."""
     with contextlib.suppress(KeyboardInterrupt):
-        asyncio.run(
-            async_run_logs(config, addresses, subscribe_states=subscribe_states)
-        )
+        asyncio.run(async_run_logs(config, addresses))

esphome/components/api/custom_api_device.h

@@ -136,9 +136,8 @@ class CustomAPIDevice {
   template<typename T>
   void subscribe_homeassistant_state(void (T::*callback)(StringRef), const std::string &entity_id,
                                      const std::string &attribute = "") {
-    auto *obj = static_cast<T *>(this);
-    global_api_server->subscribe_home_assistant_state(entity_id, optional<std::string>(attribute),
-                                                      [obj, callback](StringRef state) { (obj->*callback)(state); });
+    auto f = std::bind(callback, (T *) this, std::placeholders::_1);
+    global_api_server->subscribe_home_assistant_state(entity_id, optional<std::string>(attribute), std::move(f));
   }
 
   /** Subscribe to the state (or attribute state) of an entity from Home Assistant (legacy std::string version).
@@ -149,12 +148,10 @@ class CustomAPIDevice {
   ESPDEPRECATED("Use void callback(StringRef) instead. Will be removed in 2027.1.0.", "2026.1.0")
   void subscribe_homeassistant_state(void (T::*callback)(std::string), const std::string &entity_id,
                                      const std::string &attribute = "") {
-    auto *obj = static_cast<T *>(this);
+    auto f = std::bind(callback, (T *) this, std::placeholders::_1);
     // Explicit type to disambiguate overload resolution
-    global_api_server->subscribe_home_assistant_state(
-        entity_id, optional<std::string>(attribute),
-        std::function<void(const std::string &)>(
-            [obj, callback](const std::string &state) { (obj->*callback)(state); }));
+    global_api_server->subscribe_home_assistant_state(entity_id, optional<std::string>(attribute),
+                                                      std::function<void(const std::string &)>(f));
   }
 
   /** Subscribe to the state (or attribute state) of an entity from Home Assistant.
@@ -179,10 +176,8 @@ class CustomAPIDevice {
   template<typename T>
   void subscribe_homeassistant_state(void (T::*callback)(const std::string &, StringRef), const std::string &entity_id,
                                      const std::string &attribute = "") {
-    auto *obj = static_cast<T *>(this);
-    global_api_server->subscribe_home_assistant_state(
-        entity_id, optional<std::string>(attribute),
-        [obj, callback, entity_id](StringRef state) { (obj->*callback)(entity_id, state); });
+    auto f = std::bind(callback, (T *) this, entity_id, std::placeholders::_1);
+    global_api_server->subscribe_home_assistant_state(entity_id, optional<std::string>(attribute), std::move(f));
   }
 
   /** Subscribe to the state (or attribute state) of an entity from Home Assistant (legacy std::string version).
@@ -193,12 +188,10 @@ class CustomAPIDevice {
   ESPDEPRECATED("Use void callback(const std::string &, StringRef) instead. Will be removed in 2027.1.0.", "2026.1.0")
   void subscribe_homeassistant_state(void (T::*callback)(std::string, std::string), const std::string &entity_id,
                                      const std::string &attribute = "") {
-    auto *obj = static_cast<T *>(this);
+    auto f = std::bind(callback, (T *) this, entity_id, std::placeholders::_1);
     // Explicit type to disambiguate overload resolution
-    global_api_server->subscribe_home_assistant_state(
-        entity_id, optional<std::string>(attribute),
-        std::function<void(const std::string &)>(
-            [obj, callback, entity_id](const std::string &state) { (obj->*callback)(entity_id, state); }));
+    global_api_server->subscribe_home_assistant_state(entity_id, optional<std::string>(attribute),
+                                                      std::function<void(const std::string &)>(f));
   }
 #else
   template<typename T>

esphome/components/api/proto.cpp

@@ -145,15 +145,14 @@ uint32_t ProtoDecodableMessage::count_repeated_field(const uint8_t *buffer, size
 //   [tag][v1][v2][body ..... body]
 //                                ^-- pos_ = element end, within buffer
 void ProtoWriteBuffer::encode_sub_message(uint32_t field_id, const void *value,
-                                          uint8_t *(*encode_fn)(const void *,
-                                                                ProtoWriteBuffer &PROTO_ENCODE_DEBUG_PARAM)) {
+                                          void (*encode_fn)(const void *, ProtoWriteBuffer &)) {
   this->encode_field_raw(field_id, 2);
   // Reserve 1 byte for length varint (optimistic: submessage < 128 bytes)
   uint8_t *len_pos = this->pos_;
   this->debug_check_bounds_(1);
   this->pos_++;
   uint8_t *body_start = this->pos_;
-  this->pos_ = encode_fn(value, *this PROTO_ENCODE_DEBUG_INIT(this->buffer_));
+  encode_fn(value, *this);
   uint32_t body_size = static_cast<uint32_t>(this->pos_ - body_start);
   if (body_size < 128) [[likely]] {
     // Common case: 1-byte varint, just backpatch
@@ -174,27 +173,22 @@ void ProtoWriteBuffer::encode_sub_message(uint32_t field_id, const void *value,
 
 // Non-template core for encode_optional_sub_message.
 void ProtoWriteBuffer::encode_optional_sub_message(uint32_t field_id, uint32_t nested_size, const void *value,
-                                                   uint8_t *(*encode_fn)(const void *,
-                                                                         ProtoWriteBuffer &PROTO_ENCODE_DEBUG_PARAM)) {
+                                                   void (*encode_fn)(const void *, ProtoWriteBuffer &)) {
   if (nested_size == 0)
     return;
   this->encode_field_raw(field_id, 2);
   this->encode_varint_raw(nested_size);
 #ifdef ESPHOME_DEBUG_API
   uint8_t *start = this->pos_;
-  this->pos_ = encode_fn(value, *this PROTO_ENCODE_DEBUG_INIT(this->buffer_));
+  encode_fn(value, *this);
   if (static_cast<uint32_t>(this->pos_ - start) != nested_size)
     this->debug_check_encode_size_(field_id, nested_size, this->pos_ - start);
 #else
-  this->pos_ = encode_fn(value, *this PROTO_ENCODE_DEBUG_INIT(this->buffer_));
+  encode_fn(value, *this);
 #endif
 }
 
 #ifdef ESPHOME_DEBUG_API
-void proto_check_bounds_failed(const uint8_t *pos, size_t bytes, const uint8_t *end, const char *caller) {
-  ESP_LOGE(TAG, "Proto encode bounds check failed in %s: need %zu bytes, %td available", caller, bytes, end - pos);
-  abort();
-}
 void ProtoWriteBuffer::debug_check_bounds_(size_t bytes, const char *caller) {
   if (this->pos_ + bytes > this->buffer_->data() + this->buffer_->size()) {
     ESP_LOGE(TAG, "ProtoWriteBuffer bounds check failed in %s: bytes=%zu offset=%td buf_size=%zu", caller, bytes,
@@ -207,7 +201,6 @@ void ProtoWriteBuffer::debug_check_encode_size_(uint32_t field_id, uint32_t expe
            expected, actual);
   abort();
 }
-
 #endif
 
 void ProtoDecodableMessage::decode(const uint8_t *buffer, size_t length) {
@@ -264,13 +257,7 @@ void ProtoDecodableMessage::decode(const uint8_t *buffer, size_t length) {
           ESP_LOGV(TAG, "Out-of-bounds Fixed32-bit at offset %ld", (long) (ptr - buffer));
           return;
         }
-        uint32_t val;
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-        // Protobuf fixed32 is little-endian — direct load on LE platforms
-        memcpy(&val, ptr, 4);
-#else
-        val = encode_uint32(ptr[3], ptr[2], ptr[1], ptr[0]);
-#endif
+        uint32_t val = encode_uint32(ptr[3], ptr[2], ptr[1], ptr[0]);
         if (!this->decode_32bit(field_id, Proto32Bit(val))) {
           ESP_LOGV(TAG, "Cannot decode 32-bit field %" PRIu32 " with value %" PRIu32 "!", field_id, val);
         }

esphome/components/api/proto.h

@@ -5,7 +5,6 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 #include "esphome/core/string_ref.h"
 
 #include <cassert>
@@ -25,19 +24,6 @@ constexpr uint8_t WIRE_TYPE_LENGTH_DELIMITED = 2;  // string, bytes, embedded me
 constexpr uint8_t WIRE_TYPE_FIXED32 = 5;           // fixed32, sfixed32, float
 constexpr uint8_t WIRE_TYPE_MASK = 0b111;          // Mask to extract wire type from tag
 
-// Reinterpret float bits as uint32_t without floating-point comparison.
-// Used by both encode_float() and calc_float() to ensure identical zero checks.
-// Uses union type-punning which is a GCC/Clang extension (not standard C++),
-// but bit_cast/memcpy don't optimize to a no-op on xtensa-gcc (ESP8266).
-inline uint32_t float_to_raw(float value) {
-  union {
-    float f;
-    uint32_t u;
-  } v;
-  v.f = value;
-  return v.u;
-}
-
 // Helper functions for ZigZag encoding/decoding
 inline constexpr uint32_t encode_zigzag32(int32_t value) {
   return (static_cast<uint32_t>(value) << 1) ^ (static_cast<uint32_t>(value >> 31));
@@ -166,7 +152,8 @@ class ProtoVarInt {
 #endif
 };
 
-// Forward declarations for encoding helpers
+// Forward declarations for decode_to_message and related encoding helpers
+class ProtoDecodableMessage;
 class ProtoMessage;
 class ProtoSize;
 
@@ -179,9 +166,16 @@ class ProtoLengthDelimited {
   const uint8_t *data() const { return this->value_; }
   size_t size() const { return this->length_; }
 
-  /// Decode the length-delimited data into a message instance.
-  /// Template preserves concrete type so decode() resolves statically.
-  template<typename T> void decode_to_message(T &msg) const;
+  /**
+   * Decode the length-delimited data into an existing ProtoDecodableMessage instance.
+   *
+   * This method allows decoding without templates, enabling use in contexts
+   * where the message type is not known at compile time. The ProtoDecodableMessage's
+   * decode() method will be called with the raw data and length.
+   *
+   * @param msg The ProtoDecodableMessage instance to decode into
+   */
+  void decode_to_message(ProtoDecodableMessage &msg) const;
 
  protected:
   const uint8_t *const value_;
@@ -208,26 +202,6 @@ class Proto32Bit {
 
 // NOTE: Proto64Bit class removed - wire type 1 (64-bit fixed) not supported
 
-// Debug bounds checking for proto encode functions.
-// In debug mode (ESPHOME_DEBUG_API), an extra end-of-buffer pointer is threaded
-// through the entire encode chain. In production, these expand to nothing.
-#ifdef ESPHOME_DEBUG_API
-#define PROTO_ENCODE_DEBUG_PARAM , uint8_t *proto_debug_end_
-#define PROTO_ENCODE_DEBUG_ARG , proto_debug_end_
-#define PROTO_ENCODE_DEBUG_INIT(buf) , (buf)->data() + (buf)->size()
-#define PROTO_ENCODE_CHECK_BOUNDS(pos, n) \
-  do { \
-    if ((pos) + (n) > proto_debug_end_) \
-      proto_check_bounds_failed(pos, n, proto_debug_end_, __builtin_FUNCTION()); \
-  } while (0)
-void proto_check_bounds_failed(const uint8_t *pos, size_t bytes, const uint8_t *end, const char *caller);
-#else
-#define PROTO_ENCODE_DEBUG_PARAM
-#define PROTO_ENCODE_DEBUG_ARG
-#define PROTO_ENCODE_DEBUG_INIT(buf)
-#define PROTO_ENCODE_CHECK_BOUNDS(pos, n)
-#endif
-
 class ProtoWriteBuffer {
  public:
   ProtoWriteBuffer(APIBuffer *buffer) : buffer_(buffer), pos_(buffer->data() + buffer->size()) {}
@@ -240,6 +214,15 @@ class ProtoWriteBuffer {
     }
     this->encode_varint_raw_slow_(value);
   }
+  void encode_varint_raw_64(uint64_t value) {
+    while (value > 0x7F) {
+      this->debug_check_bounds_(1);
+      *this->pos_++ = static_cast<uint8_t>(value | 0x80);
+      value >>= 7;
+    }
+    this->debug_check_bounds_(1);
+    *this->pos_++ = static_cast<uint8_t>(value);
+  }
   /**
    * Encode a field key (tag/wire type combination).
    *
@@ -253,6 +236,98 @@ class ProtoWriteBuffer {
    * Following https://protobuf.dev/programming-guides/encoding/#structure
    */
   void encode_field_raw(uint32_t field_id, uint32_t type) { this->encode_varint_raw((field_id << 3) | type); }
+  void encode_string(uint32_t field_id, const char *string, size_t len, bool force = false) {
+    if (len == 0 && !force)
+      return;
+
+    this->encode_field_raw(field_id, 2);  // type 2: Length-delimited string
+    this->encode_varint_raw(len);
+    // Direct memcpy into pre-sized buffer — avoids push_back() per-byte capacity checks
+    // and vector::insert() iterator overhead. ~10-11x faster for 16-32 byte strings.
+    this->debug_check_bounds_(len);
+    std::memcpy(this->pos_, string, len);
+    this->pos_ += len;
+  }
+  void encode_string(uint32_t field_id, const std::string &value, bool force = false) {
+    this->encode_string(field_id, value.data(), value.size(), force);
+  }
+  void encode_string(uint32_t field_id, const StringRef &ref, bool force = false) {
+    this->encode_string(field_id, ref.c_str(), ref.size(), force);
+  }
+  void encode_bytes(uint32_t field_id, const uint8_t *data, size_t len, bool force = false) {
+    this->encode_string(field_id, reinterpret_cast<const char *>(data), len, force);
+  }
+  void encode_uint32(uint32_t field_id, uint32_t value, bool force = false) {
+    if (value == 0 && !force)
+      return;
+    this->encode_field_raw(field_id, 0);  // type 0: Varint - uint32
+    this->encode_varint_raw(value);
+  }
+  void encode_uint64(uint32_t field_id, uint64_t value, bool force = false) {
+    if (value == 0 && !force)
+      return;
+    this->encode_field_raw(field_id, 0);  // type 0: Varint - uint64
+    this->encode_varint_raw_64(value);
+  }
+  void encode_bool(uint32_t field_id, bool value, bool force = false) {
+    if (!value && !force)
+      return;
+    this->encode_field_raw(field_id, 0);  // type 0: Varint - bool
+    this->debug_check_bounds_(1);
+    *this->pos_++ = value ? 0x01 : 0x00;
+  }
+  // noinline: 51 call sites; inlining causes net code growth vs a single out-of-line copy
+  __attribute__((noinline)) void encode_fixed32(uint32_t field_id, uint32_t value, bool force = false) {
+    if (value == 0 && !force)
+      return;
+
+    this->encode_field_raw(field_id, 5);  // type 5: 32-bit fixed32
+    this->debug_check_bounds_(4);
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+    // Protobuf fixed32 is little-endian, so direct copy works
+    std::memcpy(this->pos_, &value, 4);
+    this->pos_ += 4;
+#else
+    *this->pos_++ = (value >> 0) & 0xFF;
+    *this->pos_++ = (value >> 8) & 0xFF;
+    *this->pos_++ = (value >> 16) & 0xFF;
+    *this->pos_++ = (value >> 24) & 0xFF;
+#endif
+  }
+  // NOTE: Wire type 1 (64-bit fixed: double, fixed64, sfixed64) is intentionally
+  // not supported to reduce overhead on embedded systems. All ESPHome devices are
+  // 32-bit microcontrollers where 64-bit operations are expensive. If 64-bit support
+  // is needed in the future, the necessary encoding/decoding functions must be added.
+  void encode_float(uint32_t field_id, float value, bool force = false) {
+    if (value == 0.0f && !force)
+      return;
+
+    union {
+      float value;
+      uint32_t raw;
+    } val{};
+    val.value = value;
+    this->encode_fixed32(field_id, val.raw);
+  }
+  void encode_int32(uint32_t field_id, int32_t value, bool force = false) {
+    if (value < 0) {
+      // negative int32 is always 10 byte long
+      this->encode_int64(field_id, value, force);
+      return;
+    }
+    this->encode_uint32(field_id, static_cast<uint32_t>(value), force);
+  }
+  void encode_int64(uint32_t field_id, int64_t value, bool force = false) {
+    this->encode_uint64(field_id, static_cast<uint64_t>(value), force);
+  }
+  void encode_sint32(uint32_t field_id, int32_t value, bool force = false) {
+    this->encode_uint32(field_id, encode_zigzag32(value), force);
+  }
+  void encode_sint64(uint32_t field_id, int64_t value, bool force = false) {
+    this->encode_uint64(field_id, encode_zigzag64(value), force);
+  }
+  /// Encode a packed repeated sint32 field (zero-copy from vector)
+  void encode_packed_sint32(uint32_t field_id, const std::vector<int32_t> &values);
   /// Single-pass encode for repeated submessage elements.
   /// Thin template wrapper; all buffer work is in the non-template core.
   template<typename T> void encode_sub_message(uint32_t field_id, const T &value);
@@ -260,17 +335,12 @@ class ProtoWriteBuffer {
   /// Thin template wrapper; all buffer work is in the non-template core.
   template<typename T> void encode_optional_sub_message(uint32_t field_id, const T &value);
 
-  // NOLINTBEGIN(readability-identifier-naming)
   // Non-template core for encode_sub_message — backpatch approach.
-  void encode_sub_message(uint32_t field_id, const void *value,
-                          uint8_t *(*encode_fn)(const void *, ProtoWriteBuffer &PROTO_ENCODE_DEBUG_PARAM));
+  void encode_sub_message(uint32_t field_id, const void *value, void (*encode_fn)(const void *, ProtoWriteBuffer &));
   // Non-template core for encode_optional_sub_message.
   void encode_optional_sub_message(uint32_t field_id, uint32_t nested_size, const void *value,
-                                   uint8_t *(*encode_fn)(const void *, ProtoWriteBuffer &PROTO_ENCODE_DEBUG_PARAM));
-  // NOLINTEND(readability-identifier-naming)
+                                   void (*encode_fn)(const void *, ProtoWriteBuffer &));
   APIBuffer *get_buffer() const { return buffer_; }
-  uint8_t *get_pos() const { return pos_; }
-  void set_pos(uint8_t *pos) { pos_ = pos; }
 
  protected:
   // Slow path for encode_varint_raw values >= 128, outlined to keep fast path small
@@ -287,226 +357,6 @@ class ProtoWriteBuffer {
   uint8_t *pos_;
 };
 
-// Varint encoding thresholds — used by both proto_encode_* free functions and ProtoSize.
-constexpr uint32_t VARINT_MAX_1_BYTE = 1 << 7;   // 128
-constexpr uint32_t VARINT_MAX_2_BYTE = 1 << 14;  // 16384
-
-/// Static encode helpers for generated encode() functions.
-/// Generated code hoists buffer.pos_ into a local uint8_t *__restrict__ pos,
-/// then calls these methods which take pos by reference. No struct, no overhead.
-/// For sub-messages, pos is synced back to buffer before the call and reloaded after.
-class ProtoEncode {
- public:
-  /// Write a multi-byte varint directly through a pos pointer.
-  template<typename T>
-  static inline void encode_varint_raw_loop(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, T value) {
-    do {
-      PROTO_ENCODE_CHECK_BOUNDS(pos, 1);
-      *pos++ = static_cast<uint8_t>(value | 0x80);
-      value >>= 7;
-    } while (value > 0x7F);
-    PROTO_ENCODE_CHECK_BOUNDS(pos, 1);
-    *pos++ = static_cast<uint8_t>(value);
-  }
-  static inline void ESPHOME_ALWAYS_INLINE encode_varint_raw(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM,
-                                                             uint32_t value) {
-    if (value < VARINT_MAX_1_BYTE) [[likely]] {
-      PROTO_ENCODE_CHECK_BOUNDS(pos, 1);
-      *pos++ = static_cast<uint8_t>(value);
-      return;
-    }
-    encode_varint_raw_loop(pos PROTO_ENCODE_DEBUG_ARG, value);
-  }
-  /// Encode a varint that is expected to be 1-2 bytes (e.g. zigzag RSSI, small lengths).
-  static inline void ESPHOME_ALWAYS_INLINE encode_varint_raw_short(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM,
-                                                                   uint32_t value) {
-    if (value < VARINT_MAX_1_BYTE) [[likely]] {
-      PROTO_ENCODE_CHECK_BOUNDS(pos, 1);
-      *pos++ = static_cast<uint8_t>(value);
-      return;
-    }
-    if (value < VARINT_MAX_2_BYTE) [[likely]] {
-      PROTO_ENCODE_CHECK_BOUNDS(pos, 2);
-      *pos++ = static_cast<uint8_t>(value | 0x80);
-      *pos++ = static_cast<uint8_t>(value >> 7);
-      return;
-    }
-    encode_varint_raw_loop(pos PROTO_ENCODE_DEBUG_ARG, value);
-  }
-  static inline void ESPHOME_ALWAYS_INLINE encode_varint_raw_64(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM,
-                                                                uint64_t value) {
-    if (value < VARINT_MAX_1_BYTE) [[likely]] {
-      PROTO_ENCODE_CHECK_BOUNDS(pos, 1);
-      *pos++ = static_cast<uint8_t>(value);
-      return;
-    }
-    encode_varint_raw_loop(pos PROTO_ENCODE_DEBUG_ARG, value);
-  }
-  static inline void ESPHOME_ALWAYS_INLINE encode_field_raw(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM,
-                                                            uint32_t field_id, uint32_t type) {
-    encode_varint_raw(pos PROTO_ENCODE_DEBUG_ARG, (field_id << 3) | type);
-  }
-  /// Write a single precomputed tag byte. Tag must be < 128.
-  static inline void ESPHOME_ALWAYS_INLINE write_raw_byte(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM,
-                                                          uint8_t b) {
-    PROTO_ENCODE_CHECK_BOUNDS(pos, 1);
-    *pos++ = b;
-  }
-  /// Reserve one byte for later backpatch (e.g., sub-message length).
-  /// Advances pos past the reserved byte without writing a value.
-  static inline void ESPHOME_ALWAYS_INLINE reserve_byte(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM) {
-    PROTO_ENCODE_CHECK_BOUNDS(pos, 1);
-    pos++;
-  }
-  /// Write raw bytes to the buffer (no tag, no length prefix).
-  static inline void ESPHOME_ALWAYS_INLINE encode_raw(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM,
-                                                      const void *data, size_t len) {
-    PROTO_ENCODE_CHECK_BOUNDS(pos, len);
-    std::memcpy(pos, data, len);
-    pos += len;
-  }
-  /// Encode tag + 1-byte length + raw string data. For strings with max_data_length < 128.
-  /// Tag must be a single-byte varint (< 128). Always encodes (no zero check).
-  static inline void encode_short_string_force(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint8_t tag,
-                                               const StringRef &ref) {
-#ifdef ESPHOME_DEBUG_API
-    assert(ref.size() < 128 && "encode_short_string_force: string exceeds max_data_length < 128");
-#endif
-    PROTO_ENCODE_CHECK_BOUNDS(pos, 2 + ref.size());
-    pos[0] = tag;
-    pos[1] = static_cast<uint8_t>(ref.size());
-    std::memcpy(pos + 2, ref.c_str(), ref.size());
-    pos += 2 + ref.size();
-  }
-  /// Write a precomputed tag byte + 32-bit value in one operation.
-  static inline void ESPHOME_ALWAYS_INLINE write_tag_and_fixed32(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM,
-                                                                 uint8_t tag, uint32_t value) {
-    PROTO_ENCODE_CHECK_BOUNDS(pos, 5);
-    pos[0] = tag;
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-    std::memcpy(pos + 1, &value, 4);
-#else
-    pos[1] = static_cast<uint8_t>(value & 0xFF);
-    pos[2] = static_cast<uint8_t>((value >> 8) & 0xFF);
-    pos[3] = static_cast<uint8_t>((value >> 16) & 0xFF);
-    pos[4] = static_cast<uint8_t>((value >> 24) & 0xFF);
-#endif
-    pos += 5;
-  }
-  static inline void encode_string(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id,
-                                   const char *string, size_t len, bool force = false) {
-    if (len == 0 && !force)
-      return;
-    encode_field_raw(pos PROTO_ENCODE_DEBUG_ARG, field_id, 2);  // type 2: Length-delimited string
-    if (len < VARINT_MAX_1_BYTE) [[likely]] {
-      PROTO_ENCODE_CHECK_BOUNDS(pos, 1 + len);
-      *pos++ = static_cast<uint8_t>(len);
-    } else {
-      encode_varint_raw_loop(pos PROTO_ENCODE_DEBUG_ARG, len);
-      PROTO_ENCODE_CHECK_BOUNDS(pos, len);
-    }
-    std::memcpy(pos, string, len);
-    pos += len;
-  }
-  static inline void encode_string(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id,
-                                   const std::string &value, bool force = false) {
-    encode_string(pos PROTO_ENCODE_DEBUG_ARG, field_id, value.data(), value.size(), force);
-  }
-  static inline void encode_string(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id,
-                                   const StringRef &ref, bool force = false) {
-    encode_string(pos PROTO_ENCODE_DEBUG_ARG, field_id, ref.c_str(), ref.size(), force);
-  }
-  static inline void encode_bytes(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id,
-                                  const uint8_t *data, size_t len, bool force = false) {
-    encode_string(pos PROTO_ENCODE_DEBUG_ARG, field_id, reinterpret_cast<const char *>(data), len, force);
-  }
-  static inline void encode_uint32(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id,
-                                   uint32_t value, bool force = false) {
-    if (value == 0 && !force)
-      return;
-    encode_field_raw(pos PROTO_ENCODE_DEBUG_ARG, field_id, 0);
-    encode_varint_raw(pos PROTO_ENCODE_DEBUG_ARG, value);
-  }
-  static inline void encode_uint64(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id,
-                                   uint64_t value, bool force = false) {
-    if (value == 0 && !force)
-      return;
-    encode_field_raw(pos PROTO_ENCODE_DEBUG_ARG, field_id, 0);
-    encode_varint_raw_64(pos PROTO_ENCODE_DEBUG_ARG, value);
-  }
-  static inline void encode_bool(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id, bool value,
-                                 bool force = false) {
-    if (!value && !force)
-      return;
-    encode_field_raw(pos PROTO_ENCODE_DEBUG_ARG, field_id, 0);
-    PROTO_ENCODE_CHECK_BOUNDS(pos, 1);
-    *pos++ = value ? 0x01 : 0x00;
-  }
-  static inline void encode_fixed32(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id,
-                                    uint32_t value, bool force = false) {
-    if (value == 0 && !force)
-      return;
-    encode_field_raw(pos PROTO_ENCODE_DEBUG_ARG, field_id, 5);
-    PROTO_ENCODE_CHECK_BOUNDS(pos, 4);
-#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-    std::memcpy(pos, &value, 4);
-    pos += 4;
-#else
-    *pos++ = (value >> 0) & 0xFF;
-    *pos++ = (value >> 8) & 0xFF;
-    *pos++ = (value >> 16) & 0xFF;
-    *pos++ = (value >> 24) & 0xFF;
-#endif
-  }
-  // NOTE: Wire type 1 (64-bit fixed: double, fixed64, sfixed64) is intentionally
-  // not supported to reduce overhead on embedded systems. All ESPHome devices are
-  // 32-bit microcontrollers where 64-bit operations are expensive. If 64-bit support
-  // is needed in the future, the necessary encoding/decoding functions must be added.
-  static inline void encode_float(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id, float value,
-                                  bool force = false) {
-    uint32_t raw = float_to_raw(value);
-    if (raw == 0 && !force)
-      return;
-    encode_fixed32(pos PROTO_ENCODE_DEBUG_ARG, field_id, raw);
-  }
-  static inline void encode_int32(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id, int32_t value,
-                                  bool force = false) {
-    if (value < 0) {
-      // negative int32 is always 10 byte long
-      encode_uint64(pos PROTO_ENCODE_DEBUG_ARG, field_id, static_cast<uint64_t>(value), force);
-      return;
-    }
-    encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, field_id, static_cast<uint32_t>(value), force);
-  }
-  static inline void encode_int64(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id, int64_t value,
-                                  bool force = false) {
-    encode_uint64(pos PROTO_ENCODE_DEBUG_ARG, field_id, static_cast<uint64_t>(value), force);
-  }
-  static inline void encode_sint32(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id,
-                                   int32_t value, bool force = false) {
-    encode_uint32(pos PROTO_ENCODE_DEBUG_ARG, field_id, encode_zigzag32(value), force);
-  }
-  static inline void encode_sint64(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, uint32_t field_id,
-                                   int64_t value, bool force = false) {
-    encode_uint64(pos PROTO_ENCODE_DEBUG_ARG, field_id, encode_zigzag64(value), force);
-  }
-  /// Sub-message encoding: sync pos to buffer, delegate, get pos from return value.
-  template<typename T>
-  static inline void encode_sub_message(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM, ProtoWriteBuffer &buffer,
-                                        uint32_t field_id, const T &value) {
-    buffer.set_pos(pos);
-    buffer.encode_sub_message(field_id, value);
-    pos = buffer.get_pos();
-  }
-  template<typename T>
-  static inline void encode_optional_sub_message(uint8_t *__restrict__ &pos PROTO_ENCODE_DEBUG_PARAM,
-                                                 ProtoWriteBuffer &buffer, uint32_t field_id, const T &value) {
-    buffer.set_pos(pos);
-    buffer.encode_optional_sub_message(field_id, value);
-    pos = buffer.get_pos();
-  }
-};
-
 #ifdef HAS_PROTO_MESSAGE_DUMP
 /**
  * Fixed-size buffer for message dumps - avoids heap allocation.
@@ -544,23 +394,6 @@ class DumpBuffer {
     return *this;
   }
 
-  /// Append a PROGMEM string (flash-safe on ESP8266, regular append on other platforms)
-  DumpBuffer &append_p(const char *str) {
-    if (str) {
-#ifdef USE_ESP8266
-      append_p_esp8266(str);
-#else
-      append_impl_(str, strlen(str));
-#endif
-    }
-    return *this;
-  }
-
-#ifdef USE_ESP8266
-  /// Out-of-line ESP8266 PROGMEM append to avoid inlining strlen_P/memcpy_P at every call site
-  void append_p_esp8266(const char *str);
-#endif
-
   const char *c_str() const { return buf_; }
   size_t size() const { return pos_; }
 
@@ -602,26 +435,22 @@ class ProtoMessage {
   // All call sites use templates to preserve the concrete type, so virtual
   // dispatch is not needed. This eliminates per-message vtable entries for
   // encode/calculate_size, saving ~1.3 KB of flash across all message types.
-  uint8_t *encode(ProtoWriteBuffer &buffer PROTO_ENCODE_DEBUG_PARAM) const { return buffer.get_pos(); }
+  void encode(ProtoWriteBuffer &buffer) const {}
   uint32_t calculate_size() const { return 0; }
 #ifdef HAS_PROTO_MESSAGE_DUMP
   virtual const char *dump_to(DumpBuffer &out) const = 0;
-  virtual const LogString *message_name() const { return LOG_STR("unknown"); }
+  virtual const char *message_name() const { return "unknown"; }
 #endif
 
-#ifndef USE_HOST
  protected:
-#endif
   // Non-virtual destructor is protected to prevent polymorphic deletion.
-  // On host platform, made public to allow value-initialization of std::array
-  // members (e.g. DeviceInfoResponse::devices) without clang errors.
   ~ProtoMessage() = default;
 };
 
 // Base class for messages that support decoding
 class ProtoDecodableMessage : public ProtoMessage {
  public:
-  void decode(const uint8_t *buffer, size_t length);
+  virtual void decode(const uint8_t *buffer, size_t length);
 
   /**
    * Count occurrences of a repeated field in a protobuf buffer.
@@ -644,24 +473,6 @@ class ProtoDecodableMessage : public ProtoMessage {
 
 class ProtoSize {
  public:
-  // Varint encoding thresholds — use namespace-level constants for 1/2 byte,
-  // class-level for 3/4 byte (only used within ProtoSize).
-  static constexpr uint32_t VARINT_THRESHOLD_1_BYTE = VARINT_MAX_1_BYTE;
-  static constexpr uint32_t VARINT_THRESHOLD_2_BYTE = VARINT_MAX_2_BYTE;
-  static constexpr uint32_t VARINT_THRESHOLD_3_BYTE = 1 << 21;  // 2097152
-  static constexpr uint32_t VARINT_THRESHOLD_4_BYTE = 1 << 28;  // 268435456
-
-  // Varint encoded length for a 16-bit value (1, 2, or 3 bytes).
-  // Fully inline — no slow path call for values >= 128.
-  static constexpr inline uint8_t ESPHOME_ALWAYS_INLINE varint16(uint16_t value) {
-    return value < VARINT_THRESHOLD_1_BYTE ? 1 : (value < VARINT_THRESHOLD_2_BYTE ? 2 : 3);
-  }
-
-  // Varint encoded length for an 8-bit value (1 or 2 bytes).
-  static constexpr inline uint8_t ESPHOME_ALWAYS_INLINE varint8(uint8_t value) {
-    return value < VARINT_THRESHOLD_1_BYTE ? 1 : 2;
-  }
-
   /**
    * @brief Calculates the size in bytes needed to encode a uint32_t value as a varint
    *
@@ -669,34 +480,23 @@ class ProtoSize {
    * @return The number of bytes needed to encode the value
    */
   static constexpr inline uint32_t ESPHOME_ALWAYS_INLINE varint(uint32_t value) {
-    if (value < VARINT_THRESHOLD_1_BYTE) [[likely]]
+    if (value < 128) [[likely]]
       return 1;  // Fast path: 7 bits, most common case
     if (__builtin_is_constant_evaluated())
       return varint_wide(value);
     return varint_slow(value);
   }
-  /// Size of a varint expected to be 1-2 bytes (e.g. zigzag RSSI, small lengths).
-  /// Inlines both checks; falls back to slow path for 3+ bytes.
-  static constexpr inline uint32_t ESPHOME_ALWAYS_INLINE varint_short(uint32_t value) {
-    if (value < VARINT_THRESHOLD_1_BYTE) [[likely]]
-      return 1;
-    if (value < VARINT_THRESHOLD_2_BYTE) [[likely]]
-      return 2;
-    if (__builtin_is_constant_evaluated())
-      return varint_wide(value);
-    return varint_slow(value);
-  }
 
  private:
   // Slow path for varint >= 128, outlined to keep fast path small
   static uint32_t varint_slow(uint32_t value) __attribute__((noinline));
   // Shared cascade for values >= 128 (used by both constexpr and noinline paths)
   static constexpr inline uint32_t ESPHOME_ALWAYS_INLINE varint_wide(uint32_t value) {
-    if (value < VARINT_THRESHOLD_2_BYTE)
+    if (value < 16384)
       return 2;
-    if (value < VARINT_THRESHOLD_3_BYTE)
+    if (value < 2097152)
       return 3;
-    if (value < VARINT_THRESHOLD_4_BYTE)
+    if (value < 268435456)
       return 4;
     return 5;
   }
@@ -790,8 +590,8 @@ class ProtoSize {
   }
   static constexpr uint32_t calc_bool(uint32_t field_id_size, bool value) { return value ? field_id_size + 1 : 0; }
   static constexpr uint32_t calc_bool_force(uint32_t field_id_size) { return field_id_size + 1; }
-  static uint32_t calc_float(uint32_t field_id_size, float value) {
-    return float_to_raw(value) != 0 ? field_id_size + 4 : 0;
+  static constexpr uint32_t calc_float(uint32_t field_id_size, float value) {
+    return value != 0.0f ? field_id_size + 4 : 0;
   }
   static constexpr uint32_t calc_fixed32(uint32_t field_id_size, uint32_t value) {
     return value ? field_id_size + 4 : 0;
@@ -800,10 +600,10 @@ class ProtoSize {
     return value ? field_id_size + 4 : 0;
   }
   static constexpr uint32_t calc_sint32(uint32_t field_id_size, int32_t value) {
-    return value ? field_id_size + varint_short(encode_zigzag32(value)) : 0;
+    return value ? field_id_size + varint(encode_zigzag32(value)) : 0;
   }
-  static constexpr inline uint32_t ESPHOME_ALWAYS_INLINE calc_sint32_force(uint32_t field_id_size, int32_t value) {
-    return field_id_size + varint_short(encode_zigzag32(value));
+  static constexpr uint32_t calc_sint32_force(uint32_t field_id_size, int32_t value) {
+    return field_id_size + varint(encode_zigzag32(value));
   }
   static constexpr uint32_t calc_int64(uint32_t field_id_size, int64_t value) {
     return value ? field_id_size + varint(value) : 0;
@@ -814,13 +614,13 @@ class ProtoSize {
   static constexpr uint32_t calc_uint64(uint32_t field_id_size, uint64_t value) {
     return value ? field_id_size + varint(value) : 0;
   }
-  static constexpr inline uint32_t ESPHOME_ALWAYS_INLINE calc_uint64_force(uint32_t field_id_size, uint64_t value) {
+  static constexpr uint32_t calc_uint64_force(uint32_t field_id_size, uint64_t value) {
     return field_id_size + varint(value);
   }
   static constexpr uint32_t calc_length(uint32_t field_id_size, size_t len) {
     return len ? field_id_size + varint(static_cast<uint32_t>(len)) + static_cast<uint32_t>(len) : 0;
   }
-  static constexpr inline uint32_t ESPHOME_ALWAYS_INLINE calc_length_force(uint32_t field_id_size, size_t len) {
+  static constexpr uint32_t calc_length_force(uint32_t field_id_size, size_t len) {
     return field_id_size + varint(static_cast<uint32_t>(len)) + static_cast<uint32_t>(len);
   }
   static constexpr uint32_t calc_sint64(uint32_t field_id_size, int64_t value) {
@@ -838,17 +638,35 @@ class ProtoSize {
   static constexpr uint32_t calc_message(uint32_t field_id_size, uint32_t nested_size) {
     return nested_size ? field_id_size + varint(nested_size) + nested_size : 0;
   }
-  static constexpr inline uint32_t ESPHOME_ALWAYS_INLINE calc_message_force(uint32_t field_id_size,
-                                                                            uint32_t nested_size) {
+  static constexpr uint32_t calc_message_force(uint32_t field_id_size, uint32_t nested_size) {
     return field_id_size + varint(nested_size) + nested_size;
   }
 };
 
 // Implementation of methods that depend on ProtoSize being fully defined
 
+// Implementation of encode_packed_sint32 - must be after ProtoSize is defined
+inline void ProtoWriteBuffer::encode_packed_sint32(uint32_t field_id, const std::vector<int32_t> &values) {
+  if (values.empty())
+    return;
+
+  // Calculate packed size
+  size_t packed_size = 0;
+  for (int value : values) {
+    packed_size += ProtoSize::varint(encode_zigzag32(value));
+  }
+
+  // Write tag (LENGTH_DELIMITED) + length + all zigzag-encoded values
+  this->encode_field_raw(field_id, WIRE_TYPE_LENGTH_DELIMITED);
+  this->encode_varint_raw(packed_size);
+  for (int value : values) {
+    this->encode_varint_raw(encode_zigzag32(value));
+  }
+}
+
 // Encode thunk — converts void* back to concrete type for direct encode() call
-template<typename T> uint8_t *proto_encode_msg(const void *msg, ProtoWriteBuffer &buf PROTO_ENCODE_DEBUG_PARAM) {
-  return static_cast<const T *>(msg)->encode(buf PROTO_ENCODE_DEBUG_ARG);
+template<typename T> void proto_encode_msg(const void *msg, ProtoWriteBuffer &buf) {
+  static_cast<const T *>(msg)->encode(buf);
 }
 
 // Thin template wrapper; delegates to non-template core in proto.cpp.
@@ -861,14 +679,33 @@ template<typename T> inline void ProtoWriteBuffer::encode_optional_sub_message(u
   this->encode_optional_sub_message(field_id, value.calculate_size(), &value, &proto_encode_msg<T>);
 }
 
-// Template decode_to_message - preserves concrete type so decode() resolves statically
-template<typename T> void ProtoLengthDelimited::decode_to_message(T &msg) const {
+// Implementation of decode_to_message - must be after ProtoDecodableMessage is defined
+inline void ProtoLengthDelimited::decode_to_message(ProtoDecodableMessage &msg) const {
   msg.decode(this->value_, this->length_);
 }
 
 template<typename T> const char *proto_enum_to_string(T value);
 
-// ProtoService removed — its methods were inlined into APIConnection.
-// APIConnection is the concrete server-side implementation; the extra virtual layer was unnecessary.
+class ProtoService {
+ public:
+ protected:
+  virtual bool is_authenticated() = 0;
+  virtual bool is_connection_setup() = 0;
+  virtual void on_fatal_error() = 0;
+  virtual void on_no_setup_connection() = 0;
+  virtual bool send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) = 0;
+  virtual void read_message(uint32_t msg_size, uint32_t msg_type, const uint8_t *msg_data) = 0;
+
+  // Authentication helper methods
+  inline bool check_connection_setup_() {
+    if (!this->is_connection_setup()) {
+      this->on_no_setup_connection();
+      return false;
+    }
+    return true;
+  }
+
+  inline bool check_authenticated_() { return this->check_connection_setup_(); }
+};
 
 }  // namespace esphome::api

esphome/components/api/user_services.h

@@ -275,7 +275,7 @@ template<typename... Ts> class APIRespondAction : public Action<Ts...> {
 
  protected:
   APIServer *parent_;
-  TemplatableFn<bool, Ts...> success_{[](Ts...) -> bool { return true; }};
+  TemplatableValue<bool, Ts...> success_{true};
   TemplatableValue<std::string, Ts...> error_message_{""};
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES_JSON
   std::function<void(Ts..., JsonObject)> json_builder_;

esphome/components/as3935/as3935.h

@@ -41,7 +41,7 @@ enum AS3935RegisterMasks {
   INT_MASK = 0xF0,
   THRESH_MASK = 0x0F,
   R_SPIKE_MASK = 0xF0,
-  ENERGY_MASK = 0xE0,
+  ENERGY_MASK = 0xF0,
   CAP_MASK = 0xF0,
   LIGHT_MASK = 0xCF,
   DISTURB_MASK = 0xDF,

esphome/components/as3935/sensor.py

@@ -6,7 +6,6 @@ from esphome.const import (
     CONF_LIGHTNING_ENERGY,
     ICON_FLASH,
     ICON_SIGNAL_DISTANCE_VARIANT,
-    STATE_CLASS_MEASUREMENT,
     UNIT_KILOMETER,
 )
 
@@ -21,14 +20,13 @@ CONFIG_SCHEMA = cv.Schema(
             unit_of_measurement=UNIT_KILOMETER,
             icon=ICON_SIGNAL_DISTANCE_VARIANT,
             accuracy_decimals=1,
-            state_class=STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional(CONF_LIGHTNING_ENERGY): sensor.sensor_schema(
             icon=ICON_FLASH,
             accuracy_decimals=1,
         ),
     }
-)
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config):

esphome/components/as5600/sensor/__init__.py

@@ -2,9 +2,11 @@ import esphome.codegen as cg
 from esphome.components import sensor
 import esphome.config_validation as cv
 from esphome.const import (
+    CONF_ANGLE,
     CONF_GAIN,
     CONF_ID,
     CONF_MAGNITUDE,
+    CONF_POSITION,
     CONF_STATUS,
     ENTITY_CATEGORY_DIAGNOSTIC,
     ICON_MAGNET,
@@ -19,6 +21,7 @@ DEPENDENCIES = ["as5600"]
 
 AS5600Sensor = as5600_ns.class_("AS5600Sensor", sensor.Sensor, cg.PollingComponent)
 
+CONF_RAW_ANGLE = "raw_angle"
 CONF_RAW_POSITION = "raw_position"
 CONF_SLOW_FILTER = "slow_filter"
 CONF_FAST_FILTER = "fast_filter"
@@ -86,6 +89,18 @@ async def to_code(config):
     if out_of_range_mode_config := config.get(CONF_OUT_OF_RANGE_MODE):
         cg.add(var.set_out_of_range_mode(out_of_range_mode_config))
 
+    if angle_config := config.get(CONF_ANGLE):
+        sens = await sensor.new_sensor(angle_config)
+        cg.add(var.set_angle_sensor(sens))
+
+    if raw_angle_config := config.get(CONF_RAW_ANGLE):
+        sens = await sensor.new_sensor(raw_angle_config)
+        cg.add(var.set_raw_angle_sensor(sens))
+
+    if position_config := config.get(CONF_POSITION):
+        sens = await sensor.new_sensor(position_config)
+        cg.add(var.set_position_sensor(sens))
+
     if raw_position_config := config.get(CONF_RAW_POSITION):
         sens = await sensor.new_sensor(raw_position_config)
         cg.add(var.set_raw_position_sensor(sens))

esphome/components/as5600/sensor/as5600_sensor.cpp

@@ -25,10 +25,27 @@ static const uint8_t REGISTER_MAGNITUDE = 0x1B;  // 16 bytes / R
 void AS5600Sensor::dump_config() {
   LOG_SENSOR("", "AS5600 Sensor", this);
   ESP_LOGCONFIG(TAG, "  Out of Range Mode: %u", this->out_of_range_mode_);
-  LOG_SENSOR("  ", "Raw Position Sensor", this->raw_position_sensor_);
-  LOG_SENSOR("  ", "Gain Sensor", this->gain_sensor_);
-  LOG_SENSOR("  ", "Magnitude Sensor", this->magnitude_sensor_);
-  LOG_SENSOR("  ", "Status Sensor", this->status_sensor_);
+  if (this->angle_sensor_ != nullptr) {
+    LOG_SENSOR("  ", "Angle Sensor", this->angle_sensor_);
+  }
+  if (this->raw_angle_sensor_ != nullptr) {
+    LOG_SENSOR("  ", "Raw Angle Sensor", this->raw_angle_sensor_);
+  }
+  if (this->position_sensor_ != nullptr) {
+    LOG_SENSOR("  ", "Position Sensor", this->position_sensor_);
+  }
+  if (this->raw_position_sensor_ != nullptr) {
+    LOG_SENSOR("  ", "Raw Position Sensor", this->raw_position_sensor_);
+  }
+  if (this->gain_sensor_ != nullptr) {
+    LOG_SENSOR("  ", "Gain Sensor", this->gain_sensor_);
+  }
+  if (this->magnitude_sensor_ != nullptr) {
+    LOG_SENSOR("  ", "Magnitude Sensor", this->magnitude_sensor_);
+  }
+  if (this->status_sensor_ != nullptr) {
+    LOG_SENSOR("  ", "Status Sensor", this->status_sensor_);
+  }
   LOG_UPDATE_INTERVAL(this);
 }
 

esphome/components/as5600/sensor/as5600_sensor.h

@@ -15,6 +15,9 @@ class AS5600Sensor : public PollingComponent, public Parented<AS5600Component>,
   void update() override;
   void dump_config() override;
 
+  void set_angle_sensor(sensor::Sensor *angle_sensor) { this->angle_sensor_ = angle_sensor; }
+  void set_raw_angle_sensor(sensor::Sensor *raw_angle_sensor) { this->raw_angle_sensor_ = raw_angle_sensor; }
+  void set_position_sensor(sensor::Sensor *position_sensor) { this->position_sensor_ = position_sensor; }
   void set_raw_position_sensor(sensor::Sensor *raw_position_sensor) {
     this->raw_position_sensor_ = raw_position_sensor;
   }
@@ -25,6 +28,9 @@ class AS5600Sensor : public PollingComponent, public Parented<AS5600Component>,
   OutRangeMode get_out_of_range_mode() { return this->out_of_range_mode_; }
 
  protected:
+  sensor::Sensor *angle_sensor_{nullptr};
+  sensor::Sensor *raw_angle_sensor_{nullptr};
+  sensor::Sensor *position_sensor_{nullptr};
   sensor::Sensor *raw_position_sensor_{nullptr};
   sensor::Sensor *gain_sensor_{nullptr};
   sensor::Sensor *magnitude_sensor_{nullptr};

esphome/components/async_tcp/async_tcp_socket.cpp

@@ -52,12 +52,11 @@ bool AsyncClient::connect(const char *host, uint16_t port) {
       connect_cb_(connect_arg_, this);
     return true;
   }
-  const int saved_errno = errno;
-  if (saved_errno != EINPROGRESS) {
-    ESP_LOGE(TAG, "Connect failed: %d", saved_errno);
+  if (errno != EINPROGRESS) {
+    ESP_LOGE(TAG, "Connect failed: %d", errno);
     close();
     if (error_cb_)
-      error_cb_(error_arg_, this, saved_errno);
+      error_cb_(error_arg_, this, errno);
     return false;
   }
 
@@ -80,12 +79,11 @@ size_t AsyncClient::write(const char *data, size_t len) {
 
   ssize_t sent = socket_->write(data, len);
   if (sent < 0) {
-    const int err = errno;
-    if (err != EAGAIN && err != EWOULDBLOCK) {
-      ESP_LOGE(TAG, "Write error: %d", err);
+    if (errno != EAGAIN && errno != EWOULDBLOCK) {
+      ESP_LOGE(TAG, "Write error: %d", errno);
       close();
       if (error_cb_)
-        error_cb_(error_arg_, this, err);
+        error_cb_(error_arg_, this, errno);
     }
     return 0;
   }
@@ -131,11 +129,10 @@ void AsyncClient::loop() {
           error_cb_(error_arg_, this, error);
       }
     } else if (ret < 0) {
-      const int err = errno;
-      ESP_LOGE(TAG, "Select error: %d", err);
+      ESP_LOGE(TAG, "Select error: %d", errno);
       close();
       if (error_cb_)
-        error_cb_(error_arg_, this, err);
+        error_cb_(error_arg_, this, errno);
     }
   } else if (connected_) {
     // For connected sockets, use the Application's select() results
@@ -151,14 +148,11 @@ void AsyncClient::loop() {
     } else if (len > 0) {
       if (data_cb_)
         data_cb_(data_arg_, this, buf, len);
-    } else {
-      const int err = errno;
-      if (err != EAGAIN && err != EWOULDBLOCK) {
-        ESP_LOGW(TAG, "Read error: %d", err);
-        close();
-        if (error_cb_)
-          error_cb_(error_arg_, this, err);
-      }
+    } else if (errno != EAGAIN && errno != EWOULDBLOCK) {
+      ESP_LOGW(TAG, "Read error: %d", errno);
+      close();
+      if (error_cb_)
+        error_cb_(error_arg_, this, errno);
     }
   }
 }

esphome/components/at581x/__init__.py

@@ -169,43 +169,53 @@ async def at581x_settings_to_code(config, action_id, template_arg, args):
 
     # Radar configuration
     if frontend_reset := config.get(CONF_HW_FRONTEND_RESET):
-        template_ = await cg.templatable(frontend_reset, args, cg.int8)
+        template_ = await cg.templatable(frontend_reset, args, int)
         cg.add(var.set_hw_frontend_reset(template_))
 
     if freq := config.get(CONF_FREQUENCY):
-        if not cg.is_template(freq):
-            freq = int(freq / 1000000)
-        template_ = await cg.templatable(freq, args, cg.int_)
+        template_ = await cg.templatable(freq, args, float)
+        template_ = int(template_ / 1000000)
         cg.add(var.set_frequency(template_))
 
-    if (sens_dist := config.get(CONF_SENSING_DISTANCE)) is not None:
-        template_ = await cg.templatable(sens_dist, args, cg.int_)
+    if sens_dist := config.get(CONF_SENSING_DISTANCE):
+        template_ = await cg.templatable(sens_dist, args, int)
         cg.add(var.set_sensing_distance(template_))
 
     if selfcheck := config.get(CONF_POWERON_SELFCHECK_TIME):
-        template_ = await cg.templatable(selfcheck, args, cg.int32)
+        template_ = await cg.templatable(selfcheck, args, float)
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds
+        template_ = int(template_)
         cg.add(var.set_poweron_selfcheck_time(template_))
 
     if protect := config.get(CONF_PROTECT_TIME):
-        template_ = await cg.templatable(protect, args, cg.int32)
+        template_ = await cg.templatable(protect, args, float)
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds
+        template_ = int(template_)
         cg.add(var.set_protect_time(template_))
 
     if trig_base := config.get(CONF_TRIGGER_BASE):
-        template_ = await cg.templatable(trig_base, args, cg.int32)
+        template_ = await cg.templatable(trig_base, args, float)
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds
+        template_ = int(template_)
         cg.add(var.set_trigger_base(template_))
 
     if trig_keep := config.get(CONF_TRIGGER_KEEP):
-        template_ = await cg.templatable(trig_keep, args, cg.int32)
+        template_ = await cg.templatable(trig_keep, args, float)
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds
+        template_ = int(template_)
         cg.add(var.set_trigger_keep(template_))
 
-    if (stage_gain := config.get(CONF_STAGE_GAIN)) is not None:
-        template_ = await cg.templatable(stage_gain, args, cg.int_)
+    if stage_gain := config.get(CONF_STAGE_GAIN):
+        template_ = await cg.templatable(stage_gain, args, int)
         cg.add(var.set_stage_gain(template_))
 
     if power := config.get(CONF_POWER_CONSUMPTION):
-        if not cg.is_template(power):
-            power = int(power * 1000000)
-        template_ = await cg.templatable(power, args, cg.int_)
+        template_ = await cg.templatable(power, args, float)
+        template_ = int(template_ * 1000000)
         cg.add(var.set_power_consumption(template_))
 
     return var

esphome/components/atm90e26/sensor.py

@@ -14,7 +14,6 @@ from esphome.const import (
     CONF_VOLTAGE,
     DEVICE_CLASS_CURRENT,
     DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_POWER_FACTOR,
     DEVICE_CLASS_REACTIVE_POWER,
@@ -104,7 +103,6 @@ CONFIG_SCHEMA = (
                 unit_of_measurement=UNIT_HERTZ,
                 icon=ICON_CURRENT_AC,
                 accuracy_decimals=1,
-                device_class=DEVICE_CLASS_FREQUENCY,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Required(CONF_LINE_FREQUENCY): cv.enum(LINE_FREQS, upper=True),

esphome/components/atm90e32/atm90e32.cpp

@@ -550,8 +550,8 @@ float ATM90E32Component::get_phase_harmonic_active_power_(uint8_t phase) {
 }
 
 float ATM90E32Component::get_phase_angle_(uint8_t phase) {
-  float val = this->read16_(ATM90E32_REGISTER_PANGLE + phase) / 10.0f;
-  return (val > 180.0f) ? val - 360.0f : val;
+  uint16_t val = this->read16_(ATM90E32_REGISTER_PANGLE + phase) / 10.0;
+  return (val > 180) ? (float) (val - 360.0f) : (float) val;
 }
 
 float ATM90E32Component::get_phase_peak_current_(uint8_t phase) {

esphome/components/atm90e32/atm90e32.h

@@ -111,14 +111,14 @@ class ATM90E32Component : public PollingComponent,
 #endif
   float get_reference_voltage(uint8_t phase) {
 #ifdef USE_NUMBER
-    return (phase < 3 && ref_voltages_[phase]) ? ref_voltages_[phase]->state : 120.0;  // Default voltage
+    return (phase >= 0 && phase < 3 && ref_voltages_[phase]) ? ref_voltages_[phase]->state : 120.0;  // Default voltage
 #else
     return 120.0;  // Default voltage
 #endif
   }
   float get_reference_current(uint8_t phase) {
 #ifdef USE_NUMBER
-    return (phase < 3 && ref_currents_[phase]) ? ref_currents_[phase]->state : 5.0f;  // Default current
+    return (phase >= 0 && phase < 3 && ref_currents_[phase]) ? ref_currents_[phase]->state : 5.0f;  // Default current
 #else
     return 5.0f;   // Default current
 #endif
@@ -134,6 +134,7 @@ class ATM90E32Component : public PollingComponent,
   void set_freq_status_text_sensor(text_sensor::TextSensor *sensor) { this->freq_status_text_sensor_ = sensor; }
 #endif
   uint16_t calculate_voltage_threshold(int line_freq, uint16_t ugain, float multiplier);
+  int32_t last_periodic_millis = millis();
 
  protected:
 #ifdef USE_NUMBER

esphome/components/atm90e32/sensor.py

@@ -20,7 +20,6 @@ from esphome.const import (
     DEVICE_CLASS_APPARENT_POWER,
     DEVICE_CLASS_CURRENT,
     DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_FREQUENCY,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_POWER_FACTOR,
     DEVICE_CLASS_REACTIVE_POWER,
@@ -132,6 +131,7 @@ ATM90E32_PHASE_SCHEMA = cv.Schema(
         cv.Optional(CONF_PHASE_ANGLE): sensor.sensor_schema(
             unit_of_measurement=UNIT_DEGREES,
             accuracy_decimals=2,
+            device_class=DEVICE_CLASS_POWER,
             state_class=STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional(CONF_HARMONIC_POWER): sensor.sensor_schema(
@@ -166,7 +166,6 @@ CONFIG_SCHEMA = (
                 unit_of_measurement=UNIT_HERTZ,
                 icon=ICON_CURRENT_AC,
                 accuracy_decimals=1,
-                device_class=DEVICE_CLASS_FREQUENCY,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_CHIP_TEMPERATURE): sensor.sensor_schema(

esphome/components/audio/__init__.py

@@ -204,15 +204,14 @@ async def to_code(config):
 
     add_idf_component(
         name="esphome/esp-audio-libs",
-        ref="2.0.4",
+        ref="2.0.3",
     )
 
     data = _get_data()
     if data.flac_support:
         cg.add_define("USE_AUDIO_FLAC_SUPPORT")
-        add_idf_component(name="esphome/micro-flac", ref="0.1.1")
     if data.mp3_support:
         cg.add_define("USE_AUDIO_MP3_SUPPORT")
     if data.opus_support:
         cg.add_define("USE_AUDIO_OPUS_SUPPORT")
-        add_idf_component(name="esphome/micro-opus", ref="0.3.6")
+        add_idf_component(name="esphome/micro-opus", ref="0.3.5")

esphome/components/audio/audio_decoder.cpp

@@ -84,10 +84,13 @@ esp_err_t AudioDecoder::start(AudioFileType audio_file_type) {
   switch (this->audio_file_type_) {
 #ifdef USE_AUDIO_FLAC_SUPPORT
     case AudioFileType::FLAC:
-      this->flac_decoder_ = make_unique<micro_flac::FLACDecoder>();
+      this->flac_decoder_ = make_unique<esp_audio_libs::flac::FLACDecoder>();
+      // CRC check slows down decoding by 15-20% on an ESP32-S3. FLAC sources in ESPHome are either from an http source
+      // or built into the firmware, so the data integrity is already verified by the time it gets to the decoder,
+      // making the CRC check unnecessary.
+      this->flac_decoder_->set_crc_check_enabled(false);
       this->free_buffer_required_ =
           this->output_transfer_buffer_->capacity();  // Adjusted and reallocated after reading the header
-      this->decoder_buffers_internally_ = true;
       break;
 #endif
 #ifdef USE_AUDIO_MP3_SUPPORT
@@ -265,47 +268,61 @@ AudioDecoderState AudioDecoder::decode(bool stop_gracefully) {
 
 #ifdef USE_AUDIO_FLAC_SUPPORT
 FileDecoderState AudioDecoder::decode_flac_() {
-  size_t bytes_consumed, samples_decoded;
+  if (!this->audio_stream_info_.has_value()) {
+    // Header hasn't been read
+    auto result = this->flac_decoder_->read_header(this->input_buffer_->data(), this->input_buffer_->available());
 
-  micro_flac::FLACDecoderResult result = this->flac_decoder_->decode(
-      this->input_buffer_->data(), this->input_buffer_->available(), this->output_transfer_buffer_->get_buffer_end(),
-      this->output_transfer_buffer_->free(), bytes_consumed, samples_decoded);
-
-  if (result == micro_flac::FLAC_DECODER_SUCCESS) {
-    if (samples_decoded > 0 && this->audio_stream_info_.has_value()) {
-      this->output_transfer_buffer_->increase_buffer_length(
-          this->audio_stream_info_.value().samples_to_bytes(samples_decoded));
-    }
-    this->input_buffer_->consume(bytes_consumed);
-  } else if (result == micro_flac::FLAC_DECODER_HEADER_READY) {
-    // Header just parsed, stream info now available
-    const auto &info = this->flac_decoder_->get_stream_info();
-    this->audio_stream_info_ = audio::AudioStreamInfo(info.bits_per_sample(), info.num_channels(), info.sample_rate());
-
-    // Reallocate the output transfer buffer to the required size
-    this->free_buffer_required_ = this->flac_decoder_->get_output_buffer_size_samples() * info.bytes_per_sample();
-    if (!this->output_transfer_buffer_->reallocate(this->free_buffer_required_)) {
+    if (result > esp_audio_libs::flac::FLAC_DECODER_HEADER_OUT_OF_DATA) {
+      // Serrious error reading FLAC header, there is no recovery
       return FileDecoderState::FAILED;
     }
+
+    size_t bytes_consumed = this->flac_decoder_->get_bytes_index();
     this->input_buffer_->consume(bytes_consumed);
-  } else if (result == micro_flac::FLAC_DECODER_END_OF_STREAM) {
-    this->input_buffer_->consume(bytes_consumed);
-    return FileDecoderState::END_OF_FILE;
-  } else if (result == micro_flac::FLAC_DECODER_NEED_MORE_DATA) {
-    this->input_buffer_->consume(bytes_consumed);
+
+    if (result == esp_audio_libs::flac::FLAC_DECODER_HEADER_OUT_OF_DATA) {
+      return FileDecoderState::MORE_TO_PROCESS;
+    }
+
+    // Reallocate the output transfer buffer to the smallest necessary size
+    this->free_buffer_required_ = flac_decoder_->get_output_buffer_size_bytes();
+    if (!this->output_transfer_buffer_->reallocate(this->free_buffer_required_)) {
+      // Couldn't reallocate output buffer
+      return FileDecoderState::FAILED;
+    }
+
+    this->audio_stream_info_ =
+        audio::AudioStreamInfo(this->flac_decoder_->get_sample_depth(), this->flac_decoder_->get_num_channels(),
+                               this->flac_decoder_->get_sample_rate());
+
     return FileDecoderState::MORE_TO_PROCESS;
-  } else if (result == micro_flac::FLAC_DECODER_ERROR_OUTPUT_TOO_SMALL) {
-    // Reallocate to decode the frame on the next call
-    const auto &info = this->flac_decoder_->get_stream_info();
-    this->free_buffer_required_ = this->flac_decoder_->get_output_buffer_size_samples() * info.bytes_per_sample();
-    if (!this->output_transfer_buffer_->reallocate(this->free_buffer_required_)) {
-      return FileDecoderState::FAILED;
-    }
-  } else {
-    ESP_LOGE(TAG, "FLAC decoder failed: %d", static_cast<int>(result));
+  }
+
+  uint32_t output_samples = 0;
+  auto result = this->flac_decoder_->decode_frame(this->input_buffer_->data(), this->input_buffer_->available(),
+                                                  this->output_transfer_buffer_->get_buffer_end(), &output_samples);
+
+  if (result == esp_audio_libs::flac::FLAC_DECODER_ERROR_OUT_OF_DATA) {
+    // Not an issue, just needs more data that we'll get next time.
     return FileDecoderState::POTENTIALLY_FAILED;
   }
 
+  size_t bytes_consumed = this->flac_decoder_->get_bytes_index();
+  this->input_buffer_->consume(bytes_consumed);
+
+  if (result > esp_audio_libs::flac::FLAC_DECODER_ERROR_OUT_OF_DATA) {
+    // Corrupted frame, don't retry with current buffer content, wait for new sync
+    return FileDecoderState::POTENTIALLY_FAILED;
+  }
+
+  // We have successfully decoded some input data and have new output data
+  this->output_transfer_buffer_->increase_buffer_length(
+      this->audio_stream_info_.value().samples_to_bytes(output_samples));
+
+  if (result == esp_audio_libs::flac::FLAC_DECODER_NO_MORE_FRAMES) {
+    return FileDecoderState::END_OF_FILE;
+  }
+
   return FileDecoderState::MORE_TO_PROCESS;
 }
 #endif

esphome/components/audio/audio_decoder.h

@@ -16,16 +16,14 @@
 #include "esp_err.h"
 
 // esp-audio-libs
+#ifdef USE_AUDIO_FLAC_SUPPORT
+#include <flac_decoder.h>
+#endif
 #ifdef USE_AUDIO_MP3_SUPPORT
 #include <mp3_decoder.h>
 #endif
 #include <wav_decoder.h>
 
-// micro-flac
-#ifdef USE_AUDIO_FLAC_SUPPORT
-#include <micro_flac/flac_decoder.h>
-#endif
-
 // micro-opus
 #ifdef USE_AUDIO_OPUS_SUPPORT
 #include <micro_opus/ogg_opus_decoder.h>
@@ -121,7 +119,7 @@ class AudioDecoder {
   std::unique_ptr<esp_audio_libs::wav_decoder::WAVDecoder> wav_decoder_;
 #ifdef USE_AUDIO_FLAC_SUPPORT
   FileDecoderState decode_flac_();
-  std::unique_ptr<micro_flac::FLACDecoder> flac_decoder_;
+  std::unique_ptr<esp_audio_libs::flac::FLACDecoder> flac_decoder_;
 #endif
 #ifdef USE_AUDIO_MP3_SUPPORT
   FileDecoderState decode_mp3_();

esphome/components/audio_adc/__init__.py

@@ -32,7 +32,7 @@ async def audio_adc_set_mic_gain_to_code(config, action_id, template_arg, args):
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
-    template_ = await cg.templatable(config.get(CONF_MIC_GAIN), args, cg.float_)
+    template_ = await cg.templatable(config.get(CONF_MIC_GAIN), args, float)
     cg.add(var.set_mic_gain(template_))
 
     return var

esphome/components/audio_dac/__init__.py

@@ -52,7 +52,7 @@ async def audio_dac_set_volume_to_code(config, action_id, template_arg, args):
     paren = await cg.get_variable(config[CONF_ID])
     var = cg.new_Pvariable(action_id, template_arg, paren)
 
-    template_ = await cg.templatable(config.get(CONF_VOLUME), args, cg.float_)
+    template_ = await cg.templatable(config.get(CONF_VOLUME), args, float)
     cg.add(var.set_volume(template_))
 
     return var

esphome/components/audio_file/media_source/audio_file_media_source.cpp

@@ -4,7 +4,6 @@
 
 #include "esphome/components/audio/audio_decoder.h"
 
-#include <cinttypes>
 #include <cstring>
 
 namespace esphome::audio_file {
@@ -250,7 +249,7 @@ void AudioFileMediaSource::decode_task(void *params) {
 
         audio::AudioStreamInfo stream_info = decoder->get_audio_stream_info().value();
 
-        ESP_LOGD(TAG, "Bits per sample: %d, Channels: %d, Sample rate: %" PRIu32, stream_info.get_bits_per_sample(),
+        ESP_LOGD(TAG, "Bits per sample: %d, Channels: %d, Sample rate: %d", stream_info.get_bits_per_sample(),
                  stream_info.get_channels(), stream_info.get_sample_rate());
 
         if (stream_info.get_bits_per_sample() != 16 || stream_info.get_channels() > 2) {

esphome/components/bedjet/bedjet_codec.h

@@ -183,7 +183,7 @@ class BedjetCodec {
 
   BedjetPacket packet_;
 
-  BedjetStatusPacket *status_packet_{nullptr};
+  BedjetStatusPacket *status_packet_;
   BedjetStatusPacket buf_;
 };
 

esphome/components/bedjet/climate/bedjet_climate.cpp

@@ -61,15 +61,6 @@ void BedJetClimate::dump_config() {
 }
 
 void BedJetClimate::setup() {
-  // Set custom modes once during setup — stored on Climate base class, wired via get_traits()
-  this->set_supported_custom_fan_modes(BEDJET_FAN_STEP_NAMES);
-  this->set_supported_custom_presets({
-      this->heating_mode_ == HEAT_MODE_EXTENDED ? "LTD HT" : "EXT HT",
-      "M1",
-      "M2",
-      "M3",
-  });
-
   // restore set points
   auto restore = this->restore_state_();
   if (restore.has_value()) {

esphome/components/bedjet/climate/bedjet_climate.h

@@ -42,14 +42,21 @@ class BedJetClimate : public climate::Climate, public BedJetClient, public Polli
         climate::CLIMATE_MODE_DRY,
     });
 
+    // 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_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,
     });
-    // Custom fan modes and presets are set once in setup(), stored on Climate base class,
-    // and wired automatically via get_traits()
+    // 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",
+        "M1",
+        "M2",
+        "M3",
+    });
     traits.set_visual_min_temperature(19.0);
     traits.set_visual_max_temperature(43.0);
     traits.set_visual_temperature_step(1.0);

esphome/components/bh1900nux/sensor.py

@@ -12,7 +12,7 @@ CODEOWNERS = ["@B48D81EFCC"]
 
 sensor_ns = cg.esphome_ns.namespace("bh1900nux")
 BH1900NUXSensor = sensor_ns.class_(
-    "BH1900NUXSensor", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
+    "BH1900NUXSensor", cg.PollingComponent, i2c.I2CDevice
 )
 
 CONFIG_SCHEMA = (

esphome/components/binary_sensor/__init__.py

@@ -120,15 +120,25 @@ BinarySensorInitiallyOff = binary_sensor_ns.class_(
 BinarySensorPtr = BinarySensor.operator("ptr")
 
 # Triggers
+PressTrigger = binary_sensor_ns.class_("PressTrigger", automation.Trigger.template())
+ReleaseTrigger = binary_sensor_ns.class_(
+    "ReleaseTrigger", automation.Trigger.template()
+)
 ClickTrigger = binary_sensor_ns.class_("ClickTrigger", automation.Trigger.template())
 DoubleClickTrigger = binary_sensor_ns.class_(
     "DoubleClickTrigger", automation.Trigger.template()
 )
-MultiClickTriggerBase = binary_sensor_ns.class_(
-    "MultiClickTriggerBase", automation.Trigger.template(), cg.Component
+MultiClickTrigger = binary_sensor_ns.class_(
+    "MultiClickTrigger", automation.Trigger.template(), cg.Component
 )
-MultiClickTrigger = binary_sensor_ns.class_("MultiClickTrigger", MultiClickTriggerBase)
 MultiClickTriggerEvent = binary_sensor_ns.struct("MultiClickTriggerEvent")
+StateTrigger = binary_sensor_ns.class_(
+    "StateTrigger", automation.Trigger.template(bool)
+)
+StateChangeTrigger = binary_sensor_ns.class_(
+    "StateChangeTrigger",
+    automation.Trigger.template(cg.optional.template(bool), cg.optional.template(bool)),
+)
 
 BinarySensorPublishAction = binary_sensor_ns.class_(
     "BinarySensorPublishAction", automation.Action
@@ -256,7 +266,6 @@ async def delayed_off_filter_to_code(config, filter_id):
                 ): cv.positive_time_period_milliseconds,
             }
         ),
-        cv.Length(max=254),
     ),
 )
 async def autorepeat_filter_to_code(config, filter_id):
@@ -285,7 +294,7 @@ async def autorepeat_filter_to_code(config, filter_id):
                 ),
             )
         ]
-    var = cg.new_Pvariable(filter_id, cg.TemplateArguments(len(timings)), timings)
+    var = cg.new_Pvariable(filter_id, timings)
     await cg.register_component(var, {})
     return var
 
@@ -390,7 +399,7 @@ def validate_multi_click_timing(value):
         new_state = v_.get(CONF_STATE, not state)
         if new_state == state:
             raise cv.Invalid(
-                f"Timings must have alternating state. Indices {i - 1} and {i} have the same state {state}"
+                f"Timings must have alternating state. Indices {i} and {i + 1} have the same state {state}"
             )
         if max_length is not None and max_length < min_length:
             raise cv.Invalid(
@@ -449,8 +458,16 @@ _BINARY_SENSOR_SCHEMA = (
             ): cv.boolean,
             cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
             cv.Optional(CONF_FILTERS): validate_filters,
-            cv.Optional(CONF_ON_PRESS): automation.validate_automation({}),
-            cv.Optional(CONF_ON_RELEASE): automation.validate_automation({}),
+            cv.Optional(CONF_ON_PRESS): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PressTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_RELEASE): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ReleaseTrigger),
+                }
+            ),
             cv.Optional(CONF_ON_CLICK): cv.All(
                 automation.validate_automation(
                     {
@@ -485,17 +502,23 @@ _BINARY_SENSOR_SCHEMA = (
                 {
                     cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(MultiClickTrigger),
                     cv.Required(CONF_TIMING): cv.All(
-                        [parse_multi_click_timing_str],
-                        validate_multi_click_timing,
-                        cv.Length(min=1, max=255),
+                        [parse_multi_click_timing_str], validate_multi_click_timing
                     ),
                     cv.Optional(
                         CONF_INVALID_COOLDOWN, default="1s"
                     ): cv.positive_time_period_milliseconds,
                 }
             ),
-            cv.Optional(CONF_ON_STATE): automation.validate_automation({}),
-            cv.Optional(CONF_ON_STATE_CHANGE): automation.validate_automation({}),
+            cv.Optional(CONF_ON_STATE): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(StateTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_STATE_CHANGE): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(StateChangeTrigger),
+                }
+            ),
         }
     )
 )
@@ -531,31 +554,15 @@ def binary_sensor_schema(
     return _BINARY_SENSOR_SCHEMA.extend(schema)
 
 
-_CALLBACK_AUTOMATIONS = (
-    automation.CallbackAutomation(
-        CONF_ON_PRESS,
-        "add_on_state_callback",
-        forwarder=automation.TriggerOnTrueForwarder,
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_RELEASE,
-        "add_on_state_callback",
-        forwarder=automation.TriggerOnFalseForwarder,
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_STATE, "add_on_state_callback", [(bool, "x")]
-    ),
-    automation.CallbackAutomation(
-        CONF_ON_STATE_CHANGE,
-        "add_full_state_callback",
-        [(cg.optional.template(bool), "x_previous"), (cg.optional.template(bool), "x")],
-    ),
-)
-
-
 @coroutine_with_priority(CoroPriority.AUTOMATION)
 async def _build_binary_sensor_automations(var, config):
-    await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
+    for conf in config.get(CONF_ON_PRESS, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
+
+    for conf in config.get(CONF_ON_RELEASE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
 
     for conf in config.get(CONF_ON_CLICK, []):
         trigger = cg.new_Pvariable(
@@ -579,14 +586,27 @@ async def _build_binary_sensor_automations(var, config):
             )
             for tim in conf[CONF_TIMING]
         ]
-        trigger = cg.new_Pvariable(
-            conf[CONF_TRIGGER_ID], cg.TemplateArguments(len(timings)), var, timings
-        )
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var, timings)
         if CONF_INVALID_COOLDOWN in conf:
             cg.add(trigger.set_invalid_cooldown(conf[CONF_INVALID_COOLDOWN]))
         await cg.register_component(trigger, conf)
         await automation.build_automation(trigger, [], conf)
 
+    for conf in config.get(CONF_ON_STATE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(bool, "x")], conf)
+
+    for conf in config.get(CONF_ON_STATE_CHANGE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(
+            trigger,
+            [
+                (cg.optional.template(bool), "x_previous"),
+                (cg.optional.template(bool), "x"),
+            ],
+            conf,
+        )
+
 
 @setup_entity("binary_sensor")
 async def setup_binary_sensor_core_(var, config):

esphome/components/binary_sensor/automation.cpp

@@ -13,7 +13,7 @@ constexpr uint32_t MULTICLICK_COOLDOWN_ID = 1;
 constexpr uint32_t MULTICLICK_IS_VALID_ID = 2;
 constexpr uint32_t MULTICLICK_IS_NOT_VALID_ID = 3;
 
-void MultiClickTriggerBase::on_state_(bool state) {
+void MultiClickTrigger::on_state_(bool state) {
   // Handle duplicate events
   if (state == this->last_state_) {
     return;
@@ -32,7 +32,7 @@ void MultiClickTriggerBase::on_state_(bool state) {
       ESP_LOGV(TAG, "START min=%" PRIu32 " max=%" PRIu32, evt.min_length, evt.max_length);
       ESP_LOGV(TAG, "Multi Click: Starting multi click action!");
       this->at_index_ = 1;
-      if (this->timing_count_ == 1 && evt.max_length == 4294967294UL) {
+      if (this->timing_.size() == 1 && evt.max_length == 4294967294UL) {
         this->set_timeout(MULTICLICK_TRIGGER_ID, evt.min_length, [this]() { this->trigger_(); });
       } else {
         this->schedule_is_valid_(evt.min_length);
@@ -50,7 +50,7 @@ void MultiClickTriggerBase::on_state_(bool state) {
     return;
   }
 
-  if (*this->at_index_ == this->timing_count_) {
+  if (*this->at_index_ == this->timing_.size()) {
     this->trigger_();
     return;
   }
@@ -61,7 +61,7 @@ void MultiClickTriggerBase::on_state_(bool state) {
     ESP_LOGV(TAG, "A i=%zu min=%" PRIu32 " max=%" PRIu32, *this->at_index_, evt.min_length, evt.max_length);  // NOLINT
     this->schedule_is_valid_(evt.min_length);
     this->schedule_is_not_valid_(evt.max_length);
-  } else if (*this->at_index_ + 1 != this->timing_count_) {
+  } else if (*this->at_index_ + 1 != this->timing_.size()) {
     ESP_LOGV(TAG, "B i=%zu min=%" PRIu32, *this->at_index_, evt.min_length);  // NOLINT
     this->cancel_timeout(MULTICLICK_IS_NOT_VALID_ID);
     this->schedule_is_valid_(evt.min_length);
@@ -74,7 +74,7 @@ void MultiClickTriggerBase::on_state_(bool state) {
 
   *this->at_index_ = *this->at_index_ + 1;
 }
-void MultiClickTriggerBase::schedule_cooldown_() {
+void MultiClickTrigger::schedule_cooldown_() {
   ESP_LOGV(TAG, "Multi Click: Invalid length of press, starting cooldown of %" PRIu32 " ms", this->invalid_cooldown_);
   this->is_in_cooldown_ = true;
   this->set_timeout(MULTICLICK_COOLDOWN_ID, this->invalid_cooldown_, [this]() {
@@ -86,7 +86,7 @@ void MultiClickTriggerBase::schedule_cooldown_() {
   this->cancel_timeout(MULTICLICK_IS_VALID_ID);
   this->cancel_timeout(MULTICLICK_IS_NOT_VALID_ID);
 }
-void MultiClickTriggerBase::schedule_is_valid_(uint32_t min_length) {
+void MultiClickTrigger::schedule_is_valid_(uint32_t min_length) {
   if (min_length == 0) {
     this->is_valid_ = true;
     return;
@@ -97,19 +97,19 @@ void MultiClickTriggerBase::schedule_is_valid_(uint32_t min_length) {
     this->is_valid_ = true;
   });
 }
-void MultiClickTriggerBase::schedule_is_not_valid_(uint32_t max_length) {
+void MultiClickTrigger::schedule_is_not_valid_(uint32_t max_length) {
   this->set_timeout(MULTICLICK_IS_NOT_VALID_ID, max_length, [this]() {
     ESP_LOGV(TAG, "Multi Click: You waited too long to %s.", this->parent_->state ? "RELEASE" : "PRESS");
     this->is_valid_ = false;
     this->schedule_cooldown_();
   });
 }
-void MultiClickTriggerBase::cancel() {
+void MultiClickTrigger::cancel() {
   ESP_LOGV(TAG, "Multi Click: Sequence explicitly cancelled.");
   this->is_valid_ = false;
   this->schedule_cooldown_();
 }
-void MultiClickTriggerBase::trigger_() {
+void MultiClickTrigger::trigger_() {
   ESP_LOGV(TAG, "Multi Click: Hooray, multi click is valid. Triggering!");
   this->at_index_.reset();
   this->cancel_timeout(MULTICLICK_TRIGGER_ID);

esphome/components/binary_sensor/automation.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <array>
 #include <cinttypes>
 #include <utility>
 
@@ -90,14 +89,15 @@ class DoubleClickTrigger : public Trigger<> {
   uint32_t max_length_;  /// Maximum length of click. 0 means no maximum.
 };
 
-/// Non-template base for MultiClickTrigger (keeps large method bodies out of the header).
-class MultiClickTriggerBase : public Trigger<>, public Component {
+class MultiClickTrigger : public Trigger<>, public Component {
  public:
-  explicit MultiClickTriggerBase(BinarySensor *parent) : parent_(parent) {}
+  explicit MultiClickTrigger(BinarySensor *parent, std::initializer_list<MultiClickTriggerEvent> timing)
+      : parent_(parent), timing_(timing) {}
 
   void setup() override {
     this->last_state_ = this->parent_->get_state_default(false);
-    this->parent_->add_on_state_callback([this](bool state) { this->on_state_(state); });
+    auto f = std::bind(&MultiClickTrigger::on_state_, this, std::placeholders::_1);
+    this->parent_->add_on_state_callback(f);
   }
 
   float get_setup_priority() const override { return setup_priority::HARDWARE; }
@@ -105,8 +105,6 @@ class MultiClickTriggerBase : public Trigger<>, public Component {
   void set_invalid_cooldown(uint32_t invalid_cooldown) { this->invalid_cooldown_ = invalid_cooldown; }
 
   void cancel();
-  MultiClickTriggerBase(const MultiClickTriggerBase &) = delete;
-  MultiClickTriggerBase &operator=(const MultiClickTriggerBase &) = delete;
 
  protected:
   void on_state_(bool state);
@@ -116,30 +114,14 @@ class MultiClickTriggerBase : public Trigger<>, public Component {
   void trigger_();
 
   BinarySensor *parent_;
-  const MultiClickTriggerEvent *timing_{nullptr};
+  FixedVector<MultiClickTriggerEvent> timing_;
   uint32_t invalid_cooldown_{1000};
   optional<size_t> at_index_{};
-  uint8_t timing_count_{0};
   bool last_state_{false};
   bool is_in_cooldown_{false};
   bool is_valid_{false};
 };
 
-/// Template wrapper that provides inline std::array storage for timing events.
-/// N is set by code generation to match the exact number of timing events configured in YAML.
-template<size_t N> class MultiClickTrigger : public MultiClickTriggerBase {
- public:
-  MultiClickTrigger(BinarySensor *parent, std::initializer_list<MultiClickTriggerEvent> timing)
-      : MultiClickTriggerBase(parent) {
-    init_array_from(this->timing_storage_, timing);
-    this->timing_ = this->timing_storage_.data();
-    this->timing_count_ = N;
-  }
-
- protected:
-  std::array<MultiClickTriggerEvent, N> timing_storage_{};
-};
-
 class StateTrigger : public Trigger<bool> {
  public:
   explicit StateTrigger(BinarySensor *parent) {

esphome/components/binary_sensor/binary_sensor.cpp

@@ -32,13 +32,20 @@ void BinarySensor::publish_initial_state(bool new_state) {
   this->invalidate_state();
   this->publish_state(new_state);
 }
+void BinarySensor::send_state_internal(bool new_state) {
+  // copy the new state to the visible property for backwards compatibility, before any callbacks
+  this->state = new_state;
+  // Note that set_new_state_ de-dups and will only trigger callbacks if the state has actually changed
+  this->set_new_state(new_state);
+}
+
 bool BinarySensor::set_new_state(const optional<bool> &new_state) {
   if (StatefulEntityBase::set_new_state(new_state)) {
     // weirdly, this file could be compiled even without USE_BINARY_SENSOR defined
 #if defined(USE_BINARY_SENSOR) && defined(USE_CONTROLLER_REGISTRY)
     ControllerRegistry::notify_binary_sensor_update(this);
 #endif
-    ESP_LOGV(TAG, "'%s' >> %s", this->get_name().c_str(), ONOFFMAYBE(new_state));
+    ESP_LOGD(TAG, "'%s' >> %s", this->get_name().c_str(), ONOFFMAYBE(new_state));
     return true;
   }
   return false;

esphome/components/binary_sensor/binary_sensor.h

@@ -32,10 +32,7 @@ void log_binary_sensor(const char *tag, const char *prefix, const char *type, Bi
  */
 class BinarySensor : public StatefulEntityBase<bool> {
  public:
-  explicit BinarySensor() = default;
-
-  const bool &get_state() const override { return this->state; }
-  void set_trigger_on_initial_state(bool value) { this->trigger_on_initial_state_ = value; }
+  explicit BinarySensor(){};
 
   /** Publish a new state to the front-end.
    *
@@ -57,24 +54,16 @@ class BinarySensor : public StatefulEntityBase<bool> {
 
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
-  void send_state_internal(bool new_state) {
-    // Fast path: skip virtual dispatch when state hasn't changed
-    if (this->flags_.has_state && this->state == new_state)
-      return;
-    this->set_new_state(new_state);
-  }
+  void send_state_internal(bool new_state);
 
   /// Return whether this binary sensor has outputted a state.
   virtual bool is_status_binary_sensor() const;
 
-  /// The current state of this binary sensor. Also used as the backing storage for StatefulEntityBase.
+  // For backward compatibility, provide an accessible property
+
   bool state{};
 
  protected:
-  bool get_trigger_on_initial_state() const override { return this->trigger_on_initial_state_; }
-  void set_state_value(const bool &value) override { this->state = value; }
-
-  bool trigger_on_initial_state_{true};
 #ifdef USE_BINARY_SENSOR_FILTER
   Filter *filter_list_{nullptr};
 #endif
@@ -84,7 +73,7 @@ class BinarySensor : public StatefulEntityBase<bool> {
 
 class BinarySensorInitiallyOff : public BinarySensor {
  public:
-  BinarySensorInitiallyOff() { this->set_has_state(true); }
+  bool has_state() const override { return true; }
 };
 
 }  // namespace esphome::binary_sensor

esphome/components/binary_sensor/filter.cpp

@@ -76,11 +76,14 @@ float DelayedOffFilter::get_setup_priority() const { return setup_priority::HARD
 
 optional<bool> InvertFilter::new_value(bool value) { return !value; }
 
-// AutorepeatFilterBase
-optional<bool> AutorepeatFilterBase::new_value(bool value) {
+AutorepeatFilter::AutorepeatFilter(std::initializer_list<AutorepeatFilterTiming> timings) : timings_(timings) {}
+
+optional<bool> AutorepeatFilter::new_value(bool value) {
   if (value) {
+    // Ignore if already running
     if (this->active_timing_ != 0)
       return {};
+
     this->next_timing_();
     return true;
   } else {
@@ -91,26 +94,34 @@ optional<bool> AutorepeatFilterBase::new_value(bool value) {
   }
 }
 
-void AutorepeatFilterBase::next_timing_() {
-  if (this->active_timing_ < this->timings_count_) {
+void AutorepeatFilter::next_timing_() {
+  // Entering this method
+  // 1st time: starts waiting the first delay
+  // 2nd time: starts waiting the second delay and starts toggling with the first time_off / _on
+  // last time: no delay to start but have to bump the index to reflect the last
+  if (this->active_timing_ < this->timings_.size()) {
     this->set_timeout(AUTOREPEAT_TIMING_ID, this->timings_[this->active_timing_].delay,
                       [this]() { this->next_timing_(); });
   }
-  if (this->active_timing_ <= this->timings_count_) {
+
+  if (this->active_timing_ <= this->timings_.size()) {
     this->active_timing_++;
   }
+
   if (this->active_timing_ == 2)
     this->next_value_(false);
+
+  // Leaving this method: if the toggling is started, it has to use [active_timing_ - 2] for the intervals
 }
 
-void AutorepeatFilterBase::next_value_(bool val) {
+void AutorepeatFilter::next_value_(bool val) {
   const AutorepeatFilterTiming &timing = this->timings_[this->active_timing_ - 2];
-  this->output(val);
+  this->output(val);  // This is at least the second one so not initial
   this->set_timeout(AUTOREPEAT_ON_OFF_ID, val ? timing.time_on : timing.time_off,
                     [this, val]() { this->next_value_(!val); });
 }
 
-float AutorepeatFilterBase::get_setup_priority() const { return setup_priority::HARDWARE; }
+float AutorepeatFilter::get_setup_priority() const { return setup_priority::HARDWARE; }
 
 LambdaFilter::LambdaFilter(std::function<optional<bool>(bool)> f) : f_(std::move(f)) {}
 

esphome/components/binary_sensor/filter.h

@@ -3,8 +3,6 @@
 #include "esphome/core/defines.h"
 #ifdef USE_BINARY_SENSOR_FILTER
 
-#include <array>
-
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
@@ -36,10 +34,10 @@ class TimeoutFilter : public Filter, public Component {
   template<typename T> void set_timeout_value(T timeout) { this->timeout_delay_ = timeout; }
 
  protected:
-  TemplatableFn<uint32_t> timeout_delay_{};
+  TemplatableValue<uint32_t> timeout_delay_{};
 };
 
-class DelayedOnOffFilter final : public Filter, public Component {
+class DelayedOnOffFilter : public Filter, public Component {
  public:
   optional<bool> new_value(bool value) override;
 
@@ -49,8 +47,8 @@ class DelayedOnOffFilter final : public Filter, public Component {
   template<typename T> void set_off_delay(T delay) { this->off_delay_ = delay; }
 
  protected:
-  TemplatableFn<uint32_t> on_delay_{};
-  TemplatableFn<uint32_t> off_delay_{};
+  TemplatableValue<uint32_t> on_delay_{};
+  TemplatableValue<uint32_t> off_delay_{};
 };
 
 class DelayedOnFilter : public Filter, public Component {
@@ -62,7 +60,7 @@ class DelayedOnFilter : public Filter, public Component {
   template<typename T> void set_delay(T delay) { this->delay_ = delay; }
 
  protected:
-  TemplatableFn<uint32_t> delay_{};
+  TemplatableValue<uint32_t> delay_{};
 };
 
 class DelayedOffFilter : public Filter, public Component {
@@ -74,7 +72,7 @@ class DelayedOffFilter : public Filter, public Component {
   template<typename T> void set_delay(T delay) { this->delay_ = delay; }
 
  protected:
-  TemplatableFn<uint32_t> delay_{};
+  TemplatableValue<uint32_t> delay_{};
 };
 
 class InvertFilter : public Filter {
@@ -88,39 +86,22 @@ struct AutorepeatFilterTiming {
   uint32_t time_on;
 };
 
-/// Non-template base for AutorepeatFilter — all methods in filter.cpp.
-/// Lambdas capture this base pointer, so set_timeout/cancel_timeout are instantiated once.
-class AutorepeatFilterBase : public Filter, public Component {
+class AutorepeatFilter : public Filter, public Component {
  public:
+  explicit AutorepeatFilter(std::initializer_list<AutorepeatFilterTiming> timings);
+
   optional<bool> new_value(bool value) override;
+
   float get_setup_priority() const override;
-  AutorepeatFilterBase(const AutorepeatFilterBase &) = delete;
-  AutorepeatFilterBase &operator=(const AutorepeatFilterBase &) = delete;
 
  protected:
-  AutorepeatFilterBase() = default;
   void next_timing_();
   void next_value_(bool val);
 
-  const AutorepeatFilterTiming *timings_{nullptr};
-  uint8_t timings_count_{0};
+  FixedVector<AutorepeatFilterTiming> timings_;
   uint8_t active_timing_{0};
 };
 
-/// Template wrapper that provides inline std::array storage for timings.
-/// N is set by code generation to match the exact number of timings configured in YAML.
-template<size_t N> class AutorepeatFilter : public AutorepeatFilterBase {
- public:
-  explicit AutorepeatFilter(std::initializer_list<AutorepeatFilterTiming> timings) {
-    init_array_from(this->timings_storage_, timings);
-    this->timings_ = this->timings_storage_.data();
-    this->timings_count_ = N;
-  }
-
- protected:
-  std::array<AutorepeatFilterTiming, N> timings_storage_{};
-};
-
 class LambdaFilter : public Filter {
  public:
   explicit LambdaFilter(std::function<optional<bool>(bool)> f);
@@ -155,7 +136,7 @@ class SettleFilter : public Filter, public Component {
   template<typename T> void set_delay(T delay) { this->delay_ = delay; }
 
  protected:
-  TemplatableFn<uint32_t> delay_{};
+  TemplatableValue<uint32_t> delay_{};
   bool steady_{true};
 };
 

esphome/components/bl0940/number/__init__.py

@@ -89,6 +89,6 @@ async def to_code(config):
             )
             await cg.register_component(var, conf)
 
-            if restore_value := conf.get(CONF_RESTORE_VALUE):
+            if restore_value := config.get(CONF_RESTORE_VALUE):
                 cg.add(var.set_restore_value(restore_value))
             cg.add(getattr(bl0940, setter_method)(var))

esphome/components/bl0940/sensor.py

@@ -124,9 +124,9 @@ def set_reference_values(config):
         config.setdefault(CONF_VOLTAGE_REFERENCE, DEFAULT_BL0940_LEGACY_UREF)
         config.setdefault(CONF_CURRENT_REFERENCE, DEFAULT_BL0940_LEGACY_IREF)
         config.setdefault(CONF_POWER_REFERENCE, DEFAULT_BL0940_LEGACY_PREF)
-        config.setdefault(CONF_ENERGY_REFERENCE, DEFAULT_BL0940_LEGACY_EREF)
+        config.setdefault(CONF_ENERGY_REFERENCE, DEFAULT_BL0940_LEGACY_PREF)
     else:
-        vref = config.get(CONF_REFERENCE_VOLTAGE, DEFAULT_BL0940_VREF)
+        vref = config.get(CONF_VOLTAGE_REFERENCE, DEFAULT_BL0940_VREF)
         r_one = config.get(CONF_RESISTOR_ONE, DEFAULT_BL0940_R1)
         r_two = config.get(CONF_RESISTOR_TWO, DEFAULT_BL0940_R2)
         r_shunt = config.get(CONF_RESISTOR_SHUNT, DEFAULT_BL0940_RL)

esphome/components/ble_client/sensor/ble_rssi_sensor.cpp

@@ -47,8 +47,6 @@ void BLEClientRSSISensor::gap_event_handler(esp_gap_ble_cb_event_t event, esp_bl
   switch (event) {
     // server response on RSSI request:
     case ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT:
-      if (!this->parent()->check_addr(param->read_rssi_cmpl.remote_addr))
-        return;
       if (param->read_rssi_cmpl.status == ESP_BT_STATUS_SUCCESS) {
         int8_t rssi = param->read_rssi_cmpl.rssi;
         ESP_LOGI(TAG, "ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT RSSI: %d", rssi);

esphome/components/ble_client/sensor/ble_sensor.cpp

@@ -102,10 +102,6 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
       break;
     }
     case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.value_len == 0) {
-        ESP_LOGW(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: empty value", this->get_name().c_str());
-        break;
-      }
       ESP_LOGD(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
                param->notify.handle, param->notify.value[0]);
       if (param->notify.handle != this->handle)
@@ -135,10 +131,8 @@ float BLESensor::parse_data_(uint8_t *value, uint16_t value_len) {
   if (this->has_data_to_value_) {
     std::vector<uint8_t> data(value, value + value_len);
     return this->data_to_value_func_(data);
-  } else if (value_len > 0) {
-    return value[0];
   } else {
-    return NAN;
+    return value[0];
   }
 }