[text_sensor][text] Add const char* overloads to publish_state to eliminate heap churn

2026-01-18 17:16:25 -07:00 · 2026-01-06 12:16:20 -10:00
562 changed files with 14824 additions and 24498 deletions
--- a/.ai/instructions.md
+++ b/.ai/instructions.md
@@ -293,12 +293,6 @@ This document provides essential context for AI models interacting with this pro
    *   **Configuration Design:** Aim for simplicity with sensible defaults, while allowing for advanced customization.
    *   **Embedded Systems Optimization:** ESPHome targets resource-constrained microcontrollers. Be mindful of flash size and RAM usage.

-        **Why Heap Allocation Matters:**
-
-        ESP devices run for months with small heaps shared between Wi-Fi, BLE, LWIP, and application code. Over time, repeated allocations of different sizes fragment the heap. Failures happen when the largest contiguous block shrinks, even if total free heap is still large. We have seen field crashes caused by this.
-
-        **Heap allocation after `setup()` should be avoided unless absolutely unavoidable.** Every allocation/deallocation cycle contributes to fragmentation. ESPHome treats runtime heap allocation as a long-term reliability bug, not a performance issue. Helpers that hide allocation (`std::string`, `std::to_string`, string-returning helpers) are being deprecated and replaced with buffer and view based APIs.
-
        **STL Container Guidelines:**

        ESPHome runs on embedded systems with limited resources. Choose containers carefully:
@@ -328,15 +322,15 @@ This document provides essential context for AI models interacting with this pro
           std::array<uint8_t, 256> buffer;
           ```

-        2. **Compile-time-known fixed sizes with vector-like API:** Use `StaticVector` from `esphome/core/helpers.h` for compile-time fixed size with `push_back()` interface (no dynamic allocation).
+        2. **Compile-time-known fixed sizes with vector-like API:** Use `StaticVector` from `esphome/core/helpers.h` for fixed-size stack allocation with `push_back()` interface.
           ```cpp
           // Bad - generates STL realloc code (_M_realloc_insert)
           std::vector<ServiceRecord> services;
           services.reserve(5);  // Still includes reallocation machinery

-           // Good - compile-time fixed size, no dynamic allocation
-           StaticVector<ServiceRecord, MAX_SERVICES> services;
-           services.push_back(record1);
+           // Good - compile-time fixed size, stack allocated, no reallocation machinery
+           StaticVector<ServiceRecord, MAX_SERVICES> services;  // Allocates all MAX_SERVICES on stack
+           services.push_back(record1);  // Tracks count but all slots allocated
           ```
           Use `cg.add_define("MAX_SERVICES", count)` to set the size from Python configuration.
           Like `std::array` but with vector-like API (`push_back()`, `size()`) and no STL reallocation code.
@@ -378,21 +372,22 @@ This document provides essential context for AI models interacting with this pro
           ```
           Linear search on small datasets (1-16 elements) is often faster than hashing/tree overhead, but this depends on lookup frequency and access patterns. For frequent lookups in hot code paths, the O(1) vs O(n) complexity difference may still matter even for small datasets. `std::vector` with simple structs is usually fine—it's the heavy containers (`map`, `set`, `unordered_map`) that should be avoided for small datasets unless profiling shows otherwise.

-        5. **Avoid `std::deque`:** It allocates in 512-byte blocks regardless of element size, guaranteeing at least 512 bytes of RAM usage immediately. This is a major source of crashes on memory-constrained devices.
-
-        6. **Detection:** Look for these patterns in compiler output:
+        5. **Detection:** Look for these patterns in compiler output:
           - Large code sections with STL symbols (vector, map, set)
           - `alloc`, `realloc`, `dealloc` in symbol names
           - `_M_realloc_insert`, `_M_default_append` (vector reallocation)
           - Red-black tree code (`rb_tree`, `_Rb_tree`)
           - Hash table infrastructure (`unordered_map`, `hash`)

-        **Prioritize optimization effort for:**
+        **When to optimize:**
        - Core components (API, network, logger)
        - Widely-used components (mdns, wifi, ble)
        - Components causing flash size complaints

-        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`).
+        **When not to optimize:**
+        - Single-use niche components
+        - Code where readability matters more than bytes
+        - Already using appropriate containers

    *   **State Management:** Use `CORE.data` for component state that needs to persist during configuration generation. Avoid module-level mutable globals.

--- a/.clang-tidy.hash
+++ b/.clang-tidy.hash
@@ -1 +1 @@
-d272a88e8ca28ae9340a9a03295a566432a52cb696501908f57764475bf7ca65
+191a0e6ab5842d153dd77a2023bc5742f9d4333c334de8d81b57f2b8d4d4b65e
--- a/.claude/skills/pr-workflow/SKILL.md
+++ b/.claude/skills/pr-workflow/SKILL.md
@@ -1,96 +0,0 @@
---
-name: pr-workflow
-description: Create pull requests for esphome. Use when creating PRs, submitting changes, or preparing contributions.
-allowed-tools: Read, Bash, Glob, Grep
---
-
-# ESPHome PR Workflow
-
-When creating a pull request for esphome, follow these steps:
-
-## 1. Create Branch from Upstream
-
-Always base your branch on **upstream** (not origin/fork) to ensure you have the latest code:
-
-```bash
-git fetch upstream
-git checkout -b <branch-name> upstream/dev
-```
-
-## 2. Read the PR Template
-
-Before creating a PR, read `.github/PULL_REQUEST_TEMPLATE.md` to understand required fields.
-
-## 3. Create the PR
-
-Use `gh pr create` with the **full template** filled in. Never skip or abbreviate sections.
-
-Required fields:
- **What does this implement/fix?**: Brief description of changes
- **Types of changes**: Check ONE appropriate box (Bugfix, New feature, Breaking change, etc.)
- **Related issue**: Use `fixes <link>` syntax if applicable
- **Pull request in esphome-docs**: Link if docs are needed
- **Test Environment**: Check platforms you tested on
- **Example config.yaml**: Include working example YAML
- **Checklist**: Verify code is tested and tests added
-
-## 4. Example PR Body
-
-```markdown
-# What does this implement/fix?
-
-<describe your changes here>
-
-## Types of changes
-
- [ ] Bugfix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Developer breaking change (an API change that could break external components)
- [ ] Code quality improvements to existing code or addition of tests
- [ ] Other
-
-**Related issue or feature (if applicable):**
-
- fixes https://github.com/esphome/esphome/issues/XXX
-
-**Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):**
-
- esphome/esphome-docs#XXX
-
-## Test Environment
-
- [x] ESP32
- [x] ESP32 IDF
- [ ] ESP8266
- [ ] RP2040
- [ ] BK72xx
- [ ] RTL87xx
- [ ] LN882x
- [ ] nRF52840
-
-## Example entry for `config.yaml`:
-
-```yaml
-# Example config.yaml
-component_name:
-  id: my_component
-  option: value
-```
-
-## Checklist:
-  - [x] The code change is tested and works locally.
-  - [x] Tests have been added to verify that the new code works (under `tests/` folder).
-
-If user exposed functionality or configuration variables are added/changed:
-  - [ ] Documentation added/updated in [esphome-docs](https://github.com/esphome/esphome-docs).
-```
-
-## 5. Push and Create PR
-
-```bash
-git push -u origin <branch-name>
-gh pr create --repo esphome/esphome --base dev --title "[component] Brief description"
-```
-
-Title should be prefixed with the component name in brackets, e.g. `[safe_mode] Add feature`.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -27,7 +27,6 @@
 - [ ] RP2040
 - [ ] BK72xx
 - [ ] RTL87xx
- [ ] LN882x
 - [ ] nRF52840

 ## Example entry for `config.yaml`:
--- a/.github/actions/restore-python/action.yml
+++ b/.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@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+      uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
      with:
        path: venv
        # yamllint disable-line rule:line-length
--- a/.github/workflows/ci.yml
+++ b/.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@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: venv
          # yamllint disable-line rule:line-length
@@ -157,7 +157,7 @@ jobs:
          token: ${{ secrets.CODECOV_TOKEN }}
      - name: Save Python virtual environment cache
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: venv
          key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -193,7 +193,7 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
      - name: Restore components graph cache
-        uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: .temp/components_graph.json
          key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}
@@ -223,7 +223,7 @@ jobs:
          echo "component-test-batches=$(echo "$output" | jq -c '.component_test_batches')" >> $GITHUB_OUTPUT
      - name: Save components graph cache
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: .temp/components_graph.json
          key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}
@@ -245,7 +245,7 @@ jobs:
          python-version: "3.13"
      - name: Restore Python virtual environment
        id: cache-venv
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: venv
          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -334,14 +334,14 @@ jobs:

      - name: Cache platformio
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        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@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
@@ -413,14 +413,14 @@ jobs:

      - name: Cache platformio
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.platformio
          key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}

      - name: Cache platformio
        if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.platformio
          key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
@@ -502,14 +502,14 @@ jobs:

      - name: Cache platformio
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.platformio
          key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}

      - name: Cache platformio
        if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.platformio
          key: platformio-tidyesp32-${{ hashFiles('platformio.ini') }}
@@ -735,7 +735,7 @@ jobs:
      - name: Restore cached memory analysis
        id: cache-memory-analysis
        if: steps.check-script.outputs.skip != 'true'
-        uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: memory-analysis-target.json
          key: ${{ steps.cache-key.outputs.cache-key }}
@@ -759,7 +759,7 @@ jobs:

      - name: Cache platformio
        if: steps.check-script.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true'
-        uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.platformio
          key: platformio-memory-${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}-${{ hashFiles('platformio.ini') }}
@@ -800,7 +800,7 @@ jobs:

      - name: Save memory analysis to cache
        if: steps.check-script.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true' && steps.build.outcome == 'success'
-        uses: actions/cache/save@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: memory-analysis-target.json
          key: ${{ steps.cache-key.outputs.cache-key }}
@@ -847,7 +847,7 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
      - name: Cache platformio
-        uses: actions/cache/restore@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
+        uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
        with:
          path: ~/.platformio
          key: platformio-memory-${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}-${{ hashFiles('platformio.ini') }}
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -58,7 +58,7 @@ jobs:

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
+        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
        with:
          languages: ${{ matrix.language }}
          build-mode: ${{ matrix.build-mode }}
@@ -86,6 +86,6 @@ jobs:
          exit 1

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
+        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
        with:
          category: "/language:${{matrix.language}}"
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ ci:
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.14.13
+    rev: v0.14.10
    hooks:
      # Run the linter.
      - id: ruff
--- a/2
+++ b/2
@@ -249,13 +249,11 @@ esphome/components/ina260/* @mreditor97
 esphome/components/ina2xx_base/* @latonita
 esphome/components/ina2xx_i2c/* @latonita
 esphome/components/ina2xx_spi/* @latonita
-esphome/components/infrared/* @kbx81
 esphome/components/inkbird_ibsth1_mini/* @fkirill
 esphome/components/inkplate/* @jesserockz @JosipKuci
 esphome/components/integration/* @OttoWinter
 esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
-esphome/components/ir_rf_proxy/* @kbx81
 esphome/components/jsn_sr04t/* @Mafus1
 esphome/components/json/* @esphome/core
 esphome/components/kamstrup_kmp/* @cfeenstra1024
--- a/2
+++ b/2
@@ -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.2.0-dev
+PROJECT_NUMBER         = 2026.1.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
--- a/esphome/main.py
+++ b/esphome/main.py
@@ -62,9 +62,6 @@ from esphome.util import (

 _LOGGER = logging.getLogger(__name__)

-# Maximum buffer size for serial log reading to prevent unbounded memory growth
-SERIAL_BUFFER_MAX_SIZE = 65536
-
 # Special non-component keys that appear in configs
 _NON_COMPONENT_KEYS = frozenset(
    {
@@ -222,13 +219,8 @@ def choose_upload_log_host(
            else:
                resolved.append(device)
        if not resolved:
-            if CORE.dashboard:
-                hint = "If you know the IP, set 'use_address' in your network config."
-            else:
-                hint = "If you know the IP, try --device <IP>"
            raise EsphomeError(
-                f"All specified devices {defaults} could not be resolved. "
-                f"Is the device connected to the network? {hint}"
+                f"All specified devices {defaults} could not be resolved. Is the device connected to the network?"
            )
        return resolved

@@ -448,15 +440,11 @@ def run_miniterm(config: ConfigType, port: str, args) -> int:
                        if not chunk:
                            continue
                        time_ = datetime.now()
-                        milliseconds = time_.microsecond // 1000
-                        time_str = f"[{time_.hour:02}:{time_.minute:02}:{time_.second:02}.{milliseconds:03}]"
+                        nanoseconds = time_.microsecond // 1000
+                        time_str = f"[{time_.hour:02}:{time_.minute:02}:{time_.second:02}.{nanoseconds:03}]"

                        # Add to buffer and process complete lines
-                        # Limit buffer size to prevent unbounded memory growth
-                        # if device sends data without newlines
                        buffer += chunk
-                        if len(buffer) > SERIAL_BUFFER_MAX_SIZE:
-                            buffer = buffer[-SERIAL_BUFFER_MAX_SIZE:]
                        while b"\n" in buffer:
                            raw_line, buffer = buffer.split(b"\n", 1)
                            line = raw_line.replace(b"\r", b"").decode(
@@ -1044,7 +1032,6 @@ def command_analyze_memory(args: ArgsProtocol, config: ConfigType) -> int:
        idedata.objdump_path,
        idedata.readelf_path,
        external_components,
-        idedata=idedata,
    )
    analyzer.analyze()

--- a/esphome/analyze_memory/init.py
+++ b/esphome/analyze_memory/init.py
@@ -22,7 +22,6 @@ from .helpers import (
    map_section_name,
    parse_symbol_line,
 )
-from .toolchain import find_tool, resolve_tool_path, run_tool

 if TYPE_CHECKING:
    from esphome.platformio_api import IDEData
@@ -54,9 +53,6 @@ _NAMESPACE_STD = "std::"
 # Type alias for symbol information: (symbol_name, size, component)
 SymbolInfoType = tuple[str, int, str]

-# RAM sections - symbols in these sections consume RAM
-RAM_SECTIONS = frozenset([".data", ".bss"])
-

@dataclass
 class MemorySection:
@@ -64,20 +60,7 @@ class MemorySection:

    name: str
    symbols: list[SymbolInfoType] = field(default_factory=list)
-    total_size: int = 0  # Actual section size from ELF headers
-    symbol_size: int = 0  # Sum of symbol sizes (may be less than total_size)
-
-
-@dataclass
-class SDKSymbol:
-    """Represents a symbol from an SDK library that's not in the ELF symbol table."""
-
-    name: str
-    size: int
-    library: str  # Name of the .a file (e.g., "libpp.a")
-    section: str  # ".bss" or ".data"
-    is_local: bool  # True if static/local symbol (lowercase in nm output)
-    demangled: str = ""  # Demangled name (populated after analysis)
+    total_size: int = 0


@dataclass
@@ -132,19 +115,9 @@ class MemoryAnalyzer:
            readelf_path = readelf_path or idedata.readelf_path
            _LOGGER.debug("Using toolchain paths from PlatformIO idedata")

-        # Validate paths exist, fall back to find_tool if they don't
-        # This handles cases like Zephyr where cc_path doesn't include full path
-        # and the toolchain prefix may differ (e.g., arm-zephyr-eabi- vs arm-none-eabi-)
-        objdump_path = resolve_tool_path("objdump", objdump_path, objdump_path)
-        readelf_path = resolve_tool_path("readelf", readelf_path, objdump_path)
-
        self.objdump_path = objdump_path or "objdump"
        self.readelf_path = readelf_path or "readelf"
        self.external_components = external_components or set()
-        self._idedata = idedata
-
-        # Derive nm path from objdump path using shared toolchain utility
-        self.nm_path = find_tool("nm", self.objdump_path)

        self.sections: dict[str, MemorySection] = {}
        self.components: dict[str, ComponentMemory] = defaultdict(
@@ -155,25 +128,15 @@ class MemoryAnalyzer:
        self._esphome_core_symbols: list[
            tuple[str, str, int]
        ] = []  # Track core symbols
-        # Track symbols for all components: (symbol_name, demangled, size, section)
-        self._component_symbols: dict[str, list[tuple[str, str, int, str]]] = (
-            defaultdict(list)
-        )
-        # Track RAM symbols separately for detailed analysis: (symbol_name, demangled, size, section)
-        self._ram_symbols: dict[str, list[tuple[str, str, int, str]]] = defaultdict(
+        self._component_symbols: dict[str, list[tuple[str, str, int]]] = defaultdict(
            list
-        )
-        # Track ELF symbol names for SDK cross-reference
-        self._elf_symbol_names: set[str] = set()
-        # SDK symbols not in ELF (static/local symbols from closed-source libs)
-        self._sdk_symbols: list[SDKSymbol] = []
+        )  # Track symbols for all components

    def analyze(self) -> dict[str, ComponentMemory]:
        """Analyze the ELF file and return component memory usage."""
        self._parse_sections()
        self._parse_symbols()
        self._categorize_symbols()
-        self._analyze_sdk_libraries()
        return dict(self.components)

    def _parse_sections(self) -> None:
@@ -227,8 +190,6 @@ class MemoryAnalyzer:
                continue

            self.sections[section].symbols.append((name, size, ""))
-            self.sections[section].symbol_size += size
-            self._elf_symbol_names.add(name)
            seen_addresses.add(address)

    def _categorize_symbols(self) -> None:
@@ -272,13 +233,8 @@ class MemoryAnalyzer:
                if size > 0:
                    demangled = self._demangle_symbol(symbol_name)
                    self._component_symbols[component].append(
-                        (symbol_name, demangled, size, section_name)
+                        (symbol_name, demangled, size)
                    )
-                    # Track RAM symbols separately for detailed RAM analysis
-                    if section_name in RAM_SECTIONS:
-                        self._ram_symbols[component].append(
-                            (symbol_name, demangled, size, section_name)
-                        )

    def _identify_component(self, symbol_name: str) -> str:
        """Identify which component a symbol belongs to."""
@@ -372,247 +328,6 @@ class MemoryAnalyzer:

        return "Other Core"

-    def get_unattributed_ram(self) -> tuple[int, int, int]:
-        """Get unattributed RAM sizes (SDK/framework overhead).
-
-        Returns:
-            Tuple of (unattributed_bss, unattributed_data, total_unattributed)
-            These are bytes in RAM sections that have no corresponding symbols.
-        """
-        bss_section = self.sections.get(".bss")
-        data_section = self.sections.get(".data")
-
-        unattributed_bss = 0
-        unattributed_data = 0
-
-        if bss_section:
-            unattributed_bss = max(0, bss_section.total_size - bss_section.symbol_size)
-        if data_section:
-            unattributed_data = max(
-                0, data_section.total_size - data_section.symbol_size
-            )
-
-        return unattributed_bss, unattributed_data, unattributed_bss + unattributed_data
-
-    def _find_sdk_library_dirs(self) -> list[Path]:
-        """Find SDK library directories based on platform.
-
-        Returns:
-            List of paths to SDK library directories containing .a files.
-        """
-        sdk_dirs: list[Path] = []
-
-        if self._idedata is None:
-            return sdk_dirs
-
-        # Get the CC path to determine the framework location
-        cc_path = getattr(self._idedata, "cc_path", None)
-        if not cc_path:
-            return sdk_dirs
-
-        cc_path = Path(cc_path)
-
-        # For ESP8266 Arduino framework
-        # CC is like: ~/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-gcc
-        # SDK libs are in: ~/.platformio/packages/framework-arduinoespressif8266/tools/sdk/lib/
-        if "xtensa-lx106" in str(cc_path):
-            platformio_dir = cc_path.parent.parent.parent
-            esp8266_sdk = (
-                platformio_dir
-                / "framework-arduinoespressif8266"
-                / "tools"
-                / "sdk"
-                / "lib"
-            )
-            if esp8266_sdk.exists():
-                sdk_dirs.append(esp8266_sdk)
-                # Also check for NONOSDK subdirectories (closed-source libs)
-                sdk_dirs.extend(
-                    subdir
-                    for subdir in esp8266_sdk.iterdir()
-                    if subdir.is_dir() and subdir.name.startswith("NONOSDK")
-                )
-
-        # For ESP32 IDF framework
-        # CC is like: ~/.platformio/packages/toolchain-xtensa-esp-elf/bin/xtensa-esp32-elf-gcc
-        # or: ~/.platformio/packages/toolchain-riscv32-esp/bin/riscv32-esp-elf-gcc
-        elif "xtensa-esp" in str(cc_path) or "riscv32-esp" in str(cc_path):
-            # Detect ESP32 variant from CC path or defines
-            variant = self._detect_esp32_variant()
-            if variant:
-                platformio_dir = cc_path.parent.parent.parent
-                espidf_dir = platformio_dir / "framework-espidf" / "components"
-                if espidf_dir.exists():
-                    # Find all directories named after the variant that contain .a files
-                    # This handles various ESP-IDF library layouts:
-                    # - components/*/lib/<variant>/
-                    # - components/*/<variant>/
-                    # - components/*/lib/lib/<variant>/
-                    # - components/*/*/lib_*/<variant>/
-                    sdk_dirs.extend(
-                        variant_dir
-                        for variant_dir in espidf_dir.rglob(variant)
-                        if variant_dir.is_dir() and any(variant_dir.glob("*.a"))
-                    )
-
-        return sdk_dirs
-
-    def _detect_esp32_variant(self) -> str | None:
-        """Detect ESP32 variant from idedata defines.
-
-        Returns:
-            Variant string like 'esp32', 'esp32s2', 'esp32c3', etc. or None.
-        """
-        if self._idedata is None:
-            return None
-
-        defines = getattr(self._idedata, "defines", [])
-        if not defines:
-            return None
-
-        # ESPHome always adds USE_ESP32_VARIANT_xxx defines
-        variant_prefix = "USE_ESP32_VARIANT_"
-        for define in defines:
-            if define.startswith(variant_prefix):
-                # Extract variant name and convert to lowercase
-                # USE_ESP32_VARIANT_ESP32 -> esp32
-                # USE_ESP32_VARIANT_ESP32S3 -> esp32s3
-                return define[len(variant_prefix) :].lower()
-
-        return None
-
-    def _parse_sdk_library(
-        self, lib_path: Path
-    ) -> tuple[list[tuple[str, int, str, bool]], set[str]]:
-        """Parse a single SDK library for symbols.
-
-        Args:
-            lib_path: Path to the .a library file
-
-        Returns:
-            Tuple of:
-            - List of BSS/DATA symbols: (symbol_name, size, section, is_local)
-            - Set of global BSS/DATA symbol names (for checking if RAM is linked)
-        """
-        ram_symbols: list[tuple[str, int, str, bool]] = []
-        global_ram_symbols: set[str] = set()
-
-        result = run_tool([self.nm_path, "--size-sort", str(lib_path)], timeout=10)
-        if result is None:
-            return ram_symbols, global_ram_symbols
-
-        for line in result.stdout.splitlines():
-            parts = line.split()
-            if len(parts) < 3:
-                continue
-
-            try:
-                size = int(parts[0], 16)
-                sym_type = parts[1]
-                name = parts[2]
-
-                # Only collect BSS (b/B) and DATA (d/D) for RAM analysis
-                if sym_type in ("b", "B"):
-                    section = ".bss"
-                    is_local = sym_type == "b"
-                    ram_symbols.append((name, size, section, is_local))
-                    # Track global RAM symbols (B/D) for linking check
-                    if sym_type == "B":
-                        global_ram_symbols.add(name)
-                elif sym_type in ("d", "D"):
-                    section = ".data"
-                    is_local = sym_type == "d"
-                    ram_symbols.append((name, size, section, is_local))
-                    if sym_type == "D":
-                        global_ram_symbols.add(name)
-            except (ValueError, IndexError):
-                continue
-
-        return ram_symbols, global_ram_symbols
-
-    def _analyze_sdk_libraries(self) -> None:
-        """Analyze SDK libraries to find symbols not in the ELF.
-
-        This finds static/local symbols from closed-source SDK libraries
-        that consume RAM but don't appear in the final ELF symbol table.
-        Only includes symbols from libraries that have RAM actually linked
-        (at least one global BSS/DATA symbol in the ELF).
-        """
-        sdk_dirs = self._find_sdk_library_dirs()
-        if not sdk_dirs:
-            _LOGGER.debug("No SDK library directories found")
-            return
-
-        _LOGGER.debug("Analyzing SDK libraries in %d directories", len(sdk_dirs))
-
-        # Track seen symbols to avoid duplicates from multiple SDK versions
-        seen_symbols: set[str] = set()
-
-        for sdk_dir in sdk_dirs:
-            for lib_path in sorted(sdk_dir.glob("*.a")):
-                lib_name = lib_path.name
-                ram_symbols, global_ram_symbols = self._parse_sdk_library(lib_path)
-
-                # Check if this library's RAM is actually linked by seeing if any
-                # of its global BSS/DATA symbols appear in the ELF
-                if not global_ram_symbols & self._elf_symbol_names:
-                    # No RAM from this library is in the ELF - skip it
-                    continue
-
-                for name, size, section, is_local in ram_symbols:
-                    # Skip if already in ELF or already seen from another lib
-                    if name in self._elf_symbol_names or name in seen_symbols:
-                        continue
-
-                    # Only track symbols with non-zero size
-                    if size > 0:
-                        self._sdk_symbols.append(
-                            SDKSymbol(
-                                name=name,
-                                size=size,
-                                library=lib_name,
-                                section=section,
-                                is_local=is_local,
-                            )
-                        )
-                        seen_symbols.add(name)
-
-        # Demangle SDK symbols for better readability
-        if self._sdk_symbols:
-            sdk_names = [sym.name for sym in self._sdk_symbols]
-            demangled_map = batch_demangle(sdk_names, objdump_path=self.objdump_path)
-            for sym in self._sdk_symbols:
-                sym.demangled = demangled_map.get(sym.name, sym.name)
-
-        # Sort by size descending for reporting
-        self._sdk_symbols.sort(key=lambda s: s.size, reverse=True)
-
-        total_sdk_ram = sum(s.size for s in self._sdk_symbols)
-        _LOGGER.debug(
-            "Found %d SDK symbols not in ELF, totaling %d bytes",
-            len(self._sdk_symbols),
-            total_sdk_ram,
-        )
-
-    def get_sdk_ram_symbols(self) -> list[SDKSymbol]:
-        """Get SDK symbols that consume RAM but aren't in the ELF symbol table.
-
-        Returns:
-            List of SDKSymbol objects sorted by size descending.
-        """
-        return self._sdk_symbols
-
-    def get_sdk_ram_by_library(self) -> dict[str, list[SDKSymbol]]:
-        """Get SDK RAM symbols grouped by library.
-
-        Returns:
-            Dictionary mapping library name to list of symbols.
-        """
-        by_lib: dict[str, list[SDKSymbol]] = defaultdict(list)
-        for sym in self._sdk_symbols:
-            by_lib[sym.library].append(sym)
-        return dict(by_lib)
-

 if __name__ == "__main__":
    from .cli import main
--- a/esphome/analyze_memory/cli.py
+++ b/esphome/analyze_memory/cli.py
@@ -1,25 +1,17 @@
 """CLI interface for memory analysis with report generation."""

-from __future__ import annotations
-
 from collections import defaultdict
-from collections.abc import Callable
 import json
 import sys
-from typing import TYPE_CHECKING

 from . import (
    _COMPONENT_API,
    _COMPONENT_CORE,
    _COMPONENT_PREFIX_ESPHOME,
    _COMPONENT_PREFIX_EXTERNAL,
-    RAM_SECTIONS,
    MemoryAnalyzer,
 )

-if TYPE_CHECKING:
-    from . import ComponentMemory
-

 class MemoryAnalyzerCLI(MemoryAnalyzer):
    """Memory analyzer with CLI-specific report generation."""
@@ -28,8 +20,6 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
    SYMBOL_SIZE_THRESHOLD: int = (
        100  # Show symbols larger than this in detailed analysis
    )
-    # Lower threshold for RAM symbols (RAM is more constrained)
-    RAM_SYMBOL_SIZE_THRESHOLD: int = 24

    # Column width constants
    COL_COMPONENT: int = 29
@@ -94,60 +84,6 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
        COL_CORE_PERCENT,
    )

-    def _add_section_header(self, lines: list[str], title: str) -> None:
-        """Add a section header with title centered between separator lines."""
-        lines.append("")
-        lines.append("=" * self.TABLE_WIDTH)
-        lines.append(title.center(self.TABLE_WIDTH))
-        lines.append("=" * self.TABLE_WIDTH)
-        lines.append("")
-
-    def _add_top_consumers(
-        self,
-        lines: list[str],
-        title: str,
-        components: list[tuple[str, ComponentMemory]],
-        get_size: Callable[[ComponentMemory], int],
-        total: int,
-        memory_type: str,
-        limit: int = 25,
-    ) -> None:
-        """Add a formatted list of top memory consumers to the report.
-
-        Args:
-            lines: List of report lines to append the output to.
-            title: Section title to print before the list.
-            components: Sequence of (name, ComponentMemory) tuples to analyze.
-            get_size: Callable that takes a ComponentMemory and returns the
-                size in bytes to use for ranking and display.
-            total: Total size in bytes for computing percentage usage.
-            memory_type: Label for the memory region (e.g., "flash" or "RAM").
-            limit: Maximum number of components to include in the list.
-        """
-        lines.append("")
-        lines.append(f"{title}:")
-        for i, (name, mem) in enumerate(components[:limit]):
-            size = get_size(mem)
-            if size > 0:
-                percentage = (size / total * 100) if total > 0 else 0
-                lines.append(
-                    f"{i + 1}. {name} ({size:,} B) - {percentage:.1f}% of analyzed {memory_type}"
-                )
-
-    def _format_symbol_with_section(
-        self, demangled: str, size: int, section: str | None = None
-    ) -> str:
-        """Format a symbol entry, optionally adding a RAM section label.
-
-        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.
-        """
-        section_label = ""
-        if section in RAM_SECTIONS:
-            section_label = f" [{section[1:]}]"  # .data -> [data], .bss -> [bss]
-        return f"{demangled} ({size:,} B){section_label}"
-
    def generate_report(self, detailed: bool = False) -> str:
        """Generate a formatted memory report."""
        components = sorted(
@@ -188,70 +124,43 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
            f"{total_flash:>{self.COL_TOTAL_FLASH - 2},} B | {total_ram:>{self.COL_TOTAL_RAM - 2},} B"
        )

-        # Show unattributed RAM (SDK/framework overhead)
-        unattributed_bss, unattributed_data, unattributed_total = (
-            self.get_unattributed_ram()
-        )
-        if unattributed_total > 0:
-            lines.append("")
-            lines.append(
-                f"Unattributed RAM: {unattributed_total:,} B (SDK/framework overhead)"
-            )
-            if unattributed_bss > 0 and unattributed_data > 0:
+        # Top consumers
+        lines.append("")
+        lines.append("Top Flash Consumers:")
+        for i, (name, mem) in enumerate(components[:25]):
+            if mem.flash_total > 0:
+                percentage = (
+                    (mem.flash_total / total_flash * 100) if total_flash > 0 else 0
+                )
                lines.append(
-                    f"  .bss: {unattributed_bss:,} B | .data: {unattributed_data:,} B"
+                    f"{i + 1}. {name} ({mem.flash_total:,} B) - {percentage:.1f}% of analyzed flash"
                )

-            # Show SDK symbol breakdown if available
-            sdk_by_lib = self.get_sdk_ram_by_library()
-            if sdk_by_lib:
-                lines.append("")
-                lines.append("SDK library breakdown (static symbols not in ELF):")
-                # Sort libraries by total size
-                lib_totals = [
-                    (lib, sum(s.size for s in syms), syms)
-                    for lib, syms in sdk_by_lib.items()
-                ]
-                lib_totals.sort(key=lambda x: x[1], reverse=True)
-
-                for lib_name, lib_total, syms in lib_totals:
-                    if lib_total == 0:
-                        continue
-                    lines.append(f"  {lib_name}: {lib_total:,} B")
-                    # Show top symbols from this library
-                    for sym in sorted(syms, key=lambda s: s.size, reverse=True)[:3]:
-                        section_label = sym.section.lstrip(".")
-                        # Use demangled name (falls back to original if not demangled)
-                        display_name = sym.demangled or sym.name
-                        if len(display_name) > 50:
-                            display_name = f"{display_name[:47]}..."
-                        lines.append(
-                            f"    {sym.size:>6,} B [{section_label}] {display_name}"
-                        )
-
-        # Top consumers
-        self._add_top_consumers(
-            lines,
-            "Top Flash Consumers",
-            components,
-            lambda m: m.flash_total,
-            total_flash,
-            "flash",
-        )
-
+        lines.append("")
+        lines.append("Top RAM Consumers:")
        ram_components = sorted(components, key=lambda x: x[1].ram_total, reverse=True)
-        self._add_top_consumers(
-            lines,
-            "Top RAM Consumers",
-            ram_components,
-            lambda m: m.ram_total,
-            total_ram,
-            "RAM",
+        for i, (name, mem) in enumerate(ram_components[:25]):
+            if mem.ram_total > 0:
+                percentage = (mem.ram_total / total_ram * 100) if total_ram > 0 else 0
+                lines.append(
+                    f"{i + 1}. {name} ({mem.ram_total:,} B) - {percentage:.1f}% of analyzed RAM"
+                )
+
+        lines.append("")
+        lines.append(
+            "Note: This analysis covers symbols in the ELF file. Some runtime allocations may not be included."
        )
+        lines.append("=" * self.TABLE_WIDTH)

        # Add ESPHome core detailed analysis if there are core symbols
        if self._esphome_core_symbols:
-            self._add_section_header(lines, f"{_COMPONENT_CORE} Detailed Analysis")
+            lines.append("")
+            lines.append("=" * self.TABLE_WIDTH)
+            lines.append(
+                f"{_COMPONENT_CORE} Detailed Analysis".center(self.TABLE_WIDTH)
+            )
+            lines.append("=" * self.TABLE_WIDTH)
+            lines.append("")

            # Group core symbols by subcategory
            core_subcategories: dict[str, list[tuple[str, str, int]]] = defaultdict(
@@ -303,11 +212,7 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
                f"{_COMPONENT_CORE} Symbols > {self.SYMBOL_SIZE_THRESHOLD} B ({len(large_core_symbols)} symbols):"
            )
            for i, (symbol, demangled, size) in enumerate(large_core_symbols):
-                # Core symbols only track (symbol, demangled, size) without section info,
-                # so we don't show section labels here
-                lines.append(
-                    f"{i + 1}. {self._format_symbol_with_section(demangled, size)}"
-                )
+                lines.append(f"{i + 1}. {demangled} ({size:,} B)")

            lines.append("=" * self.TABLE_WIDTH)

@@ -363,7 +268,11 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):
            for comp_name, comp_mem in components_to_analyze:
                if not (comp_symbols := self._component_symbols.get(comp_name, [])):
                    continue
-                self._add_section_header(lines, f"{comp_name} Detailed Analysis")
+                lines.append("")
+                lines.append("=" * self.TABLE_WIDTH)
+                lines.append(f"{comp_name} Detailed Analysis".center(self.TABLE_WIDTH))
+                lines.append("=" * self.TABLE_WIDTH)
+                lines.append("")

                # Sort symbols by size
                sorted_symbols = sorted(comp_symbols, key=lambda x: x[2], reverse=True)
@@ -374,69 +283,19 @@ class MemoryAnalyzerCLI(MemoryAnalyzer):

                # Show all symbols above threshold for better visibility
                large_symbols = [
-                    (sym, dem, size, sec)
-                    for sym, dem, size, sec in sorted_symbols
+                    (sym, dem, size)
+                    for sym, dem, size in sorted_symbols
                    if size > self.SYMBOL_SIZE_THRESHOLD
                ]

                lines.append(
                    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(
-                        f"{i + 1}. {self._format_symbol_with_section(demangled, size, section)}"
-                    )
+                for i, (symbol, demangled, size) in enumerate(large_symbols):
+                    lines.append(f"{i + 1}. {demangled} ({size:,} B)")

                lines.append("=" * self.TABLE_WIDTH)

-        # Detailed RAM analysis by component (at end, before RAM strings analysis)
-        self._add_section_header(lines, "RAM Symbol Analysis by Component")
-
-        # Show top 15 RAM consumers with their large symbols
-        for name, mem in ram_components[:15]:
-            if mem.ram_total == 0:
-                continue
-            ram_syms = self._ram_symbols.get(name, [])
-            if not ram_syms:
-                continue
-
-            # 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
-            ]
-
-            lines.append(f"{name} ({mem.ram_total:,} B total RAM):")
-
-            # Show breakdown by section type
-            data_size = sum(s[2] for s in ram_syms if s[3] == ".data")
-            bss_size = sum(s[2] for s in ram_syms if s[3] == ".bss")
-            lines.append(f"  .data (initialized): {data_size:,} B")
-            lines.append(f"  .bss (uninitialized): {bss_size:,} B")
-
-            if large_ram_syms:
-                lines.append(
-                    f"  Symbols > {self.RAM_SYMBOL_SIZE_THRESHOLD} B ({len(large_ram_syms)}):"
-                )
-                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 ""
-                    # Add ellipsis if name is truncated
-                    demangled_display = (
-                        f"{demangled[:70]}..." if len(demangled) > 70 else demangled
-                    )
-                    lines.append(
-                        f"    {size:>6,} B [{section_label}] {demangled_display}"
-                    )
-                if len(large_ram_syms) > 10:
-                    lines.append(f"    ... and {len(large_ram_syms) - 10} more")
-            lines.append("")
-
-        lines.append(
-            "Note: This analysis covers symbols in the ELF file. Some runtime allocations may not be included."
-        )
-        lines.append("=" * self.TABLE_WIDTH)
-
        return "\n".join(lines)

    def to_json(self) -> str:
--- a/esphome/analyze_memory/const.py
+++ b/esphome/analyze_memory/const.py
@@ -7,63 +7,11 @@ ESPHOME_COMPONENT_PATTERN = re.compile(r"esphome::([a-zA-Z0-9_]+)::")

 # Section mapping for ELF file sections
 # Maps standard section names to their various platform-specific variants
-# Note: Order matters! More specific patterns (.bss) must come before general ones (.dram)
-# because ESP-IDF uses names like ".dram0.bss" which would match ".dram" otherwise
-#
-# Platform-specific sections:
-# - ESP8266/ESP32: .iram*, .dram*
-# - LibreTiny RTL87xx: .xip.code_* (flash), .ram.code_* (RAM)
-# - LibreTiny BK7231: .itcm.code (fast RAM), .vectors (interrupt vectors)
-# - LibreTiny LN882X: .flash_text, .flash_copy* (flash code)
-# - Zephyr/nRF52: text, rodata, datas, bss (no leading dots)
 SECTION_MAPPING = {
-    ".text": frozenset(
-        [
-            ".text",
-            ".iram",
-            # LibreTiny RTL87xx XIP (eXecute In Place) flash code
-            ".xip.code",
-            # LibreTiny RTL87xx RAM code
-            ".ram.code_text",
-            # LibreTiny BK7231 fast RAM code and vectors
-            ".itcm.code",
-            ".vectors",
-            # LibreTiny LN882X flash code
-            ".flash_text",
-            ".flash_copy",
-            # Zephyr/nRF52 sections (no leading dots)
-            "text",
-            "rom_start",
-        ]
-    ),
-    ".rodata": frozenset(
-        [
-            ".rodata",
-            # LibreTiny RTL87xx read-only data in RAM
-            ".ram.code_rodata",
-            # Zephyr/nRF52 sections (no leading dots)
-            "rodata",
-        ]
-    ),
-    # .bss patterns - must be before .data to catch ".dram0.bss"
-    ".bss": frozenset(
-        [
-            ".bss",
-            # LibreTiny LN882X BSS
-            ".bss_ram",
-            # Zephyr/nRF52 sections (no leading dots)
-            "bss",
-            "noinit",
-        ]
-    ),
-    ".data": frozenset(
-        [
-            ".data",
-            ".dram",
-            # Zephyr/nRF52 sections (no leading dots)
-            "datas",
-        ]
-    ),
+    ".text": frozenset([".text", ".iram"]),
+    ".rodata": frozenset([".rodata"]),
+    ".data": frozenset([".data", ".dram"]),
+    ".bss": frozenset([".bss"]),
 }

 # Section to ComponentMemory attribute mapping
--- a/esphome/analyze_memory/helpers.py
+++ b/esphome/analyze_memory/helpers.py
@@ -94,13 +94,13 @@ def parse_symbol_line(line: str) -> tuple[str, str, int, str] | None:
        return None

    # Find section, size, and name
-    # Try each part as a potential section name
    for i, part in enumerate(parts):
-        # Skip parts that are clearly flags, addresses, or other metadata
-        # Sections start with '.' (standard ELF) or are known section names (Zephyr)
+        if not part.startswith("."):
+            continue
+
        section = map_section_name(part)
        if not section:
-            continue
+            break

        # Need at least size field after section
        if i + 1 >= len(parts):
--- a/esphome/analyze_memory/toolchain.py
+++ b/esphome/analyze_memory/toolchain.py
@@ -3,13 +3,8 @@
 from __future__ import annotations

 import logging
-import os
 from pathlib import Path
 import subprocess
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from collections.abc import Sequence

 _LOGGER = logging.getLogger(__name__)

@@ -18,82 +13,10 @@ TOOLCHAIN_PREFIXES = [
    "xtensa-lx106-elf-",  # ESP8266
    "xtensa-esp32-elf-",  # ESP32
    "xtensa-esp-elf-",  # ESP32 (newer IDF)
-    "arm-zephyr-eabi-",  # nRF52/Zephyr SDK
-    "arm-none-eabi-",  # Generic ARM (RP2040, etc.)
    "",  # System default (no prefix)
 ]


-def _find_in_platformio_packages(tool_name: str) -> str | None:
-    """Search for a tool in PlatformIO package directories.
-
-    This handles cases like Zephyr SDK where tools are installed in nested
-    directories that aren't in PATH.
-
-    Args:
-        tool_name: Name of the tool (e.g., "readelf", "objdump")
-
-    Returns:
-        Full path to the tool or None if not found
-    """
-    # Get PlatformIO packages directory
-    platformio_home = Path(os.path.expanduser("~/.platformio/packages"))
-    if not platformio_home.exists():
-        return None
-
-    # Search patterns for toolchains that might contain the tool
-    # Order matters - more specific patterns first
-    search_patterns = [
-        # Zephyr SDK deeply nested structure (4 levels)
-        # e.g., toolchain-gccarmnoneeabi/zephyr-sdk-0.17.4/arm-zephyr-eabi/bin/arm-zephyr-eabi-objdump
-        f"toolchain-*/*/*/bin/*-{tool_name}",
-        # Zephyr SDK nested structure (3 levels)
-        f"toolchain-*/*/bin/*-{tool_name}",
-        f"toolchain-*/bin/*-{tool_name}",
-        # Standard PlatformIO toolchain structure
-        f"toolchain-*/bin/*{tool_name}",
-    ]
-
-    for pattern in search_patterns:
-        matches = list(platformio_home.glob(pattern))
-        if matches:
-            # Sort to get consistent results, prefer arm-zephyr-eabi over arm-none-eabi
-            matches.sort(key=lambda p: ("zephyr" not in str(p), str(p)))
-            tool_path = str(matches[0])
-            _LOGGER.debug("Found %s in PlatformIO packages: %s", tool_name, tool_path)
-            return tool_path
-
-    return None
-
-
-def resolve_tool_path(
-    tool_name: str,
-    derived_path: str | None,
-    objdump_path: str | None = None,
-) -> str | None:
-    """Resolve a tool path, falling back to find_tool if derived path doesn't exist.
-
-    Args:
-        tool_name: Name of the tool (e.g., "objdump", "readelf")
-        derived_path: Path derived from idedata (may not exist for some platforms)
-        objdump_path: Path to objdump binary to derive other tool paths from
-
-    Returns:
-        Resolved path to the tool, or the original derived_path if it exists
-    """
-    if derived_path and not Path(derived_path).exists():
-        found = find_tool(tool_name, objdump_path)
-        if found:
-            _LOGGER.debug(
-                "Derived %s path %s not found, using %s",
-                tool_name,
-                derived_path,
-                found,
-            )
-            return found
-    return derived_path
-
-
 def find_tool(
    tool_name: str,
    objdump_path: str | None = None,
@@ -101,8 +24,7 @@ def find_tool(
    """Find a toolchain tool by name.

    First tries to derive the tool path from objdump_path (if provided),
-    then searches PlatformIO package directories (for cross-compile toolchains),
-    and finally falls back to searching for platform-specific tools in PATH.
+    then falls back to searching for platform-specific tools.

    Args:
        tool_name: Name of the tool (e.g., "objdump", "nm", "c++filt")
@@ -121,13 +43,7 @@ def find_tool(
            _LOGGER.debug("Found %s at: %s", tool_name, potential_path)
            return potential_path

-    # Search in PlatformIO packages directory first (handles Zephyr SDK, etc.)
-    # This must come before PATH search because system tools (e.g., /usr/bin/objdump)
-    # are for the host architecture, not the target (ARM, Xtensa, etc.)
-    if found := _find_in_platformio_packages(tool_name):
-        return found
-
-    # Try platform-specific tools in PATH (fallback for when tools are installed globally)
+    # Try platform-specific tools
    for prefix in TOOLCHAIN_PREFIXES:
        cmd = f"{prefix}{tool_name}"
        try:
@@ -139,35 +55,3 @@ def find_tool(

    _LOGGER.warning("Could not find %s tool", tool_name)
    return None
-
-
-def run_tool(
-    cmd: Sequence[str],
-    timeout: int = 30,
-) -> subprocess.CompletedProcess[str] | None:
-    """Run a toolchain command and return the result.
-
-    Args:
-        cmd: Command and arguments to run
-        timeout: Timeout in seconds
-
-    Returns:
-        CompletedProcess on success, None on failure
-    """
-    try:
-        return subprocess.run(
-            cmd,
-            capture_output=True,
-            text=True,
-            timeout=timeout,
-            check=False,
-        )
-    except subprocess.TimeoutExpired:
-        _LOGGER.warning("Command timed out: %s", " ".join(cmd))
-        return None
-    except FileNotFoundError:
-        _LOGGER.warning("Command not found: %s", cmd[0])
-        return None
-    except OSError as e:
-        _LOGGER.warning("Failed to run command %s: %s", cmd[0], e)
-        return None
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -69,7 +69,6 @@ from esphome.cpp_types import (  # noqa: F401
    JsonObjectConst,
    Parented,
    PollingComponent,
-    StringRef,
    arduino_json_ns,
    bool_,
    const_char_ptr,
--- a/esphome/components/ac_dimmer/ac_dimmer.cpp
+++ b/esphome/components/ac_dimmer/ac_dimmer.cpp
@@ -1,3 +1,5 @@
+#ifdef USE_ARDUINO
+
 #include "ac_dimmer.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
@@ -7,12 +9,12 @@
 #ifdef USE_ESP8266
 #include <core_esp8266_waveform.h>
 #endif
-
-#ifdef USE_ESP32
-#include "hw_timer_esp_idf.h"
+#ifdef USE_ESP32_FRAMEWORK_ARDUINO
+#include <esp32-hal-timer.h>
 #endif

-namespace esphome::ac_dimmer {
+namespace esphome {
+namespace ac_dimmer {

 static const char *const TAG = "ac_dimmer";

@@ -25,14 +27,7 @@ static AcDimmerDataStore *all_dimmers[32];  // NOLINT(cppcoreguidelines-avoid-no
 /// However other factors like gate driver propagation time
 /// are also considered and a really low value is not important
 /// See also: https://github.com/esphome/issues/issues/1632
-static constexpr uint32_t GATE_ENABLE_TIME = 50;
-
-#ifdef USE_ESP32
-/// Timer frequency in Hz (1 MHz = 1µs resolution)
-static constexpr uint32_t TIMER_FREQUENCY_HZ = 1000000;
-/// Timer interrupt interval in microseconds
-static constexpr uint64_t TIMER_INTERVAL_US = 50;
-#endif
+static const uint32_t GATE_ENABLE_TIME = 50;

 /// Function called from timer interrupt
 /// Input is current time in microseconds (micros())
@@ -159,7 +154,7 @@ void IRAM_ATTR HOT AcDimmerDataStore::s_gpio_intr(AcDimmerDataStore *store) {
 #ifdef USE_ESP32
 // ESP32 implementation, uses basically the same code but needs to wrap
 // timer_interrupt() function to auto-reschedule
-static HWTimer *dimmer_timer = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+static hw_timer_t *dimmer_timer = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 void IRAM_ATTR HOT AcDimmerDataStore::s_timer_intr() { timer_interrupt(); }
 #endif

@@ -199,15 +194,15 @@ void AcDimmer::setup() {
  setTimer1Callback(&timer_interrupt);
 #endif
 #ifdef USE_ESP32
-  dimmer_timer = timer_begin(TIMER_FREQUENCY_HZ);
-  timer_attach_interrupt(dimmer_timer, &AcDimmerDataStore::s_timer_intr);
+  // timer frequency of 1mhz
+  dimmer_timer = timerBegin(1000000);
+  timerAttachInterrupt(dimmer_timer, &AcDimmerDataStore::s_timer_intr);
  // For ESP32, we can't use dynamic interval calculation because the timerX functions
  // are not callable from ISR (placed in flash storage).
  // Here we just use an interrupt firing every 50 µs.
-  timer_alarm(dimmer_timer, TIMER_INTERVAL_US, true, 0);
+  timerAlarm(dimmer_timer, 50, true, 0);
 #endif
 }
-
 void AcDimmer::write_state(float state) {
  state = std::acos(1 - (2 * state)) / std::numbers::pi;  // RMS power compensation
  auto new_value = static_cast<uint16_t>(roundf(state * 65535));
@@ -215,7 +210,6 @@ void AcDimmer::write_state(float state) {
    this->store_.init_cycle = this->init_with_half_cycle_;
  this->store_.value = new_value;
 }
-
 void AcDimmer::dump_config() {
  ESP_LOGCONFIG(TAG,
                "AcDimmer:\n"
@@ -236,4 +230,7 @@ void AcDimmer::dump_config() {
  ESP_LOGV(TAG, "  Estimated Frequency: %.3fHz", 1e6f / this->store_.cycle_time_us / 2);
 }

-}  // namespace esphome::ac_dimmer
+}  // namespace ac_dimmer
+}  // namespace esphome
+
+#endif  // USE_ARDUINO
--- a/esphome/components/ac_dimmer/ac_dimmer.h
+++ b/esphome/components/ac_dimmer/ac_dimmer.h
@@ -1,10 +1,13 @@
 #pragma once

+#ifdef USE_ARDUINO
+
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
 #include "esphome/components/output/float_output.h"

-namespace esphome::ac_dimmer {
+namespace esphome {
+namespace ac_dimmer {

 enum DimMethod { DIM_METHOD_LEADING_PULSE = 0, DIM_METHOD_LEADING, DIM_METHOD_TRAILING };

@@ -61,4 +64,7 @@ class AcDimmer : public output::FloatOutput, public Component {
  DimMethod method_;
 };

-}  // namespace esphome::ac_dimmer
+}  // namespace ac_dimmer
+}  // namespace esphome
+
+#endif  // USE_ARDUINO
--- a/esphome/components/ac_dimmer/hw_timer_esp_idf.cpp
+++ b/esphome/components/ac_dimmer/hw_timer_esp_idf.cpp
@@ -1,152 +0,0 @@
-#ifdef USE_ESP32
-
-#include "hw_timer_esp_idf.h"
-
-#include "freertos/FreeRTOS.h"
-#include "esphome/core/log.h"
-
-#include "driver/gptimer.h"
-#include "esp_clk_tree.h"
-#include "soc/clk_tree_defs.h"
-
-static const char *const TAG = "hw_timer_esp_idf";
-
-namespace esphome::ac_dimmer {
-
-// GPTimer divider constraints from ESP-IDF documentation
-static constexpr uint32_t GPTIMER_DIVIDER_MIN = 2;
-static constexpr uint32_t GPTIMER_DIVIDER_MAX = 65536;
-
-using voidFuncPtr = void (*)();
-using voidFuncPtrArg = void (*)(void *);
-
-struct InterruptConfigT {
-  voidFuncPtr fn{nullptr};
-  void *arg{nullptr};
-};
-
-struct HWTimer {
-  gptimer_handle_t timer_handle{nullptr};
-  InterruptConfigT interrupt_handle{};
-  bool timer_started{false};
-};
-
-HWTimer *timer_begin(uint32_t frequency) {
-  esp_err_t err = ESP_OK;
-  uint32_t counter_src_hz = 0;
-  uint32_t divider = 0;
-  soc_module_clk_t clk;
-  for (auto clk_candidate : SOC_GPTIMER_CLKS) {
-    clk = clk_candidate;
-    esp_clk_tree_src_get_freq_hz(clk, ESP_CLK_TREE_SRC_FREQ_PRECISION_CACHED, &counter_src_hz);
-    divider = counter_src_hz / frequency;
-    if ((divider >= GPTIMER_DIVIDER_MIN) && (divider <= GPTIMER_DIVIDER_MAX)) {
-      break;
-    } else {
-      divider = 0;
-    }
-  }
-
-  if (divider == 0) {
-    ESP_LOGE(TAG, "Resolution not possible; aborting");
-    return nullptr;
-  }
-
-  gptimer_config_t config = {
-      .clk_src = static_cast<gptimer_clock_source_t>(clk),
-      .direction = GPTIMER_COUNT_UP,
-      .resolution_hz = frequency,
-      .flags = {.intr_shared = true},
-  };
-
-  HWTimer *timer = new HWTimer();
-
-  err = gptimer_new_timer(&config, &timer->timer_handle);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "GPTimer creation failed; error %d", err);
-    delete timer;
-    return nullptr;
-  }
-
-  err = gptimer_enable(timer->timer_handle);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "GPTimer enable failed; error %d", err);
-    gptimer_del_timer(timer->timer_handle);
-    delete timer;
-    return nullptr;
-  }
-
-  err = gptimer_start(timer->timer_handle);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "GPTimer start failed; error %d", err);
-    gptimer_disable(timer->timer_handle);
-    gptimer_del_timer(timer->timer_handle);
-    delete timer;
-    return nullptr;
-  }
-
-  timer->timer_started = true;
-  return timer;
-}
-
-bool IRAM_ATTR timer_fn_wrapper(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *args) {
-  auto *isr = static_cast<InterruptConfigT *>(args);
-  if (isr->fn) {
-    if (isr->arg) {
-      reinterpret_cast<voidFuncPtrArg>(isr->fn)(isr->arg);
-    } else {
-      isr->fn();
-    }
-  }
-  // Return false to indicate that no higher-priority task was woken and no context switch is requested.
-  return false;
-}
-
-static void timer_attach_interrupt_functional_arg(HWTimer *timer, void (*user_func)(void *), void *arg) {
-  if (timer == nullptr) {
-    ESP_LOGE(TAG, "Timer handle is nullptr");
-    return;
-  }
-  gptimer_event_callbacks_t cbs = {
-      .on_alarm = timer_fn_wrapper,
-  };
-
-  timer->interrupt_handle.fn = reinterpret_cast<voidFuncPtr>(user_func);
-  timer->interrupt_handle.arg = arg;
-
-  if (timer->timer_started) {
-    gptimer_stop(timer->timer_handle);
-  }
-  gptimer_disable(timer->timer_handle);
-  esp_err_t err = gptimer_register_event_callbacks(timer->timer_handle, &cbs, &timer->interrupt_handle);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Timer Attach Interrupt failed; error %d", err);
-  }
-  gptimer_enable(timer->timer_handle);
-  if (timer->timer_started) {
-    gptimer_start(timer->timer_handle);
-  }
-}
-
-void timer_attach_interrupt(HWTimer *timer, voidFuncPtr user_func) {
-  timer_attach_interrupt_functional_arg(timer, reinterpret_cast<voidFuncPtrArg>(user_func), nullptr);
-}
-
-void timer_alarm(HWTimer *timer, uint64_t alarm_value, bool autoreload, uint64_t reload_count) {
-  if (timer == nullptr) {
-    ESP_LOGE(TAG, "Timer handle is nullptr");
-    return;
-  }
-  gptimer_alarm_config_t alarm_cfg = {
-      .alarm_count = alarm_value,
-      .reload_count = reload_count,
-      .flags = {.auto_reload_on_alarm = autoreload},
-  };
-  esp_err_t err = gptimer_set_alarm_action(timer->timer_handle, &alarm_cfg);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Timer Alarm Write failed; error %d", err);
-  }
-}
-
-}  // namespace esphome::ac_dimmer
-#endif
--- a/esphome/components/ac_dimmer/hw_timer_esp_idf.h
+++ b/esphome/components/ac_dimmer/hw_timer_esp_idf.h
@@ -1,17 +0,0 @@
-#pragma once
-#ifdef USE_ESP32
-
-#include "driver/gptimer_types.h"
-
-namespace esphome::ac_dimmer {
-
-struct HWTimer;
-
-HWTimer *timer_begin(uint32_t frequency);
-
-void timer_attach_interrupt(HWTimer *timer, void (*user_func)());
-void timer_alarm(HWTimer *timer, uint64_t alarm_value, bool autoreload, uint64_t reload_count);
-
-}  // namespace esphome::ac_dimmer
-
-#endif
--- a/esphome/components/ac_dimmer/output.py
+++ b/esphome/components/ac_dimmer/output.py
@@ -32,6 +32,7 @@ CONFIG_SCHEMA = cv.All(
            ),
        }
    ).extend(cv.COMPONENT_SCHEMA),
+    cv.only_with_arduino,
 )


--- a/esphome/components/alarm_control_panel/alarm_control_panel.cpp
+++ b/esphome/components/alarm_control_panel/alarm_control_panel.cpp
@@ -31,8 +31,7 @@ void AlarmControlPanel::publish_state(AlarmControlPanelState state) {
  this->last_update_ = millis();
  if (state != this->current_state_) {
    auto prev_state = this->current_state_;
-    ESP_LOGD(TAG, "'%s' >> %s (was %s)", this->get_name().c_str(),
-             LOG_STR_ARG(alarm_control_panel_state_to_string(state)),
+    ESP_LOGD(TAG, "Set state to: %s, previous: %s", 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 - triggers check get_state() for specific states
--- a/esphome/components/am43/am43_base.cpp
+++ b/esphome/components/am43/am43_base.cpp
@@ -1,6 +1,6 @@
 #include "am43_base.h"
-#include "esphome/core/helpers.h"
 #include <cstring>
+#include <cstdio>

 namespace esphome {
 namespace am43 {
@@ -8,9 +8,12 @@ namespace am43 {
 const uint8_t START_PACKET[5] = {0x00, 0xff, 0x00, 0x00, 0x9a};

 std::string pkt_to_hex(const uint8_t *data, uint16_t len) {
-  char buf[64];  // format_hex_size(31) = 63, fits 31 bytes of hex data
-  format_hex_to(buf, sizeof(buf), data, len);
-  return buf;
+  char buf[64];
+  memset(buf, 0, 64);
+  for (int i = 0; i < len; i++)
+    sprintf(&buf[i * 2], "%02x", data[i]);
+  std::string ret = buf;
+  return ret;
 }

 Am43Packet *Am43Encoder::get_battery_level_request() {
--- a/esphome/components/anova/anova_base.cpp
+++ b/esphome/components/anova/anova_base.cpp
@@ -18,31 +18,31 @@ AnovaPacket *AnovaCodec::clean_packet_() {

 AnovaPacket *AnovaCodec::get_read_device_status_request() {
  this->current_query_ = READ_DEVICE_STATUS;
-  strncpy((char *) this->packet_.data, CMD_READ_DEVICE_STATUS, sizeof(this->packet_.data));
+  sprintf((char *) this->packet_.data, "%s", CMD_READ_DEVICE_STATUS);
  return this->clean_packet_();
 }

 AnovaPacket *AnovaCodec::get_read_target_temp_request() {
  this->current_query_ = READ_TARGET_TEMPERATURE;
-  strncpy((char *) this->packet_.data, CMD_READ_TARGET_TEMP, sizeof(this->packet_.data));
+  sprintf((char *) this->packet_.data, "%s", CMD_READ_TARGET_TEMP);
  return this->clean_packet_();
 }

 AnovaPacket *AnovaCodec::get_read_current_temp_request() {
  this->current_query_ = READ_CURRENT_TEMPERATURE;
-  strncpy((char *) this->packet_.data, CMD_READ_CURRENT_TEMP, sizeof(this->packet_.data));
+  sprintf((char *) this->packet_.data, "%s", CMD_READ_CURRENT_TEMP);
  return this->clean_packet_();
 }

 AnovaPacket *AnovaCodec::get_read_unit_request() {
  this->current_query_ = READ_UNIT;
-  strncpy((char *) this->packet_.data, CMD_READ_UNIT, sizeof(this->packet_.data));
+  sprintf((char *) this->packet_.data, "%s", CMD_READ_UNIT);
  return this->clean_packet_();
 }

 AnovaPacket *AnovaCodec::get_read_data_request() {
  this->current_query_ = READ_DATA;
-  strncpy((char *) this->packet_.data, CMD_READ_DATA, sizeof(this->packet_.data));
+  sprintf((char *) this->packet_.data, "%s", CMD_READ_DATA);
  return this->clean_packet_();
 }

@@ -50,25 +50,25 @@ AnovaPacket *AnovaCodec::get_set_target_temp_request(float temperature) {
  this->current_query_ = SET_TARGET_TEMPERATURE;
  if (this->fahrenheit_)
    temperature = ctof(temperature);
-  snprintf((char *) this->packet_.data, sizeof(this->packet_.data), CMD_SET_TARGET_TEMP, temperature);
+  sprintf((char *) this->packet_.data, CMD_SET_TARGET_TEMP, temperature);
  return this->clean_packet_();
 }

 AnovaPacket *AnovaCodec::get_set_unit_request(char unit) {
  this->current_query_ = SET_UNIT;
-  snprintf((char *) this->packet_.data, sizeof(this->packet_.data), CMD_SET_TEMP_UNIT, unit);
+  sprintf((char *) this->packet_.data, CMD_SET_TEMP_UNIT, unit);
  return this->clean_packet_();
 }

 AnovaPacket *AnovaCodec::get_start_request() {
  this->current_query_ = START;
-  strncpy((char *) this->packet_.data, CMD_START, sizeof(this->packet_.data));
+  sprintf((char *) this->packet_.data, CMD_START);
  return this->clean_packet_();
 }

 AnovaPacket *AnovaCodec::get_stop_request() {
  this->current_query_ = STOP;
-  strncpy((char *) this->packet_.data, CMD_STOP, sizeof(this->packet_.data));
+  sprintf((char *) this->packet_.data, CMD_STOP);
  return this->clean_packet_();
 }

--- a/esphome/components/api/init.py
+++ b/esphome/components/api/init.py
@@ -4,7 +4,6 @@ import logging
 from esphome import automation
 from esphome.automation import Condition
 import esphome.codegen as cg
-from esphome.components.logger import request_log_listener
 from esphome.config_helpers import get_logger_level
 import esphome.config_validation as cv
 from esphome.const import (
@@ -327,9 +326,6 @@ async def to_code(config: ConfigType) -> None:
    # Track controller registration for StaticVector sizing
    CORE.register_controller()

-    # Request a log listener slot for API log streaming
-    request_log_listener()
-
    cg.add(var.set_port(config[CONF_PORT]))
    cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
    cg.add(var.set_batch_delay(config[CONF_BATCH_DELAY]))
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -66,8 +66,6 @@ service APIConnection {

  rpc zwave_proxy_frame(ZWaveProxyFrame) returns (void) {}
  rpc zwave_proxy_request(ZWaveProxyRequest) returns (void) {}
-
-  rpc infrared_rf_transmit_raw_timings(InfraredRFTransmitRawTimingsRequest) returns (void) {}
 }


@@ -765,7 +763,7 @@ message SubscribeHomeassistantServicesRequest {

 message HomeassistantServiceMap {
  string key = 1;
-  string value = 2;
+  string value = 2 [(no_zero_copy) = true];
 }

 message HomeassistantActionRequest {
@@ -781,7 +779,7 @@ message HomeassistantActionRequest {
  bool is_event = 5;
  uint32 call_id = 6 [(field_ifdef) = "USE_API_HOMEASSISTANT_ACTION_RESPONSES"];
  bool wants_response = 7 [(field_ifdef) = "USE_API_HOMEASSISTANT_ACTION_RESPONSES_JSON"];
-  string response_template = 8 [(field_ifdef) = "USE_API_HOMEASSISTANT_ACTION_RESPONSES_JSON"];
+  string response_template = 8 [(no_zero_copy) = true, (field_ifdef) = "USE_API_HOMEASSISTANT_ACTION_RESPONSES_JSON"];
 }

 // Message sent by Home Assistant to ESPHome with service call response data
@@ -2439,49 +2437,3 @@ message ZWaveProxyRequest {
  ZWaveProxyRequestType type = 1;
  bytes data = 2;
 }
-
-// ==================== INFRARED ====================
-// Note: Feature and capability flag enums are defined in
-// esphome/components/infrared/infrared.h
-
-// Listing of infrared instances
-message ListEntitiesInfraredResponse {
-  option (id) = 135;
-  option (base_class) = "InfoResponseProtoMessage";
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_INFRARED";
-
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string icon = 4 [(field_ifdef) = "USE_ENTITY_ICON"];
-  bool disabled_by_default = 5;
-  EntityCategory entity_category = 6;
-  uint32 device_id = 7 [(field_ifdef) = "USE_DEVICES"];
-  uint32 capabilities = 8;  // Bitfield of InfraredCapabilityFlags
-}
-
-// Command to transmit infrared/RF data using raw timings
-message InfraredRFTransmitRawTimingsRequest {
-  option (id) = 136;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_IR_RF";
-
-  uint32 device_id = 1 [(field_ifdef) = "USE_DEVICES"];
-  fixed32 key = 2;                                       // Key identifying the transmitter instance
-  uint32 carrier_frequency = 3;                          // Carrier frequency in Hz
-  uint32 repeat_count = 4;                               // Number of times to transmit (1 = once, 2 = twice, etc.)
-  repeated sint32 timings = 5 [packed = true, (packed_buffer) = true];  // Raw timings in microseconds (zigzag-encoded): positive = mark (LED/TX on), negative = space (LED/TX off)
-}
-
-// Event message for received infrared/RF data
-message InfraredRFReceiveEvent {
-  option (id) = 137;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_IR_RF";
-  option (no_delay) = true;
-
-  uint32 device_id = 1 [(field_ifdef) = "USE_DEVICES"];
-  fixed32 key = 2;                                    // Key identifying the receiver instance
-  repeated sint32 timings = 3 [packed = true, (container_pointer_no_template) = "std::vector<int32_t>"];  // Raw timings in microseconds (zigzag-encoded): alternating mark/space periods
-}
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -46,9 +46,6 @@
 #ifdef USE_WATER_HEATER
 #include "esphome/components/water_heater/water_heater.h"
 #endif
-#ifdef USE_INFRARED
-#include "esphome/components/infrared/infrared.h"
-#endif

 namespace esphome::api {

@@ -265,7 +262,8 @@ void APIConnection::loop() {
      // If we can't send the ping request directly (tx_buffer full),
      // schedule it at the front of the batch so it will be sent with priority
      ESP_LOGW(TAG, "Buffer full, ping queued");
-      this->schedule_message_front_(nullptr, PingRequest::MESSAGE_TYPE, PingRequest::ESTIMATED_SIZE);
+      this->schedule_message_front_(nullptr, &APIConnection::try_send_ping_request, PingRequest::MESSAGE_TYPE,
+                                    PingRequest::ESTIMATED_SIZE);
      this->flags_.sent_ping = true;  // Mark as sent to avoid scheduling multiple pings
    }
  }
@@ -304,8 +302,7 @@ uint16_t APIConnection::encode_message_to_buffer(ProtoMessage &msg, uint8_t mess
 #ifdef HAS_PROTO_MESSAGE_DUMP
  // If in log-only mode, just log and return
  if (conn->flags_.log_only_mode) {
-    DumpBuffer dump_buf;
-    conn->log_send_message_(msg.message_name(), msg.dump_to(dump_buf));
+    conn->log_send_message_(msg.message_name(), msg.dump());
    return 1;  // Return non-zero to indicate "success" for logging
  }
 #endif
@@ -361,8 +358,8 @@ uint16_t APIConnection::encode_message_to_buffer(ProtoMessage &msg, uint8_t mess

 #ifdef USE_BINARY_SENSOR
 bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor) {
-  return this->send_message_smart_(binary_sensor, BinarySensorStateResponse::MESSAGE_TYPE,
-                                   BinarySensorStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(binary_sensor, &APIConnection::try_send_binary_sensor_state,
+                                   BinarySensorStateResponse::MESSAGE_TYPE, BinarySensorStateResponse::ESTIMATED_SIZE);
 }

 uint16_t APIConnection::try_send_binary_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -388,7 +385,8 @@ uint16_t APIConnection::try_send_binary_sensor_info(EntityBase *entity, APIConne

 #ifdef USE_COVER
 bool APIConnection::send_cover_state(cover::Cover *cover) {
-  return this->send_message_smart_(cover, CoverStateResponse::MESSAGE_TYPE, CoverStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(cover, &APIConnection::try_send_cover_state, CoverStateResponse::MESSAGE_TYPE,
+                                   CoverStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_cover_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
@@ -428,7 +426,8 @@ void APIConnection::cover_command(const CoverCommandRequest &msg) {

 #ifdef USE_FAN
 bool APIConnection::send_fan_state(fan::Fan *fan) {
-  return this->send_message_smart_(fan, FanStateResponse::MESSAGE_TYPE, FanStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(fan, &APIConnection::try_send_fan_state, FanStateResponse::MESSAGE_TYPE,
+                                   FanStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_fan_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                           bool is_single) {
@@ -444,7 +443,7 @@ uint16_t APIConnection::try_send_fan_state(EntityBase *entity, APIConnection *co
  if (traits.supports_direction())
    msg.direction = static_cast<enums::FanDirection>(fan->direction);
  if (traits.supports_preset_modes() && fan->has_preset_mode())
-    msg.preset_mode = fan->get_preset_mode();
+    msg.preset_mode = StringRef(fan->get_preset_mode());
  return fill_and_encode_entity_state(fan, msg, FanStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
 uint16_t APIConnection::try_send_fan_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -479,7 +478,8 @@ void APIConnection::fan_command(const FanCommandRequest &msg) {

 #ifdef USE_LIGHT
 bool APIConnection::send_light_state(light::LightState *light) {
-  return this->send_message_smart_(light, LightStateResponse::MESSAGE_TYPE, LightStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(light, &APIConnection::try_send_light_state, LightStateResponse::MESSAGE_TYPE,
+                                   LightStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_light_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
@@ -499,7 +499,7 @@ uint16_t APIConnection::try_send_light_state(EntityBase *entity, APIConnection *
  resp.cold_white = values.get_cold_white();
  resp.warm_white = values.get_warm_white();
  if (light->supports_effects()) {
-    resp.effect = light->get_effect_name();
+    resp.effect = light->get_effect_name_ref();
  }
  return fill_and_encode_entity_state(light, resp, LightStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -522,8 +522,7 @@ uint16_t APIConnection::try_send_light_info(EntityBase *entity, APIConnection *c
    effects_list.init(light_effects.size() + 1);
    effects_list.push_back("None");
    for (auto *effect : light_effects) {
-      // c_str() is safe as effect names are null-terminated strings from codegen
-      effects_list.push_back(effect->get_name().c_str());
+      effects_list.push_back(effect->get_name());
    }
  }
  msg.effects = &effects_list;
@@ -565,7 +564,8 @@ void APIConnection::light_command(const LightCommandRequest &msg) {

 #ifdef USE_SENSOR
 bool APIConnection::send_sensor_state(sensor::Sensor *sensor) {
-  return this->send_message_smart_(sensor, SensorStateResponse::MESSAGE_TYPE, SensorStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(sensor, &APIConnection::try_send_sensor_state, SensorStateResponse::MESSAGE_TYPE,
+                                   SensorStateResponse::ESTIMATED_SIZE);
 }

 uint16_t APIConnection::try_send_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -593,7 +593,8 @@ uint16_t APIConnection::try_send_sensor_info(EntityBase *entity, APIConnection *

 #ifdef USE_SWITCH
 bool APIConnection::send_switch_state(switch_::Switch *a_switch) {
-  return this->send_message_smart_(a_switch, SwitchStateResponse::MESSAGE_TYPE, SwitchStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(a_switch, &APIConnection::try_send_switch_state, SwitchStateResponse::MESSAGE_TYPE,
+                                   SwitchStateResponse::ESTIMATED_SIZE);
 }

 uint16_t APIConnection::try_send_switch_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -627,8 +628,8 @@ void APIConnection::switch_command(const SwitchCommandRequest &msg) {

 #ifdef USE_TEXT_SENSOR
 bool APIConnection::send_text_sensor_state(text_sensor::TextSensor *text_sensor) {
-  return this->send_message_smart_(text_sensor, TextSensorStateResponse::MESSAGE_TYPE,
-                                   TextSensorStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(text_sensor, &APIConnection::try_send_text_sensor_state,
+                                   TextSensorStateResponse::MESSAGE_TYPE, TextSensorStateResponse::ESTIMATED_SIZE);
 }

 uint16_t APIConnection::try_send_text_sensor_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -652,7 +653,8 @@ uint16_t APIConnection::try_send_text_sensor_info(EntityBase *entity, APIConnect

 #ifdef USE_CLIMATE
 bool APIConnection::send_climate_state(climate::Climate *climate) {
-  return this->send_message_smart_(climate, ClimateStateResponse::MESSAGE_TYPE, ClimateStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(climate, &APIConnection::try_send_climate_state, ClimateStateResponse::MESSAGE_TYPE,
+                                   ClimateStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_climate_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                               bool is_single) {
@@ -673,13 +675,13 @@ uint16_t APIConnection::try_send_climate_state(EntityBase *entity, APIConnection
  if (traits.get_supports_fan_modes() && climate->fan_mode.has_value())
    resp.fan_mode = static_cast<enums::ClimateFanMode>(climate->fan_mode.value());
  if (!traits.get_supported_custom_fan_modes().empty() && climate->has_custom_fan_mode()) {
-    resp.custom_fan_mode = climate->get_custom_fan_mode();
+    resp.custom_fan_mode = StringRef(climate->get_custom_fan_mode());
  }
  if (traits.get_supports_presets() && climate->preset.has_value()) {
    resp.preset = static_cast<enums::ClimatePreset>(climate->preset.value());
  }
  if (!traits.get_supported_custom_presets().empty() && climate->has_custom_preset()) {
-    resp.custom_preset = climate->get_custom_preset();
+    resp.custom_preset = StringRef(climate->get_custom_preset());
  }
  if (traits.get_supports_swing_modes())
    resp.swing_mode = static_cast<enums::ClimateSwingMode>(climate->swing_mode);
@@ -747,7 +749,8 @@ void APIConnection::climate_command(const ClimateCommandRequest &msg) {

 #ifdef USE_NUMBER
 bool APIConnection::send_number_state(number::Number *number) {
-  return this->send_message_smart_(number, NumberStateResponse::MESSAGE_TYPE, NumberStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(number, &APIConnection::try_send_number_state, NumberStateResponse::MESSAGE_TYPE,
+                                   NumberStateResponse::ESTIMATED_SIZE);
 }

 uint16_t APIConnection::try_send_number_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -781,7 +784,8 @@ void APIConnection::number_command(const NumberCommandRequest &msg) {

 #ifdef USE_DATETIME_DATE
 bool APIConnection::send_date_state(datetime::DateEntity *date) {
-  return this->send_message_smart_(date, DateStateResponse::MESSAGE_TYPE, DateStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(date, &APIConnection::try_send_date_state, DateStateResponse::MESSAGE_TYPE,
+                                   DateStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_date_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                            bool is_single) {
@@ -809,7 +813,8 @@ void APIConnection::date_command(const DateCommandRequest &msg) {

 #ifdef USE_DATETIME_TIME
 bool APIConnection::send_time_state(datetime::TimeEntity *time) {
-  return this->send_message_smart_(time, TimeStateResponse::MESSAGE_TYPE, TimeStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(time, &APIConnection::try_send_time_state, TimeStateResponse::MESSAGE_TYPE,
+                                   TimeStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_time_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                            bool is_single) {
@@ -837,8 +842,8 @@ void APIConnection::time_command(const TimeCommandRequest &msg) {

 #ifdef USE_DATETIME_DATETIME
 bool APIConnection::send_datetime_state(datetime::DateTimeEntity *datetime) {
-  return this->send_message_smart_(datetime, DateTimeStateResponse::MESSAGE_TYPE,
-                                   DateTimeStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(datetime, &APIConnection::try_send_datetime_state,
+                                   DateTimeStateResponse::MESSAGE_TYPE, DateTimeStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_datetime_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                bool is_single) {
@@ -868,7 +873,8 @@ void APIConnection::datetime_command(const DateTimeCommandRequest &msg) {

 #ifdef USE_TEXT
 bool APIConnection::send_text_state(text::Text *text) {
-  return this->send_message_smart_(text, TextStateResponse::MESSAGE_TYPE, TextStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(text, &APIConnection::try_send_text_state, TextStateResponse::MESSAGE_TYPE,
+                                   TextStateResponse::ESTIMATED_SIZE);
 }

 uint16_t APIConnection::try_send_text_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -900,14 +906,15 @@ void APIConnection::text_command(const TextCommandRequest &msg) {

 #ifdef USE_SELECT
 bool APIConnection::send_select_state(select::Select *select) {
-  return this->send_message_smart_(select, SelectStateResponse::MESSAGE_TYPE, SelectStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(select, &APIConnection::try_send_select_state, SelectStateResponse::MESSAGE_TYPE,
+                                   SelectStateResponse::ESTIMATED_SIZE);
 }

 uint16_t APIConnection::try_send_select_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
  auto *select = static_cast<select::Select *>(entity);
  SelectStateResponse resp;
-  resp.state = select->current_option();
+  resp.state = StringRef(select->current_option());
  resp.missing_state = !select->has_state();
  return fill_and_encode_entity_state(select, resp, SelectStateResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }
@@ -944,7 +951,8 @@ void esphome::api::APIConnection::button_command(const ButtonCommandRequest &msg

 #ifdef USE_LOCK
 bool APIConnection::send_lock_state(lock::Lock *a_lock) {
-  return this->send_message_smart_(a_lock, LockStateResponse::MESSAGE_TYPE, LockStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(a_lock, &APIConnection::try_send_lock_state, LockStateResponse::MESSAGE_TYPE,
+                                   LockStateResponse::ESTIMATED_SIZE);
 }

 uint16_t APIConnection::try_send_lock_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
@@ -984,7 +992,8 @@ void APIConnection::lock_command(const LockCommandRequest &msg) {

 #ifdef USE_VALVE
 bool APIConnection::send_valve_state(valve::Valve *valve) {
-  return this->send_message_smart_(valve, ValveStateResponse::MESSAGE_TYPE, ValveStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(valve, &APIConnection::try_send_valve_state, ValveStateResponse::MESSAGE_TYPE,
+                                   ValveStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_valve_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single) {
@@ -1018,8 +1027,8 @@ void APIConnection::valve_command(const ValveCommandRequest &msg) {

 #ifdef USE_MEDIA_PLAYER
 bool APIConnection::send_media_player_state(media_player::MediaPlayer *media_player) {
-  return this->send_message_smart_(media_player, MediaPlayerStateResponse::MESSAGE_TYPE,
-                                   MediaPlayerStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(media_player, &APIConnection::try_send_media_player_state,
+                                   MediaPlayerStateResponse::MESSAGE_TYPE, MediaPlayerStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_media_player_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                    bool is_single) {
@@ -1301,7 +1310,8 @@ void APIConnection::zwave_proxy_request(const ZWaveProxyRequest &msg) {

 #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,
+  return this->send_message_smart_(a_alarm_control_panel, &APIConnection::try_send_alarm_control_panel_state,
+                                   AlarmControlPanelStateResponse::MESSAGE_TYPE,
                                   AlarmControlPanelStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_alarm_control_panel_state(EntityBase *entity, APIConnection *conn,
@@ -1354,8 +1364,8 @@ void APIConnection::alarm_control_panel_command(const AlarmControlPanelCommandRe

 #ifdef USE_WATER_HEATER
 bool APIConnection::send_water_heater_state(water_heater::WaterHeater *water_heater) {
-  return this->send_message_smart_(water_heater, WaterHeaterStateResponse::MESSAGE_TYPE,
-                                   WaterHeaterStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(water_heater, &APIConnection::try_send_water_heater_state,
+                                   WaterHeaterStateResponse::MESSAGE_TYPE, WaterHeaterStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_water_heater_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                                    bool is_single) {
@@ -1404,16 +1414,14 @@ void APIConnection::on_water_heater_command_request(const WaterHeaterCommandRequ
 #endif

 #ifdef USE_EVENT
-// Event is a special case - unlike other entities with simple state fields,
-// events store their state in a member accessed via obj->get_last_event_type()
-void APIConnection::send_event(event::Event *event) {
-  this->send_message_smart_(event, EventResponse::MESSAGE_TYPE, EventResponse::ESTIMATED_SIZE,
-                            event->get_last_event_type_index());
+void APIConnection::send_event(event::Event *event, const char *event_type) {
+  this->send_message_smart_(event, MessageCreator(event_type), EventResponse::MESSAGE_TYPE,
+                            EventResponse::ESTIMATED_SIZE);
 }
-uint16_t APIConnection::try_send_event_response(event::Event *event, StringRef event_type, APIConnection *conn,
+uint16_t APIConnection::try_send_event_response(event::Event *event, const char *event_type, APIConnection *conn,
                                                uint32_t remaining_size, bool is_single) {
  EventResponse resp;
-  resp.event_type = event_type;
+  resp.event_type = StringRef(event_type);
  return fill_and_encode_entity_state(event, resp, EventResponse::MESSAGE_TYPE, conn, remaining_size, is_single);
 }

@@ -1428,38 +1436,10 @@ uint16_t APIConnection::try_send_event_info(EntityBase *entity, APIConnection *c
 }
 #endif

-#ifdef USE_IR_RF
-void APIConnection::infrared_rf_transmit_raw_timings(const InfraredRFTransmitRawTimingsRequest &msg) {
-  // TODO: When RF is implemented, add a field to the message to distinguish IR vs RF
-  // and dispatch to the appropriate entity type based on that field.
-#ifdef USE_INFRARED
-  ENTITY_COMMAND_MAKE_CALL(infrared::Infrared, infrared, infrared)
-  call.set_carrier_frequency(msg.carrier_frequency);
-  call.set_raw_timings_packed(msg.timings_data_, msg.timings_length_, msg.timings_count_);
-  call.set_repeat_count(msg.repeat_count);
-  call.perform();
-#endif
-}
-
-void APIConnection::send_infrared_rf_receive_event(const InfraredRFReceiveEvent &msg) {
-  this->send_message(msg, InfraredRFReceiveEvent::MESSAGE_TYPE);
-}
-#endif
-
-#ifdef USE_INFRARED
-uint16_t APIConnection::try_send_infrared_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
-                                               bool is_single) {
-  auto *infrared = static_cast<infrared::Infrared *>(entity);
-  ListEntitiesInfraredResponse msg;
-  msg.capabilities = infrared->get_capability_flags();
-  return fill_and_encode_entity_info(infrared, msg, ListEntitiesInfraredResponse::MESSAGE_TYPE, conn, remaining_size,
-                                     is_single);
-}
-#endif
-
 #ifdef USE_UPDATE
 bool APIConnection::send_update_state(update::UpdateEntity *update) {
-  return this->send_message_smart_(update, UpdateStateResponse::MESSAGE_TYPE, UpdateStateResponse::ESTIMATED_SIZE);
+  return this->send_message_smart_(update, &APIConnection::try_send_update_state, UpdateStateResponse::MESSAGE_TYPE,
+                                   UpdateStateResponse::ESTIMATED_SIZE);
 }
 uint16_t APIConnection::try_send_update_state(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                              bool is_single) {
@@ -1848,10 +1828,6 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) {
  // Toggle Nagle's algorithm based on message type to prevent log messages from
  // filling the TCP send buffer and crowding out important state updates.
  //
-  // This honors the `no_delay` proto option - SubscribeLogsResponse is the only
-  // message with `option (no_delay) = false;` in api.proto, indicating it should
-  // allow Nagle coalescing. This option existed since 2019 but was never implemented.
-  //
  // - Log messages: Enable Nagle (NODELAY=false) so small log packets coalesce
  //   into fewer, larger packets. They flush naturally via TCP delayed ACK timer
  //   (~200ms), buffer filling, or when a state update triggers a flush.
@@ -1882,31 +1858,30 @@ void APIConnection::on_fatal_error() {
  this->flags_.remove = true;
 }

-void APIConnection::DeferredBatch::add_item(EntityBase *entity, uint8_t message_type, uint8_t estimated_size,
-                                            uint8_t aux_data_index) {
+void APIConnection::DeferredBatch::add_item(EntityBase *entity, MessageCreator creator, uint8_t message_type,
+                                            uint8_t estimated_size) {
  // 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
+  for (auto &item : items) {
+    if (item.entity == entity && item.message_type == message_type) {
+      // Replace with new creator
+      item.creator = creator;
+      return;
    }
  }
-  // No existing item found (or event), add new one
-  items.push_back({entity, message_type, estimated_size, aux_data_index});
+
+  // No existing item found, add new one
+  items.emplace_back(entity, creator, message_type, estimated_size);
 }

-void APIConnection::DeferredBatch::add_item_front(EntityBase *entity, uint8_t message_type, uint8_t estimated_size) {
+void APIConnection::DeferredBatch::add_item_front(EntityBase *entity, MessageCreator creator, 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
-  items.push_back({entity, message_type, estimated_size, AUX_DATA_UNUSED});
+  items.emplace_back(entity, creator, message_type, estimated_size);
  if (items.size() > 1) {
    // Swap the new high-priority item to the front
    std::swap(items.front(), items.back());
@@ -1945,17 +1920,19 @@ void APIConnection::process_batch_() {
  if (num_items == 1) {
    const auto &item = this->deferred_batch_[0];

-    // Let dispatch_message_ calculate size and encode if it fits
-    uint16_t payload_size = this->dispatch_message_(item, std::numeric_limits<uint16_t>::max(), true);
+    // Let the creator calculate size and encode if it fits
+    uint16_t payload_size =
+        item.creator(item.entity, this, std::numeric_limits<uint16_t>::max(), true, item.message_type);

    if (payload_size > 0 && this->send_buffer(ProtoWriteBuffer{&shared_buf}, item.message_type)) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      // Log message after send attempt for VV debugging
+      // Log messages after send attempt for VV debugging
+      // It's safe to use the buffer for logging at this point regardless of send result
      this->log_batch_item_(item);
 #endif
      this->clear_batch_();
    } else if (payload_size == 0) {
-      // Message too large to fit in available space
+      // Message too large
      ESP_LOGW(TAG, "Message too large to send: type=%u", item.message_type);
      this->clear_batch_();
    }
@@ -2000,9 +1977,9 @@ void APIConnection::process_batch_() {
  // Process items and encode directly to buffer (up to our limit)
  for (size_t i = 0; i < messages_to_process; i++) {
    const auto &item = this->deferred_batch_[i];
-    // Try to encode message via dispatch
-    // The dispatch function calculates overhead to determine if the message fits
-    uint16_t payload_size = this->dispatch_message_(item, remaining_size, false);
+    // Try to encode message
+    // The creator will calculate overhead to determine if the message fits
+    uint16_t payload_size = item.creator(item.entity, this, remaining_size, false, item.message_type);

    if (payload_size == 0) {
      // Message won't fit, stop processing
@@ -2068,129 +2045,18 @@ void APIConnection::process_batch_() {
  }
 }

-// Dispatch message encoding based on message_type
-// Switch assigns function pointer, single call site for smaller code size
-uint16_t APIConnection::dispatch_message_(const DeferredBatch::BatchItem &item, uint32_t remaining_size,
-                                          bool is_single) {
+uint16_t APIConnection::MessageCreator::operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
+                                                   bool is_single, uint8_t message_type) const {
 #ifdef USE_EVENT
-  // Events need aux_data_index to look up event type from entity
-  if (item.message_type == EventResponse::MESSAGE_TYPE) {
-    // Skip if aux_data_index is invalid (should never happen in normal operation)
-    if (item.aux_data_index == DeferredBatch::AUX_DATA_UNUSED)
-      return 0;
-    auto *event = static_cast<event::Event *>(item.entity);
-    return try_send_event_response(event, StringRef::from_maybe_nullptr(event->get_event_type(item.aux_data_index)),
-                                   this, remaining_size, is_single);
+  // Special case: EventResponse uses const char * pointer
+  if (message_type == EventResponse::MESSAGE_TYPE) {
+    auto *e = static_cast<event::Event *>(entity);
+    return APIConnection::try_send_event_response(e, data_.const_char_ptr, conn, remaining_size, is_single);
  }
 #endif

-  // All other message types use function pointer lookup via switch
-  MessageCreatorPtr func = nullptr;
-
-// Macros to reduce repetitive switch cases
-#define CASE_STATE_INFO(entity_name, StateResp, InfoResp) \
-  case StateResp::MESSAGE_TYPE: \
-    func = &try_send_##entity_name##_state; \
-    break; \
-  case InfoResp::MESSAGE_TYPE: \
-    func = &try_send_##entity_name##_info; \
-    break;
-#define CASE_INFO_ONLY(entity_name, InfoResp) \
-  case InfoResp::MESSAGE_TYPE: \
-    func = &try_send_##entity_name##_info; \
-    break;
-
-  switch (item.message_type) {
-#ifdef USE_BINARY_SENSOR
-    CASE_STATE_INFO(binary_sensor, BinarySensorStateResponse, ListEntitiesBinarySensorResponse)
-#endif
-#ifdef USE_COVER
-    CASE_STATE_INFO(cover, CoverStateResponse, ListEntitiesCoverResponse)
-#endif
-#ifdef USE_FAN
-    CASE_STATE_INFO(fan, FanStateResponse, ListEntitiesFanResponse)
-#endif
-#ifdef USE_LIGHT
-    CASE_STATE_INFO(light, LightStateResponse, ListEntitiesLightResponse)
-#endif
-#ifdef USE_SENSOR
-    CASE_STATE_INFO(sensor, SensorStateResponse, ListEntitiesSensorResponse)
-#endif
-#ifdef USE_SWITCH
-    CASE_STATE_INFO(switch, SwitchStateResponse, ListEntitiesSwitchResponse)
-#endif
-#ifdef USE_BUTTON
-    CASE_INFO_ONLY(button, ListEntitiesButtonResponse)
-#endif
-#ifdef USE_TEXT_SENSOR
-    CASE_STATE_INFO(text_sensor, TextSensorStateResponse, ListEntitiesTextSensorResponse)
-#endif
-#ifdef USE_CLIMATE
-    CASE_STATE_INFO(climate, ClimateStateResponse, ListEntitiesClimateResponse)
-#endif
-#ifdef USE_NUMBER
-    CASE_STATE_INFO(number, NumberStateResponse, ListEntitiesNumberResponse)
-#endif
-#ifdef USE_DATETIME_DATE
-    CASE_STATE_INFO(date, DateStateResponse, ListEntitiesDateResponse)
-#endif
-#ifdef USE_DATETIME_TIME
-    CASE_STATE_INFO(time, TimeStateResponse, ListEntitiesTimeResponse)
-#endif
-#ifdef USE_DATETIME_DATETIME
-    CASE_STATE_INFO(datetime, DateTimeStateResponse, ListEntitiesDateTimeResponse)
-#endif
-#ifdef USE_TEXT
-    CASE_STATE_INFO(text, TextStateResponse, ListEntitiesTextResponse)
-#endif
-#ifdef USE_SELECT
-    CASE_STATE_INFO(select, SelectStateResponse, ListEntitiesSelectResponse)
-#endif
-#ifdef USE_LOCK
-    CASE_STATE_INFO(lock, LockStateResponse, ListEntitiesLockResponse)
-#endif
-#ifdef USE_VALVE
-    CASE_STATE_INFO(valve, ValveStateResponse, ListEntitiesValveResponse)
-#endif
-#ifdef USE_MEDIA_PLAYER
-    CASE_STATE_INFO(media_player, MediaPlayerStateResponse, ListEntitiesMediaPlayerResponse)
-#endif
-#ifdef USE_ALARM_CONTROL_PANEL
-    CASE_STATE_INFO(alarm_control_panel, AlarmControlPanelStateResponse, ListEntitiesAlarmControlPanelResponse)
-#endif
-#ifdef USE_WATER_HEATER
-    CASE_STATE_INFO(water_heater, WaterHeaterStateResponse, ListEntitiesWaterHeaterResponse)
-#endif
-#ifdef USE_CAMERA
-    CASE_INFO_ONLY(camera, ListEntitiesCameraResponse)
-#endif
-#ifdef USE_INFRARED
-    CASE_INFO_ONLY(infrared, ListEntitiesInfraredResponse)
-#endif
-#ifdef USE_EVENT
-    CASE_INFO_ONLY(event, ListEntitiesEventResponse)
-#endif
-#ifdef USE_UPDATE
-    CASE_STATE_INFO(update, UpdateStateResponse, ListEntitiesUpdateResponse)
-#endif
-    // Special messages (not entity state/info)
-    case ListEntitiesDoneResponse::MESSAGE_TYPE:
-      func = &try_send_list_info_done;
-      break;
-    case DisconnectRequest::MESSAGE_TYPE:
-      func = &try_send_disconnect_request;
-      break;
-    case PingRequest::MESSAGE_TYPE:
-      func = &try_send_ping_request;
-      break;
-    default:
-      return 0;
-  }
-
-#undef CASE_STATE_INFO
-#undef CASE_INFO_ONLY
-
-  return func(item.entity, this, remaining_size, is_single);
+  // All other message types use function pointers
+  return data_.function_ptr(entity, conn, remaining_size, is_single);
 }

 uint16_t APIConnection::try_send_list_info_done(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -12,7 +12,6 @@
 #include "esphome/core/string_ref.h"

 #include <functional>
-#include <limits>
 #include <vector>

 namespace esphome::api {
@@ -39,8 +38,8 @@ class APIConnection final : public APIServerConnection {
  void loop();

  bool send_list_info_done() {
-    return this->schedule_message_(nullptr, ListEntitiesDoneResponse::MESSAGE_TYPE,
-                                   ListEntitiesDoneResponse::ESTIMATED_SIZE);
+    return this->schedule_message_(nullptr, &APIConnection::try_send_list_info_done,
+                                   ListEntitiesDoneResponse::MESSAGE_TYPE, ListEntitiesDoneResponse::ESTIMATED_SIZE);
  }
 #ifdef USE_BINARY_SENSOR
  bool send_binary_sensor_state(binary_sensor::BinarySensor *binary_sensor);
@@ -173,13 +172,8 @@ class APIConnection final : public APIServerConnection {
  void on_water_heater_command_request(const WaterHeaterCommandRequest &msg) override;
 #endif

-#ifdef USE_IR_RF
-  void infrared_rf_transmit_raw_timings(const InfraredRFTransmitRawTimingsRequest &msg) override;
-  void send_infrared_rf_receive_event(const InfraredRFReceiveEvent &msg);
-#endif
-
 #ifdef USE_EVENT
-  void send_event(event::Event *event);
+  void send_event(event::Event *event, const char *event_type);
 #endif

 #ifdef USE_UPDATE
@@ -474,12 +468,8 @@ class APIConnection final : public APIServerConnection {
  static uint16_t try_send_water_heater_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
                                             bool is_single);
 #endif
-#ifdef USE_INFRARED
-  static uint16_t try_send_infrared_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size,
-                                         bool is_single);
-#endif
 #ifdef USE_EVENT
-  static uint16_t try_send_event_response(event::Event *event, StringRef event_type, APIConnection *conn,
+  static uint16_t try_send_event_response(event::Event *event, const char *event_type, APIConnection *conn,
                                          uint32_t remaining_size, bool is_single);
  static uint16_t try_send_event_info(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single);
 #endif
@@ -541,17 +531,33 @@ class APIConnection final : public APIServerConnection {
  // Function pointer type for message encoding
  using MessageCreatorPtr = uint16_t (*)(EntityBase *, APIConnection *, uint32_t remaining_size, bool is_single);

+  class MessageCreator {
+   public:
+    MessageCreator(MessageCreatorPtr ptr) { data_.function_ptr = ptr; }
+    explicit MessageCreator(const char *str_value) { data_.const_char_ptr = str_value; }
+
+    // Call operator - uses message_type to determine union type
+    uint16_t operator()(EntityBase *entity, APIConnection *conn, uint32_t remaining_size, bool is_single,
+                        uint8_t message_type) const;
+
+   private:
+    union Data {
+      MessageCreatorPtr function_ptr;
+      const char *const_char_ptr;
+    } data_;  // 4 bytes on 32-bit, 8 bytes on 64-bit
+  };
+
  // Generic batching mechanism for both state updates and entity info
  struct DeferredBatch {
-    // Sentinel value for unused aux_data_index
-    static constexpr uint8_t AUX_DATA_UNUSED = std::numeric_limits<uint8_t>::max();
-
    struct BatchItem {
-      EntityBase *entity;                       // 4 bytes - Entity pointer
-      uint8_t message_type;                     // 1 byte - Message type for protocol and dispatch
-      uint8_t estimated_size;                   // 1 byte - Estimated message size (max 255 bytes)
-      uint8_t aux_data_index{AUX_DATA_UNUSED};  // 1 byte - For events: index into entity's event_types
-      // 1 byte padding
+      EntityBase *entity;      // Entity pointer
+      MessageCreator creator;  // Function that creates the message when needed
+      uint8_t message_type;    // Message type for overhead calculation (max 255)
+      uint8_t estimated_size;  // Estimated message size (max 255 bytes)
+
+      // Constructor for creating BatchItem
+      BatchItem(EntityBase *entity, MessageCreator creator, uint8_t message_type, uint8_t estimated_size)
+          : entity(entity), creator(creator), message_type(message_type), estimated_size(estimated_size) {}
    };

    std::vector<BatchItem> items;
@@ -560,11 +566,10 @@ class APIConnection final : public APIServerConnection {
    // No pre-allocation - log connections never use batching, and for
    // connections that do, buffers are released after initial sync anyway

-    // 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);
+    // Add item to the batch
+    void add_item(EntityBase *entity, MessageCreator creator, uint8_t message_type, uint8_t estimated_size);
    // 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);
+    void add_item_front(EntityBase *entity, MessageCreator creator, uint8_t message_type, uint8_t estimated_size);

    // Clear all items
    void clear() {
@@ -578,7 +583,6 @@ class APIConnection final : public APIServerConnection {
    bool empty() const { return items.empty(); }
    size_t size() const { return items.size(); }
    const BatchItem &operator[](size_t index) const { return items[index]; }
-
    // Release excess capacity - only releases if items already empty
    void release_buffer() {
      // Safe to call: batch is processed before release_buffer is called,
@@ -650,16 +654,18 @@ class APIConnection final : public APIServerConnection {
    this->flags_.batch_scheduled = false;
  }

-  // Dispatch message encoding based on message_type - replaces function pointer storage
-  // Switch assigns pointer, single call site for smaller code size
-  uint16_t dispatch_message_(const DeferredBatch::BatchItem &item, uint32_t remaining_size, bool is_single);
-
 #ifdef HAS_PROTO_MESSAGE_DUMP
-  void log_batch_item_(const DeferredBatch::BatchItem &item) {
+  // Helper to log a proto message from a MessageCreator object
+  void log_proto_message_(EntityBase *entity, const MessageCreator &creator, uint8_t message_type) {
    this->flags_.log_only_mode = true;
-    this->dispatch_message_(item, MAX_BATCH_PACKET_SIZE, true);
+    creator(entity, this, MAX_BATCH_PACKET_SIZE, true, message_type);
    this->flags_.log_only_mode = false;
  }
+
+  void log_batch_item_(const DeferredBatch::BatchItem &item) {
+    // Use the helper to log the message
+    this->log_proto_message_(item.entity, item.creator, item.message_type);
+  }
 #endif

  // Helper to check if a message type should bypass batching
@@ -683,31 +689,63 @@ class APIConnection final : public APIServerConnection {
  // Helper method to send a message either immediately or via batching
  // Tries immediate send if should_send_immediately_() returns true and buffer has space
  // Falls back to batching if immediate send fails or isn't applicable
-  bool send_message_smart_(EntityBase *entity, uint8_t message_type, uint8_t estimated_size,
-                           uint8_t aux_data_index = DeferredBatch::AUX_DATA_UNUSED) {
+  bool send_message_smart_(EntityBase *entity, MessageCreatorPtr creator, uint8_t message_type,
+                           uint8_t estimated_size) {
    if (this->should_send_immediately_(message_type) && this->helper_->can_write_without_blocking()) {
-      DeferredBatch::BatchItem item{entity, message_type, estimated_size, aux_data_index};
-      if (this->dispatch_message_(item, MAX_BATCH_PACKET_SIZE, true) &&
+      // Now actually encode and send
+      if (creator(entity, this, MAX_BATCH_PACKET_SIZE, true) &&
          this->send_buffer(ProtoWriteBuffer{&this->parent_->get_shared_buffer_ref()}, message_type)) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
-        this->log_batch_item_(item);
+        // Log the message in verbose mode
+        this->log_proto_message_(entity, MessageCreator(creator), message_type);
 #endif
        return true;
      }
+
+      // If immediate send failed, fall through to batching
    }
-    return this->schedule_message_(entity, message_type, estimated_size, aux_data_index);
+
+    // Fall back to scheduled batching
+    return this->schedule_message_(entity, creator, message_type, estimated_size);
+  }
+
+  // Overload for MessageCreator (used by events which need to capture event_type)
+  bool send_message_smart_(EntityBase *entity, MessageCreator creator, uint8_t message_type, uint8_t estimated_size) {
+    // Try to send immediately if message type should bypass batching and buffer has space
+    if (this->should_send_immediately_(message_type) && this->helper_->can_write_without_blocking()) {
+      // Now actually encode and send
+      if (creator(entity, this, MAX_BATCH_PACKET_SIZE, true, message_type) &&
+          this->send_buffer(ProtoWriteBuffer{&this->parent_->get_shared_buffer_ref()}, message_type)) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+        // Log the message in verbose mode
+        this->log_proto_message_(entity, creator, message_type);
+#endif
+        return true;
+      }
+
+      // If immediate send failed, fall through to batching
+    }
+
+    // Fall back to scheduled batching
+    return this->schedule_message_(entity, creator, message_type, estimated_size);
  }

  // Helper function to schedule a deferred message with known message type
-  bool schedule_message_(EntityBase *entity, uint8_t message_type, uint8_t estimated_size,
-                         uint8_t aux_data_index = DeferredBatch::AUX_DATA_UNUSED) {
-    this->deferred_batch_.add_item(entity, message_type, estimated_size, aux_data_index);
+  bool schedule_message_(EntityBase *entity, MessageCreator creator, uint8_t message_type, uint8_t estimated_size) {
+    this->deferred_batch_.add_item(entity, creator, message_type, estimated_size);
    return this->schedule_batch_();
  }

+  // Overload for function pointers (for info messages and current state reads)
+  bool schedule_message_(EntityBase *entity, MessageCreatorPtr function_ptr, uint8_t message_type,
+                         uint8_t estimated_size) {
+    return schedule_message_(entity, MessageCreator(function_ptr), message_type, estimated_size);
+  }
+
  // Helper function to schedule a high priority message at the front of the batch
-  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);
+  bool schedule_message_front_(EntityBase *entity, MessageCreatorPtr function_ptr, uint8_t message_type,
+                               uint8_t estimated_size) {
+    this->deferred_batch_.add_item_front(entity, MessageCreator(function_ptr), message_type, estimated_size);
    return this->schedule_batch_();
  }

--- a/esphome/components/api/api_options.proto
+++ b/esphome/components/api/api_options.proto
@@ -27,6 +27,7 @@ extend google.protobuf.MessageOptions {
 extend google.protobuf.FieldOptions {
    optional string field_ifdef = 1042;
    optional uint32 fixed_array_size = 50007;
+    optional bool no_zero_copy = 50008 [default=false];
    optional bool fixed_array_skip_zero = 50009 [default=false];
    optional string fixed_array_size_define = 50010;
    optional string fixed_array_with_length_define = 50011;
@@ -79,15 +80,4 @@ extend google.protobuf.FieldOptions {
    // Example: [(container_pointer_no_template) = "light::ColorModeMask"]
    //   generates: const light::ColorModeMask *supported_color_modes{};
    optional string container_pointer_no_template = 50014;
-
-    // packed_buffer: Expose raw packed buffer instead of decoding into container
-    // When set on a packed repeated field, the generated code stores a pointer
-    // to the raw protobuf buffer instead of decoding values. This enables
-    // zero-copy passthrough when the consumer can decode on-demand.
-    // The field must be a packed repeated field (packed=true).
-    // Generates three fields:
-    //   - const uint8_t *<field>_data_{nullptr};
-    //   - uint16_t <field>_length_{0};
-    //   - uint16_t <field>_count_{0};
-    optional bool packed_buffer = 50015 [default=false];
 }
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -3347,98 +3347,5 @@ void ZWaveProxyRequest::calculate_size(ProtoSize &size) const {
  size.add_length(1, this->data_len);
 }
 #endif
-#ifdef USE_INFRARED
-void ListEntitiesInfraredResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->object_id);
-  buffer.encode_fixed32(2, this->key);
-  buffer.encode_string(3, this->name);
-#ifdef USE_ENTITY_ICON
-  buffer.encode_string(4, this->icon);
-#endif
-  buffer.encode_bool(5, this->disabled_by_default);
-  buffer.encode_uint32(6, static_cast<uint32_t>(this->entity_category));
-#ifdef USE_DEVICES
-  buffer.encode_uint32(7, this->device_id);
-#endif
-  buffer.encode_uint32(8, this->capabilities);
-}
-void ListEntitiesInfraredResponse::calculate_size(ProtoSize &size) const {
-  size.add_length(1, this->object_id.size());
-  size.add_fixed32(1, this->key);
-  size.add_length(1, this->name.size());
-#ifdef USE_ENTITY_ICON
-  size.add_length(1, this->icon.size());
-#endif
-  size.add_bool(1, this->disabled_by_default);
-  size.add_uint32(1, static_cast<uint32_t>(this->entity_category));
-#ifdef USE_DEVICES
-  size.add_uint32(1, this->device_id);
-#endif
-  size.add_uint32(1, this->capabilities);
-}
-#endif
-#ifdef USE_IR_RF
-bool InfraredRFTransmitRawTimingsRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-#ifdef USE_DEVICES
-    case 1:
-      this->device_id = value.as_uint32();
-      break;
-#endif
-    case 3:
-      this->carrier_frequency = value.as_uint32();
-      break;
-    case 4:
-      this->repeat_count = value.as_uint32();
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
-bool InfraredRFTransmitRawTimingsRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 5: {
-      this->timings_data_ = value.data();
-      this->timings_length_ = value.size();
-      this->timings_count_ = count_packed_varints(value.data(), value.size());
-      break;
-    }
-    default:
-      return false;
-  }
-  return true;
-}
-bool InfraredRFTransmitRawTimingsRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 2:
-      this->key = value.as_fixed32();
-      break;
-    default:
-      return false;
-  }
-  return true;
-}
-void InfraredRFReceiveEvent::encode(ProtoWriteBuffer buffer) const {
-#ifdef USE_DEVICES
-  buffer.encode_uint32(1, this->device_id);
-#endif
-  buffer.encode_fixed32(2, this->key);
-  for (const auto &it : *this->timings) {
-    buffer.encode_sint32(3, it, true);
-  }
-}
-void InfraredRFReceiveEvent::calculate_size(ProtoSize &size) const {
-#ifdef USE_DEVICES
-  size.add_uint32(1, this->device_id);
-#endif
-  size.add_fixed32(1, this->key);
-  if (!this->timings->empty()) {
-    for (const auto &it : *this->timings) {
-      size.add_sint32_force(1, it);
-    }
-  }
-}
-#endif

 }  // namespace esphome::api
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
--- a/esphome/components/api/api_pb2_dump.cpp
+++ b/esphome/components/api/api_pb2_dump.cpp
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -8,12 +8,8 @@ namespace esphome::api {
 static const char *const TAG = "api.service";

 #ifdef HAS_PROTO_MESSAGE_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;
-  ESP_LOGVV(TAG, "%s: %s", LOG_STR_ARG(name), msg.dump_to(dump_buf));
+void APIServerConnectionBase::log_send_message_(const char *name, const std::string &dump) {
+  ESP_LOGVV(TAG, "send_message %s: %s", name, dump.c_str());
 }
 #endif

@@ -23,7 +19,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      HelloRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_hello_request"), msg);
+      ESP_LOGVV(TAG, "on_hello_request: %s", msg.dump().c_str());
 #endif
      this->on_hello_request(msg);
      break;
@@ -32,7 +28,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      DisconnectRequest msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_disconnect_request"), msg);
+      ESP_LOGVV(TAG, "on_disconnect_request: %s", msg.dump().c_str());
 #endif
      this->on_disconnect_request(msg);
      break;
@@ -41,7 +37,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      DisconnectResponse msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_disconnect_response"), msg);
+      ESP_LOGVV(TAG, "on_disconnect_response: %s", msg.dump().c_str());
 #endif
      this->on_disconnect_response(msg);
      break;
@@ -50,7 +46,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      PingRequest msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_ping_request"), msg);
+      ESP_LOGVV(TAG, "on_ping_request: %s", msg.dump().c_str());
 #endif
      this->on_ping_request(msg);
      break;
@@ -59,7 +55,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      PingResponse msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_ping_response"), msg);
+      ESP_LOGVV(TAG, "on_ping_response: %s", msg.dump().c_str());
 #endif
      this->on_ping_response(msg);
      break;
@@ -68,7 +64,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      DeviceInfoRequest msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_device_info_request"), msg);
+      ESP_LOGVV(TAG, "on_device_info_request: %s", msg.dump().c_str());
 #endif
      this->on_device_info_request(msg);
      break;
@@ -77,7 +73,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      ListEntitiesRequest msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_list_entities_request"), msg);
+      ESP_LOGVV(TAG, "on_list_entities_request: %s", msg.dump().c_str());
 #endif
      this->on_list_entities_request(msg);
      break;
@@ -86,7 +82,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SubscribeStatesRequest msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_subscribe_states_request"), msg);
+      ESP_LOGVV(TAG, "on_subscribe_states_request: %s", msg.dump().c_str());
 #endif
      this->on_subscribe_states_request(msg);
      break;
@@ -95,7 +91,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SubscribeLogsRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_subscribe_logs_request"), msg);
+      ESP_LOGVV(TAG, "on_subscribe_logs_request: %s", msg.dump().c_str());
 #endif
      this->on_subscribe_logs_request(msg);
      break;
@@ -105,7 +101,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      CoverCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_cover_command_request"), msg);
+      ESP_LOGVV(TAG, "on_cover_command_request: %s", msg.dump().c_str());
 #endif
      this->on_cover_command_request(msg);
      break;
@@ -116,7 +112,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      FanCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_fan_command_request"), msg);
+      ESP_LOGVV(TAG, "on_fan_command_request: %s", msg.dump().c_str());
 #endif
      this->on_fan_command_request(msg);
      break;
@@ -127,7 +123,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      LightCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_light_command_request"), msg);
+      ESP_LOGVV(TAG, "on_light_command_request: %s", msg.dump().c_str());
 #endif
      this->on_light_command_request(msg);
      break;
@@ -138,7 +134,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SwitchCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_switch_command_request"), msg);
+      ESP_LOGVV(TAG, "on_switch_command_request: %s", msg.dump().c_str());
 #endif
      this->on_switch_command_request(msg);
      break;
@@ -149,7 +145,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SubscribeHomeassistantServicesRequest msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_subscribe_homeassistant_services_request"), msg);
+      ESP_LOGVV(TAG, "on_subscribe_homeassistant_services_request: %s", msg.dump().c_str());
 #endif
      this->on_subscribe_homeassistant_services_request(msg);
      break;
@@ -159,7 +155,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      GetTimeResponse msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_get_time_response"), msg);
+      ESP_LOGVV(TAG, "on_get_time_response: %s", msg.dump().c_str());
 #endif
      this->on_get_time_response(msg);
      break;
@@ -169,7 +165,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SubscribeHomeAssistantStatesRequest msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_subscribe_home_assistant_states_request"), msg);
+      ESP_LOGVV(TAG, "on_subscribe_home_assistant_states_request: %s", msg.dump().c_str());
 #endif
      this->on_subscribe_home_assistant_states_request(msg);
      break;
@@ -180,7 +176,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      HomeAssistantStateResponse msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_home_assistant_state_response"), msg);
+      ESP_LOGVV(TAG, "on_home_assistant_state_response: %s", msg.dump().c_str());
 #endif
      this->on_home_assistant_state_response(msg);
      break;
@@ -191,7 +187,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      ExecuteServiceRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_execute_service_request"), msg);
+      ESP_LOGVV(TAG, "on_execute_service_request: %s", msg.dump().c_str());
 #endif
      this->on_execute_service_request(msg);
      break;
@@ -202,7 +198,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      CameraImageRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_camera_image_request"), msg);
+      ESP_LOGVV(TAG, "on_camera_image_request: %s", msg.dump().c_str());
 #endif
      this->on_camera_image_request(msg);
      break;
@@ -213,7 +209,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      ClimateCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_climate_command_request"), msg);
+      ESP_LOGVV(TAG, "on_climate_command_request: %s", msg.dump().c_str());
 #endif
      this->on_climate_command_request(msg);
      break;
@@ -224,7 +220,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      NumberCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_number_command_request"), msg);
+      ESP_LOGVV(TAG, "on_number_command_request: %s", msg.dump().c_str());
 #endif
      this->on_number_command_request(msg);
      break;
@@ -235,7 +231,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SelectCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_select_command_request"), msg);
+      ESP_LOGVV(TAG, "on_select_command_request: %s", msg.dump().c_str());
 #endif
      this->on_select_command_request(msg);
      break;
@@ -246,7 +242,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SirenCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_siren_command_request"), msg);
+      ESP_LOGVV(TAG, "on_siren_command_request: %s", msg.dump().c_str());
 #endif
      this->on_siren_command_request(msg);
      break;
@@ -257,7 +253,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      LockCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_lock_command_request"), msg);
+      ESP_LOGVV(TAG, "on_lock_command_request: %s", msg.dump().c_str());
 #endif
      this->on_lock_command_request(msg);
      break;
@@ -268,7 +264,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      ButtonCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_button_command_request"), msg);
+      ESP_LOGVV(TAG, "on_button_command_request: %s", msg.dump().c_str());
 #endif
      this->on_button_command_request(msg);
      break;
@@ -279,7 +275,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      MediaPlayerCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_media_player_command_request"), msg);
+      ESP_LOGVV(TAG, "on_media_player_command_request: %s", msg.dump().c_str());
 #endif
      this->on_media_player_command_request(msg);
      break;
@@ -290,7 +286,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SubscribeBluetoothLEAdvertisementsRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_subscribe_bluetooth_le_advertisements_request"), msg);
+      ESP_LOGVV(TAG, "on_subscribe_bluetooth_le_advertisements_request: %s", msg.dump().c_str());
 #endif
      this->on_subscribe_bluetooth_le_advertisements_request(msg);
      break;
@@ -301,7 +297,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      BluetoothDeviceRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_bluetooth_device_request"), msg);
+      ESP_LOGVV(TAG, "on_bluetooth_device_request: %s", msg.dump().c_str());
 #endif
      this->on_bluetooth_device_request(msg);
      break;
@@ -312,7 +308,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      BluetoothGATTGetServicesRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_bluetooth_gatt_get_services_request"), msg);
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_get_services_request: %s", msg.dump().c_str());
 #endif
      this->on_bluetooth_gatt_get_services_request(msg);
      break;
@@ -323,7 +319,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      BluetoothGATTReadRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_bluetooth_gatt_read_request"), msg);
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_read_request: %s", msg.dump().c_str());
 #endif
      this->on_bluetooth_gatt_read_request(msg);
      break;
@@ -334,7 +330,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      BluetoothGATTWriteRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_bluetooth_gatt_write_request"), msg);
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_write_request: %s", msg.dump().c_str());
 #endif
      this->on_bluetooth_gatt_write_request(msg);
      break;
@@ -345,7 +341,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      BluetoothGATTReadDescriptorRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_bluetooth_gatt_read_descriptor_request"), msg);
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_read_descriptor_request: %s", msg.dump().c_str());
 #endif
      this->on_bluetooth_gatt_read_descriptor_request(msg);
      break;
@@ -356,7 +352,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      BluetoothGATTWriteDescriptorRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_bluetooth_gatt_write_descriptor_request"), msg);
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_write_descriptor_request: %s", msg.dump().c_str());
 #endif
      this->on_bluetooth_gatt_write_descriptor_request(msg);
      break;
@@ -367,7 +363,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      BluetoothGATTNotifyRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_bluetooth_gatt_notify_request"), msg);
+      ESP_LOGVV(TAG, "on_bluetooth_gatt_notify_request: %s", msg.dump().c_str());
 #endif
      this->on_bluetooth_gatt_notify_request(msg);
      break;
@@ -378,7 +374,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SubscribeBluetoothConnectionsFreeRequest msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_subscribe_bluetooth_connections_free_request"), msg);
+      ESP_LOGVV(TAG, "on_subscribe_bluetooth_connections_free_request: %s", msg.dump().c_str());
 #endif
      this->on_subscribe_bluetooth_connections_free_request(msg);
      break;
@@ -389,7 +385,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      UnsubscribeBluetoothLEAdvertisementsRequest msg;
      // Empty message: no decode needed
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_unsubscribe_bluetooth_le_advertisements_request"), msg);
+      ESP_LOGVV(TAG, "on_unsubscribe_bluetooth_le_advertisements_request: %s", msg.dump().c_str());
 #endif
      this->on_unsubscribe_bluetooth_le_advertisements_request(msg);
      break;
@@ -400,7 +396,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      SubscribeVoiceAssistantRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_subscribe_voice_assistant_request"), msg);
+      ESP_LOGVV(TAG, "on_subscribe_voice_assistant_request: %s", msg.dump().c_str());
 #endif
      this->on_subscribe_voice_assistant_request(msg);
      break;
@@ -411,7 +407,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      VoiceAssistantResponse msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_voice_assistant_response"), msg);
+      ESP_LOGVV(TAG, "on_voice_assistant_response: %s", msg.dump().c_str());
 #endif
      this->on_voice_assistant_response(msg);
      break;
@@ -422,7 +418,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      VoiceAssistantEventResponse msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_voice_assistant_event_response"), msg);
+      ESP_LOGVV(TAG, "on_voice_assistant_event_response: %s", msg.dump().c_str());
 #endif
      this->on_voice_assistant_event_response(msg);
      break;
@@ -433,7 +429,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      AlarmControlPanelCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_alarm_control_panel_command_request"), msg);
+      ESP_LOGVV(TAG, "on_alarm_control_panel_command_request: %s", msg.dump().c_str());
 #endif
      this->on_alarm_control_panel_command_request(msg);
      break;
@@ -444,7 +440,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      TextCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_text_command_request"), msg);
+      ESP_LOGVV(TAG, "on_text_command_request: %s", msg.dump().c_str());
 #endif
      this->on_text_command_request(msg);
      break;
@@ -455,7 +451,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      DateCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_date_command_request"), msg);
+      ESP_LOGVV(TAG, "on_date_command_request: %s", msg.dump().c_str());
 #endif
      this->on_date_command_request(msg);
      break;
@@ -466,7 +462,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      TimeCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_time_command_request"), msg);
+      ESP_LOGVV(TAG, "on_time_command_request: %s", msg.dump().c_str());
 #endif
      this->on_time_command_request(msg);
      break;
@@ -477,7 +473,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      VoiceAssistantAudio msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_voice_assistant_audio"), msg);
+      ESP_LOGVV(TAG, "on_voice_assistant_audio: %s", msg.dump().c_str());
 #endif
      this->on_voice_assistant_audio(msg);
      break;
@@ -488,7 +484,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      ValveCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_valve_command_request"), msg);
+      ESP_LOGVV(TAG, "on_valve_command_request: %s", msg.dump().c_str());
 #endif
      this->on_valve_command_request(msg);
      break;
@@ -499,7 +495,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      DateTimeCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_date_time_command_request"), msg);
+      ESP_LOGVV(TAG, "on_date_time_command_request: %s", msg.dump().c_str());
 #endif
      this->on_date_time_command_request(msg);
      break;
@@ -510,7 +506,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      VoiceAssistantTimerEventResponse msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_voice_assistant_timer_event_response"), msg);
+      ESP_LOGVV(TAG, "on_voice_assistant_timer_event_response: %s", msg.dump().c_str());
 #endif
      this->on_voice_assistant_timer_event_response(msg);
      break;
@@ -521,7 +517,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      UpdateCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_update_command_request"), msg);
+      ESP_LOGVV(TAG, "on_update_command_request: %s", msg.dump().c_str());
 #endif
      this->on_update_command_request(msg);
      break;
@@ -532,7 +528,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      VoiceAssistantAnnounceRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_voice_assistant_announce_request"), msg);
+      ESP_LOGVV(TAG, "on_voice_assistant_announce_request: %s", msg.dump().c_str());
 #endif
      this->on_voice_assistant_announce_request(msg);
      break;
@@ -543,7 +539,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      VoiceAssistantConfigurationRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_voice_assistant_configuration_request"), msg);
+      ESP_LOGVV(TAG, "on_voice_assistant_configuration_request: %s", msg.dump().c_str());
 #endif
      this->on_voice_assistant_configuration_request(msg);
      break;
@@ -554,7 +550,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      VoiceAssistantSetConfiguration msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_voice_assistant_set_configuration"), msg);
+      ESP_LOGVV(TAG, "on_voice_assistant_set_configuration: %s", msg.dump().c_str());
 #endif
      this->on_voice_assistant_set_configuration(msg);
      break;
@@ -565,7 +561,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      NoiseEncryptionSetKeyRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_noise_encryption_set_key_request"), msg);
+      ESP_LOGVV(TAG, "on_noise_encryption_set_key_request: %s", msg.dump().c_str());
 #endif
      this->on_noise_encryption_set_key_request(msg);
      break;
@@ -576,7 +572,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      BluetoothScannerSetModeRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_bluetooth_scanner_set_mode_request"), msg);
+      ESP_LOGVV(TAG, "on_bluetooth_scanner_set_mode_request: %s", msg.dump().c_str());
 #endif
      this->on_bluetooth_scanner_set_mode_request(msg);
      break;
@@ -587,7 +583,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      ZWaveProxyFrame msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_z_wave_proxy_frame"), msg);
+      ESP_LOGVV(TAG, "on_z_wave_proxy_frame: %s", msg.dump().c_str());
 #endif
      this->on_z_wave_proxy_frame(msg);
      break;
@@ -598,7 +594,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      ZWaveProxyRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_z_wave_proxy_request"), msg);
+      ESP_LOGVV(TAG, "on_z_wave_proxy_request: %s", msg.dump().c_str());
 #endif
      this->on_z_wave_proxy_request(msg);
      break;
@@ -609,7 +605,7 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      HomeassistantActionResponse msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_homeassistant_action_response"), msg);
+      ESP_LOGVV(TAG, "on_homeassistant_action_response: %s", msg.dump().c_str());
 #endif
      this->on_homeassistant_action_response(msg);
      break;
@@ -620,22 +616,11 @@ void APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
      WaterHeaterCommandRequest msg;
      msg.decode(msg_data, msg_size);
 #ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_water_heater_command_request"), msg);
+      ESP_LOGVV(TAG, "on_water_heater_command_request: %s", msg.dump().c_str());
 #endif
      this->on_water_heater_command_request(msg);
      break;
    }
-#endif
-#ifdef USE_IR_RF
-    case InfraredRFTransmitRawTimingsRequest::MESSAGE_TYPE: {
-      InfraredRFTransmitRawTimingsRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      this->log_receive_message_(LOG_STR("on_infrared_rf_transmit_raw_timings_request"), msg);
-#endif
-      this->on_infrared_rf_transmit_raw_timings_request(msg);
-      break;
-    }
 #endif
    default:
      break;
@@ -834,11 +819,6 @@ void APIServerConnection::on_z_wave_proxy_frame(const ZWaveProxyFrame &msg) { th
 #ifdef USE_ZWAVE_PROXY
 void APIServerConnection::on_z_wave_proxy_request(const ZWaveProxyRequest &msg) { this->zwave_proxy_request(msg); }
 #endif
-#ifdef USE_IR_RF
-void APIServerConnection::on_infrared_rf_transmit_raw_timings_request(const InfraredRFTransmitRawTimingsRequest &msg) {
-  this->infrared_rf_transmit_raw_timings(msg);
-}
-#endif

 void APIServerConnection::read_message(uint32_t msg_size, uint32_t msg_type, const uint8_t *msg_data) {
  // Check authentication/connection requirements for messages
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -12,16 +12,14 @@ class APIServerConnectionBase : public ProtoService {
 public:
 #ifdef HAS_PROTO_MESSAGE_DUMP
 protected:
-  void log_send_message_(const char *name, const char *dump);
-  void log_receive_message_(const LogString *name, const ProtoMessage &msg);
+  void log_send_message_(const char *name, const std::string &dump);

 public:
 #endif

  bool send_message(const ProtoMessage &msg, uint8_t message_type) {
 #ifdef HAS_PROTO_MESSAGE_DUMP
-    DumpBuffer dump_buf;
-    this->log_send_message_(msg.message_name(), msg.dump_to(dump_buf));
+    this->log_send_message_(msg.message_name(), msg.dump());
 #endif
    return this->send_message_(msg, message_type);
  }
@@ -219,11 +217,6 @@ class APIServerConnectionBase : public ProtoService {
 #ifdef USE_ZWAVE_PROXY
  virtual void on_z_wave_proxy_request(const ZWaveProxyRequest &value){};
 #endif
-
-#ifdef USE_IR_RF
-  virtual void on_infrared_rf_transmit_raw_timings_request(const InfraredRFTransmitRawTimingsRequest &value){};
-#endif
-
 protected:
  void read_message(uint32_t msg_size, uint32_t msg_type, const uint8_t *msg_data) override;
 };
@@ -354,9 +347,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_ZWAVE_PROXY
  virtual void zwave_proxy_request(const ZWaveProxyRequest &msg) = 0;
-#endif
-#ifdef USE_IR_RF
-  virtual void infrared_rf_transmit_raw_timings(const InfraredRFTransmitRawTimingsRequest &msg) = 0;
 #endif
 protected:
  void on_hello_request(const HelloRequest &msg) override;
@@ -483,9 +473,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_ZWAVE_PROXY
  void on_z_wave_proxy_request(const ZWaveProxyRequest &msg) override;
-#endif
-#ifdef USE_IR_RF
-  void on_infrared_rf_transmit_raw_timings_request(const InfraredRFTransmitRawTimingsRequest &msg) override;
 #endif
  void read_message(uint32_t msg_size, uint32_t msg_type, const uint8_t *msg_data) override;
 };
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -186,17 +186,14 @@ void APIServer::loop() {
    }

    // Rare case: handle disconnection
+#ifdef USE_API_CLIENT_DISCONNECTED_TRIGGER
+    this->client_disconnected_trigger_->trigger(std::string(client->get_name()), std::string(client->get_peername()));
+#endif
 #ifdef USE_API_USER_DEFINED_ACTION_RESPONSES
    this->unregister_active_action_calls_for_connection(client.get());
 #endif
    ESP_LOGV(TAG, "Remove connection %s", client->get_name());

-#ifdef USE_API_CLIENT_DISCONNECTED_TRIGGER
-    // Save client info before removal for the trigger
-    std::string client_name(client->get_name());
-    std::string client_peername(client->get_peername());
-#endif
-
    // Swap with the last element and pop (avoids expensive vector shifts)
    if (client_index < this->clients_.size() - 1) {
      std::swap(this->clients_[client_index], this->clients_.back());
@@ -208,11 +205,6 @@ void APIServer::loop() {
      this->status_set_warning();
      this->last_connected_ = App.get_loop_component_start_time();
    }
-
-#ifdef USE_API_CLIENT_DISCONNECTED_TRIGGER
-    // Fire trigger after client is removed so api.connected reflects the true state
-    this->client_disconnected_trigger_->trigger(client_name, client_peername);
-#endif
    // Don't increment client_index since we need to process the swapped element
  }
 }
@@ -241,10 +233,8 @@ void APIServer::handle_disconnect(APIConnection *conn) {}
  void APIServer::on_##entity_name##_update(entity_type *obj) { /* NOLINT(bugprone-macro-parentheses) */ \
    if (obj->is_internal()) \
      return; \
-    for (auto &c : this->clients_) { \
-      if (c->flags_.state_subscription) \
-        c->send_##entity_name##_state(obj); \
-    } \
+    for (auto &c : this->clients_) \
+      c->send_##entity_name##_state(obj); \
  }

 #ifdef USE_BINARY_SENSOR
@@ -320,13 +310,13 @@ API_DISPATCH_UPDATE(water_heater::WaterHeater, water_heater)
 #endif

 #ifdef USE_EVENT
+// Event is a special case - unlike other entities with simple state fields,
+// events store their state in a member accessed via obj->get_last_event_type()
 void APIServer::on_event(event::Event *obj) {
  if (obj->is_internal())
    return;
-  for (auto &c : this->clients_) {
-    if (c->flags_.state_subscription)
-      c->send_event(obj);
-  }
+  for (auto &c : this->clients_)
+    c->send_event(obj, obj->get_last_event_type());
 }
 #endif

@@ -335,10 +325,8 @@ void APIServer::on_event(event::Event *obj) {
 void APIServer::on_update(update::UpdateEntity *obj) {
  if (obj->is_internal())
    return;
-  for (auto &c : this->clients_) {
-    if (c->flags_.state_subscription)
-      c->send_update_state(obj);
-  }
+  for (auto &c : this->clients_)
+    c->send_update_state(obj);
 }
 #endif

@@ -351,21 +339,6 @@ void APIServer::on_zwave_proxy_request(const esphome::api::ProtoMessage &msg) {
 }
 #endif

-#ifdef USE_IR_RF
-void APIServer::send_infrared_rf_receive_event([[maybe_unused]] uint32_t device_id, uint32_t key,
-                                               const std::vector<int32_t> *timings) {
-  InfraredRFReceiveEvent resp{};
-#ifdef USE_DEVICES
-  resp.device_id = device_id;
-#endif
-  resp.key = key;
-  resp.timings = timings;
-
-  for (auto &c : this->clients_)
-    c->send_infrared_rf_receive_event(resp);
-}
-#endif
-
 #ifdef USE_ALARM_CONTROL_PANEL
 API_DISPATCH_UPDATE(alarm_control_panel::AlarmControlPanel, alarm_control_panel)
 #endif
@@ -558,10 +531,8 @@ bool APIServer::clear_noise_psk(bool make_active) {
 #ifdef USE_HOMEASSISTANT_TIME
 void APIServer::request_time() {
  for (auto &client : this->clients_) {
-    if (!client->flags_.remove && client->is_authenticated()) {
+    if (!client->flags_.remove && client->is_authenticated())
      client->send_time_request();
-      return;  // Only request from one client to avoid clock conflicts
-    }
  }
 }
 #endif
@@ -621,7 +592,8 @@ void APIServer::on_shutdown() {
    if (!c->send_message(req, DisconnectRequest::MESSAGE_TYPE)) {
      // If we can't send the disconnect request directly (tx_buffer full),
      // schedule it at the front of the batch so it will be sent with priority
-      c->schedule_message_front_(nullptr, DisconnectRequest::MESSAGE_TYPE, DisconnectRequest::ESTIMATED_SIZE);
+      c->schedule_message_front_(nullptr, &APIConnection::try_send_disconnect_request, DisconnectRequest::MESSAGE_TYPE,
+                                 DisconnectRequest::ESTIMATED_SIZE);
    }
  }
 }
@@ -653,18 +625,18 @@ uint32_t APIServer::register_active_action_call(uint32_t client_call_id, APIConn
  this->active_action_calls_.push_back({action_call_id, client_call_id, conn});

  // Schedule automatic cleanup after timeout (client will have given up by then)
-  // Uses numeric ID overload to avoid heap allocation from str_sprintf
-  this->set_timeout(action_call_id, USE_API_ACTION_CALL_TIMEOUT_MS, [this, action_call_id]() {
-    ESP_LOGD(TAG, "Action call %u timed out", action_call_id);
-    this->unregister_active_action_call(action_call_id);
-  });
+  this->set_timeout(str_sprintf("action_call_%u", action_call_id), USE_API_ACTION_CALL_TIMEOUT_MS,
+                    [this, action_call_id]() {
+                      ESP_LOGD(TAG, "Action call %u timed out", action_call_id);
+                      this->unregister_active_action_call(action_call_id);
+                    });

  return action_call_id;
 }

 void APIServer::unregister_active_action_call(uint32_t action_call_id) {
-  // Cancel the timeout for this action call (uses numeric ID overload)
-  this->cancel_timeout(action_call_id);
+  // Cancel the timeout for this action call
+  this->cancel_timeout(str_sprintf("action_call_%u", action_call_id));

  // Swap-and-pop is more efficient than remove_if for unordered vectors
  for (size_t i = 0; i < this->active_action_calls_.size(); i++) {
@@ -680,8 +652,8 @@ void APIServer::unregister_active_action_calls_for_connection(APIConnection *con
  // Remove all active action calls for disconnected connection using swap-and-pop
  for (size_t i = 0; i < this->active_action_calls_.size();) {
    if (this->active_action_calls_[i].connection == conn) {
-      // Cancel the timeout for this action call (uses numeric ID overload)
-      this->cancel_timeout(this->active_action_calls_[i].action_call_id);
+      // Cancel the timeout for this action call
+      this->cancel_timeout(str_sprintf("action_call_%u", this->active_action_calls_[i].action_call_id));

      std::swap(this->active_action_calls_[i], this->active_action_calls_.back());
      this->active_action_calls_.pop_back();
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -185,9 +185,6 @@ class APIServer : public Component,
 #ifdef USE_ZWAVE_PROXY
  void on_zwave_proxy_request(const esphome::api::ProtoMessage &msg);
 #endif
-#ifdef USE_IR_RF
-  void send_infrared_rf_receive_event(uint32_t device_id, uint32_t key, const std::vector<int32_t> *timings);
-#endif

  bool is_connected(bool state_subscription_only = false) const;

--- a/esphome/components/api/custom_api_device.h
+++ b/esphome/components/api/custom_api_device.h
@@ -265,7 +265,7 @@ class CustomAPIDevice {
    for (auto &it : data) {
      auto &kv = resp.data.emplace_back();
      kv.key = StringRef(it.first);
-      kv.value = StringRef(it.second);  // data map lives until send completes
+      kv.value = it.second;  // value is std::string (no_zero_copy), assign directly
    }
    global_api_server->send_homeassistant_action(resp);
  }
@@ -308,7 +308,7 @@ class CustomAPIDevice {
    for (auto &it : data) {
      auto &kv = resp.data.emplace_back();
      kv.key = StringRef(it.first);
-      kv.value = StringRef(it.second);  // data map lives until send completes
+      kv.value = it.second;  // value is std::string (no_zero_copy), assign directly
    }
    global_api_server->send_homeassistant_action(resp);
  }
--- a/esphome/components/api/homeassistant_service.h
+++ b/esphome/components/api/homeassistant_service.h
@@ -149,21 +149,11 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
    std::string service_value = this->service_.value(x...);
    resp.service = StringRef(service_value);
    resp.is_event = this->flags_.is_event;
-
-    // Local storage for lambda-evaluated strings - lives until after send
-    FixedVector<std::string> data_storage;
-    FixedVector<std::string> data_template_storage;
-    FixedVector<std::string> variables_storage;
-
-    this->populate_service_map(resp.data, this->data_, data_storage, x...);
-    this->populate_service_map(resp.data_template, this->data_template_, data_template_storage, x...);
-    this->populate_service_map(resp.variables, this->variables_, variables_storage, x...);
+    this->populate_service_map(resp.data, this->data_, x...);
+    this->populate_service_map(resp.data_template, this->data_template_, x...);
+    this->populate_service_map(resp.variables, this->variables_, x...);

 #ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES
-#ifdef USE_API_HOMEASSISTANT_ACTION_RESPONSES_JSON
-    // IMPORTANT: Declare at outer scope so it lives until send_homeassistant_action returns.
-    std::string response_template_value;
-#endif
    if (this->flags_.wants_status) {
      // Generate a unique call ID for this service call
      static uint32_t call_id_counter = 1;
@@ -174,8 +164,8 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
        resp.wants_response = true;
        // Set response template if provided
        if (this->flags_.has_response_template) {
-          response_template_value = this->response_template_.value(x...);
-          resp.response_template = StringRef(response_template_value);
+          std::string response_template_value = this->response_template_.value(x...);
+          resp.response_template = response_template_value;
        }
      }
 #endif
@@ -215,31 +205,12 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
  }

  template<typename VectorType, typename SourceType>
-  static void populate_service_map(VectorType &dest, SourceType &source, FixedVector<std::string> &value_storage,
-                                   Ts... x) {
+  static void populate_service_map(VectorType &dest, SourceType &source, Ts... x) {
    dest.init(source.size());
-
-    // Count non-static strings to allocate exact storage needed
-    size_t lambda_count = 0;
-    for (const auto &it : source) {
-      if (!it.value.is_static_string()) {
-        lambda_count++;
-      }
-    }
-    value_storage.init(lambda_count);
-
    for (auto &it : source) {
      auto &kv = dest.emplace_back();
      kv.key = StringRef(it.key);
-
-      if (it.value.is_static_string()) {
-        // Static string from YAML - zero allocation
-        kv.value = StringRef(it.value.get_static_string());
-      } else {
-        // Lambda evaluation - store result, reference it
-        value_storage.push_back(it.value.value(x...));
-        kv.value = StringRef(value_storage.back());
-      }
+      kv.value = it.value.value(x...);
    }
  }

--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -76,9 +76,6 @@ LIST_ENTITIES_HANDLER(alarm_control_panel, alarm_control_panel::AlarmControlPane
 #ifdef USE_WATER_HEATER
 LIST_ENTITIES_HANDLER(water_heater, water_heater::WaterHeater, ListEntitiesWaterHeaterResponse)
 #endif
-#ifdef USE_INFRARED
-LIST_ENTITIES_HANDLER(infrared, infrared::Infrared, ListEntitiesInfraredResponse)
-#endif
 #ifdef USE_EVENT
 LIST_ENTITIES_HANDLER(event, event::Event, ListEntitiesEventResponse)
 #endif
--- a/esphome/components/api/list_entities.h
+++ b/esphome/components/api/list_entities.h
@@ -9,10 +9,11 @@ namespace esphome::api {
 class APIConnection;

 // Macro for generating ListEntitiesIterator handlers
-// Calls schedule_message_ which dispatches to try_send_*_info
+// Calls schedule_message_ with try_send_*_info
 #define LIST_ENTITIES_HANDLER(entity_type, EntityClass, ResponseType) \
  bool ListEntitiesIterator::on_##entity_type(EntityClass *entity) { /* NOLINT(bugprone-macro-parentheses) */ \
-    return this->client_->schedule_message_(entity, ResponseType::MESSAGE_TYPE, ResponseType::ESTIMATED_SIZE); \
+    return this->client_->schedule_message_(entity, &APIConnection::try_send_##entity_type##_info, \
+                                            ResponseType::MESSAGE_TYPE, ResponseType::ESTIMATED_SIZE); \
  }

 class ListEntitiesIterator : public ComponentIterator {
@@ -84,9 +85,6 @@ class ListEntitiesIterator : public ComponentIterator {
 #ifdef USE_WATER_HEATER
  bool on_water_heater(water_heater::WaterHeater *entity) override;
 #endif
-#ifdef USE_INFRARED
-  bool on_infrared(infrared::Infrared *entity) override;
-#endif
 #ifdef USE_EVENT
  bool on_event(event::Event *entity) override;
 #endif
--- a/esphome/components/api/proto.cpp
+++ b/esphome/components/api/proto.cpp
@@ -48,14 +48,14 @@ uint32_t ProtoDecodableMessage::count_repeated_field(const uint8_t *buffer, size
        }
        uint32_t field_length = res->as_uint32();
        ptr += consumed;
-        if (field_length > static_cast<size_t>(end - ptr)) {
+        if (ptr + field_length > end) {
          return count;  // Out of bounds
        }
        ptr += field_length;
        break;
      }
      case WIRE_TYPE_FIXED32: {  // 32-bit - skip 4 bytes
-        if (end - ptr < 4) {
+        if (ptr + 4 > end) {
          return count;
        }
        ptr += 4;
@@ -110,7 +110,7 @@ void ProtoDecodableMessage::decode(const uint8_t *buffer, size_t length) {
        }
        uint32_t field_length = res->as_uint32();
        ptr += consumed;
-        if (field_length > static_cast<size_t>(end - ptr)) {
+        if (ptr + field_length > end) {
          ESP_LOGV(TAG, "Out-of-bounds Length Delimited at offset %ld", (long) (ptr - buffer));
          return;
        }
@@ -121,7 +121,7 @@ void ProtoDecodableMessage::decode(const uint8_t *buffer, size_t length) {
        break;
      }
      case WIRE_TYPE_FIXED32: {  // 32-bit
-        if (end - ptr < 4) {
+        if (ptr + 4 > end) {
          ESP_LOGV(TAG, "Out-of-bounds Fixed32-bit at offset %ld", (long) (ptr - buffer));
          return;
        }
@@ -139,4 +139,12 @@ void ProtoDecodableMessage::decode(const uint8_t *buffer, size_t length) {
  }
 }

+#ifdef HAS_PROTO_MESSAGE_DUMP
+std::string ProtoMessage::dump() const {
+  std::string out;
+  this->dump_to(out);
+  return out;
+}
+#endif
+
 }  // namespace esphome::api
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -39,24 +39,6 @@ inline constexpr int64_t decode_zigzag64(uint64_t value) {
  return (value & 1) ? static_cast<int64_t>(~(value >> 1)) : static_cast<int64_t>(value >> 1);
 }

-/// Count number of varints in a packed buffer
-inline uint16_t count_packed_varints(const uint8_t *data, size_t len) {
-  uint16_t count = 0;
-  while (len > 0) {
-    // Skip varint bytes until we find one without continuation bit
-    while (len > 0 && (*data & 0x80)) {
-      data++;
-      len--;
-    }
-    if (len > 0) {
-      data++;
-      len--;
-      count++;
-    }
-  }
-  return count;
-}
-
 /*
 * StringRef Ownership Model for API Protocol Messages
 * ===================================================
@@ -198,10 +180,9 @@ class ProtoVarInt {
  uint64_t value_;
 };

-// Forward declarations for decode_to_message, encode_message and encode_packed_sint32
-class ProtoDecodableMessage;
+// Forward declaration for decode_to_message and encode_to_writer
 class ProtoMessage;
-class ProtoSize;
+class ProtoDecodableMessage;

 class ProtoLengthDelimited {
 public:
@@ -353,8 +334,6 @@ class ProtoWriteBuffer {
  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);
  void encode_message(uint32_t field_id, const ProtoMessage &value);
  std::vector<uint8_t> *get_buffer() const { return buffer_; }

@@ -362,62 +341,8 @@ class ProtoWriteBuffer {
  std::vector<uint8_t> *buffer_;
 };

-#ifdef HAS_PROTO_MESSAGE_DUMP
-/**
- * Fixed-size buffer for message dumps - avoids heap allocation.
- * Sized to match the logger's default tx_buffer_size (512 bytes)
- * since anything larger gets truncated anyway.
- */
-class DumpBuffer {
- public:
-  // Matches default tx_buffer_size in logger component
-  static constexpr size_t CAPACITY = 512;
-
-  DumpBuffer() : pos_(0) { buf_[0] = '\0'; }
-
-  DumpBuffer &append(const char *str) {
-    if (str) {
-      append_impl_(str, strlen(str));
-    }
-    return *this;
-  }
-
-  DumpBuffer &append(const char *str, size_t len) {
-    append_impl_(str, len);
-    return *this;
-  }
-
-  DumpBuffer &append(size_t n, char c) {
-    size_t space = CAPACITY - 1 - pos_;
-    if (n > space)
-      n = space;
-    if (n > 0) {
-      memset(buf_ + pos_, c, n);
-      pos_ += n;
-      buf_[pos_] = '\0';
-    }
-    return *this;
-  }
-
-  const char *c_str() const { return buf_; }
-  size_t size() const { return pos_; }
-
- private:
-  void append_impl_(const char *str, size_t len) {
-    size_t space = CAPACITY - 1 - pos_;
-    if (len > space)
-      len = space;
-    if (len > 0) {
-      memcpy(buf_ + pos_, str, len);
-      pos_ += len;
-      buf_[pos_] = '\0';
-    }
-  }
-
-  char buf_[CAPACITY];
-  size_t pos_;
-};
-#endif
+// Forward declaration
+class ProtoSize;

 class ProtoMessage {
 public:
@@ -427,7 +352,8 @@ class ProtoMessage {
  // Default implementation for messages with no fields
  virtual void calculate_size(ProtoSize &size) const {}
 #ifdef HAS_PROTO_MESSAGE_DUMP
-  virtual const char *dump_to(DumpBuffer &out) const = 0;
+  std::string dump() const;
+  virtual void dump_to(std::string &out) const = 0;
  virtual const char *message_name() const { return "unknown"; }
 #endif
 };
@@ -866,43 +792,8 @@ class ProtoSize {
      }
    }
  }
-
-  /**
-   * @brief Calculate size of a packed repeated sint32 field
-   */
-  inline void add_packed_sint32(uint32_t field_id_size, const std::vector<int32_t> &values) {
-    if (values.empty())
-      return;
-
-    size_t packed_size = 0;
-    for (int value : values) {
-      packed_size += varint(encode_zigzag32(value));
-    }
-
-    // field_id + length varint + packed data
-    total_size_ += field_id_size + varint(static_cast<uint32_t>(packed_size)) + static_cast<uint32_t>(packed_size);
-  }
 };

-// 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));
-  }
-}
-
 // Implementation of encode_message - must be after ProtoMessage is defined
 inline void ProtoWriteBuffer::encode_message(uint32_t field_id, const ProtoMessage &value) {
  this->encode_field_raw(field_id, 2);  // type 2: Length-delimited message
--- a/esphome/components/api/subscribe_state.h
+++ b/esphome/components/api/subscribe_state.h
@@ -79,9 +79,6 @@ class InitialStateIterator : public ComponentIterator {
 #ifdef USE_WATER_HEATER
  bool on_water_heater(water_heater::WaterHeater *entity) override;
 #endif
-#ifdef USE_INFRARED
-  bool on_infrared(infrared::Infrared *infrared) override { return true; };
-#endif
 #ifdef USE_EVENT
  bool on_event(event::Event *event) override { return true; };
 #endif
--- a/esphome/components/aqi/abstract_aqi_calculator.h
+++ b/esphome/components/aqi/abstract_aqi_calculator.h
@@ -6,7 +6,7 @@ namespace esphome::aqi {

 class AbstractAQICalculator {
 public:
-  virtual uint16_t get_aqi(float pm2_5_value, float pm10_0_value) = 0;
+  virtual uint16_t get_aqi(uint16_t pm2_5_value, uint16_t pm10_0_value) = 0;
 };

 }  // namespace esphome::aqi
--- a/esphome/components/aqi/aqi_calculator.h
+++ b/esphome/components/aqi/aqi_calculator.h
@@ -1,7 +1,6 @@
 #pragma once

-#include <cmath>
-#include <limits>
+#include <climits>
 #include "abstract_aqi_calculator.h"

 // https://document.airnow.gov/technical-assistance-document-for-the-reporting-of-daily-air-quailty.pdf
@@ -10,11 +9,11 @@ namespace esphome::aqi {

 class AQICalculator : public AbstractAQICalculator {
 public:
-  uint16_t get_aqi(float pm2_5_value, float pm10_0_value) override {
-    float pm2_5_index = calculate_index(pm2_5_value, PM2_5_GRID);
-    float pm10_0_index = calculate_index(pm10_0_value, PM10_0_GRID);
+  uint16_t get_aqi(uint16_t pm2_5_value, uint16_t pm10_0_value) override {
+    int pm2_5_index = calculate_index(pm2_5_value, PM2_5_GRID);
+    int pm10_0_index = calculate_index(pm10_0_value, PM10_0_GRID);

-    return static_cast<uint16_t>(std::round((pm2_5_index < pm10_0_index) ? pm10_0_index : pm2_5_index));
+    return (pm2_5_index < pm10_0_index) ? pm10_0_index : pm2_5_index;
  }

 protected:
@@ -22,28 +21,25 @@ class AQICalculator : public AbstractAQICalculator {

  static constexpr int INDEX_GRID[NUM_LEVELS][2] = {{0, 50}, {51, 100}, {101, 150}, {151, 200}, {201, 300}, {301, 500}};

-  static constexpr float PM2_5_GRID[NUM_LEVELS][2] = {{0.0f, 9.0f},     {9.1f, 35.4f},
-                                                      {35.5f, 55.4f},   {55.5f, 125.4f},
-                                                      {125.5f, 225.4f}, {225.5f, std::numeric_limits<float>::max()}};
+  static constexpr int PM2_5_GRID[NUM_LEVELS][2] = {{0, 9}, {10, 35}, {36, 55}, {56, 125}, {126, 225}, {226, INT_MAX}};

-  static constexpr float PM10_0_GRID[NUM_LEVELS][2] = {{0.0f, 54.0f},    {55.0f, 154.0f},
-                                                       {155.0f, 254.0f}, {255.0f, 354.0f},
-                                                       {355.0f, 424.0f}, {425.0f, std::numeric_limits<float>::max()}};
+  static constexpr int PM10_0_GRID[NUM_LEVELS][2] = {{0, 54},    {55, 154},  {155, 254},
+                                                     {255, 354}, {355, 424}, {425, INT_MAX}};

-  static float calculate_index(float value, const float array[NUM_LEVELS][2]) {
+  static int calculate_index(uint16_t value, const int array[NUM_LEVELS][2]) {
    int grid_index = get_grid_index(value, array);
    if (grid_index == -1) {
-      return -1.0f;
+      return -1;
    }
-    float aqi_lo = INDEX_GRID[grid_index][0];
-    float aqi_hi = INDEX_GRID[grid_index][1];
-    float conc_lo = array[grid_index][0];
-    float conc_hi = array[grid_index][1];
+    int aqi_lo = INDEX_GRID[grid_index][0];
+    int aqi_hi = INDEX_GRID[grid_index][1];
+    int conc_lo = array[grid_index][0];
+    int conc_hi = array[grid_index][1];

    return (value - conc_lo) * (aqi_hi - aqi_lo) / (conc_hi - conc_lo) + aqi_lo;
  }

-  static int get_grid_index(float value, const float array[NUM_LEVELS][2]) {
+  static int get_grid_index(uint16_t value, const int array[NUM_LEVELS][2]) {
    for (int i = 0; i < NUM_LEVELS; i++) {
      if (value >= array[i][0] && value <= array[i][1]) {
        return i;
--- a/esphome/components/aqi/aqi_sensor.cpp
+++ b/esphome/components/aqi/aqi_sensor.cpp
@@ -44,7 +44,8 @@ void AQISensor::calculate_aqi_() {
    return;
  }

-  uint16_t aqi = calculator->get_aqi(this->pm_2_5_value_, this->pm_10_0_value_);
+  uint16_t aqi =
+      calculator->get_aqi(static_cast<uint16_t>(this->pm_2_5_value_), static_cast<uint16_t>(this->pm_10_0_value_));
  this->publish_state(aqi);
 }

--- a/esphome/components/aqi/caqi_calculator.h
+++ b/esphome/components/aqi/caqi_calculator.h
@@ -1,18 +1,16 @@
 #pragma once

-#include <cmath>
-#include <limits>
 #include "abstract_aqi_calculator.h"

 namespace esphome::aqi {

 class CAQICalculator : public AbstractAQICalculator {
 public:
-  uint16_t get_aqi(float pm2_5_value, float pm10_0_value) override {
-    float pm2_5_index = calculate_index(pm2_5_value, PM2_5_GRID);
-    float pm10_0_index = calculate_index(pm10_0_value, PM10_0_GRID);
+  uint16_t get_aqi(uint16_t pm2_5_value, uint16_t pm10_0_value) override {
+    int pm2_5_index = calculate_index(pm2_5_value, PM2_5_GRID);
+    int pm10_0_index = calculate_index(pm10_0_value, PM10_0_GRID);

-    return static_cast<uint16_t>(std::round((pm2_5_index < pm10_0_index) ? pm10_0_index : pm2_5_index));
+    return (pm2_5_index < pm10_0_index) ? pm10_0_index : pm2_5_index;
  }

 protected:
@@ -20,27 +18,25 @@ class CAQICalculator : public AbstractAQICalculator {

  static constexpr int INDEX_GRID[NUM_LEVELS][2] = {{0, 25}, {26, 50}, {51, 75}, {76, 100}, {101, 400}};

-  static constexpr float PM2_5_GRID[NUM_LEVELS][2] = {
-      {0.0f, 15.0f}, {15.1f, 30.0f}, {30.1f, 55.0f}, {55.1f, 110.0f}, {110.1f, std::numeric_limits<float>::max()}};
+  static constexpr int PM2_5_GRID[NUM_LEVELS][2] = {{0, 15}, {16, 30}, {31, 55}, {56, 110}, {111, 400}};

-  static constexpr float PM10_0_GRID[NUM_LEVELS][2] = {
-      {0.0f, 25.0f}, {25.1f, 50.0f}, {50.1f, 90.0f}, {90.1f, 180.0f}, {180.1f, std::numeric_limits<float>::max()}};
+  static constexpr int PM10_0_GRID[NUM_LEVELS][2] = {{0, 25}, {26, 50}, {51, 90}, {91, 180}, {181, 400}};

-  static float calculate_index(float value, const float array[NUM_LEVELS][2]) {
+  static int calculate_index(uint16_t value, const int array[NUM_LEVELS][2]) {
    int grid_index = get_grid_index(value, array);
    if (grid_index == -1) {
-      return -1.0f;
+      return -1;
    }

-    float aqi_lo = INDEX_GRID[grid_index][0];
-    float aqi_hi = INDEX_GRID[grid_index][1];
-    float conc_lo = array[grid_index][0];
-    float conc_hi = array[grid_index][1];
+    int aqi_lo = INDEX_GRID[grid_index][0];
+    int aqi_hi = INDEX_GRID[grid_index][1];
+    int conc_lo = array[grid_index][0];
+    int conc_hi = array[grid_index][1];

    return (value - conc_lo) * (aqi_hi - aqi_lo) / (conc_hi - conc_lo) + aqi_lo;
  }

-  static int get_grid_index(float value, const float array[NUM_LEVELS][2]) {
+  static int get_grid_index(uint16_t value, const int array[NUM_LEVELS][2]) {
    for (int i = 0; i < NUM_LEVELS; i++) {
      if (value >= array[i][0] && value <= array[i][1]) {
        return i;
--- a/esphome/components/atm90e32/atm90e32.cpp
+++ b/esphome/components/atm90e32/atm90e32.cpp
@@ -158,14 +158,12 @@ void ATM90E32Component::setup() {

  if (this->enable_offset_calibration_) {
    // Initialize flash storage for offset calibrations
-    uint32_t o_hash = fnv1_hash("_offset_calibration_");
-    o_hash = fnv1_hash_extend(o_hash, this->cs_summary_);
+    uint32_t o_hash = fnv1_hash(std::string("_offset_calibration_") + this->cs_summary_);
    this->offset_pref_ = global_preferences->make_preference<OffsetCalibration[3]>(o_hash, true);
    this->restore_offset_calibrations_();

    // Initialize flash storage for power offset calibrations
-    uint32_t po_hash = fnv1_hash("_power_offset_calibration_");
-    po_hash = fnv1_hash_extend(po_hash, this->cs_summary_);
+    uint32_t po_hash = fnv1_hash(std::string("_power_offset_calibration_") + this->cs_summary_);
    this->power_offset_pref_ = global_preferences->make_preference<PowerOffsetCalibration[3]>(po_hash, true);
    this->restore_power_offset_calibrations_();
  } else {
@@ -185,8 +183,7 @@ void ATM90E32Component::setup() {

  if (this->enable_gain_calibration_) {
    // Initialize flash storage for gain calibration
-    uint32_t g_hash = fnv1_hash("_gain_calibration_");
-    g_hash = fnv1_hash_extend(g_hash, this->cs_summary_);
+    uint32_t g_hash = fnv1_hash(std::string("_gain_calibration_") + this->cs_summary_);
    this->gain_calibration_pref_ = global_preferences->make_preference<GainCalibration[3]>(g_hash, true);
    this->restore_gain_calibrations_();

--- a/esphome/components/audio/audio_reader.cpp
+++ b/esphome/components/audio/audio_reader.cpp
@@ -185,16 +185,18 @@ esp_err_t AudioReader::start(const std::string &uri, AudioFileType &file_type) {
      return err;
    }

-    if (str_endswith_ignore_case(url, ".wav")) {
+    std::string url_string = str_lower_case(url);
+
+    if (str_endswith(url_string, ".wav")) {
      file_type = AudioFileType::WAV;
    }
 #ifdef USE_AUDIO_MP3_SUPPORT
-    else if (str_endswith_ignore_case(url, ".mp3")) {
+    else if (str_endswith(url_string, ".mp3")) {
      file_type = AudioFileType::MP3;
    }
 #endif
 #ifdef USE_AUDIO_FLAC_SUPPORT
-    else if (str_endswith_ignore_case(url, ".flac")) {
+    else if (str_endswith(url_string, ".flac")) {
      file_type = AudioFileType::FLAC;
    }
 #endif
--- a/esphome/components/bedjet/climate/bedjet_climate.cpp
+++ b/esphome/components/bedjet/climate/bedjet_climate.cpp
@@ -164,21 +164,21 @@ void BedJetClimate::control(const ClimateCall &call) {
      return;
    }
  } else if (call.has_custom_preset()) {
-    auto preset = call.get_custom_preset();
+    const char *preset = call.get_custom_preset();
    bool result;

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

@@ -208,11 +208,10 @@ void BedJetClimate::control(const ClimateCall &call) {
      this->set_fan_mode_(fan_mode);
    }
  } else if (call.has_custom_fan_mode()) {
-    auto fan_mode = call.get_custom_fan_mode();
-    auto fan_index = bedjet_fan_speed_to_step(fan_mode.c_str());
+    const char *fan_mode = call.get_custom_fan_mode();
+    auto fan_index = bedjet_fan_speed_to_step(fan_mode);
    if (fan_index <= 19) {
-      ESP_LOGV(TAG, "[%s] Converted fan mode %.*s to bedjet fan step %d", this->get_name().c_str(),
-               (int) fan_mode.size(), fan_mode.c_str(), fan_index);
+      ESP_LOGV(TAG, "[%s] Converted fan mode %s to bedjet fan step %d", this->get_name().c_str(), fan_mode, fan_index);
      bool result = this->parent_->set_fan_index(fan_index);
      if (result) {
        this->set_custom_fan_mode_(fan_mode);
--- a/esphome/components/binary_sensor/binary_sensor.cpp
+++ b/esphome/components/binary_sensor/binary_sensor.cpp
@@ -44,7 +44,7 @@ bool BinarySensor::set_new_state(const optional<bool> &new_state) {
 #if defined(USE_BINARY_SENSOR) && defined(USE_CONTROLLER_REGISTRY)
    ControllerRegistry::notify_binary_sensor_update(this);
 #endif
-    ESP_LOGD(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;
--- a/esphome/components/bk72xx/init.py
+++ b/esphome/components/bk72xx/init.py
@@ -1,23 +1,9 @@
-"""
-██╗    ██╗ █████╗ ██████╗ ███╗   ██╗██╗███╗   ██╗ ██████╗
-██║    ██║██╔══██╗██╔══██╗████╗  ██║██║████╗  ██║██╔════╝
-██║ █╗ ██║███████║██████╔╝██╔██╗ ██║██║██╔██╗ ██║██║  ███╗
-██║███╗██║██╔══██║██╔══██╗██║╚██╗██║██║██║╚██╗██║██║   ██║
-╚███╔███╔╝██║  ██║██║  ██║██║ ╚████║██║██║ ╚████║╚██████╔╝
- ╚══╝╚══╝ ╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═══╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-         AUTO-GENERATED FILE - DO NOT EDIT!
-
-This file was auto-generated by libretiny/generate_components.py.
-Any manual changes WILL BE LOST on regeneration.
-
-To customize this component:
-  - Pin validators: Create gpio.py with validate_pin() or validate_usage()
-  - Schema extensions: Create schema.py with COMPONENT_SCHEMA or COMPONENT_PIN_SCHEMA
-
-Platform-specific code should be added to the main libretiny component
-(__init__.py in esphome/components/libretiny/) rather than here.
-"""
+# This file was auto-generated by libretiny/generate_components.py
+# Do not modify its contents.
+# For custom pin validators, put validate_pin() or validate_usage()
+# in gpio.py file in this directory.
+# For changing schema/pin schema, put COMPONENT_SCHEMA or COMPONENT_PIN_SCHEMA
+# in schema.py file in this directory.

 from esphome import pins
 from esphome.components import libretiny
@@ -41,7 +27,6 @@ COMPONENT_DATA = LibreTinyComponent(
    board_pins=BK72XX_BOARD_PINS,
    pin_validation=None,
    usage_validation=None,
-    supports_atomics=False,
 )


--- a/esphome/components/bk72xx/boards.py
+++ b/esphome/components/bk72xx/boards.py
--- a/esphome/components/ble_client/text_sensor/automation.h
+++ b/esphome/components/ble_client/text_sensor/automation.h
@@ -21,7 +21,7 @@ class BLETextSensorNotifyTrigger : public Trigger<std::string>, public BLETextSe
        if (param->notify.conn_id != this->sensor_->parent()->get_conn_id() ||
            param->notify.handle != this->sensor_->handle)
          break;
-        this->trigger(std::string(reinterpret_cast<const char *>(param->notify.value), param->notify.value_len));
+        this->trigger(this->sensor_->parse_data(param->notify.value, param->notify.value_len));
      }
      default:
        break;
--- a/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
+++ b/esphome/components/ble_client/text_sensor/ble_text_sensor.cpp
@@ -11,6 +11,8 @@ namespace esphome::ble_client {

 static const char *const TAG = "ble_text_sensor";

+static const std::string EMPTY = "";
+
 void BLETextSensor::loop() {
  // Parent BLEClientNode has a loop() method, but this component uses
  // polling via update() and BLE callbacks so loop isn't needed
@@ -45,7 +47,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
    }
    case ESP_GATTC_CLOSE_EVT: {
      this->status_set_warning();
-      this->publish_state("");
+      this->publish_state(EMPTY);
      break;
    }
    case ESP_GATTC_SEARCH_CMPL_EVT: {
@@ -53,7 +55,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
      auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
      if (chr == nullptr) {
        this->status_set_warning();
-        this->publish_state("");
+        this->publish_state(EMPTY);
        char service_buf[esp32_ble::UUID_STR_LEN];
        char char_buf[esp32_ble::UUID_STR_LEN];
        ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", this->service_uuid_.to_str(service_buf),
@@ -65,7 +67,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
        auto *descr = chr->get_descriptor(this->descr_uuid_);
        if (descr == nullptr) {
          this->status_set_warning();
-          this->publish_state("");
+          this->publish_state(EMPTY);
          char service_buf[esp32_ble::UUID_STR_LEN];
          char char_buf[esp32_ble::UUID_STR_LEN];
          char descr_buf[esp32_ble::UUID_STR_LEN];
@@ -97,7 +99,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
          break;
        }
        this->status_clear_warning();
-        this->publish_state(reinterpret_cast<const char *>(param->read.value), param->read.value_len);
+        this->publish_state(this->parse_data(param->read.value, param->read.value_len));
      }
      break;
    }
@@ -106,7 +108,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
        break;
      ESP_LOGV(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
               param->notify.handle, param->notify.value[0]);
-      this->publish_state(reinterpret_cast<const char *>(param->notify.value), param->notify.value_len);
+      this->publish_state(this->parse_data(param->notify.value, param->notify.value_len));
      break;
    }
    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
@@ -119,6 +121,11 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
  }
 }

+std::string BLETextSensor::parse_data(uint8_t *value, uint16_t value_len) {
+  std::string text(value, value + value_len);
+  return text;
+}
+
 void BLETextSensor::update() {
  if (this->node_state != espbt::ClientState::ESTABLISHED) {
    ESP_LOGW(TAG, "[%s] Cannot poll, not connected", this->get_name().c_str());
@@ -133,7 +140,7 @@ void BLETextSensor::update() {
                                        ESP_GATT_AUTH_REQ_NONE);
  if (status) {
    this->status_set_warning();
-    this->publish_state("");
+    this->publish_state(EMPTY);
    ESP_LOGW(TAG, "[%s] Error sending read request for sensor, status=%d", this->get_name().c_str(), status);
  }
 }
--- a/esphome/components/ble_client/text_sensor/ble_text_sensor.h
+++ b/esphome/components/ble_client/text_sensor/ble_text_sensor.h
@@ -29,6 +29,7 @@ class BLETextSensor : public text_sensor::TextSensor, public PollingComponent, p
  void set_descr_uuid32(uint32_t uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
  void set_descr_uuid128(uint8_t *uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
  void set_enable_notify(bool notify) { this->notify_ = notify; }
+  std::string parse_data(uint8_t *value, uint16_t value_len);
  uint16_t handle;

 protected:
--- a/esphome/components/ble_nus/init.py
+++ b/esphome/components/ble_nus/init.py
@@ -1,5 +1,4 @@
 import esphome.codegen as cg
-from esphome.components.logger import request_log_listener
 from esphome.components.zephyr import zephyr_add_prj_conf
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_LOGS, CONF_TYPE
@@ -26,8 +25,5 @@ CONFIG_SCHEMA = cv.All(
 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
    zephyr_add_prj_conf("BT_NUS", True)
-    expose_log = config[CONF_TYPE] == CONF_LOGS
-    cg.add(var.set_expose_log(expose_log))
-    if expose_log:
-        request_log_listener()  # Request a log listener slot for BLE NUS log streaming
+    cg.add(var.set_expose_log(config[CONF_TYPE] == CONF_LOGS))
    await cg.register_component(var, config)
--- a/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
+++ b/esphome/components/bluetooth_proxy/bluetooth_connection.cpp
@@ -135,8 +135,8 @@ void BluetoothConnection::loop() {
  // - For V3_WITH_CACHE: Services are never sent, disable after INIT state
  // - For V3_WITHOUT_CACHE: Disable only after service discovery is complete
  //   (send_service_ == DONE_SENDING_SERVICES, which is only set after services are sent)
-  if (this->state() != espbt::ClientState::INIT && (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
-                                                    this->send_service_ == DONE_SENDING_SERVICES)) {
+  if (this->state_ != espbt::ClientState::INIT && (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
+                                                   this->send_service_ == DONE_SENDING_SERVICES)) {
    this->disable_loop();
  }
 }
--- a/esphome/components/bme68x_bsec2/sensor.py
+++ b/esphome/components/bme68x_bsec2/sensor.py
@@ -50,7 +50,7 @@ TYPES = [

 CONFIG_SCHEMA = cv.Schema(
    {
-        cv.GenerateID(): cv.declare_id(cg.EntityBase),
+        cv.GenerateID(): cv.declare_id(cg.Component),
        cv.GenerateID(CONF_BME68X_BSEC2_ID): cv.use_id(BME68xBSEC2Component),
        cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
            unit_of_measurement=UNIT_CELSIUS,
--- a/esphome/components/bme68x_bsec2_i2c/bme68x_bsec2_i2c.cpp
+++ b/esphome/components/bme68x_bsec2_i2c/bme68x_bsec2_i2c.cpp
@@ -31,11 +31,7 @@ void BME68xBSEC2I2CComponent::dump_config() {
  BME68xBSEC2Component::dump_config();
 }

-uint32_t BME68xBSEC2I2CComponent::get_hash() {
-  char buf[22];  // "bme68x_bsec_state_" (18) + uint8_t max (3) + null
-  snprintf(buf, sizeof(buf), "bme68x_bsec_state_%u", this->address_);
-  return fnv1_hash(buf);
-}
+uint32_t BME68xBSEC2I2CComponent::get_hash() { return fnv1_hash("bme68x_bsec_state_" + to_string(this->address_)); }

 int8_t BME68xBSEC2I2CComponent::read_bytes_wrapper(uint8_t a_register, uint8_t *data, uint32_t len, void *intfPtr) {
  ESP_LOGVV(TAG, "read_bytes_wrapper: reg = %u", a_register);
--- a/esphome/components/captive_portal/init.py
+++ b/esphome/components/captive_portal/init.py
@@ -44,7 +44,7 @@ CONFIG_SCHEMA = cv.All(
            cv.GenerateID(CONF_WEB_SERVER_BASE_ID): cv.use_id(
                web_server_base.WebServerBase
            ),
-            cv.Optional(CONF_COMPRESSION, default="gzip"): cv.one_of("gzip", "br"),
+            cv.Optional(CONF_COMPRESSION, default="br"): cv.one_of("br", "gzip"),
        }
    ).extend(cv.COMPONENT_SCHEMA),
    cv.only_on(
--- a/esphome/components/captive_portal/captive_index.h
+++ b/esphome/components/captive_portal/captive_index.h
@@ -7,87 +7,90 @@ namespace esphome::captive_portal {

 #ifdef USE_CAPTIVE_PORTAL_GZIP
 const uint8_t INDEX_GZ[] PROGMEM = {
-    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x95, 0x16, 0x6b, 0x8f, 0xdb, 0x36, 0xf2, 0x7b, 0x7e,
-    0x05, 0x8f, 0x49, 0xbb, 0x52, 0xb3, 0x7a, 0x7a, 0xed, 0x6c, 0x24, 0x51, 0x45, 0x9a, 0xbb, 0xa2, 0x05, 0x9a, 0x36,
-    0xc0, 0x6e, 0x73, 0x1f, 0x82, 0x00, 0x4b, 0x53, 0x23, 0x8b, 0x31, 0x45, 0xea, 0x48, 0xca, 0x8f, 0x18, 0xbe, 0xdf,
-    0x7e, 0xa0, 0x24, 0x7b, 0x9d, 0x45, 0x73, 0xb8, 0xb3, 0x60, 0x61, 0x38, 0xef, 0x19, 0xcd, 0x83, 0xc5, 0xdf, 0x2a,
-    0xc5, 0xec, 0xbe, 0x03, 0xd4, 0xd8, 0x56, 0x94, 0x85, 0x7b, 0x23, 0x41, 0xe5, 0x8a, 0x80, 0x2c, 0x8b, 0x06, 0x68,
-    0x55, 0x16, 0x2d, 0x58, 0x8a, 0x58, 0x43, 0xb5, 0x01, 0x4b, 0xfe, 0xbc, 0xff, 0x39, 0xb8, 0x2d, 0x0b, 0xc1, 0xe5,
-    0x1a, 0x69, 0x10, 0x84, 0x33, 0x25, 0x51, 0xa3, 0xa1, 0x26, 0x15, 0xb5, 0x34, 0xe3, 0x2d, 0x5d, 0xc1, 0x24, 0x22,
-    0x69, 0x0b, 0x64, 0xc3, 0x61, 0xdb, 0x29, 0x6d, 0x11, 0x53, 0xd2, 0x82, 0xb4, 0x04, 0x6f, 0x79, 0x65, 0x1b, 0x52,
-    0xc1, 0x86, 0x33, 0x08, 0x86, 0xc3, 0x35, 0x97, 0xdc, 0x72, 0x2a, 0x02, 0xc3, 0xa8, 0x00, 0x92, 0x5c, 0xf7, 0x06,
-    0xf4, 0x70, 0xa0, 0x4b, 0x01, 0x44, 0x2a, 0x5c, 0x16, 0x86, 0x69, 0xde, 0x59, 0xe4, 0x5c, 0x25, 0xad, 0xaa, 0x7a,
-    0x01, 0x65, 0x14, 0x51, 0x63, 0xc0, 0x9a, 0x88, 0xcb, 0x0a, 0x76, 0xe1, 0x32, 0x66, 0x2c, 0x86, 0xdb, 0xdb, 0xf0,
-    0xb3, 0x79, 0x56, 0x29, 0xd6, 0xb7, 0x20, 0x6d, 0x28, 0x14, 0xa3, 0x96, 0x2b, 0x19, 0x1a, 0xa0, 0x9a, 0x35, 0x84,
-    0x10, 0xfc, 0xa3, 0xa1, 0x1b, 0xc0, 0xdf, 0x7f, 0xef, 0x9d, 0x99, 0x56, 0x60, 0xff, 0x21, 0xc0, 0x81, 0xe6, 0xa7,
-    0xfd, 0x3d, 0x5d, 0xfd, 0x4e, 0x5b, 0xf0, 0x30, 0x35, 0xbc, 0x02, 0xec, 0x7f, 0x8c, 0x3f, 0x85, 0xc6, 0xee, 0x05,
-    0x84, 0x15, 0x37, 0x9d, 0xa0, 0x7b, 0x82, 0x97, 0x42, 0xb1, 0x35, 0xf6, 0xf3, 0xba, 0x97, 0xcc, 0x29, 0x47, 0xc6,
-    0x03, 0xff, 0x20, 0xc0, 0x22, 0x4b, 0xde, 0x51, 0xdb, 0x84, 0x2d, 0xdd, 0x79, 0x23, 0xc0, 0xa5, 0x97, 0xfe, 0xe0,
-    0xc1, 0xcb, 0x24, 0x8e, 0xfd, 0xeb, 0xe1, 0x15, 0xfb, 0x51, 0x12, 0xc7, 0xb9, 0x06, 0xdb, 0x6b, 0x89, 0xa8, 0xf7,
-    0x50, 0x74, 0xd4, 0x36, 0xa8, 0x22, 0xf8, 0x5d, 0x92, 0xa2, 0xe4, 0x75, 0x98, 0xce, 0x7f, 0x0b, 0x5f, 0xa1, 0x9b,
-    0x30, 0x9d, 0xb3, 0x57, 0xc1, 0x1c, 0x25, 0x37, 0xc1, 0x1c, 0xa5, 0x69, 0x38, 0x47, 0xf1, 0x17, 0x8c, 0x6a, 0x2e,
-    0x04, 0xc1, 0x52, 0x49, 0xc0, 0xc8, 0x58, 0xad, 0xd6, 0x40, 0x30, 0xeb, 0xb5, 0x06, 0x69, 0xdf, 0x2a, 0xa1, 0x34,
-    0x8e, 0xca, 0x67, 0xff, 0x97, 0x42, 0xab, 0xa9, 0x34, 0xb5, 0xd2, 0x2d, 0xc1, 0x43, 0xf6, 0xbd, 0x17, 0x07, 0x7b,
-    0x44, 0xee, 0xe5, 0x5f, 0x10, 0x03, 0xa5, 0xf9, 0x8a, 0x4b, 0x82, 0x9d, 0xc6, 0x5b, 0x1c, 0x95, 0x0f, 0xfe, 0xf1,
-    0x1c, 0x3d, 0x75, 0xd1, 0x4f, 0xf1, 0x28, 0xef, 0xe3, 0x43, 0x61, 0x36, 0x2b, 0xb4, 0x6b, 0x85, 0x34, 0x04, 0x37,
-    0xd6, 0x76, 0x59, 0x14, 0x6d, 0xb7, 0xdb, 0x70, 0x3b, 0x0b, 0x95, 0x5e, 0x45, 0x69, 0x1c, 0xc7, 0x91, 0xd9, 0xac,
-    0x30, 0x1a, 0x0b, 0x01, 0xa7, 0x37, 0x18, 0x35, 0xc0, 0x57, 0x8d, 0x1d, 0xe0, 0xf2, 0xc5, 0x01, 0x8e, 0x85, 0xe3,
-    0x28, 0x1f, 0x3e, 0x5d, 0x58, 0xe1, 0x17, 0x56, 0xe0, 0x47, 0xea, 0xe1, 0x53, 0x98, 0x57, 0x43, 0x98, 0xaf, 0x68,
-    0x8a, 0x52, 0x14, 0x0f, 0x4f, 0x1a, 0x38, 0x78, 0x3a, 0x05, 0x4f, 0x4e, 0xe8, 0xe2, 0xe4, 0xa0, 0x76, 0x11, 0xbc,
-    0x3e, 0xcb, 0x26, 0x0e, 0xb3, 0x49, 0xe2, 0x47, 0x84, 0x13, 0xf8, 0x65, 0x71, 0x79, 0x0e, 0xd2, 0x0f, 0x97, 0x0c,
-    0xce, 0x5a, 0x93, 0x7c, 0x58, 0xd0, 0x39, 0x9a, 0x4f, 0x98, 0x79, 0xe0, 0xe0, 0xf3, 0x09, 0xcd, 0x37, 0x69, 0x93,
-    0xb4, 0xc1, 0x22, 0x98, 0xd3, 0x19, 0x9a, 0x4d, 0x8e, 0xcc, 0xd0, 0x6c, 0x93, 0x36, 0x8b, 0x0f, 0x8b, 0x4b, 0x5c,
-    0x30, 0xfb, 0x72, 0x15, 0x95, 0xd8, 0xcf, 0x30, 0x7e, 0x8c, 0x5c, 0x5d, 0x46, 0x1e, 0x7e, 0x56, 0x5c, 0x7a, 0x18,
-    0xfb, 0xc7, 0x1a, 0x2c, 0x6b, 0x3c, 0x1c, 0x31, 0x25, 0x6b, 0xbe, 0x0a, 0x3f, 0x1b, 0x25, 0xb1, 0x1f, 0xda, 0x06,
-    0xa4, 0x77, 0x12, 0x75, 0x82, 0x30, 0x50, 0xbc, 0xa7, 0x14, 0xeb, 0x1f, 0xce, 0xf5, 0x6f, 0xb9, 0x15, 0x40, 0x6c,
-    0xe8, 0x1a, 0xf6, 0xfa, 0x8c, 0x5d, 0xaa, 0x6a, 0xff, 0x8d, 0xd6, 0x68, 0x92, 0xb1, 0x2f, 0xb8, 0x94, 0xa0, 0xef,
-    0x61, 0x67, 0x09, 0x7e, 0xf7, 0xe6, 0x2d, 0x7a, 0x53, 0x55, 0x1a, 0x8c, 0xc9, 0x10, 0x7e, 0x69, 0xc3, 0x96, 0xb2,
-    0xff, 0x5d, 0x57, 0xf2, 0x95, 0xae, 0x7f, 0xf2, 0x9f, 0x39, 0xfa, 0x1d, 0xec, 0x56, 0xe9, 0xf5, 0xa4, 0xcd, 0xb9,
-    0x96, 0xbb, 0x0e, 0xd3, 0xc4, 0x86, 0xb4, 0x33, 0xa1, 0x11, 0x9c, 0x81, 0x97, 0xf8, 0x61, 0x4b, 0xbb, 0xc7, 0xa8,
-    0xe4, 0x29, 0x51, 0x0f, 0x45, 0xc5, 0x37, 0x88, 0x09, 0x6a, 0x0c, 0xc1, 0x72, 0x54, 0x85, 0xd1, 0x33, 0x34, 0xfc,
-    0x94, 0x64, 0x82, 0xb3, 0x35, 0xc1, 0x7f, 0x31, 0x01, 0x7e, 0xda, 0xff, 0x5a, 0x79, 0x57, 0xc6, 0xf0, 0xea, 0xca,
-    0x0f, 0x37, 0x54, 0xf4, 0x80, 0x08, 0xb2, 0x0d, 0x37, 0x8f, 0x0e, 0xe6, 0xdf, 0x14, 0xeb, 0xcc, 0xfa, 0xca, 0x0f,
-    0x6b, 0xc5, 0x7a, 0xe3, 0xf9, 0xb8, 0x9c, 0xcc, 0x15, 0x74, 0x1c, 0x90, 0xf8, 0x39, 0x7e, 0xe2, 0x51, 0x20, 0xa0,
-    0xb6, 0x67, 0x3e, 0x84, 0x5e, 0x1c, 0x8c, 0x27, 0x43, 0x6d, 0x0c, 0xf7, 0x8f, 0x67, 0x64, 0x61, 0x3a, 0x2a, 0x9f,
-    0x0a, 0x3a, 0x07, 0x5d, 0xab, 0xc8, 0xd0, 0x41, 0xae, 0x5f, 0x3a, 0x2a, 0xcf, 0x06, 0x23, 0x7a, 0x02, 0x5f, 0x1c,
-    0xb8, 0x27, 0xdd, 0x14, 0x5c, 0x9f, 0x35, 0x16, 0x51, 0xc5, 0x37, 0xe5, 0xc3, 0xd1, 0x7f, 0x8c, 0xe3, 0x5f, 0x3d,
-    0xe8, 0xfd, 0x1d, 0x08, 0x60, 0x56, 0x69, 0x0f, 0x3f, 0x97, 0x60, 0xb1, 0x3f, 0x06, 0xfc, 0xcb, 0xfd, 0xbb, 0xdf,
-    0x88, 0xf2, 0xb4, 0x7f, 0xfd, 0x2d, 0x6e, 0xb7, 0x0a, 0x3e, 0x6a, 0x10, 0xff, 0x26, 0x57, 0x6e, 0x19, 0x5c, 0x7d,
-    0xc2, 0x7e, 0x38, 0xc4, 0xfb, 0xf0, 0xb8, 0x11, 0x5c, 0x3b, 0xbf, 0xdc, 0xb5, 0xe2, 0xda, 0x45, 0x18, 0x2c, 0xe6,
-    0xfe, 0xf1, 0xe1, 0xe8, 0x1f, 0xfd, 0xbc, 0x88, 0xc6, 0xb9, 0x5e, 0x16, 0xc3, 0x88, 0x2d, 0x7f, 0x38, 0x2c, 0xd5,
-    0x2e, 0x30, 0xfc, 0x0b, 0x97, 0xab, 0x8c, 0xcb, 0x06, 0x34, 0xb7, 0xc7, 0x8a, 0x6f, 0xae, 0xb9, 0xec, 0x7a, 0x7b,
-    0xe8, 0x68, 0x55, 0x39, 0xca, 0xbc, 0xdb, 0xe5, 0xb5, 0x92, 0xd6, 0x71, 0x42, 0x96, 0x40, 0x7b, 0x1c, 0xe9, 0xc3,
-    0x44, 0xc9, 0x5e, 0xcf, 0xbf, 0x3b, 0xba, 0x82, 0x3b, 0x58, 0xd8, 0xd9, 0x80, 0x0a, 0xbe, 0x92, 0x19, 0x03, 0x69,
-    0x41, 0x8f, 0x42, 0x35, 0x6d, 0xb9, 0xd8, 0x67, 0x86, 0x4a, 0x13, 0x18, 0xd0, 0xbc, 0x3e, 0x2e, 0x7b, 0x6b, 0x95,
-    0x3c, 0x2c, 0x95, 0xae, 0x40, 0x67, 0x71, 0x3e, 0x02, 0x81, 0xa6, 0x15, 0xef, 0x4d, 0x16, 0xce, 0x34, 0xb4, 0xf9,
-    0x92, 0xb2, 0xf5, 0x4a, 0xab, 0x5e, 0x56, 0x01, 0x73, 0x93, 0x36, 0x7b, 0x9e, 0xd4, 0x74, 0x06, 0x2c, 0x9f, 0x4e,
-    0x75, 0x5d, 0xe7, 0x82, 0x4b, 0x08, 0xc6, 0x59, 0x96, 0xa5, 0xe1, 0x8d, 0x13, 0xbb, 0x70, 0x33, 0x4c, 0x1d, 0x62,
-    0xf4, 0x31, 0x89, 0xe3, 0xef, 0xf2, 0x53, 0x38, 0x71, 0xce, 0x7a, 0x6d, 0x94, 0xce, 0x3a, 0xc5, 0x9d, 0x9b, 0xc7,
-    0x96, 0x72, 0x79, 0xe9, 0xbd, 0x2b, 0x93, 0x7c, 0x5a, 0x3f, 0x19, 0x97, 0x83, 0x99, 0x61, 0x09, 0xe5, 0x2d, 0x97,
-    0xe3, 0x0e, 0xcd, 0xd2, 0x45, 0xdc, 0xed, 0x8e, 0xe1, 0x54, 0x20, 0x87, 0x13, 0x77, 0x2d, 0x60, 0x97, 0x7f, 0xee,
-    0x8d, 0xe5, 0xf5, 0x3e, 0x98, 0x76, 0x70, 0x66, 0x3a, 0xca, 0x20, 0x58, 0x82, 0xdd, 0x02, 0xc8, 0x7c, 0xb0, 0x11,
-    0x70, 0x0b, 0xad, 0x99, 0xf2, 0x74, 0x56, 0x33, 0x14, 0xe8, 0xd7, 0xba, 0xfe, 0x1b, 0xb7, 0xab, 0xc5, 0x43, 0x4b,
-    0xf5, 0x8a, 0xcb, 0x60, 0xa9, 0xac, 0x55, 0x6d, 0x16, 0xbc, 0xea, 0x76, 0xf9, 0x84, 0x72, 0xca, 0xb2, 0xc4, 0xb9,
-    0x39, 0xec, 0xd6, 0x53, 0xbe, 0x93, 0x6e, 0x87, 0x8c, 0x12, 0xbc, 0x9a, 0xf8, 0x06, 0x16, 0x14, 0x9f, 0xd3, 0x93,
-    0xcc, 0xbb, 0x1d, 0x72, 0xb8, 0x53, 0xaa, 0x6f, 0xea, 0x5b, 0x9a, 0xc4, 0x7f, 0xf1, 0x45, 0xaa, 0xba, 0x4e, 0x97,
-    0xf5, 0x39, 0x53, 0x6e, 0x4d, 0xba, 0xd6, 0x18, 0x4a, 0xab, 0x88, 0xc6, 0xdb, 0x8c, 0xab, 0x8c, 0xb2, 0x70, 0x19,
-    0x2e, 0x8b, 0x26, 0x41, 0xbc, 0x22, 0x2d, 0x65, 0xe5, 0xc5, 0xf8, 0x2a, 0xa2, 0x26, 0x39, 0x91, 0x9a, 0xa4, 0xfc,
-    0x6a, 0x18, 0x8d, 0xb4, 0xc1, 0xfb, 0xf2, 0xad, 0x92, 0x12, 0x98, 0xe5, 0x72, 0x85, 0xac, 0x42, 0x53, 0x0a, 0xc2,
-    0x30, 0x2c, 0x96, 0xba, 0x7c, 0x2f, 0x80, 0x1a, 0x40, 0x5b, 0xca, 0x6d, 0x58, 0x44, 0x23, 0xff, 0xd8, 0xc7, 0xbc,
-    0x22, 0x12, 0x6c, 0x39, 0x35, 0x6c, 0xd1, 0xcc, 0x46, 0x03, 0x77, 0x60, 0x9d, 0x26, 0x67, 0x60, 0x56, 0x16, 0x6e,
-    0xe5, 0x22, 0x3a, 0x8c, 0x34, 0x12, 0x6d, 0x79, 0xcd, 0xdd, 0x95, 0xa5, 0x2c, 0x86, 0x22, 0x77, 0x1a, 0x5c, 0x9e,
-    0xc7, 0xeb, 0xd5, 0x00, 0x09, 0x90, 0x2b, 0xdb, 0x90, 0x59, 0x8a, 0x3a, 0x41, 0x19, 0x34, 0x4a, 0x54, 0xa0, 0xc9,
-    0xdd, 0xdd, 0xaf, 0x7f, 0x2f, 0x9d, 0x33, 0x8f, 0x72, 0x9d, 0x59, 0x8f, 0x62, 0x0e, 0x98, 0xa4, 0x16, 0x37, 0xe3,
-    0xa5, 0xaa, 0xa3, 0xc6, 0x6c, 0x95, 0xae, 0xbe, 0xd2, 0xf1, 0x7e, 0x42, 0x8e, 0x7a, 0x86, 0xff, 0xd0, 0x2a, 0xe5,
-    0x1d, 0xdd, 0x40, 0x11, 0x4d, 0x87, 0x22, 0x72, 0x0e, 0x8f, 0xf4, 0x66, 0xe2, 0x6b, 0x92, 0xf2, 0x8f, 0xfb, 0x37,
-    0xe8, 0xcf, 0xae, 0xa2, 0x16, 0xc6, 0xb4, 0x0d, 0x51, 0xb5, 0x60, 0x1b, 0x55, 0x91, 0xf7, 0x7f, 0xdc, 0xdd, 0x9f,
-    0x23, 0xec, 0x07, 0x26, 0x04, 0x92, 0x8d, 0xd7, 0xbb, 0x5e, 0x58, 0xde, 0x51, 0x6d, 0x07, 0xb5, 0x81, 0x9b, 0x22,
-    0xa7, 0x18, 0x06, 0x7a, 0xcd, 0x05, 0x8c, 0x61, 0x8c, 0x82, 0x25, 0x3a, 0x79, 0x75, 0xb2, 0xf6, 0xc4, 0xaf, 0x68,
-    0xfc, 0xda, 0xd1, 0xf8, 0xe9, 0xa3, 0xe1, 0xa6, 0xfb, 0x1f, 0x53, 0x58, 0x46, 0xb2, 0xf9, 0x0a, 0x00, 0x00};
+    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x95, 0x56, 0xeb, 0x6f, 0xd4, 0x38, 0x10, 0xff, 0xce,
+    0x5f, 0xe1, 0x33, 0x8f, 0x26, 0xd0, 0x3c, 0xb7, 0xdb, 0x96, 0x6c, 0x12, 0x04, 0xdc, 0x21, 0x90, 0x28, 0x20, 0xb5,
+    0x70, 0x1f, 0x10, 0x52, 0xbd, 0xc9, 0x64, 0x63, 0x9a, 0x38, 0x39, 0xdb, 0xfb, 0x62, 0xb5, 0xf7, 0xb7, 0xdf, 0x38,
+    0xc9, 0x6e, 0xb7, 0x15, 0x9c, 0xee, 0x5a, 0x35, 0x1d, 0xdb, 0xf3, 0xf8, 0xcd, 0x78, 0x1e, 0x8e, 0x7f, 0xcb, 0x9b,
+    0x4c, 0xaf, 0x5b, 0x20, 0xa5, 0xae, 0xab, 0x34, 0x36, 0x5f, 0x52, 0x31, 0x31, 0x4b, 0x40, 0xe0, 0x0a, 0x58, 0x9e,
+    0xc6, 0x35, 0x68, 0x46, 0xb2, 0x92, 0x49, 0x05, 0x3a, 0xf9, 0x7c, 0xf5, 0xc6, 0x39, 0x4f, 0xe3, 0x8a, 0x8b, 0x1b,
+    0x22, 0xa1, 0x4a, 0x78, 0xd6, 0x08, 0x52, 0x4a, 0x28, 0x92, 0x9c, 0x69, 0x16, 0xf1, 0x9a, 0xcd, 0x60, 0x10, 0x11,
+    0xac, 0x86, 0x64, 0xc1, 0x61, 0xd9, 0x36, 0x52, 0x13, 0xe4, 0xd3, 0x20, 0x74, 0x42, 0x97, 0x3c, 0xd7, 0x65, 0x92,
+    0xc3, 0x82, 0x67, 0xe0, 0x74, 0x8b, 0x63, 0x2e, 0xb8, 0xe6, 0xac, 0x72, 0x54, 0xc6, 0x2a, 0x48, 0x82, 0xe3, 0xb9,
+    0x02, 0xd9, 0x2d, 0xd8, 0x14, 0xd7, 0xa2, 0xa1, 0x69, 0xac, 0x32, 0xc9, 0x5b, 0x4d, 0x0c, 0xd4, 0xa4, 0x6e, 0xf2,
+    0x79, 0x05, 0xa9, 0xe7, 0x31, 0x85, 0x90, 0x94, 0xc7, 0x45, 0x0e, 0x2b, 0x77, 0xea, 0x67, 0x99, 0x0f, 0xe7, 0xe7,
+    0xee, 0x77, 0xf5, 0x00, 0x9d, 0x9a, 0xd7, 0x68, 0xcd, 0xad, 0x9a, 0x8c, 0x69, 0xde, 0x08, 0x57, 0x01, 0x93, 0x59,
+    0x99, 0x24, 0x09, 0x7d, 0xa1, 0xd8, 0x02, 0xe8, 0x93, 0x27, 0xd6, 0x9e, 0x69, 0x06, 0xfa, 0x8f, 0x0a, 0x0c, 0xa9,
+    0x5e, 0xad, 0xaf, 0xd8, 0xec, 0x03, 0x02, 0xb7, 0x28, 0x53, 0x3c, 0x07, 0x6a, 0x7f, 0xf5, 0xbf, 0xb9, 0x4a, 0xaf,
+    0x2b, 0x70, 0x73, 0xae, 0xda, 0x8a, 0xad, 0x13, 0x3a, 0x45, 0xad, 0x37, 0xd4, 0x9e, 0x14, 0x73, 0x91, 0x19, 0xe5,
+    0x44, 0x59, 0x60, 0x6f, 0x2a, 0x40, 0x78, 0xc9, 0x05, 0xd3, 0xa5, 0x5b, 0xb3, 0x95, 0xd5, 0x13, 0x5c, 0x58, 0xe1,
+    0x53, 0x0b, 0x9e, 0x05, 0xbe, 0x6f, 0x1f, 0x77, 0x1f, 0xdf, 0xf6, 0xf0, 0xff, 0x44, 0x82, 0x9e, 0x4b, 0x41, 0x98,
+    0x75, 0x1d, 0xb7, 0xc8, 0x49, 0xf2, 0x84, 0x5e, 0x04, 0x21, 0x09, 0x9e, 0xbb, 0xe1, 0xf8, 0xbd, 0x7b, 0x46, 0x4e,
+    0xf0, 0x7f, 0x76, 0xe6, 0x8c, 0x49, 0x70, 0x82, 0x9f, 0x30, 0x74, 0xc7, 0xc4, 0xff, 0x41, 0x49, 0xc1, 0xab, 0x2a,
+    0xa1, 0xa2, 0x11, 0x40, 0x89, 0xd2, 0xb2, 0xb9, 0x81, 0x84, 0x66, 0x73, 0x29, 0x11, 0xfb, 0xeb, 0xa6, 0x6a, 0x24,
+    0xf5, 0xd2, 0x07, 0xff, 0x4b, 0xa1, 0x96, 0x4c, 0xa8, 0xa2, 0x91, 0x75, 0x42, 0xbb, 0xe8, 0x5b, 0x8f, 0x36, 0x7a,
+    0x4b, 0xcc, 0xc7, 0x3e, 0x38, 0x74, 0x1a, 0xc9, 0x67, 0x5c, 0x24, 0xd4, 0x68, 0x3c, 0x47, 0x23, 0xd7, 0xf6, 0x76,
+    0xef, 0x3d, 0x33, 0xde, 0x0f, 0xfe, 0x34, 0xd6, 0xd7, 0xeb, 0x58, 0x2d, 0x66, 0x64, 0x55, 0x57, 0x42, 0x25, 0xb4,
+    0xd4, 0xba, 0x8d, 0x3c, 0x6f, 0xb9, 0x5c, 0xba, 0xcb, 0x91, 0xdb, 0xc8, 0x99, 0x17, 0xfa, 0xbe, 0xef, 0x21, 0x07,
+    0x25, 0x7d, 0x22, 0xd0, 0xf0, 0x84, 0x92, 0x12, 0xf8, 0xac, 0xd4, 0x1d, 0x9d, 0x3e, 0xda, 0xc0, 0x36, 0x36, 0x1c,
+    0xe9, 0xf5, 0xb7, 0x03, 0x2b, 0xfc, 0xc0, 0x0a, 0xbc, 0x60, 0x16, 0xdd, 0xb9, 0x79, 0xd4, 0xb9, 0x79, 0xc6, 0x42,
+    0x12, 0x12, 0xbf, 0xfb, 0x0d, 0x1d, 0x43, 0x0f, 0x2b, 0xe7, 0xde, 0x8a, 0x1c, 0xac, 0x0c, 0x55, 0x9f, 0x3a, 0xcf,
+    0xf7, 0xb2, 0x81, 0xd9, 0x59, 0x04, 0xfe, 0xed, 0x86, 0x11, 0x78, 0x7b, 0x7a, 0xb8, 0x76, 0xc2, 0x2f, 0x87, 0x0c,
+    0xc6, 0x5a, 0x19, 0x7c, 0x39, 0x65, 0x63, 0x32, 0x1e, 0x76, 0xc6, 0x8e, 0xa1, 0xf7, 0x2b, 0x32, 0x5e, 0x20, 0x47,
+    0xed, 0x9c, 0x3a, 0x63, 0x36, 0x22, 0xa3, 0x01, 0x08, 0x52, 0xb8, 0x7d, 0x8a, 0x82, 0x07, 0x7b, 0xce, 0xe8, 0xc7,
+    0x91, 0x97, 0x52, 0x3b, 0xa2, 0xf4, 0xd6, 0xf3, 0xe6, 0xd0, 0x73, 0xf7, 0x7b, 0x83, 0x39, 0x45, 0x29, 0x46, 0x06,
+    0x74, 0x56, 0x5a, 0xd4, 0xc3, 0xc2, 0x2a, 0xf8, 0x0c, 0xb3, 0xbe, 0x11, 0xd4, 0x76, 0x75, 0x09, 0xc2, 0xda, 0x89,
+    0x1a, 0x41, 0xe8, 0x4e, 0xac, 0xfb, 0x27, 0xda, 0xde, 0xec, 0xf3, 0x5f, 0x73, 0x8d, 0x65, 0xa6, 0x5d, 0x53, 0xb0,
+    0xc7, 0xfb, 0xdd, 0x69, 0x93, 0xaf, 0x7f, 0x51, 0x1a, 0x65, 0xd0, 0xd7, 0x05, 0x17, 0x02, 0xe4, 0x15, 0xac, 0xf0,
+    0xe6, 0x2e, 0x5e, 0xbe, 0x26, 0x2f, 0xf3, 0x5c, 0x82, 0x52, 0x11, 0xa1, 0xcf, 0x34, 0xd6, 0x40, 0xf6, 0xdf, 0x75,
+    0x05, 0x77, 0x74, 0xfd, 0xc9, 0xdf, 0x70, 0xf2, 0x01, 0xf4, 0xb2, 0x91, 0x37, 0x83, 0x36, 0x03, 0x6d, 0x62, 0x2a,
+    0x4c, 0x22, 0x4e, 0xd6, 0x2a, 0x57, 0x55, 0xd8, 0x3e, 0xac, 0xc0, 0x46, 0x3b, 0xed, 0xad, 0x57, 0x62, 0x17, 0xa8,
+    0xeb, 0x38, 0xe7, 0x0b, 0x92, 0x55, 0xd8, 0x21, 0xb0, 0x5c, 0x7a, 0x55, 0x94, 0x3c, 0x20, 0xdd, 0x4f, 0x23, 0x32,
+    0x94, 0xbe, 0x49, 0xe8, 0x4f, 0x3a, 0xc0, 0xab, 0xf5, 0xbb, 0xdc, 0x3a, 0x52, 0x58, 0xfb, 0x47, 0xb6, 0xbb, 0x60,
+    0xd5, 0x1c, 0x48, 0x42, 0x74, 0xc9, 0xd5, 0x2d, 0xc0, 0xc9, 0x2f, 0xc5, 0x5a, 0x75, 0x83, 0x52, 0x05, 0x1e, 0x2b,
+    0xcb, 0xa6, 0xe9, 0x60, 0x2e, 0x66, 0x7d, 0x83, 0xa4, 0x0f, 0xe9, 0x3d, 0x44, 0x4e, 0x05, 0x85, 0xde, 0xf3, 0x11,
+    0x2c, 0x3b, 0x65, 0x09, 0x57, 0xa2, 0x75, 0x7b, 0xbb, 0xdf, 0x8c, 0x55, 0xcb, 0xc4, 0x7d, 0x41, 0x03, 0xd0, 0x94,
+    0x0a, 0x36, 0x36, 0xa4, 0x4c, 0xbd, 0x20, 0xd3, 0xde, 0xa0, 0xc7, 0x76, 0xe4, 0xa3, 0x0d, 0x47, 0x8d, 0xa6, 0x5f,
+    0xed, 0x35, 0xc6, 0x1e, 0x86, 0x26, 0xbd, 0xde, 0xda, 0xb7, 0x7e, 0xfc, 0x35, 0x07, 0xb9, 0xbe, 0x84, 0x0a, 0x32,
+    0xdd, 0x48, 0x8b, 0x3e, 0x44, 0x2b, 0x98, 0x4a, 0x9d, 0xc3, 0x6f, 0xaf, 0x2e, 0xde, 0x27, 0x8d, 0x25, 0xed, 0xe3,
+    0x5f, 0x71, 0x9b, 0x51, 0xf0, 0x15, 0x47, 0xc1, 0xdf, 0xc9, 0x91, 0x19, 0x06, 0x47, 0xdf, 0x50, 0xb4, 0xf3, 0xf7,
+    0xfa, 0x76, 0x22, 0x98, 0x72, 0x7e, 0x86, 0x2d, 0xe1, 0xd8, 0x78, 0xe8, 0x9c, 0x8e, 0xed, 0x2d, 0xda, 0x47, 0x04,
+    0x88, 0xbb, 0xeb, 0xeb, 0xd8, 0xdf, 0x4d, 0x8b, 0x4d, 0x9f, 0x6e, 0xa6, 0xcd, 0xca, 0x51, 0xfc, 0x07, 0x17, 0xb3,
+    0x88, 0x8b, 0x12, 0x24, 0xd7, 0x5b, 0x84, 0x8b, 0x13, 0xa2, 0x9d, 0xeb, 0x4d, 0xcb, 0xf2, 0xdc, 0x9c, 0x8c, 0xdb,
+    0xd5, 0xa4, 0xc0, 0x79, 0x62, 0x38, 0x21, 0x0a, 0xa0, 0xde, 0xf6, 0xe7, 0x5d, 0x47, 0x89, 0x9e, 0x8f, 0x1f, 0x6f,
+    0x4d, 0xc2, 0x6d, 0x34, 0x5e, 0x96, 0xc3, 0x2a, 0x3e, 0x13, 0x51, 0x86, 0xc0, 0x41, 0xf6, 0x42, 0x05, 0xab, 0x79,
+    0xb5, 0x8e, 0x14, 0xf6, 0x36, 0x07, 0x07, 0x0d, 0x2f, 0xb6, 0xd3, 0xb9, 0xd6, 0x8d, 0x40, 0xdb, 0x32, 0x07, 0x19,
+    0xf9, 0x93, 0x9e, 0x70, 0x24, 0xcb, 0xf9, 0x5c, 0x45, 0xee, 0x48, 0x42, 0x3d, 0x99, 0xb2, 0xec, 0x66, 0x26, 0x9b,
+    0xb9, 0xc8, 0x9d, 0xcc, 0x74, 0xda, 0xe8, 0x61, 0x50, 0xb0, 0x11, 0x64, 0x93, 0x61, 0x55, 0x14, 0xc5, 0x04, 0x43,
+    0x01, 0x4e, 0xdf, 0xcb, 0xa2, 0xd0, 0x3d, 0x31, 0x62, 0x07, 0x30, 0xdd, 0xd0, 0x6c, 0xf4, 0x18, 0x71, 0x04, 0x3c,
+    0x9e, 0xec, 0xdc, 0xf1, 0x27, 0xd8, 0xc2, 0x15, 0x2a, 0x69, 0xb1, 0xb6, 0x11, 0xe6, 0xb6, 0x66, 0x5c, 0x1c, 0xa2,
+    0x37, 0x69, 0x32, 0x19, 0xc6, 0x0f, 0x86, 0xa5, 0x33, 0xd3, 0x0d, 0xa1, 0x09, 0x0e, 0x98, 0x7e, 0x86, 0x46, 0xe1,
+    0xa9, 0xdf, 0xae, 0xb6, 0xee, 0x90, 0x20, 0x9b, 0x1d, 0x77, 0x51, 0xc1, 0x6a, 0xf2, 0x7d, 0xae, 0x34, 0x2f, 0xd6,
+    0xce, 0x30, 0x83, 0x23, 0x4c, 0x16, 0x9c, 0xbd, 0x53, 0x64, 0x05, 0x10, 0x93, 0xce, 0x86, 0xc3, 0x35, 0xd4, 0x6a,
+    0x88, 0xd3, 0x5e, 0x4d, 0x97, 0xa0, 0x77, 0x75, 0xfd, 0x1b, 0xb7, 0xc9, 0xc5, 0x4d, 0xcd, 0x24, 0x8e, 0x0a, 0x67,
+    0xda, 0x60, 0x4c, 0xeb, 0xc8, 0x39, 0xc3, 0xbb, 0x1a, 0xb6, 0x8c, 0x32, 0xf4, 0x1c, 0x61, 0x76, 0xb3, 0x75, 0x17,
+    0xef, 0xa0, 0x5d, 0x11, 0xd5, 0x54, 0x3c, 0x1f, 0xf8, 0x3a, 0x16, 0xe2, 0xef, 0xc3, 0x13, 0xe0, 0x75, 0x13, 0xb3,
+    0xb7, 0x0b, 0xf5, 0x49, 0x71, 0xce, 0x02, 0xff, 0x27, 0x37, 0x92, 0x17, 0x45, 0x38, 0x2d, 0xf6, 0x91, 0x32, 0x63,
+    0xd2, 0x94, 0x46, 0x97, 0x5a, 0xb1, 0xd7, 0xbf, 0x66, 0x4c, 0x66, 0xe0, 0x03, 0x05, 0x23, 0x8c, 0xef, 0x9b, 0x80,
+    0xf0, 0x3c, 0xc1, 0x4e, 0x95, 0x1e, 0xb4, 0x2f, 0x64, 0x0c, 0x76, 0x47, 0x48, 0xdd, 0x69, 0x46, 0xfd, 0x59, 0x87,
+    0x3e, 0x7d, 0xdd, 0x60, 0x7d, 0x60, 0xdb, 0x11, 0x33, 0xa2, 0x1b, 0x32, 0x84, 0xc0, 0x75, 0xdd, 0x78, 0x2a, 0xd3,
+    0x4f, 0x15, 0x30, 0x05, 0x64, 0xc9, 0xb8, 0x76, 0xb1, 0x1a, 0x3b, 0xfe, 0xbe, 0x8e, 0x51, 0x29, 0xb2, 0xa6, 0x43,
+    0xc1, 0xc6, 0xe5, 0xa8, 0x37, 0x70, 0x09, 0xda, 0x68, 0x32, 0x06, 0x46, 0x69, 0x6c, 0x46, 0x2e, 0x61, 0x5d, 0x4b,
+    0x4b, 0xbc, 0x25, 0x2f, 0xb8, 0x79, 0xb2, 0xa4, 0x71, 0x97, 0xe4, 0x46, 0x83, 0x89, 0x73, 0xff, 0xbc, 0xea, 0xa8,
+    0x0a, 0xc4, 0x0c, 0x27, 0xe9, 0x28, 0x24, 0xe8, 0x76, 0x06, 0x65, 0x53, 0x61, 0x58, 0x93, 0xcb, 0xcb, 0x77, 0xbf,
+    0xa7, 0x06, 0xcc, 0xad, 0x1c, 0xf6, 0xa7, 0x5e, 0xcc, 0x10, 0x83, 0xd4, 0xe9, 0x49, 0xff, 0xa8, 0x6a, 0xb1, 0xbf,
+    0xa0, 0x07, 0xf9, 0x1d, 0x1d, 0x9f, 0x86, 0xcd, 0x5e, 0x4f, 0xf7, 0xd7, 0x95, 0x4a, 0x7a, 0x89, 0x80, 0x62, 0x6f,
+    0x58, 0xc4, 0x9e, 0x01, 0xdc, 0x9f, 0x97, 0x03, 0x1f, 0xc6, 0xe9, 0xe3, 0xd5, 0x4b, 0xf2, 0xb9, 0xc5, 0x26, 0x00,
+    0x7d, 0xd8, 0x3a, 0xaf, 0xf0, 0x65, 0x58, 0x36, 0x79, 0xf2, 0xe9, 0xe3, 0xe5, 0xd5, 0xde, 0xc3, 0x79, 0xc7, 0x44,
+    0x40, 0x64, 0xfd, 0xf3, 0x6e, 0x5e, 0x69, 0xde, 0x32, 0xa9, 0x3b, 0xb5, 0x8e, 0xe9, 0x22, 0x3b, 0x1f, 0xba, 0x73,
+    0x7c, 0x03, 0x41, 0xef, 0x46, 0x2f, 0x98, 0x92, 0x1d, 0xaa, 0x9d, 0xb5, 0x7b, 0xb8, 0xbc, 0xfe, 0xb6, 0xbd, 0xfe,
+    0xea, 0xbd, 0xee, 0xa5, 0xfb, 0x0f, 0x53, 0x58, 0x46, 0xb2, 0xf9, 0x0a, 0x00, 0x00};
+
+static constexpr size_t INDEX_SIZE = sizeof(INDEX_GZ);
+static constexpr const char *INDEX_CONTENT_ENCODING = "gzip";

 #else  // Brotli (default, smaller)
 const uint8_t INDEX_BR[] PROGMEM = {
-    0x1b, 0xf8, 0x0a, 0x00, 0x64, 0x5a, 0xd3, 0xfa, 0xe7, 0xf3, 0x62, 0xd8, 0x06, 0x1b, 0xe9, 0x6a, 0x8a, 0x81, 0x2b,
+    0x1f, 0xf8, 0x0a, 0x00, 0x64, 0x5a, 0xd3, 0xfa, 0xe7, 0xf3, 0x62, 0xd8, 0x06, 0x1b, 0xe9, 0x6a, 0x8a, 0x81, 0x2b,
    0xb5, 0x49, 0x14, 0x37, 0xdc, 0x9e, 0x1a, 0xcb, 0x56, 0x87, 0xfb, 0xff, 0xf7, 0x73, 0x75, 0x12, 0x0a, 0xd6, 0x48,
    0x84, 0xc6, 0x21, 0xa4, 0x6d, 0xb5, 0x71, 0xef, 0x13, 0xbe, 0x4e, 0x54, 0xf1, 0x64, 0x8f, 0x3f, 0xcc, 0x9a, 0x78,
    0xa5, 0x89, 0x25, 0xb3, 0xda, 0x2c, 0xa2, 0x32, 0x9c, 0x57, 0x07, 0x56, 0xbc, 0x34, 0x13, 0xff, 0x5c, 0x0a, 0xa1,
@@ -149,6 +152,8 @@ const uint8_t INDEX_BR[] PROGMEM = {

 // Backwards compatibility alias
 #define INDEX_GZ INDEX_BR
+static constexpr size_t INDEX_SIZE = sizeof(INDEX_BR);
+static constexpr const char *INDEX_CONTENT_ENCODING = "br";

 #endif  // USE_CAPTIVE_PORTAL_GZIP

--- a/esphome/components/ccs811/ccs811.cpp
+++ b/esphome/components/ccs811/ccs811.cpp
@@ -81,8 +81,8 @@ void CCS811Component::setup() {
           bootloader_version, application_version);
  if (this->version_ != nullptr) {
    char version[20];  // "15.15.15 (0xffff)" is 17 chars, plus NUL, plus wiggle room
-    buf_append_printf(version, sizeof(version), 0, "%d.%d.%d (0x%02x)", (application_version >> 12 & 15),
-                      (application_version >> 8 & 15), (application_version >> 4 & 15), application_version);
+    sprintf(version, "%d.%d.%d (0x%02x)", (application_version >> 12 & 15), (application_version >> 8 & 15),
+            (application_version >> 4 & 15), application_version);
    ESP_LOGD(TAG, "publishing version state: %s", version);
    this->version_->publish_state(version);
  }
--- a/esphome/components/ch422g/ch422g.cpp
+++ b/esphome/components/ch422g/ch422g.cpp
@@ -93,9 +93,7 @@ bool CH422GComponent::read_inputs_() {
 bool CH422GComponent::write_reg_(uint8_t reg, uint8_t value) {
  auto err = this->bus_->write_readv(reg, &value, 1, nullptr, 0);
  if (err != i2c::ERROR_OK) {
-    char buf[64];
-    snprintf(buf, sizeof(buf), "write failed for register 0x%X, error %d", reg, err);
-    this->status_set_warning(buf);
+    this->status_set_warning(str_sprintf("write failed for register 0x%X, error %d", reg, err).c_str());
    return false;
  }
  this->status_clear_warning();
@@ -106,9 +104,7 @@ uint8_t CH422GComponent::read_reg_(uint8_t reg) {
  uint8_t value;
  auto err = this->bus_->write_readv(reg, nullptr, 0, &value, 1);
  if (err != i2c::ERROR_OK) {
-    char buf[64];
-    snprintf(buf, sizeof(buf), "read failed for register 0x%X, error %d", reg, err);
-    this->status_set_warning(buf);
+    this->status_set_warning(str_sprintf("read failed for register 0x%X, error %d", reg, err).c_str());
    return 0;
  }
  this->status_clear_warning();
@@ -133,7 +129,7 @@ bool CH422GGPIOPin::digital_read() { return this->parent_->digital_read(this->pi

 void CH422GGPIOPin::digital_write(bool value) { this->parent_->digital_write(this->pin_, value ^ this->inverted_); }
 size_t CH422GGPIOPin::dump_summary(char *buffer, size_t len) const {
-  return buf_append_printf(buffer, len, 0, "EXIO%u via CH422G", this->pin_);
+  return snprintf(buffer, len, "EXIO%u via CH422G", this->pin_);
 }
 void CH422GGPIOPin::set_flags(gpio::Flags flags) {
  flags_ = flags;
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -436,7 +436,7 @@ void Climate::save_state_() {
 }

 void Climate::publish_state() {
-  ESP_LOGD(TAG, "'%s' >>", this->name_.c_str());
+  ESP_LOGD(TAG, "'%s' - Sending state:", this->name_.c_str());
  auto traits = this->get_traits();

  ESP_LOGD(TAG, "  Mode: %s", LOG_STR_ARG(climate_mode_to_string(this->mode)));
@@ -682,19 +682,19 @@ bool Climate::set_fan_mode_(ClimateFanMode mode) {
  return set_primary_mode(this->fan_mode, this->custom_fan_mode_, mode);
 }

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

 void Climate::clear_custom_fan_mode_() { this->custom_fan_mode_ = nullptr; }

 bool Climate::set_preset_(ClimatePreset preset) { return set_primary_mode(this->preset, this->custom_preset_, preset); }

-bool Climate::set_custom_preset_(const char *preset, size_t len) {
+bool Climate::set_custom_preset_(const char *preset) {
  auto traits = this->get_traits();
-  return set_custom_mode<ClimatePreset>(this->custom_preset_, this->preset, traits.find_custom_preset_(preset, len),
+  return set_custom_mode<ClimatePreset>(this->custom_preset_, this->preset, traits.find_custom_preset_(preset),
                                        this->has_custom_preset());
 }

--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -5,7 +5,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "esphome/core/preferences.h"
-#include "esphome/core/string_ref.h"
 #include "climate_mode.h"
 #include "climate_traits.h"

@@ -111,8 +110,8 @@ class ClimateCall {
  const optional<ClimateFanMode> &get_fan_mode() const;
  const optional<ClimateSwingMode> &get_swing_mode() const;
  const optional<ClimatePreset> &get_preset() const;
-  StringRef get_custom_fan_mode() const { return StringRef::from_maybe_nullptr(this->custom_fan_mode_); }
-  StringRef get_custom_preset() const { return StringRef::from_maybe_nullptr(this->custom_preset_); }
+  const char *get_custom_fan_mode() const { return this->custom_fan_mode_; }
+  const char *get_custom_preset() const { return this->custom_preset_; }
  bool has_custom_fan_mode() const { return this->custom_fan_mode_ != nullptr; }
  bool has_custom_preset() const { return this->custom_preset_ != nullptr; }

@@ -267,11 +266,11 @@ class Climate : public EntityBase {
  /// The active swing mode of the climate device.
  ClimateSwingMode swing_mode{CLIMATE_SWING_OFF};

-  /// Get the active custom fan mode (read-only access). Returns StringRef.
-  StringRef get_custom_fan_mode() const { return StringRef::from_maybe_nullptr(this->custom_fan_mode_); }
+  /// Get the active custom fan mode (read-only access).
+  const char *get_custom_fan_mode() const { return this->custom_fan_mode_; }

-  /// Get the active custom preset (read-only access). Returns StringRef.
-  StringRef get_custom_preset() const { return StringRef::from_maybe_nullptr(this->custom_preset_); }
+  /// Get the active custom preset (read-only access).
+  const char *get_custom_preset() const { return this->custom_preset_; }

 protected:
  friend ClimateCall;
@@ -281,9 +280,7 @@ class Climate : public EntityBase {
  bool set_fan_mode_(ClimateFanMode mode);

  /// Set custom fan mode. Reset primary fan mode. Return true if fan mode has been changed.
-  bool set_custom_fan_mode_(const char *mode) { return this->set_custom_fan_mode_(mode, strlen(mode)); }
-  bool set_custom_fan_mode_(const char *mode, size_t len);
-  bool set_custom_fan_mode_(StringRef mode) { return this->set_custom_fan_mode_(mode.c_str(), mode.size()); }
+  bool set_custom_fan_mode_(const char *mode);
  /// Clear custom fan mode.
  void clear_custom_fan_mode_();

@@ -291,9 +288,7 @@ class Climate : public EntityBase {
  bool set_preset_(ClimatePreset preset);

  /// Set custom preset. Reset primary preset. Return true if preset has been changed.
-  bool set_custom_preset_(const char *preset) { return this->set_custom_preset_(preset, strlen(preset)); }
-  bool set_custom_preset_(const char *preset, size_t len);
-  bool set_custom_preset_(StringRef preset) { return this->set_custom_preset_(preset.c_str(), preset.size()); }
+  bool set_custom_preset_(const char *preset);
  /// Clear custom preset.
  void clear_custom_preset_();

--- a/esphome/components/copy/fan/copy_fan.cpp
+++ b/esphome/components/copy/fan/copy_fan.cpp
@@ -8,24 +8,20 @@ static const char *const TAG = "copy.fan";

 void CopyFan::setup() {
  source_->add_on_state_callback([this]() {
-    this->copy_state_from_source_();
+    this->state = source_->state;
+    this->oscillating = source_->oscillating;
+    this->speed = source_->speed;
+    this->direction = source_->direction;
+    this->set_preset_mode_(source_->get_preset_mode());
    this->publish_state();
  });

-  this->copy_state_from_source_();
-  this->publish_state();
-}
-
-void CopyFan::copy_state_from_source_() {
  this->state = source_->state;
  this->oscillating = source_->oscillating;
  this->speed = source_->speed;
  this->direction = source_->direction;
-  if (source_->has_preset_mode()) {
-    this->set_preset_mode_(source_->get_preset_mode());
-  } else {
-    this->clear_preset_mode_();
-  }
+  this->set_preset_mode_(source_->get_preset_mode());
+  this->publish_state();
 }

 void CopyFan::dump_config() { LOG_FAN("", "Copy Fan", this); }
--- a/esphome/components/copy/fan/copy_fan.h
+++ b/esphome/components/copy/fan/copy_fan.h
@@ -16,7 +16,7 @@ class CopyFan : public fan::Fan, public Component {

 protected:
  void control(const fan::FanCall &call) override;
-  void copy_state_from_source_();
+  ;

  fan::Fan *source_;
 };
--- a/esphome/components/cover/cover.cpp
+++ b/esphome/components/cover/cover.cpp
@@ -153,7 +153,7 @@ void Cover::publish_state(bool save) {
  this->position = clamp(this->position, 0.0f, 1.0f);
  this->tilt = clamp(this->tilt, 0.0f, 1.0f);

-  ESP_LOGD(TAG, "'%s' >>", this->name_.c_str());
+  ESP_LOGD(TAG, "'%s' - Publishing:", this->name_.c_str());
  auto traits = this->get_traits();
  if (traits.get_supports_position()) {
    ESP_LOGD(TAG, "  Position: %.0f%%", this->position * 100.0f);
--- a/esphome/components/cse7766/cse7766.cpp
+++ b/esphome/components/cse7766/cse7766.cpp
@@ -207,24 +207,20 @@ void CSE7766Component::parse_data_() {

 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERY_VERBOSE
  {
-    // Buffer: 7 + 15 + 33 + 15 + 25 = 95 chars max + null, rounded to 128 for safety margin.
-    // Float sizes with %.4f can be up to 11 chars for large values (e.g., 999999.9999).
-    char buf[128];
-    size_t pos = buf_append_printf(buf, sizeof(buf), 0, "Parsed:");
+    std::string buf = "Parsed:";
    if (have_voltage) {
-      pos = buf_append_printf(buf, sizeof(buf), pos, " V=%.4fV", voltage);
+      buf += str_sprintf(" V=%fV", voltage);
    }
    if (have_current) {
-      pos = buf_append_printf(buf, sizeof(buf), pos, " I=%.4fmA (~%.4fmA)", current * 1000.0f,
-                              calculated_current * 1000.0f);
+      buf += str_sprintf(" I=%fmA (~%fmA)", current * 1000.0f, calculated_current * 1000.0f);
    }
    if (have_power) {
-      pos = buf_append_printf(buf, sizeof(buf), pos, " P=%.4fW", power);
+      buf += str_sprintf(" P=%fW", power);
    }
    if (energy != 0.0f) {
-      buf_append_printf(buf, sizeof(buf), pos, " E=%.4fkWh (%u)", energy, cf_pulses);
+      buf += str_sprintf(" E=%fkWh (%u)", energy, cf_pulses);
    }
-    ESP_LOGVV(TAG, "%s", buf);
+    ESP_LOGVV(TAG, "%s", buf.c_str());
  }
 #endif
 }
--- a/esphome/components/daikin_arc/daikin_arc.cpp
+++ b/esphome/components/daikin_arc/daikin_arc.cpp
@@ -258,9 +258,8 @@ bool DaikinArcClimate::parse_state_frame_(const uint8_t frame[]) {
  }

  char buf[DAIKIN_STATE_FRAME_SIZE * 3 + 1] = {0};
-  size_t pos = 0;
  for (size_t i = 0; i < DAIKIN_STATE_FRAME_SIZE; i++) {
-    pos = buf_append_printf(buf, sizeof(buf), pos, "%02x ", frame[i]);
+    sprintf(buf, "%s%02x ", buf, frame[i]);
  }
  ESP_LOGD(TAG, "FRAME %s", buf);

@@ -350,9 +349,8 @@ bool DaikinArcClimate::on_receive(remote_base::RemoteReceiveData data) {
  if (data.expect_item(DAIKIN_HEADER_MARK, DAIKIN_HEADER_SPACE)) {
    valid_daikin_frame = true;
    size_t bytes_count = data.size() / 2 / 8;
-    size_t buf_size = bytes_count * 3 + 1;
-    std::unique_ptr<char[]> buf(new char[buf_size]());  // value-initialize (zero-fill)
-    size_t buf_pos = 0;
+    std::unique_ptr<char[]> buf(new char[bytes_count * 3 + 1]);
+    buf[0] = '\0';
    for (size_t i = 0; i < bytes_count; i++) {
      uint8_t byte = 0;
      for (int8_t bit = 0; bit < 8; bit++) {
@@ -363,19 +361,19 @@ bool DaikinArcClimate::on_receive(remote_base::RemoteReceiveData data) {
          break;
        }
      }
-      buf_pos = buf_append_printf(buf.get(), buf_size, buf_pos, "%02x ", byte);
+      sprintf(buf.get(), "%s%02x ", buf.get(), byte);
    }
    ESP_LOGD(TAG, "WHOLE FRAME %s  size: %d", buf.get(), data.size());
  }
  if (!valid_daikin_frame) {
-    char sbuf[16 * 10 + 1] = {0};
-    size_t sbuf_pos = 0;
+    char sbuf[16 * 10 + 1];
+    sbuf[0] = '\0';
    for (size_t j = 0; j < static_cast<size_t>(data.size()); j++) {
      if ((j - 2) % 16 == 0) {
        if (j > 0) {
          ESP_LOGD(TAG, "DATA %04x: %s", (j - 16 > 0xffff ? 0 : j - 16), sbuf);
        }
-        sbuf_pos = 0;
+        sbuf[0] = '\0';
      }
      char type_ch = ' ';
      // debug_tolerance = 25%
@@ -403,10 +401,9 @@ bool DaikinArcClimate::on_receive(remote_base::RemoteReceiveData data) {
        type_ch = '0';

      if (abs(data[j]) > 100000) {
-        sbuf_pos = buf_append_printf(sbuf, sizeof(sbuf), sbuf_pos, "%-5d[%c] ", data[j] > 0 ? 99999 : -99999, type_ch);
+        sprintf(sbuf, "%s%-5d[%c] ", sbuf, data[j] > 0 ? 99999 : -99999, type_ch);
      } else {
-        sbuf_pos =
-            buf_append_printf(sbuf, sizeof(sbuf), sbuf_pos, "%-5d[%c] ", (int) (round(data[j] / 10.) * 10), type_ch);
+        sprintf(sbuf, "%s%-5d[%c] ", sbuf, (int) (round(data[j] / 10.) * 10), type_ch);
      }
      if (j + 1 == static_cast<size_t>(data.size())) {
        ESP_LOGD(TAG, "DATA %04x: %s", (j - 8 > 0xffff ? 0 : j - 8), sbuf);
--- a/esphome/components/dallas_temp/dallas_temp.cpp
+++ b/esphome/components/dallas_temp/dallas_temp.cpp
@@ -44,7 +44,7 @@ void DallasTemperatureSensor::update() {

  this->send_command_(DALLAS_COMMAND_START_CONVERSION);

-  this->set_timeout(this->get_address_name().c_str(), this->millis_to_wait_for_conversion_(), [this] {
+  this->set_timeout(this->get_address_name(), this->millis_to_wait_for_conversion_(), [this] {
    if (!this->read_scratch_pad_() || !this->check_scratch_pad_()) {
      this->publish_state(NAN);
      return;
--- a/esphome/components/datetime/date_entity.cpp
+++ b/esphome/components/datetime/date_entity.cpp
@@ -30,7 +30,7 @@ void DateEntity::publish_state() {
    return;
  }
  this->set_has_state(true);
-  ESP_LOGD(TAG, "'%s' >> %d-%d-%d", this->get_name().c_str(), this->year_, this->month_, this->day_);
+  ESP_LOGD(TAG, "'%s': Sending date %d-%d-%d", this->get_name().c_str(), this->year_, this->month_, this->day_);
  this->state_callback_.call();
 #if defined(USE_DATETIME_DATE) && defined(USE_CONTROLLER_REGISTRY)
  ControllerRegistry::notify_date_update(this);
--- a/esphome/components/datetime/datetime_entity.cpp
+++ b/esphome/components/datetime/datetime_entity.cpp
@@ -45,8 +45,8 @@ void DateTimeEntity::publish_state() {
    return;
  }
  this->set_has_state(true);
-  ESP_LOGD(TAG, "'%s' >> %04u-%02u-%02u %02d:%02d:%02d", this->get_name().c_str(), this->year_, this->month_,
-           this->day_, this->hour_, this->minute_, this->second_);
+  ESP_LOGD(TAG, "'%s': Sending datetime %04u-%02u-%02u %02d:%02d:%02d", this->get_name().c_str(), this->year_,
+           this->month_, this->day_, this->hour_, this->minute_, this->second_);
  this->state_callback_.call();
 #if defined(USE_DATETIME_DATETIME) && defined(USE_CONTROLLER_REGISTRY)
  ControllerRegistry::notify_datetime_update(this);
--- a/esphome/components/datetime/time_entity.cpp
+++ b/esphome/components/datetime/time_entity.cpp
@@ -26,7 +26,8 @@ void TimeEntity::publish_state() {
    return;
  }
  this->set_has_state(true);
-  ESP_LOGD(TAG, "'%s' >> %02d:%02d:%02d", this->get_name().c_str(), this->hour_, this->minute_, this->second_);
+  ESP_LOGD(TAG, "'%s': Sending time %02d:%02d:%02d", this->get_name().c_str(), this->hour_, this->minute_,
+           this->second_);
  this->state_callback_.call();
 #if defined(USE_DATETIME_TIME) && defined(USE_CONTROLLER_REGISTRY)
  ControllerRegistry::notify_time_update(this);
--- a/esphome/components/debug/debug_component.cpp
+++ b/esphome/components/debug/debug_component.cpp
@@ -28,23 +28,24 @@ void DebugComponent::dump_config() {
 #endif  // defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
 #endif  // USE_SENSOR

-  char device_info_buffer[DEVICE_INFO_BUFFER_SIZE];
+  std::string device_info;
+  device_info.reserve(256);
  ESP_LOGD(TAG, "ESPHome version %s", ESPHOME_VERSION);
-  size_t pos = buf_append_printf(device_info_buffer, DEVICE_INFO_BUFFER_SIZE, 0, "%s", ESPHOME_VERSION);
+  device_info += ESPHOME_VERSION;

  this->free_heap_ = get_free_heap_();
  ESP_LOGD(TAG, "Free Heap Size: %" PRIu32 " bytes", this->free_heap_);

-  pos = get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>(device_info_buffer), pos);
+  get_device_info_(device_info);

 #ifdef USE_TEXT_SENSOR
  if (this->device_info_ != nullptr) {
-    this->device_info_->publish_state(device_info_buffer, pos);
+    if (device_info.length() > 255)
+      device_info.resize(255);
+    this->device_info_->publish_state(device_info);
  }
  if (this->reset_reason_ != nullptr) {
-    char reset_reason_buffer[RESET_REASON_BUFFER_SIZE];
-    this->reset_reason_->publish_state(
-        get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE>(reset_reason_buffer)));
+    this->reset_reason_->publish_state(get_reset_reason_());
  }
 #endif  // USE_TEXT_SENSOR

--- a/esphome/components/debug/debug_component.h
+++ b/esphome/components/debug/debug_component.h
@@ -4,7 +4,6 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/macros.h"
-#include <span>

 #ifdef USE_SENSOR
 #include "esphome/components/sensor/sensor.h"
@@ -16,11 +15,6 @@
 namespace esphome {
 namespace debug {

-static constexpr size_t DEVICE_INFO_BUFFER_SIZE = 256;
-static constexpr size_t RESET_REASON_BUFFER_SIZE = 128;
-
-// buf_append_printf is now provided by esphome/core/helpers.h
-
 class DebugComponent : public PollingComponent {
 public:
  void loop() override;
@@ -35,11 +29,8 @@ class DebugComponent : public PollingComponent {
 #ifdef USE_SENSOR
  void set_free_sensor(sensor::Sensor *free_sensor) { free_sensor_ = free_sensor; }
  void set_block_sensor(sensor::Sensor *block_sensor) { block_sensor_ = block_sensor; }
-#if (defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)) || defined(USE_ESP32)
+#if defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
  void set_fragmentation_sensor(sensor::Sensor *fragmentation_sensor) { fragmentation_sensor_ = fragmentation_sensor; }
-#endif
-#if defined(USE_ESP32) || defined(USE_LIBRETINY)
-  void set_min_free_sensor(sensor::Sensor *min_free_sensor) { min_free_sensor_ = min_free_sensor; }
 #endif
  void set_loop_time_sensor(sensor::Sensor *loop_time_sensor) { loop_time_sensor_ = loop_time_sensor; }
 #ifdef USE_ESP32
@@ -61,11 +52,8 @@ class DebugComponent : public PollingComponent {

  sensor::Sensor *free_sensor_{nullptr};
  sensor::Sensor *block_sensor_{nullptr};
-#if (defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)) || defined(USE_ESP32)
+#if defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(2, 5, 2)
  sensor::Sensor *fragmentation_sensor_{nullptr};
-#endif
-#if defined(USE_ESP32) || defined(USE_LIBRETINY)
-  sensor::Sensor *min_free_sensor_{nullptr};
 #endif
  sensor::Sensor *loop_time_sensor_{nullptr};
 #ifdef USE_ESP32
@@ -93,10 +81,10 @@ class DebugComponent : public PollingComponent {
  text_sensor::TextSensor *reset_reason_{nullptr};
 #endif  // USE_TEXT_SENSOR

-  const char *get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer);
-  const char *get_wakeup_cause_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer);
+  std::string get_reset_reason_();
+  std::string get_wakeup_cause_();
  uint32_t get_free_heap_();
-  size_t get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE> buffer, size_t pos);
+  void get_device_info_(std::string &device_info);
  void update_platform_();
 };

--- a/esphome/components/debug/debug_esp32.cpp
+++ b/esphome/components/debug/debug_esp32.cpp
@@ -58,29 +58,24 @@ void DebugComponent::on_shutdown() {
  global_preferences->sync();
 }

-const char *DebugComponent::get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) {
-  char *buf = buffer.data();
-  const size_t size = RESET_REASON_BUFFER_SIZE;
-
+std::string DebugComponent::get_reset_reason_() {
+  std::string reset_reason;
  unsigned reason = esp_reset_reason();
  if (reason < sizeof(RESET_REASONS) / sizeof(RESET_REASONS[0])) {
+    reset_reason = RESET_REASONS[reason];
    if (reason == ESP_RST_SW) {
      auto pref = global_preferences->make_preference(REBOOT_MAX_LEN, fnv1_hash(REBOOT_KEY + App.get_name()));
-      char reboot_source[REBOOT_MAX_LEN]{};
-      if (pref.load(&reboot_source)) {
-        reboot_source[REBOOT_MAX_LEN - 1] = '\0';
-        snprintf(buf, size, "Reboot request from %s", reboot_source);
-      } else {
-        snprintf(buf, size, "%s", RESET_REASONS[reason]);
+      char buffer[REBOOT_MAX_LEN]{};
+      if (pref.load(&buffer)) {
+        buffer[REBOOT_MAX_LEN - 1] = '\0';
+        reset_reason = "Reboot request from " + std::string(buffer);
      }
-    } else {
-      snprintf(buf, size, "%s", RESET_REASONS[reason]);
    }
  } else {
-    snprintf(buf, size, "unknown source");
+    reset_reason = "unknown source";
  }
-  ESP_LOGD(TAG, "Reset Reason: %s", buf);
-  return buf;
+  ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
+  return reset_reason;
 }

 static const char *const WAKEUP_CAUSES[] = {
@@ -99,7 +94,7 @@ static const char *const WAKEUP_CAUSES[] = {
    "BT",
 };

-const char *DebugComponent::get_wakeup_cause_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) {
+std::string DebugComponent::get_wakeup_cause_() {
  const char *wake_reason;
  unsigned reason = esp_sleep_get_wakeup_cause();
  if (reason < sizeof(WAKEUP_CAUSES) / sizeof(WAKEUP_CAUSES[0])) {
@@ -108,7 +103,6 @@ const char *DebugComponent::get_wakeup_cause_(std::span<char, RESET_REASON_BUFFE
    wake_reason = "unknown source";
  }
  ESP_LOGD(TAG, "Wakeup Reason: %s", wake_reason);
-  // Return the static string directly - no need to copy to buffer
  return wake_reason;
 }

@@ -142,10 +136,7 @@ static constexpr ChipFeature CHIP_FEATURES[] = {
    {CHIP_FEATURE_WIFI_BGN, "2.4GHz WiFi"},
 };

-size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE> buffer, size_t pos) {
-  constexpr size_t size = DEVICE_INFO_BUFFER_SIZE;
-  char *buf = buffer.data();
-
+void DebugComponent::get_device_info_(std::string &device_info) {
 #if defined(USE_ARDUINO)
  const char *flash_mode;
  switch (ESP.getFlashChipMode()) {  // NOLINT(readability-static-accessed-through-instance)
@@ -170,83 +161,74 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
    default:
      flash_mode = "UNKNOWN";
  }
-  uint32_t flash_size = ESP.getFlashChipSize() / 1024;       // NOLINT
-  uint32_t flash_speed = ESP.getFlashChipSpeed() / 1000000;  // NOLINT
-  ESP_LOGD(TAG, "Flash Chip: Size=%" PRIu32 "kB Speed=%" PRIu32 "MHz Mode=%s", flash_size, flash_speed, flash_mode);
-  pos = buf_append_printf(buf, size, pos, "|Flash: %" PRIu32 "kB Speed:%" PRIu32 "MHz Mode:%s", flash_size, flash_speed,
-                          flash_mode);
+  ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s",
+           ESP.getFlashChipSize() / 1024,                                                   // NOLINT
+           ESP.getFlashChipSpeed() / 1000000, flash_mode);                                  // NOLINT
+  device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) +                    // NOLINT
+                 "kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:";  // NOLINT
+  device_info += flash_mode;
 #endif

  esp_chip_info_t info;
  esp_chip_info(&info);
  const char *model = ESPHOME_VARIANT;
+  std::string features;

-  // Build features string
-  pos = buf_append_printf(buf, size, pos, "|Chip: %s Features:", model);
-  bool first_feature = true;
+  // Check each known feature bit
  for (const auto &feature : CHIP_FEATURES) {
    if (info.features & feature.bit) {
-      pos = buf_append_printf(buf, size, pos, "%s%s", first_feature ? "" : ", ", feature.name);
-      first_feature = false;
+      features += feature.name;
+      features += ", ";
      info.features &= ~feature.bit;
    }
  }
-  if (info.features != 0) {
-    pos = buf_append_printf(buf, size, pos, "%sOther:0x%" PRIx32, first_feature ? "" : ", ", info.features);
-  }
-  ESP_LOGD(TAG, "Chip: Model=%s, Cores=%u, Revision=%u", model, info.cores, info.revision);
-  pos = buf_append_printf(buf, size, pos, " Cores:%u Revision:%u", info.cores, info.revision);
-
-  uint32_t cpu_freq_mhz = arch_get_cpu_freq_hz() / 1000000;
-  ESP_LOGD(TAG, "CPU Frequency: %" PRIu32 " MHz", cpu_freq_mhz);
-  pos = buf_append_printf(buf, size, pos, "|CPU Frequency: %" PRIu32 " MHz", cpu_freq_mhz);
+  if (info.features != 0)
+    features += "Other:" + format_hex(info.features);
+  ESP_LOGD(TAG, "Chip: Model=%s, Features=%s Cores=%u, Revision=%u", model, features.c_str(), info.cores,
+           info.revision);
+  device_info += "|Chip: ";
+  device_info += model;
+  device_info += " Features:";
+  device_info += features;
+  device_info += " Cores:" + to_string(info.cores);
+  device_info += " Revision:" + to_string(info.revision);
+  device_info += str_sprintf("|CPU Frequency: %" PRIu32 " MHz", arch_get_cpu_freq_hz() / 1000000);
+  ESP_LOGD(TAG, "CPU Frequency: %" PRIu32 " MHz", arch_get_cpu_freq_hz() / 1000000);

  // Framework detection
+  device_info += "|Framework: ";
 #ifdef USE_ARDUINO
  ESP_LOGD(TAG, "Framework: Arduino");
-  pos = buf_append_printf(buf, size, pos, "|Framework: Arduino");
+  device_info += "Arduino";
 #elif defined(USE_ESP32)
  ESP_LOGD(TAG, "Framework: ESP-IDF");
-  pos = buf_append_printf(buf, size, pos, "|Framework: ESP-IDF");
+  device_info += "ESP-IDF";
 #else
  ESP_LOGW(TAG, "Framework: UNKNOWN");
-  pos = buf_append_printf(buf, size, pos, "|Framework: UNKNOWN");
+  device_info += "UNKNOWN";
 #endif

  ESP_LOGD(TAG, "ESP-IDF Version: %s", esp_get_idf_version());
-  pos = buf_append_printf(buf, size, pos, "|ESP-IDF: %s", esp_get_idf_version());
+  device_info += "|ESP-IDF: ";
+  device_info += esp_get_idf_version();

-  uint8_t mac[6];
-  get_mac_address_raw(mac);
-  ESP_LOGD(TAG, "EFuse MAC: %02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
-  pos = buf_append_printf(buf, size, pos, "|EFuse MAC: %02X:%02X:%02X:%02X:%02X:%02X", mac[0], mac[1], mac[2], mac[3],
-                          mac[4], mac[5]);
+  std::string mac = get_mac_address_pretty();
+  ESP_LOGD(TAG, "EFuse MAC: %s", mac.c_str());
+  device_info += "|EFuse MAC: ";
+  device_info += mac;

-  char reason_buffer[RESET_REASON_BUFFER_SIZE];
-  const char *reset_reason = get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE>(reason_buffer));
-  pos = buf_append_printf(buf, size, pos, "|Reset: %s", reset_reason);
+  device_info += "|Reset: ";
+  device_info += get_reset_reason_();

-  const char *wakeup_cause = get_wakeup_cause_(std::span<char, RESET_REASON_BUFFER_SIZE>(reason_buffer));
-  pos = buf_append_printf(buf, size, pos, "|Wakeup: %s", wakeup_cause);
-
-  return pos;
+  std::string wakeup_reason = this->get_wakeup_cause_();
+  device_info += "|Wakeup: ";
+  device_info += wakeup_reason;
 }

 void DebugComponent::update_platform_() {
 #ifdef USE_SENSOR
-  uint32_t max_alloc = heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL);
  if (this->block_sensor_ != nullptr) {
-    this->block_sensor_->publish_state(max_alloc);
-  }
-  if (this->min_free_sensor_ != nullptr) {
-    this->min_free_sensor_->publish_state(heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL));
-  }
-  if (this->fragmentation_sensor_ != nullptr) {
-    uint32_t free_heap = heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
-    if (free_heap > 0) {
-      float fragmentation = 100.0f - (100.0f * max_alloc / free_heap);
-      this->fragmentation_sensor_->publish_state(fragmentation);
-    }
+    this->block_sensor_->publish_state(heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL));
  }
  if (this->psram_sensor_ != nullptr) {
    this->psram_sensor_->publish_state(heap_caps_get_free_size(MALLOC_CAP_SPIRAM));
--- a/esphome/components/debug/debug_esp8266.cpp
+++ b/esphome/components/debug/debug_esp8266.cpp
@@ -3,155 +3,77 @@
 #include "esphome/core/log.h"
 #include <Esp.h>

-extern "C" {
-#include <user_interface.h>
-
-// Global reset info struct populated by SDK at boot
-extern struct rst_info resetInfo;
-
-// Core version - either a string pointer or a version number to format as hex
-extern uint32_t core_version;
-extern const char *core_release;
-}
-
 namespace esphome {
 namespace debug {

 static const char *const TAG = "debug";

-// Get reset reason string from reason code (no heap allocation)
-// Returns LogString* pointing to flash (PROGMEM) on ESP8266
-static const LogString *get_reset_reason_str(uint32_t reason) {
-  switch (reason) {
-    case REASON_DEFAULT_RST:
-      return LOG_STR("Power On");
-    case REASON_WDT_RST:
-      return LOG_STR("Hardware Watchdog");
-    case REASON_EXCEPTION_RST:
-      return LOG_STR("Exception");
-    case REASON_SOFT_WDT_RST:
-      return LOG_STR("Software Watchdog");
-    case REASON_SOFT_RESTART:
-      return LOG_STR("Software/System restart");
-    case REASON_DEEP_SLEEP_AWAKE:
-      return LOG_STR("Deep-Sleep Wake");
-    case REASON_EXT_SYS_RST:
-      return LOG_STR("External System");
-    default:
-      return LOG_STR("Unknown");
-  }
-}
-
-// Size for core version hex buffer
-static constexpr size_t CORE_VERSION_BUFFER_SIZE = 12;
-
-// Get core version string (no heap allocation)
-// Returns either core_release directly or formats core_version as hex into provided buffer
-static const char *get_core_version_str(std::span<char, CORE_VERSION_BUFFER_SIZE> buffer) {
-  if (core_release != nullptr) {
-    return core_release;
-  }
-  snprintf_P(buffer.data(), CORE_VERSION_BUFFER_SIZE, PSTR("%08x"), core_version);
-  return buffer.data();
-}
-
-// Size for reset info buffer
-static constexpr size_t RESET_INFO_BUFFER_SIZE = 200;
-
-// Get detailed reset info string (no heap allocation)
-// For watchdog/exception resets, includes detailed exception info
-static const char *get_reset_info_str(std::span<char, RESET_INFO_BUFFER_SIZE> buffer, uint32_t reason) {
-  if (reason >= REASON_WDT_RST && reason <= REASON_SOFT_WDT_RST) {
-    snprintf_P(buffer.data(), RESET_INFO_BUFFER_SIZE,
-               PSTR("Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x"),
-               static_cast<int>(resetInfo.exccause), static_cast<int>(reason),
-               LOG_STR_ARG(get_reset_reason_str(reason)), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3,
-               resetInfo.excvaddr, resetInfo.depc);
-    return buffer.data();
-  }
-  return LOG_STR_ARG(get_reset_reason_str(reason));
-}
-
-const char *DebugComponent::get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) {
-  // Copy from flash to provided buffer
-  strncpy_P(buffer.data(), (PGM_P) get_reset_reason_str(resetInfo.reason), RESET_REASON_BUFFER_SIZE - 1);
-  buffer[RESET_REASON_BUFFER_SIZE - 1] = '\0';
-  return buffer.data();
-}
-
-const char *DebugComponent::get_wakeup_cause_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) {
-  // ESP8266 doesn't have detailed wakeup cause like ESP32
+std::string DebugComponent::get_reset_reason_() {
+#if !defined(CLANG_TIDY)
+  return ESP.getResetReason().c_str();
+#else
  return "";
+#endif
 }

 uint32_t DebugComponent::get_free_heap_() {
  return ESP.getFreeHeap();  // NOLINT(readability-static-accessed-through-instance)
 }

-size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE> buffer, size_t pos) {
-  constexpr size_t size = DEVICE_INFO_BUFFER_SIZE;
-  char *buf = buffer.data();
-
-  const LogString *flash_mode;
+void DebugComponent::get_device_info_(std::string &device_info) {
+  const char *flash_mode;
  switch (ESP.getFlashChipMode()) {  // NOLINT(readability-static-accessed-through-instance)
    case FM_QIO:
-      flash_mode = LOG_STR("QIO");
+      flash_mode = "QIO";
      break;
    case FM_QOUT:
-      flash_mode = LOG_STR("QOUT");
+      flash_mode = "QOUT";
      break;
    case FM_DIO:
-      flash_mode = LOG_STR("DIO");
+      flash_mode = "DIO";
      break;
    case FM_DOUT:
-      flash_mode = LOG_STR("DOUT");
+      flash_mode = "DOUT";
      break;
    default:
-      flash_mode = LOG_STR("UNKNOWN");
+      flash_mode = "UNKNOWN";
  }
-  uint32_t flash_size = ESP.getFlashChipSize() / 1024;       // NOLINT(readability-static-accessed-through-instance)
-  uint32_t flash_speed = ESP.getFlashChipSpeed() / 1000000;  // NOLINT(readability-static-accessed-through-instance)
-  ESP_LOGD(TAG, "Flash Chip: Size=%" PRIu32 "kB Speed=%" PRIu32 "MHz Mode=%s", flash_size, flash_speed,
-           LOG_STR_ARG(flash_mode));
-  pos = buf_append_printf(buf, size, pos, "|Flash: %" PRIu32 "kB Speed:%" PRIu32 "MHz Mode:%s", flash_size, flash_speed,
-                          LOG_STR_ARG(flash_mode));
-
-  char reason_buffer[RESET_REASON_BUFFER_SIZE];
-  const char *reset_reason = get_reset_reason_(reason_buffer);
-  char core_version_buffer[CORE_VERSION_BUFFER_SIZE];
-  char reset_info_buffer[RESET_INFO_BUFFER_SIZE];
-  // NOLINTBEGIN(readability-static-accessed-through-instance)
-  uint32_t chip_id = ESP.getChipId();
-  uint8_t boot_version = ESP.getBootVersion();
-  uint8_t boot_mode = ESP.getBootMode();
-  uint8_t cpu_freq = ESP.getCpuFreqMHz();
-  uint32_t flash_chip_id = ESP.getFlashChipId();
-  const char *sdk_version = ESP.getSdkVersion();
-  // NOLINTEND(readability-static-accessed-through-instance)
+  ESP_LOGD(TAG, "Flash Chip: Size=%ukB Speed=%uMHz Mode=%s",
+           ESP.getFlashChipSize() / 1024,                                                   // NOLINT
+           ESP.getFlashChipSpeed() / 1000000, flash_mode);                                  // NOLINT
+  device_info += "|Flash: " + to_string(ESP.getFlashChipSize() / 1024) +                    // NOLINT
+                 "kB Speed:" + to_string(ESP.getFlashChipSpeed() / 1000000) + "MHz Mode:";  // NOLINT
+  device_info += flash_mode;

+#if !defined(CLANG_TIDY)
+  auto reset_reason = get_reset_reason_();
  ESP_LOGD(TAG,
-           "Chip ID: 0x%08" PRIX32 "\n"
+           "Chip ID: 0x%08X\n"
           "SDK Version: %s\n"
           "Core Version: %s\n"
           "Boot Version=%u Mode=%u\n"
           "CPU Frequency: %u\n"
-           "Flash Chip ID=0x%08" PRIX32 "\n"
+           "Flash Chip ID=0x%08X\n"
           "Reset Reason: %s\n"
           "Reset Info: %s",
-           chip_id, sdk_version, get_core_version_str(core_version_buffer), boot_version, boot_mode, cpu_freq,
-           flash_chip_id, reset_reason, get_reset_info_str(reset_info_buffer, resetInfo.reason));
+           ESP.getChipId(), ESP.getSdkVersion(), ESP.getCoreVersion().c_str(), ESP.getBootVersion(), ESP.getBootMode(),
+           ESP.getCpuFreqMHz(), ESP.getFlashChipId(), reset_reason.c_str(), ESP.getResetInfo().c_str());

-  pos = buf_append_printf(buf, size, pos, "|Chip: 0x%08" PRIX32, chip_id);
-  pos = buf_append_printf(buf, size, pos, "|SDK: %s", sdk_version);
-  pos = buf_append_printf(buf, size, pos, "|Core: %s", get_core_version_str(core_version_buffer));
-  pos = buf_append_printf(buf, size, pos, "|Boot: %u", boot_version);
-  pos = buf_append_printf(buf, size, pos, "|Mode: %u", boot_mode);
-  pos = buf_append_printf(buf, size, pos, "|CPU: %u", cpu_freq);
-  pos = buf_append_printf(buf, size, pos, "|Flash: 0x%08" PRIX32, flash_chip_id);
-  pos = buf_append_printf(buf, size, pos, "|Reset: %s", reset_reason);
-  pos = buf_append_printf(buf, size, pos, "|%s", get_reset_info_str(reset_info_buffer, resetInfo.reason));
-
-  return pos;
+  device_info += "|Chip: 0x" + format_hex(ESP.getChipId());
+  device_info += "|SDK: ";
+  device_info += ESP.getSdkVersion();
+  device_info += "|Core: ";
+  device_info += ESP.getCoreVersion().c_str();
+  device_info += "|Boot: ";
+  device_info += to_string(ESP.getBootVersion());
+  device_info += "|Mode: " + to_string(ESP.getBootMode());
+  device_info += "|CPU: " + to_string(ESP.getCpuFreqMHz());
+  device_info += "|Flash: 0x" + format_hex(ESP.getFlashChipId());
+  device_info += "|Reset: ";
+  device_info += reset_reason;
+  device_info += "|";
+  device_info += ESP.getResetInfo().c_str();
+#endif
 }

 void DebugComponent::update_platform_() {
--- a/esphome/components/debug/debug_host.cpp
+++ b/esphome/components/debug/debug_host.cpp
@@ -5,13 +5,11 @@
 namespace esphome {
 namespace debug {

-const char *DebugComponent::get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) { return ""; }
-
-const char *DebugComponent::get_wakeup_cause_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) { return ""; }
+std::string DebugComponent::get_reset_reason_() { return ""; }

 uint32_t DebugComponent::get_free_heap_() { return INT_MAX; }

-size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE> buffer, size_t pos) { return pos; }
+void DebugComponent::get_device_info_(std::string &device_info) {}

 void DebugComponent::update_platform_() {}

--- a/esphome/components/debug/debug_libretiny.cpp
+++ b/esphome/components/debug/debug_libretiny.cpp
@@ -7,43 +7,31 @@ namespace debug {

 static const char *const TAG = "debug";

-const char *DebugComponent::get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) {
-  // Return the static string directly
-  return lt_get_reboot_reason_name(lt_get_reboot_reason());
-}
-
-const char *DebugComponent::get_wakeup_cause_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) { return ""; }
+std::string DebugComponent::get_reset_reason_() { return lt_get_reboot_reason_name(lt_get_reboot_reason()); }

 uint32_t DebugComponent::get_free_heap_() { return lt_heap_get_free(); }

-size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE> buffer, size_t pos) {
-  constexpr size_t size = DEVICE_INFO_BUFFER_SIZE;
-  char *buf = buffer.data();
-
-  char reason_buffer[RESET_REASON_BUFFER_SIZE];
-  const char *reset_reason = get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE>(reason_buffer));
-  uint32_t flash_kib = lt_flash_get_size() / 1024;
-  uint32_t ram_kib = lt_ram_get_size() / 1024;
-  uint32_t mac_id = lt_cpu_get_mac_id();
-
+void DebugComponent::get_device_info_(std::string &device_info) {
+  std::string reset_reason = get_reset_reason_();
  ESP_LOGD(TAG,
           "LibreTiny Version: %s\n"
           "Chip: %s (%04x) @ %u MHz\n"
-           "Chip ID: 0x%06" PRIX32 "\n"
+           "Chip ID: 0x%06X\n"
           "Board: %s\n"
-           "Flash: %" PRIu32 " KiB / RAM: %" PRIu32 " KiB\n"
+           "Flash: %u KiB / RAM: %u KiB\n"
           "Reset Reason: %s",
-           lt_get_version(), lt_cpu_get_model_name(), lt_cpu_get_model(), lt_cpu_get_freq_mhz(), mac_id,
-           lt_get_board_code(), flash_kib, ram_kib, reset_reason);
+           lt_get_version(), lt_cpu_get_model_name(), lt_cpu_get_model(), lt_cpu_get_freq_mhz(), lt_cpu_get_mac_id(),
+           lt_get_board_code(), lt_flash_get_size() / 1024, lt_ram_get_size() / 1024, reset_reason.c_str());

-  pos = buf_append_printf(buf, size, pos, "|Version: %s", LT_BANNER_STR + 10);
-  pos = buf_append_printf(buf, size, pos, "|Reset Reason: %s", reset_reason);
-  pos = buf_append_printf(buf, size, pos, "|Chip Name: %s", lt_cpu_get_model_name());
-  pos = buf_append_printf(buf, size, pos, "|Chip ID: 0x%06" PRIX32, mac_id);
-  pos = buf_append_printf(buf, size, pos, "|Flash: %" PRIu32 " KiB", flash_kib);
-  pos = buf_append_printf(buf, size, pos, "|RAM: %" PRIu32 " KiB", ram_kib);
-
-  return pos;
+  device_info += "|Version: ";
+  device_info += LT_BANNER_STR + 10;
+  device_info += "|Reset Reason: ";
+  device_info += reset_reason;
+  device_info += "|Chip Name: ";
+  device_info += lt_cpu_get_model_name();
+  device_info += "|Chip ID: 0x" + format_hex(lt_cpu_get_mac_id());
+  device_info += "|Flash: " + to_string(lt_flash_get_size() / 1024) + " KiB";
+  device_info += "|RAM: " + to_string(lt_ram_get_size() / 1024) + " KiB";
 }

 void DebugComponent::update_platform_() {
@@ -51,9 +39,6 @@ void DebugComponent::update_platform_() {
  if (this->block_sensor_ != nullptr) {
    this->block_sensor_->publish_state(lt_heap_get_max_alloc());
  }
-  if (this->min_free_sensor_ != nullptr) {
-    this->min_free_sensor_->publish_state(lt_heap_get_min_free());
-  }
 #endif
 }

--- a/esphome/components/debug/debug_rp2040.cpp
+++ b/esphome/components/debug/debug_rp2040.cpp
@@ -7,21 +7,13 @@ namespace debug {

 static const char *const TAG = "debug";

-const char *DebugComponent::get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) { return ""; }
-
-const char *DebugComponent::get_wakeup_cause_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) { return ""; }
+std::string DebugComponent::get_reset_reason_() { return ""; }

 uint32_t DebugComponent::get_free_heap_() { return rp2040.getFreeHeap(); }

-size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE> buffer, size_t pos) {
-  constexpr size_t size = DEVICE_INFO_BUFFER_SIZE;
-  char *buf = buffer.data();
-
-  uint32_t cpu_freq = rp2040.f_cpu();
-  ESP_LOGD(TAG, "CPU Frequency: %" PRIu32, cpu_freq);
-  pos = buf_append_printf(buf, size, pos, "|CPU Frequency: %" PRIu32, cpu_freq);
-
-  return pos;
+void DebugComponent::get_device_info_(std::string &device_info) {
+  ESP_LOGD(TAG, "CPU Frequency: %u", rp2040.f_cpu());
+  device_info += "CPU Frequency: " + to_string(rp2040.f_cpu());
 }

 void DebugComponent::update_platform_() {}
--- a/esphome/components/debug/debug_zephyr.cpp
+++ b/esphome/components/debug/debug_zephyr.cpp
@@ -15,14 +15,14 @@ static const char *const TAG = "debug";
 constexpr std::uintptr_t MBR_PARAM_PAGE_ADDR = 0xFFC;
 constexpr std::uintptr_t MBR_BOOTLOADER_ADDR = 0xFF8;

-static size_t append_reset_reason(char *buf, size_t size, size_t pos, bool set, const char *reason) {
+static void show_reset_reason(std::string &reset_reason, bool set, const char *reason) {
  if (!set) {
-    return pos;
+    return;
  }
-  if (pos > 0) {
-    pos = buf_append_printf(buf, size, pos, ", ");
+  if (!reset_reason.empty()) {
+    reset_reason += ", ";
  }
-  return buf_append_printf(buf, size, pos, "%s", reason);
+  reset_reason += reason;
 }

 static inline uint32_t read_mem_u32(uintptr_t addr) {
@@ -56,47 +56,33 @@ static inline uint32_t sd_version_get() {
  return 0;
 }

-const char *DebugComponent::get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) {
-  char *buf = buffer.data();
-  const size_t size = RESET_REASON_BUFFER_SIZE;
-
+std::string DebugComponent::get_reset_reason_() {
  uint32_t cause;
  auto ret = hwinfo_get_reset_cause(&cause);
  if (ret) {
    ESP_LOGE(TAG, "Unable to get reset cause: %d", ret);
-    buf[0] = '\0';
-    return buf;
+    return "";
  }
-  size_t pos = 0;
+  std::string reset_reason;

-  pos = append_reset_reason(buf, size, pos, cause & RESET_PIN, "External pin");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_SOFTWARE, "Software reset");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_BROWNOUT, "Brownout (drop in voltage)");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_POR, "Power-on reset (POR)");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_WATCHDOG, "Watchdog timer expiration");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_DEBUG, "Debug event");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_SECURITY, "Security violation");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_LOW_POWER_WAKE, "Waking up from low power mode");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_CPU_LOCKUP, "CPU lock-up detected");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_PARITY, "Parity error");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_PLL, "PLL error");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_CLOCK, "Clock error");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_HARDWARE, "Hardware reset");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_USER, "User reset");
-  pos = append_reset_reason(buf, size, pos, cause & RESET_TEMPERATURE, "Temperature reset");
+  show_reset_reason(reset_reason, cause & RESET_PIN, "External pin");
+  show_reset_reason(reset_reason, cause & RESET_SOFTWARE, "Software reset");
+  show_reset_reason(reset_reason, cause & RESET_BROWNOUT, "Brownout (drop in voltage)");
+  show_reset_reason(reset_reason, cause & RESET_POR, "Power-on reset (POR)");
+  show_reset_reason(reset_reason, cause & RESET_WATCHDOG, "Watchdog timer expiration");
+  show_reset_reason(reset_reason, cause & RESET_DEBUG, "Debug event");
+  show_reset_reason(reset_reason, cause & RESET_SECURITY, "Security violation");
+  show_reset_reason(reset_reason, cause & RESET_LOW_POWER_WAKE, "Waking up from low power mode");
+  show_reset_reason(reset_reason, cause & RESET_CPU_LOCKUP, "CPU lock-up detected");
+  show_reset_reason(reset_reason, cause & RESET_PARITY, "Parity error");
+  show_reset_reason(reset_reason, cause & RESET_PLL, "PLL error");
+  show_reset_reason(reset_reason, cause & RESET_CLOCK, "Clock error");
+  show_reset_reason(reset_reason, cause & RESET_HARDWARE, "Hardware reset");
+  show_reset_reason(reset_reason, cause & RESET_USER, "User reset");
+  show_reset_reason(reset_reason, cause & RESET_TEMPERATURE, "Temperature reset");

-  // Ensure null termination if nothing was written
-  if (pos == 0) {
-    buf[0] = '\0';
-  }
-
-  ESP_LOGD(TAG, "Reset Reason: %s", buf);
-  return buf;
-}
-
-const char *DebugComponent::get_wakeup_cause_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) {
-  // Zephyr doesn't have detailed wakeup cause like ESP32
-  return "";
+  ESP_LOGD(TAG, "Reset Reason: %s", reset_reason.c_str());
+  return reset_reason;
 }

 uint32_t DebugComponent::get_free_heap_() { return INT_MAX; }
@@ -132,183 +118,175 @@ void DebugComponent::log_partition_info_() {
  flash_area_foreach(fa_cb, nullptr);
 }

-size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE> buffer, size_t pos) {
-  constexpr size_t size = DEVICE_INFO_BUFFER_SIZE;
-  char *buf = buffer.data();
+void DebugComponent::get_device_info_(std::string &device_info) {
+  std::string supply = "Main supply status: ";
+  if (nrf_power_mainregstatus_get(NRF_POWER) == NRF_POWER_MAINREGSTATUS_NORMAL) {
+    supply += "Normal voltage.";
+  } else {
+    supply += "High voltage.";
+  }
+  ESP_LOGD(TAG, "%s", supply.c_str());
+  device_info += "|" + supply;

-  // Main supply status
-  const char *supply_status =
-      (nrf_power_mainregstatus_get(NRF_POWER) == NRF_POWER_MAINREGSTATUS_NORMAL) ? "Normal voltage." : "High voltage.";
-  ESP_LOGD(TAG, "Main supply status: %s", supply_status);
-  pos = buf_append_printf(buf, size, pos, "|Main supply status: %s", supply_status);
-
-  // Regulator stage 0
+  std::string reg0 = "Regulator stage 0: ";
  if (nrf_power_mainregstatus_get(NRF_POWER) == NRF_POWER_MAINREGSTATUS_HIGH) {
-    const char *reg0_type = nrf_power_dcdcen_vddh_get(NRF_POWER) ? "DC/DC" : "LDO";
-    const char *reg0_voltage;
+    reg0 += nrf_power_dcdcen_vddh_get(NRF_POWER) ? "DC/DC" : "LDO";
+    reg0 += ", ";
    switch (NRF_UICR->REGOUT0 & UICR_REGOUT0_VOUT_Msk) {
      case (UICR_REGOUT0_VOUT_DEFAULT << UICR_REGOUT0_VOUT_Pos):
-        reg0_voltage = "1.8V (default)";
+        reg0 += "1.8V (default)";
        break;
      case (UICR_REGOUT0_VOUT_1V8 << UICR_REGOUT0_VOUT_Pos):
-        reg0_voltage = "1.8V";
+        reg0 += "1.8V";
        break;
      case (UICR_REGOUT0_VOUT_2V1 << UICR_REGOUT0_VOUT_Pos):
-        reg0_voltage = "2.1V";
+        reg0 += "2.1V";
        break;
      case (UICR_REGOUT0_VOUT_2V4 << UICR_REGOUT0_VOUT_Pos):
-        reg0_voltage = "2.4V";
+        reg0 += "2.4V";
        break;
      case (UICR_REGOUT0_VOUT_2V7 << UICR_REGOUT0_VOUT_Pos):
-        reg0_voltage = "2.7V";
+        reg0 += "2.7V";
        break;
      case (UICR_REGOUT0_VOUT_3V0 << UICR_REGOUT0_VOUT_Pos):
-        reg0_voltage = "3.0V";
+        reg0 += "3.0V";
        break;
      case (UICR_REGOUT0_VOUT_3V3 << UICR_REGOUT0_VOUT_Pos):
-        reg0_voltage = "3.3V";
+        reg0 += "3.3V";
        break;
      default:
-        reg0_voltage = "???V";
+        reg0 += "???V";
    }
-    ESP_LOGD(TAG, "Regulator stage 0: %s, %s", reg0_type, reg0_voltage);
-    pos = buf_append_printf(buf, size, pos, "|Regulator stage 0: %s, %s", reg0_type, reg0_voltage);
  } else {
-    ESP_LOGD(TAG, "Regulator stage 0: disabled");
-    pos = buf_append_printf(buf, size, pos, "|Regulator stage 0: disabled");
+    reg0 += "disabled";
  }
+  ESP_LOGD(TAG, "%s", reg0.c_str());
+  device_info += "|" + reg0;

-  // Regulator stage 1
-  const char *reg1_type = nrf_power_dcdcen_get(NRF_POWER) ? "DC/DC" : "LDO";
-  ESP_LOGD(TAG, "Regulator stage 1: %s", reg1_type);
-  pos = buf_append_printf(buf, size, pos, "|Regulator stage 1: %s", reg1_type);
+  std::string reg1 = "Regulator stage 1: ";
+  reg1 += nrf_power_dcdcen_get(NRF_POWER) ? "DC/DC" : "LDO";
+  ESP_LOGD(TAG, "%s", reg1.c_str());
+  device_info += "|" + reg1;

-  // USB power state
-  const char *usb_state;
+  std::string usb_power = "USB power state: ";
  if (nrf_power_usbregstatus_vbusdet_get(NRF_POWER)) {
    if (nrf_power_usbregstatus_outrdy_get(NRF_POWER)) {
-      usb_state = "ready";
+      /**< From the power viewpoint, USB is ready for working. */
+      usb_power += "ready";
    } else {
-      usb_state = "connected (regulator is not ready)";
+      /**< The USB power is detected, but USB power regulator is not ready. */
+      usb_power += "connected (regulator is not ready)";
    }
  } else {
-    usb_state = "disconnected";
+    /**< No power on USB lines detected. */
+    usb_power += "disconected";
  }
-  ESP_LOGD(TAG, "USB power state: %s", usb_state);
-  pos = buf_append_printf(buf, size, pos, "|USB power state: %s", usb_state);
+  ESP_LOGD(TAG, "%s", usb_power.c_str());
+  device_info += "|" + usb_power;

-  // Power-fail comparator
  bool enabled;
-  nrf_power_pof_thr_t pof_thr = nrf_power_pofcon_get(NRF_POWER, &enabled);
+  nrf_power_pof_thr_t pof_thr;
+
+  pof_thr = nrf_power_pofcon_get(NRF_POWER, &enabled);
+  std::string pof = "Power-fail comparator: ";
  if (enabled) {
-    const char *pof_voltage;
    switch (pof_thr) {
      case POWER_POFCON_THRESHOLD_V17:
-        pof_voltage = "1.7V";
+        pof += "1.7V";
        break;
      case POWER_POFCON_THRESHOLD_V18:
-        pof_voltage = "1.8V";
+        pof += "1.8V";
        break;
      case POWER_POFCON_THRESHOLD_V19:
-        pof_voltage = "1.9V";
+        pof += "1.9V";
        break;
      case POWER_POFCON_THRESHOLD_V20:
-        pof_voltage = "2.0V";
+        pof += "2.0V";
        break;
      case POWER_POFCON_THRESHOLD_V21:
-        pof_voltage = "2.1V";
+        pof += "2.1V";
        break;
      case POWER_POFCON_THRESHOLD_V22:
-        pof_voltage = "2.2V";
+        pof += "2.2V";
        break;
      case POWER_POFCON_THRESHOLD_V23:
-        pof_voltage = "2.3V";
+        pof += "2.3V";
        break;
      case POWER_POFCON_THRESHOLD_V24:
-        pof_voltage = "2.4V";
+        pof += "2.4V";
        break;
      case POWER_POFCON_THRESHOLD_V25:
-        pof_voltage = "2.5V";
+        pof += "2.5V";
        break;
      case POWER_POFCON_THRESHOLD_V26:
-        pof_voltage = "2.6V";
+        pof += "2.6V";
        break;
      case POWER_POFCON_THRESHOLD_V27:
-        pof_voltage = "2.7V";
+        pof += "2.7V";
        break;
      case POWER_POFCON_THRESHOLD_V28:
-        pof_voltage = "2.8V";
-        break;
-      default:
-        pof_voltage = "???V";
+        pof += "2.8V";
        break;
    }

    if (nrf_power_mainregstatus_get(NRF_POWER) == NRF_POWER_MAINREGSTATUS_HIGH) {
-      const char *vddh_voltage;
+      pof += ", VDDH: ";
      switch (nrf_power_pofcon_vddh_get(NRF_POWER)) {
        case NRF_POWER_POFTHRVDDH_V27:
-          vddh_voltage = "2.7V";
+          pof += "2.7V";
          break;
        case NRF_POWER_POFTHRVDDH_V28:
-          vddh_voltage = "2.8V";
+          pof += "2.8V";
          break;
        case NRF_POWER_POFTHRVDDH_V29:
-          vddh_voltage = "2.9V";
+          pof += "2.9V";
          break;
        case NRF_POWER_POFTHRVDDH_V30:
-          vddh_voltage = "3.0V";
+          pof += "3.0V";
          break;
        case NRF_POWER_POFTHRVDDH_V31:
-          vddh_voltage = "3.1V";
+          pof += "3.1V";
          break;
        case NRF_POWER_POFTHRVDDH_V32:
-          vddh_voltage = "3.2V";
+          pof += "3.2V";
          break;
        case NRF_POWER_POFTHRVDDH_V33:
-          vddh_voltage = "3.3V";
+          pof += "3.3V";
          break;
        case NRF_POWER_POFTHRVDDH_V34:
-          vddh_voltage = "3.4V";
+          pof += "3.4V";
          break;
        case NRF_POWER_POFTHRVDDH_V35:
-          vddh_voltage = "3.5V";
+          pof += "3.5V";
          break;
        case NRF_POWER_POFTHRVDDH_V36:
-          vddh_voltage = "3.6V";
+          pof += "3.6V";
          break;
        case NRF_POWER_POFTHRVDDH_V37:
-          vddh_voltage = "3.7V";
+          pof += "3.7V";
          break;
        case NRF_POWER_POFTHRVDDH_V38:
-          vddh_voltage = "3.8V";
+          pof += "3.8V";
          break;
        case NRF_POWER_POFTHRVDDH_V39:
-          vddh_voltage = "3.9V";
+          pof += "3.9V";
          break;
        case NRF_POWER_POFTHRVDDH_V40:
-          vddh_voltage = "4.0V";
+          pof += "4.0V";
          break;
        case NRF_POWER_POFTHRVDDH_V41:
-          vddh_voltage = "4.1V";
+          pof += "4.1V";
          break;
        case NRF_POWER_POFTHRVDDH_V42:
-          vddh_voltage = "4.2V";
-          break;
-        default:
-          vddh_voltage = "???V";
+          pof += "4.2V";
          break;
      }
-      ESP_LOGD(TAG, "Power-fail comparator: %s, VDDH: %s", pof_voltage, vddh_voltage);
-      pos = buf_append_printf(buf, size, pos, "|Power-fail comparator: %s, VDDH: %s", pof_voltage, vddh_voltage);
-    } else {
-      ESP_LOGD(TAG, "Power-fail comparator: %s", pof_voltage);
-      pos = buf_append_printf(buf, size, pos, "|Power-fail comparator: %s", pof_voltage);
    }
  } else {
-    ESP_LOGD(TAG, "Power-fail comparator: disabled");
-    pos = buf_append_printf(buf, size, pos, "|Power-fail comparator: disabled");
+    pof += "disabled";
  }
+  ESP_LOGD(TAG, "%s", pof.c_str());
+  device_info += "|" + pof;

  auto package = [](uint32_t value) {
    switch (value) {
@@ -322,8 +300,6 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
    return "Unspecified";
  };

-  char mac_pretty[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
-  get_mac_address_pretty_into_buffer(mac_pretty);
  ESP_LOGD(TAG,
           "Code page size: %u, code size: %u, device id: 0x%08x%08x\n"
           "Encryption root: 0x%08x%08x%08x%08x, Identity Root: 0x%08x%08x%08x%08x\n"
@@ -332,10 +308,10 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
           "RAM: %ukB, Flash: %ukB, production test: %sdone",
           NRF_FICR->CODEPAGESIZE, NRF_FICR->CODESIZE, NRF_FICR->DEVICEID[1], NRF_FICR->DEVICEID[0], NRF_FICR->ER[0],
           NRF_FICR->ER[1], NRF_FICR->ER[2], NRF_FICR->ER[3], NRF_FICR->IR[0], NRF_FICR->IR[1], NRF_FICR->IR[2],
-           NRF_FICR->IR[3], (NRF_FICR->DEVICEADDRTYPE & 0x1 ? "Random" : "Public"), mac_pretty, NRF_FICR->INFO.PART,
-           NRF_FICR->INFO.VARIANT >> 24 & 0xFF, NRF_FICR->INFO.VARIANT >> 16 & 0xFF, NRF_FICR->INFO.VARIANT >> 8 & 0xFF,
-           NRF_FICR->INFO.VARIANT & 0xFF, package(NRF_FICR->INFO.PACKAGE), NRF_FICR->INFO.RAM, NRF_FICR->INFO.FLASH,
-           (NRF_FICR->PRODTEST[0] == 0xBB42319F ? "" : "not "));
+           NRF_FICR->IR[3], (NRF_FICR->DEVICEADDRTYPE & 0x1 ? "Random" : "Public"), get_mac_address_pretty().c_str(),
+           NRF_FICR->INFO.PART, NRF_FICR->INFO.VARIANT >> 24 & 0xFF, NRF_FICR->INFO.VARIANT >> 16 & 0xFF,
+           NRF_FICR->INFO.VARIANT >> 8 & 0xFF, NRF_FICR->INFO.VARIANT & 0xFF, package(NRF_FICR->INFO.PACKAGE),
+           NRF_FICR->INFO.RAM, NRF_FICR->INFO.FLASH, (NRF_FICR->PRODTEST[0] == 0xBB42319F ? "" : "not "));
  bool n_reset_enabled = NRF_UICR->PSELRESET[0] == NRF_UICR->PSELRESET[1] &&
                         (NRF_UICR->PSELRESET[0] & UICR_PSELRESET_CONNECT_Msk) == UICR_PSELRESET_CONNECT_Connected
                                                                                      << UICR_PSELRESET_CONNECT_Pos;
@@ -397,8 +373,6 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
           "NRFFW %s\n"
           "NRFHW %s",
           uicr(NRF_UICR->NRFFW, 13).c_str(), uicr(NRF_UICR->NRFHW, 12).c_str());
-
-  return pos;
 }

 void DebugComponent::update_platform_() {}
--- a/esphome/components/debug/sensor.py
+++ b/esphome/components/debug/sensor.py
@@ -11,24 +11,16 @@ from esphome.const import (
    ENTITY_CATEGORY_DIAGNOSTIC,
    ICON_COUNTER,
    ICON_TIMER,
-    PLATFORM_BK72XX,
-    PLATFORM_LN882X,
-    PLATFORM_RTL87XX,
    UNIT_BYTES,
    UNIT_HERTZ,
    UNIT_MILLISECOND,
    UNIT_PERCENT,
 )

-from . import (  # noqa: F401  pylint: disable=unused-import
-    CONF_DEBUG_ID,
-    FILTER_SOURCE_FILES,
-    DebugComponent,
-)
+from . import CONF_DEBUG_ID, DebugComponent

 DEPENDENCIES = ["debug"]

-CONF_MIN_FREE = "min_free"
 CONF_PSRAM = "psram"

 CONFIG_SCHEMA = {
@@ -46,14 +38,8 @@ CONFIG_SCHEMA = {
        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
    ),
    cv.Optional(CONF_FRAGMENTATION): cv.All(
-        cv.Any(
-            cv.All(
-                cv.only_on_esp8266,
-                cv.require_framework_version(esp8266_arduino=cv.Version(2, 5, 2)),
-            ),
-            cv.only_on_esp32,
-            msg="This feature is only available on ESP8266 (Arduino 2.5.2+) and ESP32",
-        ),
+        cv.only_on_esp8266,
+        cv.require_framework_version(esp8266_arduino=cv.Version(2, 5, 2)),
        sensor.sensor_schema(
            unit_of_measurement=UNIT_PERCENT,
            icon=ICON_COUNTER,
@@ -61,19 +47,6 @@ CONFIG_SCHEMA = {
            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
        ),
    ),
-    cv.Optional(CONF_MIN_FREE): cv.All(
-        cv.Any(
-            cv.only_on_esp32,
-            cv.only_on([PLATFORM_BK72XX, PLATFORM_LN882X, PLATFORM_RTL87XX]),
-            msg="This feature is only available on ESP32 and LibreTiny (BK72xx, LN882x, RTL87xx)",
-        ),
-        sensor.sensor_schema(
-            unit_of_measurement=UNIT_BYTES,
-            icon=ICON_COUNTER,
-            accuracy_decimals=0,
-            entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-        ),
-    ),
    cv.Optional(CONF_LOOP_TIME): sensor.sensor_schema(
        unit_of_measurement=UNIT_MILLISECOND,
        icon=ICON_TIMER,
@@ -116,10 +89,6 @@ async def to_code(config):
        sens = await sensor.new_sensor(fragmentation_conf)
        cg.add(debug_component.set_fragmentation_sensor(sens))

-    if min_free_conf := config.get(CONF_MIN_FREE):
-        sens = await sensor.new_sensor(min_free_conf)
-        cg.add(debug_component.set_min_free_sensor(sens))
-
    if loop_time_conf := config.get(CONF_LOOP_TIME):
        sens = await sensor.new_sensor(loop_time_conf)
        cg.add(debug_component.set_loop_time_sensor(sens))
--- a/esphome/components/debug/text_sensor.py
+++ b/esphome/components/debug/text_sensor.py
@@ -8,11 +8,7 @@ from esphome.const import (
    ICON_RESTART,
 )

-from . import (  # noqa: F401  pylint: disable=unused-import
-    CONF_DEBUG_ID,
-    FILTER_SOURCE_FILES,
-    DebugComponent,
-)
+from . import CONF_DEBUG_ID, DebugComponent

 DEPENDENCIES = ["debug"]

--- a/esphome/components/deep_sleep/deep_sleep_esp32.cpp
+++ b/esphome/components/deep_sleep/deep_sleep_esp32.cpp
@@ -26,7 +26,7 @@ namespace deep_sleep {
 // - ext0: Single pin wakeup using RTC GPIO (esp_sleep_enable_ext0_wakeup)
 // - ext1: Multiple pin wakeup (esp_sleep_enable_ext1_wakeup)
 // - Touch: Touch pad wakeup (esp_sleep_enable_touchpad_wakeup)
-// - GPIO wakeup: GPIO wakeup for RTC pins (esp_deep_sleep_enable_gpio_wakeup)
+// - GPIO wakeup: GPIO wakeup for non-RTC pins (esp_deep_sleep_enable_gpio_wakeup)

 static const char *const TAG = "deep_sleep";

@@ -127,14 +127,22 @@ void DeepSleepComponent::deep_sleep_() {
    defined(USE_ESP32_VARIANT_ESP32C61)
  if (this->wakeup_pin_ != nullptr) {
    const auto gpio_pin = gpio_num_t(this->wakeup_pin_->get_pin());
-    // Make sure GPIO is in input mode, not all RTC GPIO pins are input by default
-    gpio_set_direction(gpio_pin, GPIO_MODE_INPUT);
+    if (this->wakeup_pin_->get_flags() & gpio::FLAG_PULLUP) {
+      gpio_sleep_set_pull_mode(gpio_pin, GPIO_PULLUP_ONLY);
+    } else if (this->wakeup_pin_->get_flags() & gpio::FLAG_PULLDOWN) {
+      gpio_sleep_set_pull_mode(gpio_pin, GPIO_PULLDOWN_ONLY);
+    }
+    gpio_sleep_set_direction(gpio_pin, GPIO_MODE_INPUT);
+    gpio_hold_en(gpio_pin);
+#if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP
+    // Some ESP32 variants support holding a single GPIO during deep sleep without this function
+    // For those variants, gpio_hold_en() is sufficient to hold the pin state during deep sleep
+    gpio_deep_sleep_hold_en();
+#endif
    bool level = !this->wakeup_pin_->is_inverted();
    if (this->wakeup_pin_mode_ == WAKEUP_PIN_MODE_INVERT_WAKEUP && this->wakeup_pin_->digital_read()) {
      level = !level;
    }
-    // Internal pullup/pulldown resistors are enabled automatically, when
-    // ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS is set (by default it is)
    esp_deep_sleep_enable_gpio_wakeup(1 << this->wakeup_pin_->get_pin(),
                                      static_cast<esp_deepsleep_gpio_wake_up_mode_t>(level));
  }
--- a/esphome/components/dfrobot_sen0395/commands.cpp
+++ b/esphome/components/dfrobot_sen0395/commands.cpp
@@ -127,9 +127,7 @@ DetRangeCfgCommand::DetRangeCfgCommand(float min1, float max1, float min2, float
    this->min2_ = min2 = this->max2_ = max2 = this->min3_ = min3 = this->max3_ = max3 = this->min4_ = min4 =
        this->max4_ = max4 = -1;

-    char buf[72];  // max 72: "detRangeCfg -1 "(15) + 8 * (float(5) + space(1)) + null
-    snprintf(buf, sizeof(buf), "detRangeCfg -1 %.0f %.0f", min1 / 0.15, max1 / 0.15);
-    this->cmd_ = buf;
+    this->cmd_ = str_sprintf("detRangeCfg -1 %.0f %.0f", min1 / 0.15, max1 / 0.15);
  } else if (min3 < 0 || max3 < 0) {
    this->min1_ = min1 = round(min1 / 0.15) * 0.15;
    this->max1_ = max1 = round(max1 / 0.15) * 0.15;
@@ -137,10 +135,7 @@ DetRangeCfgCommand::DetRangeCfgCommand(float min1, float max1, float min2, float
    this->max2_ = max2 = round(max2 / 0.15) * 0.15;
    this->min3_ = min3 = this->max3_ = max3 = this->min4_ = min4 = this->max4_ = max4 = -1;

-    char buf[72];  // max 72: "detRangeCfg -1 "(15) + 8 * (float(5) + space(1)) + null
-    snprintf(buf, sizeof(buf), "detRangeCfg -1 %.0f %.0f %.0f %.0f", min1 / 0.15, max1 / 0.15, min2 / 0.15,
-             max2 / 0.15);
-    this->cmd_ = buf;
+    this->cmd_ = str_sprintf("detRangeCfg -1 %.0f %.0f %.0f %.0f", min1 / 0.15, max1 / 0.15, min2 / 0.15, max2 / 0.15);
  } else if (min4 < 0 || max4 < 0) {
    this->min1_ = min1 = round(min1 / 0.15) * 0.15;
    this->max1_ = max1 = round(max1 / 0.15) * 0.15;
@@ -150,10 +145,9 @@ DetRangeCfgCommand::DetRangeCfgCommand(float min1, float max1, float min2, float
    this->max3_ = max3 = round(max3 / 0.15) * 0.15;
    this->min4_ = min4 = this->max4_ = max4 = -1;

-    char buf[72];  // max 72: "detRangeCfg -1 "(15) + 8 * (float(5) + space(1)) + null
-    snprintf(buf, sizeof(buf), "detRangeCfg -1 %.0f %.0f %.0f %.0f %.0f %.0f", min1 / 0.15, max1 / 0.15, min2 / 0.15,
-             max2 / 0.15, min3 / 0.15, max3 / 0.15);
-    this->cmd_ = buf;
+    this->cmd_ = str_sprintf("detRangeCfg -1 "
+                             "%.0f %.0f %.0f %.0f %.0f %.0f",
+                             min1 / 0.15, max1 / 0.15, min2 / 0.15, max2 / 0.15, min3 / 0.15, max3 / 0.15);
  } else {
    this->min1_ = min1 = round(min1 / 0.15) * 0.15;
    this->max1_ = max1 = round(max1 / 0.15) * 0.15;
@@ -164,10 +158,10 @@ DetRangeCfgCommand::DetRangeCfgCommand(float min1, float max1, float min2, float
    this->min4_ = min4 = round(min4 / 0.15) * 0.15;
    this->max4_ = max4 = round(max4 / 0.15) * 0.15;

-    char buf[72];  // max 72: "detRangeCfg -1 "(15) + 8 * (float(5) + space(1)) + null
-    snprintf(buf, sizeof(buf), "detRangeCfg -1 %.0f %.0f %.0f %.0f %.0f %.0f %.0f %.0f", min1 / 0.15, max1 / 0.15,
-             min2 / 0.15, max2 / 0.15, min3 / 0.15, max3 / 0.15, min4 / 0.15, max4 / 0.15);
-    this->cmd_ = buf;
+    this->cmd_ = str_sprintf("detRangeCfg -1 "
+                             "%.0f %.0f %.0f %.0f %.0f %.0f %.0f %.0f",
+                             min1 / 0.15, max1 / 0.15, min2 / 0.15, max2 / 0.15, min3 / 0.15, max3 / 0.15, min4 / 0.15,
+                             max4 / 0.15);
  }

  this->min1_ = min1;
@@ -209,10 +203,7 @@ SetLatencyCommand::SetLatencyCommand(float delay_after_detection, float delay_af
  delay_after_disappear = std::round(delay_after_disappear / 0.025f) * 0.025f;
  this->delay_after_detection_ = clamp(delay_after_detection, 0.0f, 1638.375f);
  this->delay_after_disappear_ = clamp(delay_after_disappear, 0.0f, 1638.375f);
-  // max 32: "setLatency "(11) + float(8) + " "(1) + float(8) + null, rounded to 32
-  char buf[32];
-  snprintf(buf, sizeof(buf), "setLatency %.03f %.03f", this->delay_after_detection_, this->delay_after_disappear_);
-  this->cmd_ = buf;
+  this->cmd_ = str_sprintf("setLatency %.03f %.03f", this->delay_after_detection_, this->delay_after_disappear_);
 };

 uint8_t SetLatencyCommand::on_message(std::string &message) {
--- a/esphome/components/dfrobot_sen0395/commands.h
+++ b/esphome/components/dfrobot_sen0395/commands.h
@@ -75,8 +75,8 @@ class SetLatencyCommand : public Command {
 class SensorCfgStartCommand : public Command {
 public:
  SensorCfgStartCommand(bool startup_mode) : startup_mode_(startup_mode) {
-    char tmp_cmd[20];  // "sensorCfgStart " (15) + "0/1" (1) + null = 17
-    buf_append_printf(tmp_cmd, sizeof(tmp_cmd), 0, "sensorCfgStart %d", startup_mode);
+    char tmp_cmd[20] = {0};
+    sprintf(tmp_cmd, "sensorCfgStart %d", startup_mode);
    cmd_ = std::string(tmp_cmd);
  }
  uint8_t on_message(std::string &message) override;
@@ -142,8 +142,8 @@ class SensitivityCommand : public Command {
  SensitivityCommand(uint8_t sensitivity) : sensitivity_(sensitivity) {
    if (sensitivity > 9)
      sensitivity_ = sensitivity = 9;
-    char tmp_cmd[20];  // "setSensitivity " (15) + "0-9" (1) + null = 17
-    buf_append_printf(tmp_cmd, sizeof(tmp_cmd), 0, "setSensitivity %d", sensitivity);
+    char tmp_cmd[20] = {0};
+    sprintf(tmp_cmd, "setSensitivity %d", sensitivity);
    cmd_ = std::string(tmp_cmd);
  };
  uint8_t on_message(std::string &message) override;
--- a/esphome/components/display_menu_base/menu_item.cpp
+++ b/esphome/components/display_menu_base/menu_item.cpp
@@ -42,8 +42,7 @@ std::string MenuItemSelect::get_value_text() const {
    result = this->value_getter_.value()(this);
  } else {
    if (this->select_var_ != nullptr) {
-      auto option = this->select_var_->current_option();
-      result.assign(option.c_str(), option.size());
+      result = this->select_var_->current_option();
    }
  }

--- a/esphome/components/dsmr/dsmr.cpp
+++ b/esphome/components/dsmr/dsmr.cpp
@@ -268,7 +268,7 @@ bool Dsmr::parse_telegram() {

    // publish the telegram, after publishing the sensors so it can also trigger action based on latest values
    if (this->s_telegram_ != nullptr) {
-      this->s_telegram_->publish_state(this->telegram_, this->bytes_read_);
+      this->s_telegram_->publish_state(std::string(this->telegram_, this->bytes_read_));
    }
    return true;
  }
--- a/esphome/components/e131/e131.cpp
+++ b/esphome/components/e131/e131.cpp
@@ -82,9 +82,8 @@ void E131Component::add_effect(E131AddressableLightEffect *light_effect) {
    return;
  }

-  auto effect_name = light_effect->get_name();
-  ESP_LOGD(TAG, "Registering '%.*s' for universes %d-%d.", (int) effect_name.size(), effect_name.c_str(),
-           light_effect->get_first_universe(), light_effect->get_last_universe());
+  ESP_LOGD(TAG, "Registering '%s' for universes %d-%d.", light_effect->get_name(), light_effect->get_first_universe(),
+           light_effect->get_last_universe());

  light_effects_.push_back(light_effect);

@@ -99,9 +98,8 @@ void E131Component::remove_effect(E131AddressableLightEffect *light_effect) {
    return;
  }

-  auto effect_name = light_effect->get_name();
-  ESP_LOGD(TAG, "Unregistering '%.*s' for universes %d-%d.", (int) effect_name.size(), effect_name.c_str(),
-           light_effect->get_first_universe(), light_effect->get_last_universe());
+  ESP_LOGD(TAG, "Unregistering '%s' for universes %d-%d.", light_effect->get_name(), light_effect->get_first_universe(),
+           light_effect->get_last_universe());

  // Swap with last element and pop for O(1) removal (order doesn't matter)
  *it = light_effects_.back();
--- a/esphome/components/e131/e131_addressable_light_effect.cpp
+++ b/esphome/components/e131/e131_addressable_light_effect.cpp
@@ -58,9 +58,8 @@ bool E131AddressableLightEffect::process_(int universe, const E131Packet &packet
      std::min(it->size(), std::min(output_offset + get_lights_per_universe(), output_offset + packet.count - 1));
  auto *input_data = packet.values + 1;

-  auto effect_name = get_name();
-  ESP_LOGV(TAG, "Applying data for '%.*s' on %d universe, for %" PRId32 "-%d.", (int) effect_name.size(),
-           effect_name.c_str(), universe, output_offset, output_end);
+  ESP_LOGV(TAG, "Applying data for '%s' on %d universe, for %" PRId32 "-%d.", get_name(), universe, output_offset,
+           output_end);

  switch (channels_) {
    case E131_MONO:
--- a/esphome/components/epaper_spi/display.py
+++ b/esphome/components/epaper_spi/display.py
@@ -187,7 +187,6 @@ async def to_code(config):
        height,
        init_sequence_id,
        init_sequence_length,
-        *model.get_constructor_args(config),
    )

    # Rotation is handled by setting the transform
--- a/esphome/components/epaper_spi/epaper_spi.cpp
+++ b/esphome/components/epaper_spi/epaper_spi.cpp
@@ -54,14 +54,20 @@ void EPaperBase::setup_pins_() const {
 float EPaperBase::get_setup_priority() const { return setup_priority::PROCESSOR; }

 void EPaperBase::command(uint8_t value) {
-  ESP_LOGV(TAG, "Command: 0x%02X", value);
-  this->dc_pin_->digital_write(false);
-  this->enable();
+  this->start_command_();
  this->write_byte(value);
-  this->disable();
+  this->end_command_();
+}
+
+void EPaperBase::data(uint8_t value) {
+  this->start_data_();
+  this->write_byte(value);
+  this->end_data_();
 }

 // write a command followed by zero or more bytes of data.
+// The command is the first byte, length is the length of data only in the second byte, followed by the data.
+// [COMMAND, LENGTH, DATA...]
 void EPaperBase::cmd_data(uint8_t command, const uint8_t *ptr, size_t length) {
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
  char hex_buf[format_hex_pretty_size(EPAPER_MAX_CMD_LOG_BYTES)];
@@ -124,10 +130,14 @@ void EPaperBase::wait_for_idle_(bool should_wait) {

 void EPaperBase::loop() {
  auto now = millis();
-  // using modulus arithmetic to handle wrap-around
-  int diff = now - this->delay_until_;
-  if (diff < 0)
-    return;
+  if (this->delay_until_ != 0) {
+    // using modulus arithmetic to handle wrap-around
+    int diff = now - this->delay_until_;
+    if (diff < 0) {
+      return;
+    }
+    this->delay_until_ = 0;
+  }
  if (this->waiting_for_idle_) {
    if (this->is_idle_()) {
      this->waiting_for_idle_ = false;
@@ -182,7 +192,7 @@ void EPaperBase::process_state_() {
      this->set_state_(EPaperState::RESET);
      break;
    case EPaperState::INITIALISE:
-      this->initialise(this->update_count_ != 0);
+      this->initialise_();
      this->set_state_(EPaperState::TRANSFER_DATA);
      break;
    case EPaperState::TRANSFER_DATA:
@@ -220,11 +230,11 @@ void EPaperBase::set_state_(EPaperState state, uint16_t delay) {
  ESP_LOGV(TAG, "Exit state %s", this->epaper_state_to_string_());
  this->state_ = state;
  this->wait_for_idle_(state > EPaperState::SHOULD_WAIT);
-  // allow subclasses to nominate delays
-  if (delay == 0)
-    delay = this->next_delay_;
-  this->next_delay_ = 0;
-  this->delay_until_ = millis() + delay;
+  if (delay != 0) {
+    this->delay_until_ = millis() + delay;
+  } else {
+    this->delay_until_ = 0;
+  }
  ESP_LOGV(TAG, "Enter state %s, delay %u, wait_for_idle=%s", this->epaper_state_to_string_(), delay,
           TRUEFALSE(this->waiting_for_idle_));
  if (state == EPaperState::IDLE) {
@@ -232,14 +242,22 @@ void EPaperBase::set_state_(EPaperState state, uint16_t delay) {
  }
 }

+void EPaperBase::start_command_() {
+  this->dc_pin_->digital_write(false);
+  this->enable();
+}
+
+void EPaperBase::end_command_() { this->disable(); }
+
 void EPaperBase::start_data_() {
  this->dc_pin_->digital_write(true);
  this->enable();
 }
+void EPaperBase::end_data_() { this->disable(); }

 void EPaperBase::on_safe_shutdown() { this->deep_sleep(); }

-void EPaperBase::initialise(bool partial) {
+void EPaperBase::initialise_() {
  size_t index = 0;

  auto *sequence = this->init_sequence_;
@@ -299,8 +317,9 @@ bool EPaperBase::rotate_coordinates_(int &x, int &y) {
 void HOT EPaperBase::draw_pixel_at(int x, int y, Color color) {
  if (!rotate_coordinates_(x, y))
    return;
-  const size_t byte_position = y * this->row_width_ + x / 8;
-  const uint8_t bit_position = x % 8;
+  const size_t pixel_position = y * this->width_ + x;
+  const size_t byte_position = pixel_position / 8;
+  const uint8_t bit_position = pixel_position % 8;
  const uint8_t pixel_bit = 0x80 >> bit_position;
  const auto original = this->buffer_[byte_position];
  if ((color_to_bit(color) == 0)) {
--- a/esphome/components/epaper_spi/epaper_spi.h
+++ b/esphome/components/epaper_spi/epaper_spi.h
@@ -36,16 +36,14 @@ class EPaperBase : public Display,
                   public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,
                                         spi::DATA_RATE_2MHZ> {
 public:
-  EPaperBase(const char *name, uint16_t width, uint16_t height, const uint8_t *init_sequence = nullptr,
-             size_t init_sequence_length = 0, DisplayType display_type = DISPLAY_TYPE_BINARY)
+  EPaperBase(const char *name, uint16_t width, uint16_t height, const uint8_t *init_sequence,
+             size_t init_sequence_length, DisplayType display_type = DISPLAY_TYPE_BINARY)
      : name_(name),
        width_(width),
        height_(height),
        init_sequence_(init_sequence),
        init_sequence_length_(init_sequence_length),
-        display_type_(display_type) {
-    this->row_width_ = (this->width_ + 7) / 8;  // width of a row in bytes
-  }
+        display_type_(display_type) {}
  void set_dc_pin(GPIOPin *dc_pin) { dc_pin_ = dc_pin; }
  float get_setup_priority() const override;
  void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; }
@@ -56,13 +54,9 @@ class EPaperBase : public Display,
  void dump_config() override;

  void command(uint8_t value);
+  void data(uint8_t value);
  void cmd_data(uint8_t command, const uint8_t *ptr, size_t length);

-  // variant with in-place initializer list
-  void cmd_data(uint8_t command, std::initializer_list<uint8_t> data) {
-    this->cmd_data(command, data.begin(), data.size());
-  }
-
  void update() override;
  void loop() override;

@@ -115,7 +109,7 @@ class EPaperBase : public Display,
  bool is_idle_() const;
  void setup_pins_() const;
  virtual bool reset();
-  virtual void initialise(bool partial);
+  void initialise_();
  void wait_for_idle_(bool should_wait);
  bool init_buffer_(size_t buffer_length);
  bool rotate_coordinates_(int &x, int &y);
@@ -149,12 +143,14 @@ class EPaperBase : public Display,

  void set_state_(EPaperState state, uint16_t delay = 0);

+  void start_command_();
+  void end_command_();
  void start_data_();
+  void end_data_();

  // properties initialised in the constructor
  const char *name_;
  uint16_t width_;
-  uint16_t row_width_;  // width of a row in bytes
  uint16_t height_;
  const uint8_t *init_sequence_;
  size_t init_sequence_length_;
@@ -167,8 +163,7 @@ class EPaperBase : public Display,
  GPIOPin *busy_pin_{};
  GPIOPin *reset_pin_{};
  bool waiting_for_idle_{};
-  uint32_t delay_until_{};  // timestamp until which to delay processing
-  uint16_t next_delay_{};   // milliseconds to delay before next state
+  uint32_t delay_until_{};
  uint8_t transform_{};
  uint8_t update_count_{};
  // these values represent the bounds of the updated buffer. Note that x_high and y_high
--- a/esphome/components/epaper_spi/epaper_spi_spectra_e6.cpp
+++ b/esphome/components/epaper_spi/epaper_spi_spectra_e6.cpp
@@ -80,17 +80,20 @@ void EPaperSpectraE6::power_on() {

 void EPaperSpectraE6::power_off() {
  ESP_LOGV(TAG, "Power off");
-  this->cmd_data(0x02, {0x00});
+  this->command(0x02);
+  this->data(0x00);
 }

 void EPaperSpectraE6::refresh_screen(bool partial) {
  ESP_LOGV(TAG, "Refresh");
-  this->cmd_data(0x12, {0x00});
+  this->command(0x12);
+  this->data(0x00);
 }

 void EPaperSpectraE6::deep_sleep() {
  ESP_LOGV(TAG, "Deep sleep");
-  this->cmd_data(0x07, {0xA5});
+  this->command(0x07);
+  this->data(0xA5);
 }

 void EPaperSpectraE6::fill(Color color) {
@@ -140,7 +143,7 @@ bool HOT EPaperSpectraE6::transfer_data() {
    if (buf_idx == sizeof bytes_to_send) {
      this->start_data_();
      this->write_array(bytes_to_send, buf_idx);
-      this->disable();
+      this->end_data_();
      ESP_LOGV(TAG, "Wrote %d bytes at %ums", buf_idx, (unsigned) millis());
      buf_idx = 0;

@@ -154,7 +157,7 @@ bool HOT EPaperSpectraE6::transfer_data() {
  if (buf_idx != 0) {
    this->start_data_();
    this->write_array(bytes_to_send, buf_idx);
-    this->disable();
+    this->end_data_();
  }
  this->current_data_index_ = 0;
  return true;
--- a/esphome/components/epaper_spi/epaper_spi_ssd1677.cpp
+++ b/esphome/components/epaper_spi/epaper_spi_ssd1677.cpp
@@ -1,24 +1,25 @@
-#include "epaper_spi_mono.h"
+#include "epaper_spi_ssd1677.h"

 #include <algorithm>

 #include "esphome/core/log.h"

 namespace esphome::epaper_spi {
-static constexpr const char *const TAG = "epaper_spi.mono";
+static constexpr const char *const TAG = "epaper_spi.ssd1677";

-void EPaperMono::refresh_screen(bool partial) {
+void EPaperSSD1677::refresh_screen(bool partial) {
  ESP_LOGV(TAG, "Refresh screen");
-  this->cmd_data(0x22, {partial ? (uint8_t) 0xFF : (uint8_t) 0xF7});
+  this->command(0x22);
+  this->data(partial ? 0xFF : 0xF7);
  this->command(0x20);
 }

-void EPaperMono::deep_sleep() {
+void EPaperSSD1677::deep_sleep() {
  ESP_LOGV(TAG, "Deep sleep");
  this->command(0x10);
 }

-bool EPaperMono::reset() {
+bool EPaperSSD1677::reset() {
  if (EPaperBase::reset()) {
    this->command(0x12);
    return true;
@@ -26,24 +27,29 @@ bool EPaperMono::reset() {
  return false;
 }

-void EPaperMono::set_window() {
-  // round x-coordinates to byte boundaries
-  this->x_low_ &= ~7;
-  this->x_high_ += 7;
-  this->x_high_ &= ~7;
-  this->cmd_data(0x44, {(uint8_t) this->x_low_, (uint8_t) (this->x_low_ / 256), (uint8_t) (this->x_high_ - 1),
-                        (uint8_t) ((this->x_high_ - 1) / 256)});
-  this->cmd_data(0x4E, {(uint8_t) this->x_low_, (uint8_t) (this->x_low_ / 256)});
-  this->cmd_data(0x45, {(uint8_t) this->y_low_, (uint8_t) (this->y_low_ / 256), (uint8_t) (this->y_high_ - 1),
-                        (uint8_t) ((this->y_high_ - 1) / 256)});
-  this->cmd_data(0x4F, {(uint8_t) this->y_low_, (uint8_t) (this->y_low_ / 256)});
-}
-
-bool HOT EPaperMono::transfer_data() {
+bool HOT EPaperSSD1677::transfer_data() {
  auto start_time = millis();
  if (this->current_data_index_ == 0) {
+    uint8_t data[4]{};
    // round to byte boundaries
-    this->set_window();
+    this->x_low_ &= ~7;
+    this->y_low_ &= ~7;
+    this->x_high_ += 7;
+    this->x_high_ &= ~7;
+    this->y_high_ += 7;
+    this->y_high_ &= ~7;
+    data[0] = this->x_low_;
+    data[1] = this->x_low_ / 256;
+    data[2] = this->x_high_ - 1;
+    data[3] = (this->x_high_ - 1) / 256;
+    cmd_data(0x4E, data, 2);
+    cmd_data(0x44, data, sizeof(data));
+    data[0] = this->y_low_;
+    data[1] = this->y_low_ / 256;
+    data[2] = this->y_high_ - 1;
+    data[3] = (this->y_high_ - 1) / 256;
+    cmd_data(0x4F, data, 2);
+    this->cmd_data(0x45, data, sizeof(data));
    // for monochrome, we still need to clear the red data buffer at least once to prevent it
    // causing dirty pixels after partial refresh.
    this->command(this->send_red_ ? 0x26 : 0x24);
@@ -52,10 +58,10 @@ bool HOT EPaperMono::transfer_data() {
  size_t row_length = (this->x_high_ - this->x_low_) / 8;
  FixedVector<uint8_t> bytes_to_send{};
  bytes_to_send.init(row_length);
-  ESP_LOGV(TAG, "Writing %u bytes at line %zu at %ums", row_length, this->current_data_index_, (unsigned) millis());
+  ESP_LOGV(TAG, "Writing bytes at line %zu at %ums", this->current_data_index_, (unsigned) millis());
  this->start_data_();
  while (this->current_data_index_ != this->y_high_) {
-    size_t data_idx = this->current_data_index_ * this->row_width_ + this->x_low_ / 8;
+    size_t data_idx = (this->current_data_index_ * this->width_ + this->x_low_) / 8;
    for (size_t i = 0; i != row_length; i++) {
      bytes_to_send[i] = this->send_red_ ? 0 : this->buffer_[data_idx++];
    }
@@ -63,12 +69,12 @@ bool HOT EPaperMono::transfer_data() {
    this->write_array(&bytes_to_send.front(), row_length);  // NOLINT
    if (millis() - start_time > MAX_TRANSFER_TIME) {
      // Let the main loop run and come back next loop
-      this->disable();
+      this->end_data_();
      return false;
    }
  }

-  this->disable();
+  this->end_data_();
  this->current_data_index_ = 0;
  if (this->send_red_) {
    this->send_red_ = false;
--- a/esphome/components/epaper_spi/epaper_spi_ssd1677.h
+++ b/esphome/components/epaper_spi/epaper_spi_ssd1677.h
@@ -3,15 +3,13 @@
 #include "epaper_spi.h"

 namespace esphome::epaper_spi {
-/**
- * A class for monochrome epaper displays.
- */
-class EPaperMono : public EPaperBase {
+
+class EPaperSSD1677 : public EPaperBase {
 public:
-  EPaperMono(const char *name, uint16_t width, uint16_t height, const uint8_t *init_sequence,
-             size_t init_sequence_length)
+  EPaperSSD1677(const char *name, uint16_t width, uint16_t height, const uint8_t *init_sequence,
+                size_t init_sequence_length)
      : EPaperBase(name, width, height, init_sequence, init_sequence_length, DISPLAY_TYPE_BINARY) {
-    this->buffer_length_ = (width + 7) / 8 * height;  // 8 pixels per byte, rounded up
+    this->buffer_length_ = width * height / 8;  // 8 pixels per byte
  }

 protected:
@@ -20,7 +18,6 @@ class EPaperMono : public EPaperBase {
  void power_off() override{};
  void deep_sleep() override;
  bool reset() override;
-  virtual void set_window();
  bool transfer_data() override;
  bool send_red_{true};
 };
--- a/esphome/components/epaper_spi/epaper_waveshare.cpp
+++ b/esphome/components/epaper_spi/epaper_waveshare.cpp
@@ -1,47 +0,0 @@
-#include "epaper_waveshare.h"
-
-namespace esphome::epaper_spi {
-
-static const char *const TAG = "epaper_spi.waveshare";
-
-void EpaperWaveshare::initialise(bool partial) {
-  EPaperBase::initialise(partial);
-  if (partial) {
-    this->cmd_data(0x32, this->partial_lut_, this->partial_lut_length_);
-    this->cmd_data(0x3C, {0x80});
-    this->cmd_data(0x22, {0xC0});
-    this->command(0x20);
-    this->next_delay_ = 100;
-  } else {
-    this->cmd_data(0x32, this->lut_, this->lut_length_);
-    this->cmd_data(0x3C, {0x05});
-  }
-  this->send_red_ = true;
-}
-
-void EpaperWaveshare::set_window() {
-  this->x_low_ &= ~7;
-  this->x_high_ += 7;
-  this->x_high_ &= ~7;
-  uint16_t x_start = this->x_low_ / 8;
-  uint16_t x_end = (this->x_high_ - 1) / 8;
-  this->cmd_data(0x44, {(uint8_t) x_start, (uint8_t) (x_end)});
-  this->cmd_data(0x4E, {(uint8_t) x_start});
-  this->cmd_data(0x45, {(uint8_t) this->y_low_, (uint8_t) (this->y_low_ / 256), (uint8_t) (this->y_high_ - 1),
-                        (uint8_t) ((this->y_high_ - 1) / 256)});
-  this->cmd_data(0x4F, {(uint8_t) this->y_low_, (uint8_t) (this->y_low_ / 256)});
-  ESP_LOGV(TAG, "Set window X: %u-%u, Y: %u-%u", this->x_low_, this->x_high_, this->y_low_, this->y_high_);
-}
-
-void EpaperWaveshare::refresh_screen(bool partial) {
-  if (partial) {
-    this->cmd_data(0x22, {0x0F});
-  } else {
-    this->cmd_data(0x22, {0xC7});
-  }
-  this->command(0x20);
-  this->next_delay_ = partial ? 100 : 3000;
-}
-
-void EpaperWaveshare::deep_sleep() { this->cmd_data(0x10, {0x01}); }
-}  // namespace esphome::epaper_spi
--- a/Show More
+++ b/Show More