[logger] Add optional boot log buffer replayed over the API

.github/ISSUE_TEMPLATE/config.yml

@@ -8,7 +8,7 @@ contact_links:
     url: https://github.com/esphome/esphome-webserver/issues/new/choose
     about: Report an issue with the ESPHome web server.
   - name: Report an issue with the ESPHome Builder / Dashboard
-    url: https://github.com/esphome/device-builder/issues/new/choose
+    url: https://github.com/esphome/dashboard/issues/new/choose
     about: Report an issue with the ESPHome Builder / Dashboard.
   - name: Report an issue with the ESPHome API client
     url: https://github.com/esphome/aioesphomeapi/issues/new/choose

.github/PULL_REQUEST_TEMPLATE.md

@@ -6,7 +6,6 @@
 
 - [ ] Bugfix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
-- [ ] New developer-facing feature (adds functionality for component developers; no end-user configuration change)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) — [policy](https://developers.esphome.io/contributing/code/#what-constitutes-a-c-breaking-change)
 - [ ] Developer breaking change (an API change that could break external components) — [policy](https://developers.esphome.io/contributing/code/#what-is-considered-public-c-api)
 - [ ] Undocumented C++ API change (removal or change of undocumented public methods that lambda users may depend on) — [policy](https://developers.esphome.io/contributing/code/#c-user-expectations)
@@ -21,10 +20,6 @@
 
 - esphome/esphome.io#<esphome.io PR number goes here>
 
-**Pull request in [developers.esphome.io](https://github.com/esphome/developers.esphome.io) with developer documentation (if applicable):**
-
-- esphome/developers.esphome.io#<developers.esphome.io PR number goes here>
-
 ## Test Environment
 
 - [ ] ESP32

.github/actions/cache-esp-idf/action.yml

@@ -3,10 +3,8 @@ description: >
   Resolve the pinned ESP-IDF version and cache the native ESP-IDF install
   (toolchains + source) at ~/.esphome-idf. Every job that installs ESP-IDF
   natively (clang-tidy for IDF/Arduino and the component test batches) shares
-  one cache, since the install is identical: ESPHOME_IDF_DEFAULT_TARGETS
-  defaults to "all", and _get_configured_targets() in espidf/toolchain.py
-  skips per-variant narrowing whenever CI is set, so all toolchains are
-  present regardless of the chip a job builds.
+  one cache, since the install is identical (ESPHOME_IDF_DEFAULT_TARGETS
+  defaults to "all", so all toolchains are present regardless of the chip).
   Callers must set env ESPHOME_ESP_IDF_PREFIX: ~/.esphome-idf and have the
   Python venv already restored.
 inputs:

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

@@ -17,7 +17,7 @@ runs:
   steps:
     - name: Set up Python ${{ inputs.python-version }}
       id: python
-      uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+      uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
       with:
         python-version: ${{ inputs.python-version }}
     - name: Restore Python virtual environment
@@ -32,7 +32,7 @@ runs:
       # detects the activated venv via ``VIRTUAL_ENV`` so the venv layout
       # downstream jobs rely on is preserved.
       if: steps.cache-venv.outputs.cache-hit != 'true'
-      uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+      uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
       with:
         enable-cache: true
         # Pull request saves land in per-PR scopes nothing else can

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

@@ -13,7 +13,6 @@ module.exports = {
     'merging-to-release',
     'merging-to-beta',
     'chained-pr',
-    'stacked-pr',
     'core',
     'small-pr',
     'medium-pr',
@@ -23,13 +22,11 @@ module.exports = {
     'has-tests',
     'needs-tests',
     'needs-docs',
-    'needs-developer-docs',
     'needs-codeowners',
     'too-big',
     'labeller-recheck',
     'bugfix',
     'new-feature',
-    'new-feature-developer',
     'breaking-change',
     'developer-breaking-change',
     'undocumented-api-change',
@@ -43,17 +40,5 @@ module.exports = {
     // Keep matching the old esphome-docs name during the transition period
     /https:\/\/github\.com\/esphome\/esphome-docs\/pull\/\d+/,
     /esphome\/esphome-docs#\d+/
-  ],
-
-  DEVELOPER_DOCS_PR_PATTERNS: [
-    /https:\/\/github\.com\/esphome\/developers\.esphome\.io\/pull\/\d+/,
-    /esphome\/developers\.esphome\.io#\d+/
-  ],
-
-  // Files whose developer-facing changes are documented via Python docstrings
-  // only - developers.esphome.io has no reference page for them yet, so PRs
-  // touching nothing but these files (and tests/) skip needs-developer-docs.
-  DEV_DOCS_EXEMPT_FILES: [
-    'esphome/config_validation.py'
   ]
 };

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

@@ -1,4 +1,4 @@
-const { DOCS_PR_PATTERNS, DEVELOPER_DOCS_PR_PATTERNS, DEV_DOCS_EXEMPT_FILES } = require('./constants');
+const { DOCS_PR_PATTERNS } = require('./constants');
 const {
   COMPONENT_REGEX,
   detectComponents,
@@ -33,41 +33,8 @@ async function fetchPrFileContent(github, context, path) {
   }
 }
 
-// Check whether a pull request is part of a GitHub stack.
-//
-// GitHub's stacked pull request feature adds a `stack` object to the pull
-// request resource. It is present on every pull request in the stack -
-// including the bottom one, whose base is already `dev` - and is absent
-// entirely on standalone pull requests.
-//
-// The `pull_request_target` webhook payload is not guaranteed to carry this
-// field, so fall back to asking the API when it is missing. Guessing wrong
-// here is costly: a stacked pull request mistaken for a manually chained one
-// gets a label that blocks merging.
-async function isStackedPr(github, context) {
-  const pr = context.payload.pull_request;
-  if (pr.stack != null) {
-    return true;
-  }
-
-  try {
-    const { owner, repo } = context.repo;
-    const { data } = await github.rest.pulls.get({
-      owner,
-      repo,
-      pull_number: pr.number,
-    });
-    return data.stack != null;
-  } catch (error) {
-    // Treat an API failure as "not stacked" so a chained pull request still
-    // gets its blocking label rather than silently slipping through.
-    console.log('Failed to check stack membership:', error.message);
-    return false;
-  }
-}
-
 // Strategy: Merge branch detection
-async function detectMergeBranch(github, context) {
+async function detectMergeBranch(context) {
   const labels = new Set();
   const baseRef = context.payload.pull_request.base.ref;
 
@@ -75,11 +42,7 @@ async function detectMergeBranch(github, context) {
     labels.add('merging-to-release');
   } else if (baseRef === 'beta') {
     labels.add('merging-to-beta');
-  } else if (await isStackedPr(github, context)) {
-    // GitHub manages the merge order for a stack, so these are not blocked.
-    labels.add('stacked-pr');
   } else if (baseRef !== 'dev') {
-    // A chain built by hand: it must not merge until its base branch does.
     labels.add('chained-pr');
   }
 
@@ -282,7 +245,6 @@ async function detectPRTemplateCheckboxes(context) {
   const checkboxPatterns = [
     { pattern: /- \[x\] Bugfix \(non-breaking change which fixes an issue\)/i, label: 'bugfix' },
     { pattern: /- \[x\] New feature \(non-breaking change which adds functionality\)/i, label: 'new-feature' },
-    { pattern: /- \[x\] New developer-facing feature \(adds functionality for component developers; no end-user configuration change\)/i, label: 'new-feature-developer' },
     { pattern: /- \[x\] Breaking change \(fix or feature that would cause existing functionality to not work as expected\)/i, label: 'breaking-change' },
     { pattern: /- \[x\] Developer breaking change \(an API change that could break external components\)/i, label: 'developer-breaking-change' },
     { pattern: /- \[x\] Undocumented C\+\+ API change \(removal or change of undocumented public methods that lambda users may depend on\)/i, label: 'undocumented-api-change' },
@@ -393,14 +355,12 @@ async function detectRequirements(allLabels, prFiles, context, hasYamlLoadable)
   const labels = new Set();
 
   // Check for missing tests
-  if ((allLabels.has('new-component') || allLabels.has('new-platform') || allLabels.has('new-feature') || allLabels.has('new-feature-developer')) && !allLabels.has('has-tests')) {
+  if ((allLabels.has('new-component') || allLabels.has('new-platform') || allLabels.has('new-feature')) && !allLabels.has('has-tests')) {
     labels.add('needs-tests');
   }
 
   // Check for missing docs.
-  // `new-feature` (PR-body checkbox) always counts. `new-feature-developer` is
-  // deliberately excluded here: its docs live on developers.esphome.io and are
-  // checked separately below. `new-component` / `new-platform`
+  // `new-feature` (PR-body checkbox) always counts. `new-component` / `new-platform`
   // only count when at least one newly added file defines a top-level CONFIG_SCHEMA,
   // i.e. the new component/platform is actually loadable from YAML.
   const docsEligible =
@@ -416,22 +376,6 @@ async function detectRequirements(allLabels, prFiles, context, hasYamlLoadable)
     }
   }
 
-  // Check for missing developer docs. `new-feature-developer` requires a
-  // developers.esphome.io PR link, unless every changed file outside tests/ is
-  // in DEV_DOCS_EXEMPT_FILES (core validators documented via docstrings only).
-  if (allLabels.has('new-feature-developer')) {
-    const prBody = context.payload.pull_request.body || '';
-    const nonTestFiles = prFiles
-      .map(file => file.filename)
-      .filter(file => !file.startsWith('tests/'));
-    const onlyExemptFiles = nonTestFiles.every(file => DEV_DOCS_EXEMPT_FILES.includes(file));
-    const hasDevDocsLink = DEVELOPER_DOCS_PR_PATTERNS.some(pattern => pattern.test(prBody));
-
-    if (!onlyExemptFiles && !hasDevDocsLink) {
-      labels.add('needs-developer-docs');
-    }
-  }
-
   // Check for missing CODEOWNERS
   if (allLabels.has('new-component')) {
     const codeownersModified = prFiles.some(file =>

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

@@ -88,7 +88,7 @@ module.exports = async ({ github, context }) => {
 
   // Early exit for release and beta branches only
   if (baseRef === 'release' || baseRef === 'beta') {
-    const branchLabels = await detectMergeBranch(github, context);
+    const branchLabels = await detectMergeBranch(context);
     const finalLabels = Array.from(branchLabels);
 
     console.log('Computed labels (merge branch only):', finalLabels.join(', '));
@@ -118,7 +118,7 @@ module.exports = async ({ github, context }) => {
     deprecatedResult,
     maintainerAccess
   ] = await Promise.all([
-    detectMergeBranch(github, context),
+    detectMergeBranch(context),
     detectComponentPlatforms(changedFiles, apiData),
     detectNewComponents(github, context, prFiles),
     detectNewPlatforms(github, context, prFiles, apiData),

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

@@ -1,14 +1,6 @@
 const { describe, it } = require('node:test');
 const assert = require('node:assert/strict');
-const {
-  detectMergeBranch,
-  detectNewPlatforms,
-  detectNewComponents,
-  detectPRSize,
-  detectPRTemplateCheckboxes,
-  detectRequirements,
-} = require('../detectors');
-const { MANAGED_LABELS } = require('../constants');
+const { detectNewPlatforms, detectNewComponents, detectPRSize } = require('../detectors');
 
 // Minimal GitHub API mock — only repos.getContent is called by detectNewPlatforms/detectNewComponents
 // to check for CONFIG_SCHEMA in newly added files.
@@ -37,107 +29,6 @@ const API_DATA = {
 const WITH_SCHEMA = 'CONFIG_SCHEMA = cv.Schema({})';
 const WITHOUT_SCHEMA = 'CODEOWNERS = ["@esphome/core"]';
 
-// ---------------------------------------------------------------------------
-// detectMergeBranch
-// ---------------------------------------------------------------------------
-
-// Builds a fresh context for detectMergeBranch tests instead of mutating the
-// shared CONTEXT fixture above (which other describe blocks rely on).
-function makeMergeContext(baseRef, { stack } = {}) {
-  const pull_request = { number: 1, base: { ref: baseRef } };
-  if (stack !== undefined) {
-    pull_request.stack = stack;
-  }
-  return {
-    repo: { owner: 'esphome', repo: 'esphome' },
-    payload: { pull_request }
-  };
-}
-
-// A GitHub API mock exposing only rest.pulls.get, with a call counter so
-// tests can assert whether the API fallback was actually invoked.
-function makeStackGithub({ stack = null, error = null } = {}) {
-  const state = { calls: 0 };
-  const github = {
-    rest: {
-      pulls: {
-        get: async () => {
-          state.calls++;
-          if (error) throw error;
-          return { data: { stack } };
-        }
-      }
-    }
-  };
-  return { github, state };
-}
-
-const STACK_INFO = { base: { ref: 'dev' }, id: 71540, number: 17978, position: 3, size: 3 };
-
-describe('detectMergeBranch', () => {
-  it('base ref release adds merging-to-release only and never checks the stack', async () => {
-    const { github, state } = makeStackGithub({ stack: STACK_INFO });
-    const context = makeMergeContext('release', { stack: STACK_INFO });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['merging-to-release']);
-    assert.equal(state.calls, 0);
-  });
-
-  it('base ref beta adds merging-to-beta only and never checks the stack', async () => {
-    const { github, state } = makeStackGithub({ stack: STACK_INFO });
-    const context = makeMergeContext('beta', { stack: STACK_INFO });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['merging-to-beta']);
-    assert.equal(state.calls, 0);
-  });
-
-  it('stack present on the webhook payload adds stacked-pr without calling the API', async () => {
-    const { github, state } = makeStackGithub();
-    const context = makeMergeContext('feature-branch', { stack: STACK_INFO });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['stacked-pr']);
-    assert.equal(state.calls, 0);
-  });
-
-  it('stack absent from payload falls back to the API and adds stacked-pr', async () => {
-    const { github, state } = makeStackGithub({ stack: STACK_INFO });
-    const context = makeMergeContext('feature-branch');
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['stacked-pr']);
-    assert.equal(state.calls, 1);
-  });
-
-  it('bottom of a stack (base ref dev, stack present) still adds stacked-pr', async () => {
-    const { github, state } = makeStackGithub();
-    const context = makeMergeContext('dev', { stack: STACK_INFO });
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['stacked-pr']);
-    assert.equal(state.calls, 0);
-  });
-
-  it('not stacked, base ref not dev adds chained-pr', async () => {
-    const { github } = makeStackGithub({ stack: null });
-    const context = makeMergeContext('feature-branch');
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['chained-pr']);
-  });
-
-  it('not stacked, base ref dev adds no labels', async () => {
-    const { github } = makeStackGithub({ stack: null });
-    const context = makeMergeContext('dev');
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), []);
-  });
-
-  it('a failed stack lookup falls back to not-stacked, so a feature-branch base adds chained-pr', async () => {
-    const { github, state } = makeStackGithub({ error: new Error('API unavailable') });
-    const context = makeMergeContext('feature-branch');
-    const labels = await detectMergeBranch(github, context);
-    assert.deepEqual(Array.from(labels).sort(), ['chained-pr']);
-    assert.equal(state.calls, 1);
-  });
-});
-
 // ---------------------------------------------------------------------------
 // detectNewPlatforms
 // ---------------------------------------------------------------------------
@@ -255,125 +146,6 @@ describe('detectNewComponents', () => {
   });
 });
 
-// ---------------------------------------------------------------------------
-// detectPRTemplateCheckboxes
-// ---------------------------------------------------------------------------
-
-const NEW_FEATURE_LINE = '- [x] New feature (non-breaking change which adds functionality)';
-const DEV_FEATURE_LINE = '- [x] New developer-facing feature (adds functionality for component developers; no end-user configuration change)';
-const DEV_FEATURE_LINE_UNTICKED = '- [ ] New developer-facing feature (adds functionality for component developers; no end-user configuration change)';
-
-function makeBodyContext(body) {
-  return { payload: { pull_request: { body } } };
-}
-
-describe('detectPRTemplateCheckboxes', () => {
-  it('ticked developer-facing feature checkbox adds new-feature-developer only', async () => {
-    const labels = await detectPRTemplateCheckboxes(makeBodyContext(DEV_FEATURE_LINE));
-    assert.ok(labels.has('new-feature-developer'));
-    assert.ok(!labels.has('new-feature'));
-  });
-
-  it('unticked developer-facing feature checkbox adds no label', async () => {
-    const labels = await detectPRTemplateCheckboxes(makeBodyContext(DEV_FEATURE_LINE_UNTICKED));
-    assert.ok(!labels.has('new-feature-developer'));
-  });
-
-  it('ticked new feature checkbox does not add new-feature-developer', async () => {
-    const labels = await detectPRTemplateCheckboxes(makeBodyContext(NEW_FEATURE_LINE));
-    assert.ok(labels.has('new-feature'));
-    assert.ok(!labels.has('new-feature-developer'));
-  });
-});
-
-// ---------------------------------------------------------------------------
-// detectRequirements
-// ---------------------------------------------------------------------------
-
-describe('detectRequirements', () => {
-  // PR body without any docs-PR link.
-  const NO_DOCS_CONTEXT = makeBodyContext('Just a description, no docs link.');
-  const USER_DOCS_CONTEXT = makeBodyContext('Docs: esphome/esphome.io#1234');
-  const DEV_DOCS_CONTEXT = makeBodyContext('Docs: esphome/developers.esphome.io#1234');
-  const DEV_DOCS_URL_CONTEXT = makeBodyContext('Docs: https://github.com/esphome/developers.esphome.io/pull/1234');
-
-  // File sets: a normal source change vs. one confined to the exempt core validators.
-  const SOURCE_FILES = [
-    { filename: 'esphome/components/foo/foo.py' },
-    { filename: 'tests/components/foo/common.yaml' },
-  ];
-  const VALIDATOR_FILES = [
-    { filename: 'esphome/config_validation.py' },
-    { filename: 'tests/unit_tests/test_config_validation.py' },
-  ];
-
-  it('new-feature-developer without has-tests adds needs-tests but not needs-docs', async () => {
-    const labels = await detectRequirements(new Set(['new-feature-developer']), SOURCE_FILES, NO_DOCS_CONTEXT, false);
-    assert.ok(labels.has('needs-tests'));
-    assert.ok(!labels.has('needs-docs'));
-  });
-
-  it('new-feature-developer with has-tests does not add needs-tests', async () => {
-    const labels = await detectRequirements(new Set(['new-feature-developer', 'has-tests']), SOURCE_FILES, NO_DOCS_CONTEXT, false);
-    assert.ok(!labels.has('needs-tests'));
-  });
-
-  it('new-feature without a docs link still adds needs-docs', async () => {
-    const labels = await detectRequirements(new Set(['new-feature', 'has-tests']), [], NO_DOCS_CONTEXT, false);
-    assert.ok(labels.has('needs-docs'));
-  });
-
-  it('new-feature-developer without a developer docs link adds needs-developer-docs', async () => {
-    const labels = await detectRequirements(new Set(['new-feature-developer', 'has-tests']), SOURCE_FILES, NO_DOCS_CONTEXT, false);
-    assert.ok(labels.has('needs-developer-docs'));
-  });
-
-  it('a developers.esphome.io shorthand link satisfies needs-developer-docs', async () => {
-    const labels = await detectRequirements(new Set(['new-feature-developer', 'has-tests']), SOURCE_FILES, DEV_DOCS_CONTEXT, false);
-    assert.ok(!labels.has('needs-developer-docs'));
-  });
-
-  it('a developers.esphome.io URL link satisfies needs-developer-docs', async () => {
-    const labels = await detectRequirements(new Set(['new-feature-developer', 'has-tests']), SOURCE_FILES, DEV_DOCS_URL_CONTEXT, false);
-    assert.ok(!labels.has('needs-developer-docs'));
-  });
-
-  it('a user docs (esphome.io) link does not satisfy needs-developer-docs', async () => {
-    const labels = await detectRequirements(new Set(['new-feature-developer', 'has-tests']), SOURCE_FILES, USER_DOCS_CONTEXT, false);
-    assert.ok(labels.has('needs-developer-docs'));
-  });
-
-  it('a developer docs link does not satisfy needs-docs for new-feature', async () => {
-    const labels = await detectRequirements(new Set(['new-feature', 'has-tests']), [], DEV_DOCS_CONTEXT, false);
-    assert.ok(labels.has('needs-docs'));
-  });
-
-  it('changes confined to core validator files are exempt from needs-developer-docs', async () => {
-    const labels = await detectRequirements(new Set(['new-feature-developer', 'has-tests']), VALIDATOR_FILES, NO_DOCS_CONTEXT, false);
-    assert.ok(!labels.has('needs-developer-docs'));
-  });
-
-  it('validator changes mixed with other source files are not exempt', async () => {
-    const prFiles = [...VALIDATOR_FILES, { filename: 'esphome/components/foo/foo.py' }];
-    const labels = await detectRequirements(new Set(['new-feature-developer', 'has-tests']), prFiles, NO_DOCS_CONTEXT, false);
-    assert.ok(labels.has('needs-developer-docs'));
-  });
-});
-
-// ---------------------------------------------------------------------------
-// MANAGED_LABELS
-// ---------------------------------------------------------------------------
-
-describe('MANAGED_LABELS', () => {
-  it('includes new-feature-developer so the workflow syncs it', () => {
-    assert.ok(MANAGED_LABELS.includes('new-feature-developer'));
-  });
-
-  it('includes needs-developer-docs so the workflow syncs it', () => {
-    assert.ok(MANAGED_LABELS.includes('needs-developer-docs'));
-  });
-});
-
 // ---------------------------------------------------------------------------
 // detectPRSize
 // ---------------------------------------------------------------------------

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

@@ -24,7 +24,7 @@ jobs:
     if: github.event.pull_request.state == 'open' && (github.event.action != 'labeled' || github.event.sender.type != 'Bot')
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Generate a token
         id: generate-token
@@ -35,7 +35,7 @@ jobs:
           # Scope the minted App token to the minimum needed by auto-label-pr/*.js.
           permission-contents: read       # repos.getContent for CODEOWNERS and file lookups in detectors.js
           permission-issues: write        # listLabelsOnIssue, addLabels, removeLabel, list/createComment
-          permission-pull-requests: write  # pulls.get, pulls.listFiles, list/create/update/dismissReview
+          permission-pull-requests: write  # pulls.listFiles, list/create/update/dismissReview
 
       - name: Auto Label PR
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0

.github/workflows/ci-api-proto.yml

@@ -21,15 +21,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.12"
       - name: Set up uv
         # ``--system`` (below) installs into the setup-python interpreter;
         # no venv is created or restored by this workflow.
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           enable-cache: true
           # Pull-request-only workflow: a save could never be shared and

.github/workflows/ci-docker.yml

@@ -61,9 +61,9 @@ jobs:
       tag: ${{ steps.tag.outputs.tag }}
       push: ${{ steps.tag.outputs.push }}
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.12"
       - name: Set up Docker Buildx
@@ -71,13 +71,11 @@ jobs:
 
       - name: Determine tag and whether to push
         id: tag
-        env:
-          HEAD_REF: ${{ github.head_ref || github.ref_name }}
         run: |
           # Sanitize the branch name into a valid docker tag: replace invalid
           # characters, ensure the first character is valid (tags must start
           # with [A-Za-z0-9_]), and cap the length at 128 characters.
-          branch="$HEAD_REF"
+          branch="${{ github.head_ref || github.ref_name }}"
           tag="${branch//[^a-zA-Z0-9_.-]/-}"
           case "$tag" in
             [a-zA-Z0-9_]*) ;;
@@ -98,7 +96,7 @@ jobs:
 
       - name: Log in to the GitHub container registry
         if: steps.tag.outputs.push == 'true'
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -147,16 +145,16 @@ jobs:
           - "ha-addon"
           - "docker"
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.12"
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
 
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -204,7 +202,7 @@ jobs:
           - nrf52
           - host
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Download image artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:

.github/workflows/ci-github-scripts.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Run tests
         working-directory: .github/scripts/auto-label-pr

.github/workflows/ci-memory-impact-comment.yml

@@ -49,7 +49,7 @@ jobs:
 
       - name: Check out code from base repository
         if: steps.pr.outputs.skip != 'true'
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           # Always check out from the base repository (esphome/esphome), never from forks
           # Use the PR's target branch to ensure we run trusted code from the main repo

.github/workflows/ci.yml

@@ -28,13 +28,13 @@ jobs:
       cache-key: ${{ steps.cache-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Generate cache-key
         id: cache-key
         run: echo key="${{ hashFiles('requirements.txt', 'requirements_dev.txt', 'requirements_test.txt', '.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
@@ -49,7 +49,7 @@ jobs:
         # detects the activated venv via ``VIRTUAL_ENV`` so downstream jobs
         # that ``. venv/bin/activate`` see an identical layout.
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           enable-cache: true
           # Pull request saves land in per-PR scopes nothing else can
@@ -65,9 +65,202 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python --version
-          uv pip install -r requirements.txt -r requirements_dev.txt -r requirements_test.txt
+          uv pip install -r requirements.txt -r requirements_dev.txt -r requirements_test.txt pre-commit
           uv pip install -e .
 
+  pylint:
+    name: Check pylint
+    runs-on: ubuntu-24.04
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.python-linters == 'true'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Run pylint
+        run: |
+          . venv/bin/activate
+          pylint -f parseable --persistent=n esphome
+      - name: Suggested changes
+        run: script/ci-suggest-changes
+        if: always()
+
+  ci-custom:
+    name: Run script/ci-custom
+    runs-on: ubuntu-24.04
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.core-ci == 'true'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Register matcher
+        run: echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
+      - name: Run script/ci-custom
+        run: |
+          . venv/bin/activate
+          script/ci-custom.py
+          script/build_codeowners.py --check
+          script/build_language_schema.py --check
+          script/generate-esp32-boards.py --check
+          script/generate-rp2-boards.py --check
+          script/ci_check_duplicate_test_ids.py
+
+  import-time:
+    name: Check import esphome.__main__ time
+    runs-on: ubuntu-24.04
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.import-time == 'true'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Check import time against budget and write waterfall HAR
+        run: |
+          . venv/bin/activate
+          script/check_import_time.py --check --har importtime.har
+      - name: Upload waterfall HAR
+        if: always()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: import-time-waterfall
+          path: importtime.har
+          if-no-files-found: ignore
+          retention-days: 14
+
+  device-builder:
+    name: Test downstream esphome/device-builder
+    runs-on: ubuntu-24.04
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.device-builder == 'true'
+    steps:
+      - name: Check out esphome (this PR)
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          path: esphome
+      - name: Check out esphome/device-builder
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          repository: esphome/device-builder
+          ref: main
+          path: device-builder
+      - name: Set up Python
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        with:
+          python-version: "3.13"
+      - name: Set up uv
+        # Mirrors the install shape device-builder's own CI uses
+        # (esphome/device-builder#192): uv replaces pip for the
+        # install step (order-of-magnitude faster on cold boots,
+        # with its own wheel cache). actions/setup-python still
+        # provides the interpreter.
+        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        with:
+          enable-cache: true
+          # Pull request saves land in per-PR scopes nothing else can
+          # reuse; dev pushes seed the shared copy instead.
+          save-cache: ${{ github.event_name != 'pull_request' }}
+          # Pin uv version so the action does not have to fetch the
+          # manifest from raw.githubusercontent.com on every cache
+          # miss; that fetch flakes on Windows runners.
+          version: "0.11.15"
+      - name: Install device-builder + esphome from PR
+        # Install device-builder with its esphome + test extras
+        # first so its pinned versions of pytest/etc. land, then
+        # overlay the PR's esphome so the downstream tests run
+        # against this PR's Python code. ``--system`` installs into
+        # the runner's Python instead of a venv.
+        run: |
+          uv pip install --system -e './device-builder[esphome,test]'
+          uv pip install --system -e ./esphome
+      - name: Run device-builder pytest
+        # ``-n auto`` runs under pytest-xdist (matches device-builder's
+        # own CI). No ``--cov`` here -- this is purely a downstream
+        # smoke check against this PR's esphome code. ``tests/e2e/slow``
+        # is excluded: those are real multi-minute toolchain compiles
+        # (LibreTiny SDK clone, native ESP-IDF install) that device-builder
+        # runs in its own dedicated jobs, not this smoke check.
+        working-directory: device-builder
+        run: pytest -q -n auto --maxfail=5 --durations=30 --no-cov --ignore=tests/benchmarks --ignore=tests/e2e/slow
+
+  pytest:
+    name: Run pytest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.12"
+          - "3.13"
+          - "3.14"
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+        exclude:
+          # Minimize CI resource usage
+          # by only running the Python version
+          # version used for docker images on Windows and macOS
+          - python-version: "3.13"
+            os: windows-latest
+          - python-version: "3.13"
+            os: macOS-latest
+    runs-on: ${{ matrix.os }}
+    needs:
+      - common
+      - determine-jobs
+    if: needs.determine-jobs.outputs.core-ci == 'true'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Restore Python
+        id: restore-python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Register matcher
+        run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
+      - name: Run pytest
+        if: matrix.os == 'windows-latest'
+        run: |
+          . ./venv/Scripts/activate.ps1
+          pytest -vv --cov-report=xml --tb=native --durations=30 -n auto tests --ignore=tests/integration/
+      - name: Run pytest
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
+        run: |
+          . venv/bin/activate
+          pytest -vv --cov-report=xml --tb=native --durations=30 -n auto tests --ignore=tests/integration/
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+      - name: Save Python virtual environment cache
+        if: github.ref == 'refs/heads/dev'
+        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: venv
+          key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
+
   determine-jobs:
     name: Determine which jobs to run
     runs-on: ubuntu-24.04
@@ -98,7 +291,7 @@ jobs:
       benchmarks: ${{ steps.determine.outputs.benchmarks }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           # Fetch enough history to find the merge base
           fetch-depth: 2
@@ -157,169 +350,6 @@ jobs:
           path: .temp/components_graph.json
           key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}
 
-  ci-custom:
-    name: Run script/ci-custom
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.core-ci == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
-      - name: Run script/ci-custom
-        run: |
-          . venv/bin/activate
-          script/ci-custom.py
-          script/build_codeowners.py --check
-          script/build_language_schema.py --check
-          script/generate-esp32-boards.py --check
-          script/generate-rp2-boards.py --check
-          script/ci_check_duplicate_test_ids.py
-          script/ci_check_test_fixture_list_form.py
-
-  pylint:
-    name: Check pylint
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.python-linters == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Run pylint
-        run: |
-          . venv/bin/activate
-          pylint -f parseable --persistent=n esphome
-      - name: Suggested changes
-        run: script/ci-suggest-changes
-        if: always()
-
-  lint-format:
-    name: Check lint and formatting
-    runs-on: ubuntu-latest
-    needs:
-      - determine-jobs
-    if: github.event_name == 'pull_request' && !startsWith(github.base_ref, 'beta') && !startsWith(github.base_ref, 'release') && needs.determine-jobs.outputs.core-ci == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Run prek
-        uses: j178/prek-action@4e14d07f9231acabce116ccfca13b13dd9755ece # v3.0.0
-        with:
-          # Keep in sync with requirements_test.txt.
-          prek-version: "0.4.11"
-          # This job only runs on pull requests, so nothing ever populates
-          # the cache on dev. Every run would miss and then write a per-pull
-          # request copy, which is what the old seed-cache job existed to
-          # avoid. Building the hooks from scratch takes seconds, so skip it.
-          cache: false
-        env:
-          PREK_SKIP: pylint,ci-custom
-      # Pushes any fixes the hooks made back to the pull request. This step
-      # must keep its default name: the GitHub App that performs the push
-      # locates the workflow run by that name.
-      - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
-        if: always()
-        with:
-          msg: apply automatic formatting fixes
-
-  pytest:
-    name: Run pytest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.12"
-          - "3.13"
-          - "3.14"
-        os:
-          - ubuntu-latest
-          - macOS-latest
-          - windows-latest
-        exclude:
-          # Minimize CI resource usage
-          # by only running the Python version
-          # version used for docker images on Windows and macOS
-          - python-version: "3.13"
-            os: windows-latest
-          - python-version: "3.13"
-            os: macOS-latest
-    runs-on: ${{ matrix.os }}
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.core-ci == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Restore Python
-        id: restore-python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
-      - name: Run pytest
-        if: matrix.os == 'windows-latest'
-        run: |
-          . ./venv/Scripts/activate.ps1
-          pytest -vv --cov-report=xml --tb=native --durations=30 -n auto tests --ignore=tests/integration/
-      - name: Run pytest
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
-        run: |
-          . venv/bin/activate
-          pytest -vv --cov-report=xml --tb=native --durations=30 -n auto tests --ignore=tests/integration/
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
-      - name: Save Python virtual environment cache
-        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: venv
-          key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
-
-  codecov-empty-upload:
-    name: Report no coverage to Codecov
-    runs-on: ubuntu-24.04
-    needs:
-      - determine-jobs
-    # ``pytest`` is the only job that uploads coverage, and it is skipped when
-    # every changed file is CI-irrelevant (see ``should_run_core_ci`` in
-    # ``script/determine-jobs.py``). With no upload Codecov never reports a
-    # result, so the required ``codecov/patch`` status stays pending forever and
-    # the pull request can never be merged. Tell Codecov up front that this
-    # commit has nothing to cover so it publishes a passing status instead.
-    #
-    # ``force`` skips Codecov's own check that every changed file is ignorable;
-    # ``determine-jobs`` has already decided none of these files can affect
-    # coverage, and Codecov would otherwise fail the status for paths it does
-    # not recognise as non-testable (``docker/**``, ``.yamllint``).
-    if: needs.determine-jobs.outputs.core-ci == 'false'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Report empty upload to Codecov
-        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
-        with:
-          run_command: empty-upload
-          force: true
-          fail_ci_if_error: true
-
   integration-tests:
     name: Run integration tests (${{ matrix.bucket.name }})
     runs-on: ubuntu-latest
@@ -333,28 +363,10 @@ jobs:
         bucket: ${{ fromJson(needs.determine-jobs.outputs.integration-test-buckets) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-      - name: Install ccache
-        # Speeds up the host compiles: tests in a bucket compile overlapping
-        # component sets, so later tests reuse earlier tests' objects.
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends ccache
-      - name: Restore ccache (restore-only)
-        # esphome stores the PlatformIO ccache under the machine-global cache
-        # dir (see _ccache_env() in esphome/platformio/toolchain.py). The
-        # bucket-name prefix prefers a same-bucket seed; the bare prefix falls
-        # back to any seed when the bucket layout differs from dev.
-        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: ~/.cache/esphome/platformio-ccache
-          key: integration-ccache-${{ matrix.bucket.name }}-${{ github.sha }}
-          restore-keys: |
-            integration-ccache-${{ matrix.bucket.name }}-
-            integration-ccache-
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Set up Python 3.13
         id: python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.13"
       - name: Restore Python virtual environment
@@ -366,7 +378,7 @@ jobs:
       - name: Set up uv
         # Only needed on cache miss to populate the venv.
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           enable-cache: true
           # Pull request saves land in per-PR scopes nothing else can
@@ -396,46 +408,33 @@ jobs:
           mapfile -t test_files < <(echo "$BUCKET_TESTS" | jq -r '.[]')
           echo "Bucket ${{ matrix.bucket.name }}: running ${#test_files[@]} integration tests"
           pytest -vv --no-cov --tb=native --durations=30 -n auto "${test_files[@]}"
-      - name: Print ccache statistics
-        # esphome stores the PlatformIO ccache under the machine-global cache
-        # dir (see _ccache_env() in esphome/platformio/toolchain.py).
-        run: CCACHE_DIR="$HOME/.cache/esphome/platformio-ccache" ccache -s
-      - name: Save ccache
-        # Pull request saves land in per-PR scopes nothing else can reuse;
-        # dev pushes seed the shared copy instead.
-        if: github.event_name != 'pull_request'
-        uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
-        with:
-          path: ~/.cache/esphome/platformio-ccache
-          key: integration-ccache-${{ matrix.bucket.name }}-${{ github.sha }}
 
-  import-time:
-    name: Check import esphome.__main__ time
+  cpp-unit-tests:
+    name: Run C++ unit tests
     runs-on: ubuntu-24.04
     needs:
       - common
       - determine-jobs
-    if: needs.determine-jobs.outputs.import-time == 'true'
+    if: github.event_name == 'pull_request' && (needs.determine-jobs.outputs.cpp-unit-tests-run-all == 'true' || needs.determine-jobs.outputs.cpp-unit-tests-components != '[]')
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Check import time against budget and write waterfall HAR
+
+      - name: Run cpp_unit_test.py
         run: |
           . venv/bin/activate
-          script/check_import_time.py --check --har importtime.har
-      - name: Upload waterfall HAR
-        if: always()
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: import-time-waterfall
-          path: importtime.har
-          if-no-files-found: ignore
-          retention-days: 14
+          if [ "${{ needs.determine-jobs.outputs.cpp-unit-tests-run-all }}" = "true" ]; then
+            script/cpp_unit_test.py --all
+          else
+            ARGS=$(echo '${{ needs.determine-jobs.outputs.cpp-unit-tests-components }}' | jq -r '.[] | @sh' | xargs)
+            script/cpp_unit_test.py $ARGS
+          fi
 
   benchmarks:
     name: Run CodSpeed benchmarks
@@ -448,7 +447,7 @@ jobs:
       (github.event_name == 'pull_request' && needs.determine-jobs.outputs.benchmarks == 'true')
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Restore Python
         uses: ./.github/actions/restore-python
@@ -466,7 +465,7 @@ jobs:
           echo "binary=$BINARY" >> $GITHUB_OUTPUT
 
       - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@0ca9cbbf4623b599a6c3ed4fc8a922942705d9f1 # v5.0.2
+        uses: CodSpeedHQ/action@f99becdce5e5d51fd556489ebef684f4ecfd6286 # v4.18.5
         with:
           run: |
             . venv/bin/activate
@@ -474,33 +473,6 @@ jobs:
             pytest tests/benchmarks/python/ --codspeed --no-cov
           mode: simulation
 
-  cpp-unit-tests:
-    name: Run C++ unit tests
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: github.event_name == 'pull_request' && (needs.determine-jobs.outputs.cpp-unit-tests-run-all == 'true' || needs.determine-jobs.outputs.cpp-unit-tests-components != '[]')
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-
-      - name: Run cpp_unit_test.py
-        run: |
-          . venv/bin/activate
-          if [ "${{ needs.determine-jobs.outputs.cpp-unit-tests-run-all }}" = "true" ]; then
-            script/cpp_unit_test.py --all
-          else
-            ARGS=$(echo '${{ needs.determine-jobs.outputs.cpp-unit-tests-components }}' | jq -r '.[] | @sh' | xargs)
-            script/cpp_unit_test.py $ARGS
-          fi
-
   clang-tidy-single:
     name: ${{ matrix.name }}
     runs-on: ubuntu-24.04
@@ -544,7 +516,7 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           # Need history for HEAD~1 to work for checking changed files
           fetch-depth: 2
@@ -642,7 +614,7 @@ jobs:
       ESPHOME_ESP_IDF_PREFIX: ~/.esphome-idf
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           # Need history for HEAD~1 to work for checking changed files
           fetch-depth: 2
@@ -722,7 +694,7 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           # Need history for HEAD~1 to work for checking changed files
           fetch-depth: 2
@@ -807,7 +779,7 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           # Need history for HEAD~1 to work for checking changed files
           fetch-depth: 2
@@ -894,7 +866,7 @@ jobs:
           sudo apt-get install -y --no-install-recommends libsdl2-dev ccache
 
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -1039,7 +1011,7 @@ jobs:
       TEST_COMPONENTS: ${{ needs.determine-jobs.outputs.esp32-platformio-components }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Restore Python
         uses: ./.github/actions/restore-python
@@ -1065,62 +1037,69 @@ jobs:
           # Arduino framework via PlatformIO (only components with an esp32-ard test are built):
           python3 script/test_build_components.py -e compile -t esp32-ard -c "$TEST_COMPONENTS" -f --toolchain platformio
 
-  device-builder:
-    name: Test downstream esphome/device-builder
-    runs-on: ubuntu-24.04
+  pre-commit-seed-cache:
+    name: Seed pre-commit cache
+    runs-on: ubuntu-latest
+    needs:
+      - common
+    # Saves a dev-scoped pre-commit cache that pull request runs can
+    # restore, since pre-commit.ci lite itself never runs on dev pushes.
+    if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Cache pre-commit environments
+        id: cache-pre-commit
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.cache/pre-commit
+          # Must match the restore key in pre-commit-ci-lite
+          # yamllint disable-line rule:line-length
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Install pre-commit hook environments
+        if: steps.cache-pre-commit.outputs.cache-hit != 'true'
+        run: |
+          python -m pip install pre-commit
+          pre-commit install-hooks
+
+  pre-commit-ci-lite:
+    name: pre-commit.ci lite
+    runs-on: ubuntu-latest
     needs:
       - common
       - determine-jobs
-    if: needs.determine-jobs.outputs.device-builder == 'true'
+    if: github.event_name == 'pull_request' && !startsWith(github.base_ref, 'beta') && !startsWith(github.base_ref, 'release') && needs.determine-jobs.outputs.core-ci == 'true'
     steps:
-      - name: Check out esphome (this PR)
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Check out code from GitHub
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
         with:
-          path: esphome
-      - name: Check out esphome/device-builder
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      # Inlined from esphome/pre-commit-action with a restore-only cache
+      # step: the pre-commit-seed-cache job owns saving this cache, so
+      # pull request runs never write per-PR copies.
+      - name: Restore pre-commit cache
+        uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
-          repository: esphome/device-builder
-          ref: main
-          path: device-builder
-      - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
-        with:
-          python-version: "3.13"
-      - name: Set up uv
-        # Mirrors the install shape device-builder's own CI uses
-        # (esphome/device-builder#192): uv replaces pip for the
-        # install step (order-of-magnitude faster on cold boots,
-        # with its own wheel cache). actions/setup-python still
-        # provides the interpreter.
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
-        with:
-          enable-cache: true
-          # Pull request saves land in per-PR scopes nothing else can
-          # reuse; dev pushes seed the shared copy instead.
-          save-cache: ${{ github.event_name != 'pull_request' }}
-          # Pin uv version so the action does not have to fetch the
-          # manifest from raw.githubusercontent.com on every cache
-          # miss; that fetch flakes on Windows runners.
-          version: "0.11.15"
-      - name: Install device-builder + esphome from PR
-        # Install device-builder with its esphome + test extras
-        # first so its pinned versions of pytest/etc. land, then
-        # overlay the PR's esphome so the downstream tests run
-        # against this PR's Python code. ``--system`` installs into
-        # the runner's Python instead of a venv.
+          path: ~/.cache/pre-commit
+          # Must match the key pre-commit-seed-cache saves
+          # yamllint disable-line rule:line-length
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Run pre-commit
+        env:
+          SKIP: pylint,ci-custom
         run: |
-          uv pip install --system -e './device-builder[esphome,test]'
-          uv pip install --system -e ./esphome
-      - name: Run device-builder pytest
-        # ``-n auto`` runs under pytest-xdist (matches device-builder's
-        # own CI). No ``--cov`` here -- this is purely a downstream
-        # smoke check against this PR's esphome code. ``tests/e2e/slow``
-        # is excluded: those are real multi-minute toolchain compiles
-        # (LibreTiny SDK clone, native ESP-IDF install) that device-builder
-        # runs in its own dedicated jobs, not this smoke check.
-        working-directory: device-builder
-        run: pytest -q -n auto --maxfail=5 --durations=30 --no-cov --ignore=tests/benchmarks --ignore=tests/e2e/slow
+          python -m pip install pre-commit
+          pre-commit run --show-diff-on-failure --color=always --all-files
+      - uses: pre-commit-ci/lite-action@5d6cc0eb514c891a40562a58a8e71576c5c7fb43 # v1.1.0
+        if: always()
 
   memory-impact-target-branch:
     name: Build target branch for memory impact
@@ -1136,7 +1115,7 @@ jobs:
       skip: ${{ steps.check-script.outputs.skip || steps.check-tests.outputs.skip }}
     steps:
       - name: Check out target branch
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.base_ref }}
 
@@ -1318,7 +1297,7 @@ jobs:
       flash_usage: ${{ steps.extract.outputs.flash_usage }}
     steps:
       - name: Check out PR branch
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -1387,7 +1366,7 @@ jobs:
       GH_TOKEN: ${{ github.token }}
     steps:
       - name: Check out code
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -1421,27 +1400,21 @@ jobs:
   ci-status:
     name: CI Status
     runs-on: ubuntu-24.04
-    # Listed in the same order the jobs are defined above. One job is
-    # deliberately left out: "benchmarks" reports through CodSpeed rather than
-    # this check.
     needs:
       - common
-      - determine-jobs
       - ci-custom
       - pylint
-      - lint-format
       - pytest
-      - codecov-empty-upload
       - integration-tests
-      - import-time
-      - cpp-unit-tests
       - clang-tidy-single
       - clang-tidy-nosplit
       - clang-tidy-split
       - clang-tidy-esp32-variants
+      - determine-jobs
+      - device-builder
       - test-build-components-split
       - test-esp32-platformio
-      - device-builder
+      - pre-commit-ci-lite
       - memory-impact-target-branch
       - memory-impact-pr-branch
       - memory-impact-comment

.github/workflows/codeowner-approved-label-update.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout base branch
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.base.sha }}
           sparse-checkout: |

.github/workflows/codeowner-review-request.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout base branch
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.base.sha }}
 

.github/workflows/codeql.yml

@@ -52,11 +52,11 @@ jobs:
             # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
+        uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -84,6 +84,6 @@ jobs:
           exit 1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f205ea1c3313d32999d8d6a48b4f6530d4437b38 # v4.37.4
+        uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
         with:
           category: "/language:${{matrix.language}}"

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

@@ -16,7 +16,7 @@ jobs:
     name: Validate PR title
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       branch_build: ${{ steps.tag.outputs.branch_build }}
       deploy_env: ${{ steps.tag.outputs.deploy_env }}
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Get tag
         id: tag
         # yamllint disable rule:line-length
@@ -60,9 +60,9 @@ jobs:
       contents: read   # actions/checkout to build the sdist/wheel
       id-token: write  # OIDC token for PyPI Trusted Publishing (pypa/gh-action-pypi-publish)
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.x"
       - name: Build
@@ -70,7 +70,7 @@ jobs:
           pip3 install build
           python3 -m build
       - name: Publish
-        uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
+        uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
         with:
           skip-existing: true
 
@@ -92,9 +92,9 @@ jobs:
             os: "ubuntu-24.04-arm"
 
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.12"
 
@@ -102,12 +102,12 @@ jobs:
         uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
 
       - name: Log in to docker hub
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the GitHub container registry
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -168,7 +168,7 @@ jobs:
           - ghcr
           - dockerhub
     steps:
-      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Download digests
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -182,13 +182,13 @@ jobs:
 
       - name: Log in to docker hub
         if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the GitHub container registry
         if: matrix.registry == 'ghcr'
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
+        uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/stale.yml

@@ -6,46 +6,61 @@ on:
     - cron: "30 0 * * *"
   workflow_dispatch:
 
-# The reusable workflow authenticates as the ESPHome GitHub App, so GITHUB_TOKEN
-# needs no permissions at all.
-permissions: {}
+permissions:
+  issues: write         # actions/stale labels, comments on, and closes stale issues
+  pull-requests: write  # actions/stale labels, comments on, and closes stale pull requests
+
+concurrency:
+  group: lock
 
 jobs:
   stale:
     if: github.repository_owner == 'esphome'
-    # No GITHUB_TOKEN permissions: the reusable workflow mints an ESPHome
-    # GitHub App token so the labels, comments and closures come from
-    # esphome[bot] instead of github-actions[bot].
-    uses: esphome/workflows/.github/workflows/stale.yml@61fd37a044cad4e9aa4303027b2a61b6a34da855  # main
-    secrets:
-      ESPHOME_GITHUB_APP_PRIVATE_KEY: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
-    with:
-      # Live only on dev: a workflow_dispatch from any other branch is a dry run
-      dry-run: ${{ github.ref != 'refs/heads/dev' }}
-      days-before-stale: 90
-      days-before-close: 7
-      stale-label: stale
-      exempt-label: not-stale
-      ignored-users: esphbot,codecov-commenter
-      stale-pr-message: >
-        There hasn't been any activity on this pull request recently. This
-        pull request has been automatically marked as stale because of that
-        and will be closed if no further activity occurs within 7 days.
+    runs-on: ubuntu-latest
+    steps:
+      - name: Stale
+        uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
+        with:
+          debug-only: ${{ github.ref != 'refs/heads/dev' }} # Dry-run when not run on dev branch
+          remove-stale-when-updated: true
+          operations-per-run: 400
 
-        If you are the author of this PR, please leave a comment if you want
-        to keep it open. Also, please rebase your PR onto the latest dev
-        branch to ensure that it's up to date with the latest changes.
+          # The 90 day stale policy for PRs
+          # - PRs
+          # - No PRs marked as "not-stale"
+          # - No Issues (see below)
+          days-before-pr-stale: 90
+          days-before-pr-close: 7
+          stale-pr-label: "stale"
+          exempt-pr-labels: "not-stale"
+          stale-pr-message: >
+            There hasn't been any activity on this pull request recently. This
+            pull request has been automatically marked as stale because of that
+            and will be closed if no further activity occurs within 7 days.
 
-        Thank you for your contribution!
-      stale-issue-message: >
-        There hasn't been any activity on this issue recently. Due to the
-        high number of incoming GitHub notifications, we have to clean some
-        of the old issues, as many of them have already been resolved with
-        the latest updates.
+            If you are the author of this PR, please leave a comment if you want
+            to keep it open. Also, please rebase your PR onto the latest dev
+            branch to ensure that it's up to date with the latest changes.
 
-        Please make sure to update to the latest ESPHome version and
-        check if that solves the issue. Let us know if that works for you by
-        adding a comment 👍
+            Thank you for your contribution!
 
-        This issue has now been marked as stale and will be closed if no
-        further activity occurs. Thank you for your contributions.
+          # The 90 day stale policy for Issues
+          # - Issues
+          # - No Issues marked as "not-stale"
+          # - No PRs (see above)
+          days-before-issue-stale: 90
+          days-before-issue-close: 7
+          stale-issue-label: "stale"
+          exempt-issue-labels: "not-stale"
+          stale-issue-message: >
+            There hasn't been any activity on this issue recently. Due to the
+            high number of incoming GitHub notifications, we have to clean some
+            of the old issues, as many of them have already been resolved with
+            the latest updates.
+
+            Please make sure to update to the latest ESPHome version and
+            check if that solves the issue. Let us know if that works for you by
+            adding a comment 👍
+
+            This issue has now been marked as stale and will be closed if no
+            further activity occurs. Thank you for your contributions.

.github/workflows/status-check-labels.yml

@@ -5,7 +5,7 @@ on:
     types: [opened, reopened, labeled, unlabeled, synchronize]
 
 permissions:
-  pull-requests: read  # issues.listLabelsOnIssue to detect blocking labels (needs-docs, needs-developer-docs, merge-after-release, chained-pr)
+  pull-requests: read  # issues.listLabelsOnIssue to detect blocking labels (needs-docs, merge-after-release, chained-pr)
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
@@ -20,7 +20,7 @@ jobs:
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:
           script: |
-            const blockingLabels = ['needs-docs', 'needs-developer-docs', 'merge-after-release', 'chained-pr'];
+            const blockingLabels = ['needs-docs', 'merge-after-release', 'chained-pr'];
             const { data: labels } = await github.rest.issues.listLabelsOnIssue({
               owner: context.repo.owner,
               repo: context.repo.repo,

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

@@ -28,26 +28,26 @@ jobs:
           permission-pull-requests: write  # pulls.create / pulls.update to open or refresh the sync PR
 
       - name: Checkout
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Checkout Home Assistant
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           repository: home-assistant/core
           path: lib/home-assistant
 
       - name: Setup Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
         with:
           python-version: "3.14"
 
       - name: Set up uv
         # An order of magnitude faster than pip on cold boots, with its
         # own wheel cache. ``--system`` (below) installs into the
-        # setup-python interpreter so subsequent ``prek`` /
+        # setup-python interpreter so subsequent ``pre-commit`` /
         # ``script/run-in-env.py`` steps find the deps without a
         # ``uv run`` prefix.
-        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
+        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
         with:
           enable-cache: true
           # Pin uv version so the action does not have to fetch the
@@ -58,19 +58,19 @@ jobs:
       - name: Install Home Assistant
         run: |
           uv pip install --system -e lib/home-assistant
-          uv pip install --system -r requirements.txt -r requirements_test.txt
+          uv pip install --system -r requirements.txt -r requirements_test.txt pre-commit
 
       - name: Sync
         run: |
           python ./script/sync-device_class.py
 
-      - name: Apply prek auto-fixes
+      - name: Apply pre-commit auto-fixes
         # First pass: let formatters (ruff, end-of-file-fixer, etc.) modify
-        # files. prek exits non-zero whenever a hook touches anything,
+        # files. pre-commit exits non-zero whenever a hook touches anything,
         # which would otherwise abort the workflow before the auto-fixes
         # can flow into the sync PR.
         #
-        # PREK_SKIP:
+        # SKIP:
         #   - no-commit-to-branch is a local guard against committing on
         #     dev/release/beta; CI runs on dev by definition, and
         #     peter-evans/create-pull-request creates the branch itself.
@@ -79,25 +79,25 @@ jobs:
         #     the runtime deps (HA + requirements*.txt); main CI already
         #     gates pylint on real PRs.
         env:
-          PREK_SKIP: pylint,no-commit-to-branch
-        run: python script/run-in-env.py prek run --all-files || true
+          SKIP: pylint,no-commit-to-branch
+        run: python script/run-in-env.py pre-commit run --all-files || true
 
-      - name: Verify prek clean
+      - name: Verify pre-commit clean
         # Second pass: re-run all hooks against the now-fixed tree.
         # Auto-fixers exit 0 (nothing to change); any remaining failure
         # from a check-only hook (flake8 / yamllint / ci-custom) is a
-        # real issue and fails the workflow loudly. Same PREK_SKIP list as
+        # real issue and fails the workflow loudly. Same SKIP list as
         # above for the same reasons.
         env:
-          PREK_SKIP: pylint,no-commit-to-branch
-        run: python script/run-in-env.py prek run --all-files
+          SKIP: pylint,no-commit-to-branch
+        run: python script/run-in-env.py pre-commit run --all-files
 
       - name: Commit changes
         uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
           commit-message: "Synchronise Device Classes from Home Assistant"
-          committer: esphome[bot] <115708604+esphome[bot]@users.noreply.github.com>
-          author: esphome[bot] <115708604+esphome[bot]@users.noreply.github.com>
+          committer: esphomebot <esphome@openhomefoundation.org>
+          author: esphomebot <esphome@openhomefoundation.org>
           branch: sync/device-classes
           delete-branch: true
           title: "Synchronise Device Classes from Home Assistant"

.gitignore

@@ -133,8 +133,6 @@ CTestTestfile.cmake
 .gcc-flags.json
 
 config/
-# Test fixture config/ directories are tracked (the rule above is the dashboard dir)
-!tests/component_tests/**/config/
 tests/build/
 tests/.esphome/
 /.temp-clang-tidy.cpp

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ ci:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.16.0
+    rev: v0.15.15
     hooks:
       # Run the linter.
       - id: ruff

AGENTS.md

@@ -191,14 +191,11 @@ This document provides essential context for AI models interacting with this pro
         my_component_ns = cg.esphome_ns.namespace("my_component")
         MyComponent = my_component_ns.class_("MyComponent", cg.Component)
 
-        CONFIG_SCHEMA = cv.Schema(
-            {
-                cv.GenerateID(): cv.declare_id(MyComponent),
-                cv.Required(CONF_KEY): cv.string,
-                cv.Optional(CONF_PARAM, default=42): cv.int_,
-            }
-        ).extend(cv.COMPONENT_SCHEMA)
-
+        CONFIG_SCHEMA = cv.Schema({
+            cv.GenerateID(): cv.declare_id(MyComponent),
+            cv.Required(CONF_KEY): cv.string,
+            cv.Optional(CONF_PARAM, default=42): cv.int_,
+        }).extend(cv.COMPONENT_SCHEMA)
 
         async def to_code(config):
             var = cg.new_Pvariable(config[CONF_ID])
@@ -232,12 +229,7 @@ This document provides essential context for AI models interacting with this pro
         - **Sensor:**
           ```python
           from esphome.components import sensor
-
-          CONFIG_SCHEMA = sensor.sensor_schema(MySensor).extend(
-              cv.polling_component_schema("60s")
-          )
-
-
+          CONFIG_SCHEMA = sensor.sensor_schema(MySensor).extend(cv.polling_component_schema("60s"))
           async def to_code(config):
               var = await sensor.new_sensor(config)
               await cg.register_component(var, config)
@@ -246,10 +238,7 @@ This document provides essential context for AI models interacting with this pro
         - **Binary Sensor:**
           ```python
           from esphome.components import binary_sensor
-
-          CONFIG_SCHEMA = binary_sensor.binary_sensor_schema().extend({...})
-
-
+          CONFIG_SCHEMA = binary_sensor.binary_sensor_schema().extend({ ... })
           async def to_code(config):
               var = await binary_sensor.new_binary_sensor(config)
           ```
@@ -257,10 +246,7 @@ This document provides essential context for AI models interacting with this pro
         - **Switch:**
           ```python
           from esphome.components import switch
-
-          CONFIG_SCHEMA = switch.switch_schema().extend({...})
-
-
+          CONFIG_SCHEMA = switch.switch_schema().extend({ ... })
           async def to_code(config):
               var = await switch.new_switch(config)
           ```
@@ -277,13 +263,10 @@ This document provides essential context for AI models interacting with this pro
         ```python
         from esphome import automation
 
-        CONFIG_SCHEMA = cv.Schema(
-            {
-                cv.GenerateID(): cv.declare_id(MyComponent),
-                cv.Optional(CONF_ON_STATE): automation.validate_automation({}),
-            }
-        ).extend(cv.COMPONENT_SCHEMA)
-
+        CONFIG_SCHEMA = cv.Schema({
+            cv.GenerateID(): cv.declare_id(MyComponent),
+            cv.Optional(CONF_ON_STATE): automation.validate_automation({}),
+        }).extend(cv.COMPONENT_SCHEMA)
 
         async def to_code(config):
             var = cg.new_Pvariable(config[CONF_ID])
@@ -333,14 +316,11 @@ This document provides essential context for AI models interacting with this pro
         ```python
         TurnOnTrigger = my_ns.class_("TurnOnTrigger", automation.Trigger.template())
 
-        CONFIG_SCHEMA = cv.Schema(
-            {
-                cv.Optional(CONF_ON_TURN_ON): automation.validate_automation(
-                    {cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TurnOnTrigger)}
-                ),
-            }
-        )
-
+        CONFIG_SCHEMA = cv.Schema({
+            cv.Optional(CONF_ON_TURN_ON): automation.validate_automation(
+                {cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TurnOnTrigger)}
+            ),
+        })
 
         async def to_code(config):
             for conf in config.get(CONF_ON_TURN_ON, []):
@@ -388,10 +368,7 @@ This document provides essential context for AI models interacting with this pro
         ```
         Register with `@automation.register_condition("my_component.is_active", MyCondition, schema)`.
 
-*   **Type Hints:** Type-hint all function signatures, including test functions and config validators (e.g. `def validate_x(config: ConfigType) -> ConfigType:`, `def test_x() -> None:`). Import `ConfigType` from `esphome.types`.
-
 *   **Configuration Validation:**
-    *   **Reuse existing validators:** Before writing a custom validator, check for an existing one in `config_validation.py` and compose it in `cv.All(...)` rather than duplicating logic across components. For example, rename a config key with `cv.rename_key(CONF_OLD, CONF_NEW, removed_in="2026.6.0")`, and reject mutually-exclusive keys with `cv.has_at_most_one_key(...)` / `cv.has_exactly_one_key(...)`. See how `api` composes `cv.has_exactly_one_key` + `cv.rename_key`.
     *   **Common Validators:** `cv.int_`, `cv.float_`, `cv.string`, `cv.boolean`, `cv.int_range(min=0, max=100)`, `cv.positive_int`, `cv.percentage`.
     *   **Complex Validation:** `cv.All(cv.string, cv.Length(min=1, max=50))`, `cv.Any(cv.int_, cv.string)`.
     *   **Platform-Specific:** `cv.only_on(["esp32", "esp8266"])`, `esp32.only_on_variant(...)`, `cv.only_on_esp32`, `cv.only_on_esp8266`, `cv.only_on_rp2040`.
@@ -404,7 +381,6 @@ This document provides essential context for AI models interacting with this pro
          .extend(i2c.i2c_device_schema(0x48))
          .extend(spi.spi_device_schema(cs_pin_required=True))
         ```
-    *   **Constants:** `esphome/const.py` is frozen — do not add new `CONF_` constants there. Define a component-local constant in the component's own `.py` (as with `CONF_PARAM` above); for a constant shared by multiple components, add it to `esphome/components/const/__init__.py`. CI (`lint_constants_usage`) fails if the same constant is defined in three or more component files. Constants used in core files (i.e. those not under `esphome/components`) may be added to `esphome/const.py` but will require adjustment to the CI validation check.
 
 ## 5. Key Files & Entrypoints
 
@@ -412,7 +388,7 @@ This document provides essential context for AI models interacting with this pro
 *   **Configuration:**
     *   `pyproject.toml`: Defines the Python project metadata and dependencies.
     *   `platformio.ini`: Configures the PlatformIO build environments for different microcontrollers.
-    *   `.pre-commit-config.yaml`: Configures the lint and format hooks, run by `prek`.
+    *   `.pre-commit-config.yaml`: Configures the pre-commit hooks for linting and formatting.
 *   **CI/CD Pipeline:** Defined in `.github/workflows`.
 *   **Static Analysis & Development:**
     *   `esphome/core/defines.h`: A comprehensive header file containing all `#define` directives that can be added by components using `cg.add_define()` in Python. This file is used exclusively for development, static analysis tools, and CI testing - it is not used during runtime compilation. When developing components that add new defines, they must be added to this file to ensure proper IDE support and static analysis coverage. The file includes feature flags, build configurations, and platform-specific defines that help static analyzers understand the complete codebase without needing to compile for specific platforms.
@@ -420,7 +396,7 @@ This document provides essential context for AI models interacting with this pro
 ## 6. Development & Testing Workflow
 
 *   **Local Development Environment:** Use the provided Docker container or create a Python virtual environment and install dependencies from `requirements_dev.txt`.
-*   **Running Commands:** Use the `script/run-in-env.py` script to execute commands within the project's virtual environment. For example, to run the linter: `python3 script/run-in-env.py prek run`.
+*   **Running Commands:** Use the `script/run-in-env.py` script to execute commands within the project's virtual environment. For example, to run the linter: `python3 script/run-in-env.py pre-commit run`.
 *   **Testing:**
     *   **Python:** Run unit tests with `pytest`.
     *   **C++:** Use `clang-tidy` for static analysis.
@@ -493,9 +469,9 @@ This document provides essential context for AI models interacting with this pro
     1.  **Fork & Branch:** Create a new branch based on the `dev` branch (always use `git checkout -b <branch-name> dev` to ensure you're branching from `dev`, not the currently checked out branch).
     2.  **Make Changes:** Adhere to all coding conventions and patterns.
     3.  **Test:** Create component tests for all supported platforms and run the full test suite locally.
-    4.  **Lint:** Run `prek` to ensure code is compliant.
+    4.  **Lint:** Run `pre-commit` to ensure code is compliant.
     5.  **Commit:** Commit your changes. There is no strict format for commit messages.
-    6.  **Pull Request:** Submit a PR against the `dev` branch. The Pull Request title must start with a `[tag]` prefix. For component work, use the component name (e.g., `[display] Fix bug`, `[abc123] Add new component`); for changes to shared/core code that isn't tied to a single component, use `[core]` (e.g., `[core] Add validator`). Update documentation, examples, and add `CODEOWNERS` entries as needed. Pull requests should always be made using the `.github/PULL_REQUEST_TEMPLATE.md` template - fill out all sections completely without removing any parts of the template.
+    6.  **Pull Request:** Submit a PR against the `dev` branch. The Pull Request title should have a prefix of the component being worked on (e.g., `[display] Fix bug`, `[abc123] Add new component`). Update documentation, examples, and add `CODEOWNERS` entries as needed. Pull requests should always be made using the `.github/PULL_REQUEST_TEMPLATE.md` template - fill out all sections completely without removing any parts of the template.
 
 *   **Documentation Contributions:**
     *   Documentation is hosted in the separate `esphome/esphome.io` repository.
@@ -641,7 +617,6 @@ This document provides essential context for AI models interacting with this pro
         _component_state = []
         _use_feature = None
 
-
         def enable_feature():
             global _use_feature
             _use_feature = True
@@ -661,24 +636,20 @@ This document provides essential context for AI models interacting with this pro
 
         DOMAIN = "my_component"
 
-
         @dataclass
         class MyComponentData:
             feature_enabled: bool = False
             item_count: int = 0
             items: list[str] = field(default_factory=list)
 
-
         def _get_data() -> MyComponentData:
             if DOMAIN not in CORE.data:
                 CORE.data[DOMAIN] = MyComponentData()
             return CORE.data[DOMAIN]
 
-
         def request_feature() -> None:
             _get_data().feature_enabled = True
 
-
         def add_item(item: str) -> None:
             _get_data().items.append(item)
         ```
@@ -733,22 +704,10 @@ This document provides essential context for AI models interacting with this pro
     ```
 
 *   **Deprecation Pattern (Python):**
-    For a renamed config key, use the shared `cv.rename_key` validator with `removed_in` (and `component` for context) — it warns and auto-migrates:
-    ```python
-    CONFIG_SCHEMA = cv.All(
-        cv.rename_key(
-            CONF_OLD_KEY, CONF_NEW_KEY, removed_in="2026.6.0", component="my_component"
-        ),
-        cv.Schema({ ... }),
-    )
-    ```
-    For other deprecations, warn manually during validation:
     ```python
     # Remove before 2026.6.0
     if CONF_OLD_KEY in config:
-        _LOGGER.warning(
-            f"'{CONF_OLD_KEY}' deprecated, use '{CONF_NEW_KEY}'. Removed in 2026.6.0"
-        )
+        _LOGGER.warning(f"'{CONF_OLD_KEY}' deprecated, use '{CONF_NEW_KEY}'. Removed in 2026.6.0")
         config[CONF_NEW_KEY] = config.pop(CONF_OLD_KEY)  # Auto-migrate
     ```
 ## 9. English Language

CODEOWNERS

@@ -69,14 +69,11 @@ esphome/components/bh1750/* @OttoWinter
 esphome/components/bh1900nux/* @B48D81EFCC
 esphome/components/binary_sensor/* @esphome/core
 esphome/components/bk72xx/* @kuba2k2
-esphome/components/bk72xx_ble/* @Bl00d-B0b
-esphome/components/bk72xx_ble_tracker/* @Bl00d-B0b
 esphome/components/bl0906/* @athom-tech @jesserockz @tarontop
 esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @dan-s-github @tobias-
 esphome/components/bl0942/* @dbuezas @dwmw2
 esphome/components/ble_client/* @buxtronix @clydebarrow
-esphome/components/ble_device_base/* @Bl00d-B0b
 esphome/components/ble_nus/* @tomaszduda23
 esphome/components/bluetooth_proxy/* @bdraco @jesserockz
 esphome/components/bm8563/* @abmantis
@@ -295,8 +292,6 @@ esphome/components/light/* @esphome/core
 esphome/components/lightwaverf/* @max246
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lm75b/* @beormund
-esphome/components/ln882h_ble/* @Bl00d-B0b
-esphome/components/ln882h_ble_tracker/* @Bl00d-B0b
 esphome/components/ln882x/* @lamauny
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
@@ -439,7 +434,6 @@ esphome/components/rp2/* @jesserockz
 esphome/components/rp2040_ble/* @bdraco
 esphome/components/rp2040_pio_led_strip/* @Papa-DMan
 esphome/components/rp2040_pwm/* @jesserockz
-esphome/components/rp2_ble_tracker/* @bdraco
 esphome/components/rpi_dpi_rgb/* @clydebarrow
 esphome/components/rtl87xx/* @kuba2k2
 esphome/components/rtttl/* @glmnet @ximex
@@ -630,7 +624,6 @@ esphome/components/xpt2046/touchscreen/* @nielsnl68 @numo68
 esphome/components/xxtea/* @clydebarrow
 esphome/components/zephyr/* @tomaszduda23
 esphome/components/zephyr_mcumgr/ota/* @tomaszduda23
-esphome/components/zephyr_pwm/* @wiomoc
 esphome/components/zhlt01/* @cfeenstra1024
 esphome/components/zigbee/* @luar123 @tomaszduda23
 esphome/components/zio_ultrasonic/* @kahrendt

docker/Dockerfile

@@ -22,7 +22,7 @@ RUN \
     -r /requirements.txt
 
 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.9.2
+RUN uv pip install --no-cache-dir esphome-device-builder==1.6.4
 
 RUN \
     platformio settings set enable_telemetry No \

esphome/__main__.py

@@ -2,31 +2,37 @@
 import argparse
 from collections.abc import Callable
 from contextlib import suppress
+from datetime import datetime
 import functools
+import getpass
 import importlib
 import logging
 import os
 from pathlib import Path
 import re
+import shutil
+import subprocess
 import sys
 import time
 from typing import Protocol
 
+import argcomplete
+
 # Note: Do not import modules from esphome.components here, as this would
 # cause them to be loaded before external components are processed, resulting
 # in the built-in version being used instead of the external component one.
-from esphome import const, platform_hooks
+from esphome import const
+import esphome.codegen as cg
+from esphome.config import iter_component_configs, read_config, strip_default_ids
 from esphome.const import (
     ALLOWED_NAME_CHARS,
     ARGUMENT_HELP_DEVICE,
-    BUNDLE_EXTENSION,
     CONF_API,
     CONF_AUTH,
     CONF_BAUD_RATE,
     CONF_BROKER,
     CONF_DEASSERT_RTS_DTR,
     CONF_DISABLED,
-    CONF_DISCOVER_IP,
     CONF_ESPHOME,
     CONF_LEVEL,
     CONF_LOG_TOPIC,
@@ -46,8 +52,6 @@ from esphome.const import (
     CONF_WEB_SERVER,
     CONF_WIFI,
     ENV_NOGITIGNORE,
-    KEY_ESP32,
-    KEY_VARIANT,
     SECRETS_FILES,
     Toolchain,
 )
@@ -55,7 +59,6 @@ from esphome.core import CORE, EsphomeError, coroutine
 from esphome.enum import StrEnum
 from esphome.helpers import get_bool_env, indent, is_ip_address
 from esphome.log import AnsiFore, color, setup_log
-from esphome.stacktrace import LogLineProcessor
 from esphome.types import ConfigType
 from esphome.upload_targets import PortType, get_port_type
 from esphome.util import (
@@ -485,6 +488,8 @@ def has_web_server_ota() -> bool:
 
 def has_mqtt_ip_lookup() -> bool:
     """Check if MQTT is available and IP lookup is supported."""
+    from esphome.components.mqtt import CONF_DISCOVER_IP
+
     if CONF_MQTT not in CORE.config:
         return False
     # Default Enabled
@@ -617,8 +622,6 @@ def _resolve_network_devices(
 
 
 def run_miniterm(config: ConfigType, port: str, args) -> int:
-    from datetime import datetime
-
     from aioesphomeapi import LogParser
     import serial
 
@@ -631,9 +634,18 @@ def run_miniterm(config: ConfigType, port: str, args) -> int:
         return 1
     _LOGGER.info("Starting log output from %s with baud rate %s", port, baud_rate)
 
-    # Decoder resolution, crash isolation, and disable-after-failure
-    # all live in LogLineProcessor, shared with the API log path.
-    processor = LogLineProcessor(config, CORE.target_platform)
+    process_stacktrace = None
+
+    try:
+        module = importlib.import_module("esphome.components." + CORE.target_platform)
+        process_stacktrace = module.process_stacktrace
+    except (AttributeError, ImportError):
+        _LOGGER.info(
+            'Stacktrace analysis is unavailable: no compatible analyzer found for target platform "%s".',
+            CORE.target_platform,
+        )
+
+    backtrace_state = False
     ser = serial.Serial()
     ser.baudrate = baud_rate
     ser.port = port
@@ -673,7 +685,11 @@ def run_miniterm(config: ConfigType, port: str, args) -> int:
                                 "utf8", "backslashreplace"
                             )
                             safe_print(parser.parse_line(line, time_str))
-                            processor.process_line(line)
+
+                            if process_stacktrace is not None:
+                                backtrace_state = process_stacktrace(
+                                    config, line, backtrace_state
+                                )
                     except serial.SerialException:
                         _LOGGER.error("Serial port closed!")
                         return 0
@@ -688,8 +704,6 @@ def run_miniterm(config: ConfigType, port: str, args) -> int:
 
 
 def _wrap_to_code(name, comp, yaml_util):
-    import esphome.codegen as cg
-
     coro = coroutine(comp.to_code)
 
     @functools.wraps(comp.to_code)
@@ -725,7 +739,6 @@ def write_cpp(config: ConfigType) -> int:
 
 def generate_cpp_contents(config: ConfigType) -> None:
     from esphome import yaml_util
-    from esphome.config import iter_component_configs
 
     _LOGGER.info("Generating C++ source...")
 
@@ -763,13 +776,6 @@ def compile_program(args: ArgsProtocol, config: ConfigType) -> int:
 
         check_placeholder_credentials(config)
 
-    # Keep this here, NOT in codegen: config-hash and --only-generate must keep
-    # working on machines that cannot run the toolchain.
-    if CORE.is_esp8266:
-        from esphome.components.esp8266 import check_rosetta
-
-        check_rosetta()
-
     # NOTE: "Build path:" format is parsed by script/ci_memory_impact_extract.py
     # If you change this format, update the regex in that script as well
     _LOGGER.info("Compiling app... Build path: %s", CORE.build_path)
@@ -918,10 +924,9 @@ def upload_using_esptool(
 
     mcu = "esp8266"
     if CORE.is_esp32:
-        # Same lookup as esp32.get_esp32_variant(), read directly so the
-        # serial upload path does not import the esp32 package; both the
-        # validator and the warm-cache apply_to_core populate this key.
-        mcu = CORE.data[KEY_ESP32][KEY_VARIANT].lower()
+        from esphome.components.esp32 import get_esp32_variant
+
+        mcu = get_esp32_variant().lower()
 
     line_callbacks: list[Callable[[str], str | None]] = []
     if (
@@ -975,8 +980,6 @@ def upload_using_esptool(
 
 
 def upload_using_platformio(config: ConfigType, port: str) -> int:
-    import shutil
-
     from esphome.platformio import toolchain
 
     # RP2040 platform-raspberrypi build recipe expects firmware.bin.signed for
@@ -1014,8 +1017,6 @@ def upload_using_picotool(config: ConfigType) -> int:
     the mass storage copy approach that causes "disk not ejected properly"
     warnings on macOS.
     """
-    import subprocess
-
     from esphome.platformio import toolchain
 
     idedata = toolchain.get_idedata(config)
@@ -1122,8 +1123,6 @@ def check_permissions(port: str):
                 "the USB cable can be used for data and is not a power-only cable."
             )
         if not (os.access(port, os.R_OK | os.W_OK)):
-            import getpass
-
             raise EsphomeError(
                 "You do not have read or write permission on the selected serial port. "
                 "To resolve this issue, you can add your user to the dialout group "
@@ -1136,11 +1135,12 @@ def upload_program(
     config: ConfigType, args: ArgsProtocol, devices: list[str]
 ) -> tuple[int, str | None]:
     host = devices[0]
-    platform_upload = platform_hooks.get_platform_hook(
-        CORE.target_platform, "upload_program"
-    )
-    if platform_upload is not None and platform_upload(config, args, host):
-        return 0, host
+    try:
+        module = importlib.import_module("esphome.components." + CORE.target_platform)
+        if module.upload_program(config, args, host):
+            return 0, host
+    except AttributeError:
+        pass
 
     port_type = get_port_type(host)
 
@@ -1400,11 +1400,12 @@ def _should_subscribe_states(args: ArgsProtocol) -> bool:
 
 
 def show_logs(config: ConfigType, args: ArgsProtocol, devices: list[str]) -> int | None:
-    platform_show_logs = platform_hooks.get_platform_hook(
-        CORE.target_platform, "show_logs"
-    )
-    if platform_show_logs is not None and platform_show_logs(config, args, devices):
-        return 0
+    try:
+        module = importlib.import_module("esphome.components." + CORE.target_platform)
+        if module.show_logs(config, args, devices):
+            return 0
+    except AttributeError:
+        pass
 
     if "logger" not in config:
         raise EsphomeError("Logger is not configured!")
@@ -1422,7 +1423,7 @@ def show_logs(config: ConfigType, args: ArgsProtocol, devices: list[str]) -> int
     if has_api() and (
         network_devices := _resolve_network_devices(devices, config, args)
     ):
-        from esphome.api_client import run_logs
+        from esphome.components.api.client import run_logs
 
         return run_logs(
             config,
@@ -1456,7 +1457,6 @@ def command_wizard(args: ArgsProtocol) -> int | None:
 
 def command_config(args: ArgsProtocol, config: ConfigType) -> int | None:
     from esphome import yaml_util
-    from esphome.config import strip_default_ids
 
     if getattr(args, "no_defaults", False):
         user_config = getattr(config, "user_config", None)
@@ -1510,18 +1510,10 @@ def _redact_with_legacy_fallback(output: str) -> str:
         m = _LEGACY_REDACTION_RE.search(line)
         if m is None:
             continue
-        key = m.group("key")
         if not in_substitutions:
-            # Public keys (e.g. wireguard's peer_public_key) are not secret;
-            # redacting them and telling maintainers to mark them cv.sensitive
-            # would be wrong on both counts. Substitution keys are user-named
-            # with no schema behind them, so anything secret-shaped there
-            # (public or not) stays conservatively redacted.
-            if "public" in key.split("_"):
-                continue
-            unmarked.add(key)
+            unmarked.add(m.group("key"))
         lines[i] = (
-            f"{line[: m.start()]}{key}: "
+            f"{line[: m.start()]}{m.group('key')}: "
             f"\\033[8m{m.group('val')}\\033[28m{line[m.end() :]}"
         )
     output = "\n".join(lines)
@@ -1706,7 +1698,7 @@ def command_clean(args: ArgsProtocol, config: ConfigType) -> int | None:
 
 
 def command_bundle(args: ArgsProtocol, config: ConfigType) -> int | None:
-    from esphome.bundle import ConfigBundleCreator
+    from esphome.bundle import BUNDLE_EXTENSION, ConfigBundleCreator
 
     creator = ConfigBundleCreator(config)
 
@@ -2491,12 +2483,7 @@ def parse_args(argv):
     # a deprecation warning).
     arguments = argv[1:]
 
-    # argcomplete only does anything when the shell-completion machinery
-    # invokes us with _ARGCOMPLETE set; skip the import otherwise.
-    if "_ARGCOMPLETE" in os.environ:
-        import argcomplete
-
-        argcomplete.autocomplete(parser)
+    argcomplete.autocomplete(parser)
 
     if len(arguments) > 0 and arguments[0] in SIMPLE_CONFIG_ACTIONS:
         args, unknown_args = parser.parse_known_args(arguments)
@@ -2556,11 +2543,10 @@ def run_esphome(argv):
         return 0
 
     # Bundle support: if the configuration is a .esphomebundle, extract it
-    # and rewrite conf_path to the extracted YAML config. The suffix check
-    # stays inline so the ordinary run never imports esphome.bundle.
-    if conf_path.name.lower().endswith(BUNDLE_EXTENSION):
-        from esphome.bundle import prepare_bundle_for_compile
+    # and rewrite conf_path to the extracted YAML config.
+    from esphome.bundle import is_bundle_path, prepare_bundle_for_compile
 
+    if is_bundle_path(conf_path):
         _LOGGER.info("Extracting config bundle %s...", conf_path)
         conf_path = prepare_bundle_for_compile(conf_path)
         # Update the argument so downstream code sees the extracted path
@@ -2596,13 +2582,9 @@ def run_esphome(argv):
             )
 
     if config is None:
-        from esphome.config import read_config
-
         config = read_config(
             command_line_substitutions,
             skip_external_update=skip_external,
-            # Snapshot only needed by `esphome config --no-defaults`.
-            snapshot_user_config=getattr(args, "no_defaults", False),
         )
         # Refresh the cache so the next upload/logs hits the fast path
         # instead of re-running read_config. Skip when the storage

esphome/api_client.py

@@ -1,117 +0,0 @@
-from __future__ import annotations
-
-import asyncio
-from contextlib import suppress
-import logging
-from typing import TYPE_CHECKING, Any
-import warnings
-
-# Suppress protobuf version warnings
-with warnings.catch_warnings():
-    warnings.filterwarnings(
-        "ignore", category=UserWarning, message=".*Protobuf gencode version.*"
-    )
-    from aioesphomeapi import APIClient, parse_log_message
-    from aioesphomeapi.log_runner import async_run
-
-from esphome.const import CONF_ENCRYPTION, CONF_KEY, CONF_PORT, __version__
-from esphome.core import CORE
-from esphome.stacktrace import LogLineProcessor
-from esphome.util import safe_print
-
-if TYPE_CHECKING:
-    from aioesphomeapi.api_pb2 import (
-        SubscribeLogsResponse,  # pylint: disable=no-name-in-module
-    )
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_run_logs(
-    config: dict[str, Any],
-    addresses: list[str],
-    subscribe_states: bool = True,
-) -> None:
-    """Run the logs command in the event loop."""
-    from datetime import datetime
-
-    conf = config["api"]
-    name = config["esphome"]["name"]
-    port: int = int(conf[CONF_PORT])
-    noise_psk: str | None = None
-    if (encryption := conf.get(CONF_ENCRYPTION)) and (key := encryption.get(CONF_KEY)):
-        noise_psk = key
-
-    _LOGGER.info(
-        "Starting log output from %s using esphome API", " or ".join(addresses)
-    )
-
-    cli = APIClient(
-        addresses[0],  # Primary address for compatibility
-        port,
-        "",  # Password auth removed in 2026.1.0
-        client_info=f"ESPHome Logs {__version__}",
-        noise_psk=noise_psk,
-        addresses=addresses,  # Pass all addresses for automatic retry
-        provide_time=False,
-    )
-
-    # Decoder resolution policy lives in LogLineProcessor.
-    processor = LogLineProcessor(config, CORE.target_platform)
-
-    def on_log(msg: SubscribeLogsResponse) -> None:
-        """Handle a new log message."""
-        time_ = datetime.now().astimezone()
-        message: bytes = msg.message
-        text = message.decode("utf8", "backslashreplace")
-        nanoseconds = time_.microsecond // 1000
-        timestamp = (
-            f"[{time_.hour:02}:{time_.minute:02}:{time_.second:02}.{nanoseconds:03}]"
-        )
-        for parsed_msg in parse_log_message(text, timestamp):
-            # safe_print handles the dashboard \033 escaping and falls back
-            # to backslashreplace encoding on stdouts that can't represent
-            # the wifi signal-bar block characters (Windows redirected
-            # cp1252 pipe).
-            safe_print(parsed_msg)
-        for raw_line in text.splitlines():
-            processor.process_line(raw_line)
-
-    # Safe to fall back to plaintext here only for this diagnostics use
-    # case: the stream is one-way from device to client, and this code
-    # never accepts commands or acts on any message the device sends.
-    # An on-path attacker could still both inject fabricated log lines
-    # and passively read the device's log output (and any state data
-    # delivered when subscribe_states is enabled), so this does lose
-    # confidentiality as well as authentication/integrity. That tradeoff
-    # is acceptable for operator-visible logs, which aioesphomeapi also
-    # warns may come from an unverified device. Never mirror this opt-in
-    # for any connection that sends data to the device or uses Home
-    # Assistant actions.
-    stop = await async_run(
-        cli,
-        on_log,
-        name=name,
-        subscribe_states=subscribe_states,
-        allow_plaintext_fallback=True,
-        # A top-level ``deep_sleep:`` block means the device is only awake
-        # briefly; cap the reconnect backoff so a wake window is not missed.
-        deep_sleep="deep_sleep" in config,
-    )
-    try:
-        await asyncio.Event().wait()
-    finally:
-        await stop()
-
-
-def run_logs(
-    config: dict[str, Any],
-    addresses: list[str],
-    subscribe_states: bool = True,
-) -> None:
-    """Run the logs command."""
-    with suppress(KeyboardInterrupt):
-        asyncio.run(
-            async_run_logs(config, addresses, subscribe_states=subscribe_states)
-        )

esphome/async_thread.py

@@ -11,136 +11,43 @@ from __future__ import annotations
 
 import asyncio
 from collections.abc import Awaitable, Callable
-from itertools import count
-import logging
 import threading
-from typing import cast
-
-_LOGGER = logging.getLogger(__name__)
-
-# How long the orphan watcher waits for an abandoned coroutine before giving
-# up, so a hung operation does not park a watcher thread forever.
-ORPHAN_WAIT_TIMEOUT = 300.0
-
-
-_runner_ids = count(1)
-
-
-class AsyncDispatchTimeout(TimeoutError):
-    """The caller stopped waiting; the coroutine was abandoned.
-
-    A subclass so callers can tell the dispatcher's own expiry apart from a
-    ``TimeoutError`` raised inside the coroutine, while existing
-    ``except TimeoutError`` handlers keep working.
-    """
 
 
 class AsyncThreadRunner[T](threading.Thread):
     """Run an async coroutine in a daemon thread and expose its result.
 
-    ``event`` is always set, even when the coroutine crashes, so waiters
-    never hang; ``completed`` distinguishes a delivered result (even a
-    legitimate ``None``) from a coroutine that never finished. Prefer
-    :func:`run_async`; use this class directly only when a failure should
-    degrade to a default value instead of raising.
+    The runner catches all exceptions from the coroutine and stores them in
+    ``exception`` so ``event`` is always set — this prevents callers waiting
+    on ``event`` from hanging forever when the coroutine crashes.
+
+    Typical usage::
+
+        runner = AsyncThreadRunner(lambda: my_coro(arg))
+        runner.start()
+        if not runner.event.wait(timeout=5.0):
+            ...  # timed out
+        if runner.exception is not None:
+            raise runner.exception
+        result = runner.result
     """
 
     def __init__(self, coro_factory: Callable[[], Awaitable[T]]) -> None:
-        super().__init__(daemon=True, name=f"async-thread-runner-{next(_runner_ids)}")
+        super().__init__(daemon=True)
         self._coro_factory = coro_factory
         self.result: T | None = None
         self.exception: BaseException | None = None
-        self.completed = False
         self.event = threading.Event()
 
     async def _runner(self) -> None:
         try:
             self.result = await self._coro_factory()
-            # Distinguishes a delivered result from "never ran", since None
-            # is a valid result value.
-            self.completed = True
-        except BaseException as exc:  # noqa: BLE001  # pylint: disable=broad-except
-            # Capture everything, including BaseException — otherwise a
-            # cancellation or SystemExit would leave ``exception`` unset and
-            # waiters would mistake the empty ``result`` for success.
+        except Exception as exc:  # noqa: BLE001  # pylint: disable=broad-except
+            # Capture all exceptions so ``event`` is always set — otherwise a
+            # crash would hang the waiter forever.
             self.exception = exc
         finally:
             self.event.set()
 
     def run(self) -> None:
-        try:
-            asyncio.run(self._runner())
-        except BaseException as exc:  # noqa: BLE001  # pylint: disable=broad-except
-            # asyncio.run itself can fail before _runner executes (e.g. loop
-            # creation under fd exhaustion); record it so waiters never hang.
-            # A failure during loop cleanup after the coroutine completed
-            # must not clobber the delivered result, hence the guard.
-            if self.exception is None and not self.completed:
-                self.exception = exc
-            else:
-                _LOGGER.debug(
-                    "Event loop teardown failed after outcome recorded",
-                    exc_info=True,
-                )
-        finally:
-            self.event.set()
-
-
-def run_async[T](
-    coro_factory: Callable[[], Awaitable[T]],
-    timeout: float | None = None,
-    on_orphan: Callable[[T], None] | None = None,
-) -> T:
-    """Run a coroutine in a daemon-thread event loop and return its result.
-
-    Raises :class:`AsyncDispatchTimeout` if the coroutine does not finish
-    within ``timeout`` seconds; the thread is abandoned and exits with the
-    interpreter. If the abandoned coroutine later produces a result,
-    ``on_orphan`` (if given) is called with it so resources such as a
-    connected socket can be released; delivery is best effort and bounded
-    by ``ORPHAN_WAIT_TIMEOUT``.
-    """
-    runner: AsyncThreadRunner[T] = AsyncThreadRunner(coro_factory)
-    runner.start()
-    if not runner.event.wait(timeout):
-
-        def _cleanup() -> None:
-            if not runner.event.wait(ORPHAN_WAIT_TIMEOUT):
-                # The one state where a resource can genuinely leak; leave
-                # a trace so a recurring hang is attributable.
-                _LOGGER.info(
-                    "Orphan watcher gave up after %.0fs; a late result may leak",
-                    ORPHAN_WAIT_TIMEOUT,
-                )
-                return
-            if not runner.completed:
-                # The only place an abandoned thread's real error surfaces;
-                # without it a late failure hides behind the TimeoutError.
-                # INFO, not DEBUG: it fires at most once per abandoned
-                # operation and the cause may not reproduce on a rerun.
-                _LOGGER.info(
-                    "Abandoned async operation failed",
-                    exc_info=runner.exception,
-                )
-                return
-            if (result := runner.result) is None:
-                return
-            if on_orphan is None:
-                _LOGGER.debug("Discarding late result; no on_orphan handler")
-                return
-            try:
-                on_orphan(result)
-            except Exception:  # pylint: disable=broad-except
-                # INFO, not DEBUG: a failed release means a real leak, and
-                # it fires at most once per abandoned operation.
-                _LOGGER.info("Error releasing orphaned result", exc_info=True)
-
-        threading.Thread(
-            target=_cleanup, daemon=True, name="async-orphan-cleanup"
-        ).start()
-        raise AsyncDispatchTimeout("Timed out waiting for async operation")
-    if (exc := runner.exception) is not None:
-        raise exc
-    if not runner.completed:
-        raise RuntimeError("Async operation finished without a result or an exception")
-    return cast("T", runner.result)
+        asyncio.run(self._runner())

esphome/build_gen/espidf.py

@@ -210,27 +210,15 @@ def get_component_cmakelists() -> str:
 if(CMAKE_SCRIPT_MODE_FILE)
     file(GLOB_RECURSE app_sources
         "${{CMAKE_CURRENT_SOURCE_DIR}}/*.cpp"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/*.cc"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/*.cxx"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/*.c++"
         "${{CMAKE_CURRENT_SOURCE_DIR}}/*.c"
         "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.cpp"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.cc"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.cxx"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.c++"
         "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.c"
     )
 else()
     file(GLOB_RECURSE app_sources CONFIGURE_DEPENDS
         "${{CMAKE_CURRENT_SOURCE_DIR}}/*.cpp"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/*.cc"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/*.cxx"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/*.c++"
         "${{CMAKE_CURRENT_SOURCE_DIR}}/*.c"
         "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.cpp"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.cc"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.cxx"
-        "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.c++"
         "${{CMAKE_CURRENT_SOURCE_DIR}}/esphome/*.c"
     )
 endif()

esphome/bundle.py

@@ -12,7 +12,7 @@ from enum import StrEnum
 import io
 import json
 import logging
-from pathlib import Path, PurePath, PurePosixPath, PureWindowsPath
+from pathlib import Path
 import re
 import shutil
 import tarfile
@@ -20,7 +20,6 @@ from typing import Any
 
 from esphome import const, yaml_util
 from esphome.const import (
-    BUNDLE_EXTENSION,
     CONF_ESPHOME,
     CONF_EXTERNAL_COMPONENTS,
     CONF_INCLUDES,
@@ -30,12 +29,12 @@ from esphome.const import (
     CONF_TYPE,
 )
 from esphome.core import CORE, EsphomeError
-from esphome.util import filter_yaml_files
 
 _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = "bundle"
 
+BUNDLE_EXTENSION = ".esphomebundle.tar.gz"
 MANIFEST_FILENAME = "manifest.json"
 CURRENT_MANIFEST_VERSION = 1
 MAX_DECOMPRESSED_SIZE = 500 * 1024 * 1024  # 500 MB
@@ -52,7 +51,6 @@ class ManifestKey(StrEnum):
     MANIFEST_VERSION = "manifest_version"
     ESPHOME_VERSION = "esphome_version"
     CONFIG_FILENAME = "config_filename"
-    CONFIG_DIR = "config_dir"
     FILES = "files"
     HAS_SECRETS = "has_secrets"
 
@@ -129,15 +127,6 @@ class BundleData:
     """Files components asked to include, keyed under DOMAIN in CORE.data."""
 
     extra_files: list[Path] = field(default_factory=list)
-    # Directories whose YAML files are scanned for !secret references but
-    # never bundled, e.g. git package checkouts the builder re-fetches.
-    secret_scan_dirs: set[Path] = field(default_factory=set)
-    # Original config dir parsed from an extracted bundle's manifest.json,
-    # kept in the path flavor of the machine the bundle was created on.
-    # The checked flag makes the manifest lookup happen at most once per run;
-    # CORE.data is cleared between runs.
-    original_config_dir: PurePath | None = None
-    original_config_dir_checked: bool = False
 
 
 def _get_data() -> BundleData:
@@ -159,118 +148,6 @@ def add_bundle_file(path: Path) -> None:
     _get_data().extra_files.append(CORE.relative_config_path(path))
 
 
-def add_secret_scan_dir(path: Path) -> None:
-    """Register a directory to scan for ``!secret`` references when bundling.
-
-    The directory's files are not added to the bundle. Components call this
-    for YAML the build consumes without bundling it — such as git-fetched
-    packages, which the builder re-fetches — so the secrets those files
-    reference are still shipped in the filtered secrets file.
-
-    A relative path is taken as relative to the config directory.
-    """
-    if not path.is_absolute():
-        path = CORE.relative_config_path(path)
-    _get_data().secret_scan_dirs.add(path)
-
-
-def _secret_scan_yaml_files() -> list[Path]:
-    """Return the YAML files inside registered secret-scan directories."""
-    return filter_yaml_files(
-        f
-        for scan_dir in _get_data().secret_scan_dirs
-        for f in yaml_util.find_files(scan_dir, "*")
-    )
-
-
-# Windows paths start with a drive letter or contain backslashes; POSIX
-# paths do neither in practice, so this is how the flavor of a recorded
-# path string is recognized on any host.
-_WINDOWS_DRIVE_RE = re.compile(r"^[A-Za-z]:")
-
-
-def _path_flavor(value: str) -> type[PurePath]:
-    """Pick the pure path class matching the flavor ``value`` was written in."""
-    if "\\" in value or _WINDOWS_DRIVE_RE.match(value):
-        return PureWindowsPath
-    return PurePosixPath
-
-
-def _load_original_config_dir() -> PurePath | None:
-    """Read the original config dir from an extracted bundle's manifest.
-
-    Returns None when the current config dir is not an extracted bundle or
-    the manifest does not record the original config dir.
-    """
-    manifest_path = CORE.config_dir / MANIFEST_FILENAME
-    try:
-        manifest = json.loads(manifest_path.read_text(encoding="utf-8"))
-    except FileNotFoundError:
-        # The common case: this config dir is not an extracted bundle.
-        return None
-    except (OSError, UnicodeDecodeError, json.JSONDecodeError) as err:
-        # A manifest.json is present but unreadable or malformed. Say so
-        # instead of letting it look identical to "not a bundle".
-        _LOGGER.warning("Bundle: ignoring unreadable %s: %s", manifest_path, err)
-        return None
-    if not isinstance(manifest, dict):
-        return None
-    # A manifest.json in the config dir does not have to be ours. Only trust
-    # one that looks like a bundle manifest for exactly this config file.
-    version = manifest.get(ManifestKey.MANIFEST_VERSION)
-    if not isinstance(version, int) or version < 1:
-        return None
-    if manifest.get(ManifestKey.CONFIG_FILENAME) != CORE.config_path.name:
-        return None
-    config_dir = manifest.get(ManifestKey.CONFIG_DIR)
-    if not isinstance(config_dir, str) or not config_dir:
-        return None
-    return _path_flavor(config_dir)(config_dir)
-
-
-def remap_bundle_path(value: str) -> Path | None:
-    """Remap an absolute path from the machine a bundle was created on.
-
-    A bundled config may reference files by absolute path. The referenced
-    files ship inside the bundle at their config-relative locations, but the
-    YAML text is copied verbatim, so after extraction on another machine the
-    absolute reference points at a path that only existed on the creating
-    machine. The bundle manifest records that machine's config dir; when
-    ``value`` names a path that lived under it, return the corresponding
-    file next to the extracted config.
-
-    ``value`` is the raw path string from the config. It is parsed with the
-    original machine's path flavor, so a bundle created on Windows remaps on
-    a POSIX build server and vice versa.
-
-    Returns None when not compiling an extracted bundle, when ``value`` was
-    not under the original config dir, or when the bundle does not contain
-    the file.
-    """
-    data = _get_data()
-    if not data.original_config_dir_checked:
-        data.original_config_dir_checked = True
-        data.original_config_dir = _load_original_config_dir()
-    original_dir = data.original_config_dir
-    if original_dir is None:
-        return None
-    path = type(original_dir)(value)
-    if not path.is_absolute():
-        return None
-    try:
-        rel = path.relative_to(original_dir)
-    except ValueError:
-        return None
-    # relative_to is lexical, so ".." segments survive it. Refuse them: the
-    # remapped file must land strictly inside the extracted config tree.
-    if ".." in rel.parts:
-        return None
-    remapped = CORE.relative_config_path(Path(*rel.parts))
-    if not remapped.exists():
-        return None
-    return remapped
-
-
 @dataclass
 class BundleFile:
     """A file to include in the bundle."""
@@ -297,7 +174,6 @@ class BundleManifest:
     config_filename: str
     files: list[str]
     has_secrets: bool
-    config_dir: str | None = None
 
 
 class ConfigBundleCreator:
@@ -338,7 +214,6 @@ class ConfigBundleCreator:
         yaml_sources = [
             bf.source for bf in files if bf.source.suffix in (".yaml", ".yml")
         ]
-        yaml_sources.extend(_secret_scan_yaml_files())
         used_secret_keys = _find_used_secret_keys(yaml_sources)
         filtered_secrets = self._build_filtered_secrets(used_secret_keys)
 
@@ -423,13 +298,6 @@ class ConfigBundleCreator:
         """
         discovered = yaml_util.discover_user_yaml_files(self._config_path)
         self._secrets_paths.update(discovered.secrets)
-        # A !secret inside a file this re-parse does not reach (for example
-        # a git-fetched package the builder re-fetches) still resolves
-        # against the config-dir secrets.yaml at build time, so always
-        # consider that file; filtering no-ops when no key matches.
-        default_secrets = self._config_dir / yaml_util.SECRET_YAML
-        if default_secrets.is_file():
-            self._secrets_paths.add(default_secrets.resolve())
         config_resolved = self._config_path.resolve()
         for fpath in discovered.files:
             if fpath == config_resolved:
@@ -570,7 +438,6 @@ class ConfigBundleCreator:
             ManifestKey.MANIFEST_VERSION: CURRENT_MANIFEST_VERSION,
             ManifestKey.ESPHOME_VERSION: const.__version__,
             ManifestKey.CONFIG_FILENAME: self._config_path.name,
-            ManifestKey.CONFIG_DIR: str(self._config_dir),
             ManifestKey.FILES: [f.path for f in files],
             ManifestKey.HAS_SECRETS: has_secrets,
         }
@@ -655,14 +522,12 @@ def read_bundle_manifest(bundle_path: Path) -> BundleManifest:
     except tarfile.TarError as err:
         raise EsphomeError(f"Failed to read bundle: {err}") from err
 
-    config_dir = manifest.get(ManifestKey.CONFIG_DIR)
     return BundleManifest(
         manifest_version=manifest[ManifestKey.MANIFEST_VERSION],
         esphome_version=manifest.get(ManifestKey.ESPHOME_VERSION, "unknown"),
         config_filename=manifest[ManifestKey.CONFIG_FILENAME],
         files=manifest.get(ManifestKey.FILES, []),
         has_secrets=manifest.get(ManifestKey.HAS_SECRETS, False),
-        config_dir=config_dir if isinstance(config_dir, str) else None,
     )
 
 
@@ -755,6 +620,11 @@ def _validate_tar_members(tar: tarfile.TarFile, target_dir: Path) -> None:
             )
 
 
+def is_bundle_path(path: Path) -> bool:
+    """Check if a path looks like a bundle file."""
+    return path.name.lower().endswith(BUNDLE_EXTENSION)
+
+
 def _add_bytes_to_tar(tar: tarfile.TarFile, name: str, data: bytes) -> None:
     """Add in-memory bytes to a tar archive with deterministic metadata."""
     info = tarfile.TarInfo(name=name)

esphome/codegen.py

@@ -49,13 +49,10 @@ from esphome.cpp_helpers import (  # noqa: F401
     build_registry_entry,
     build_registry_list,
     extract_registry_entry_config,
-    get_slot_count,
     gpio_pin_expression,
     past_safe_mode,
     register_component,
     register_parented,
-    set_setup_priority,
-    slot_counter,
 )
 from esphome.cpp_types import (  # noqa: F401
     NAN,

esphome/compiled_config.py

@@ -61,14 +61,7 @@ def load_compiled_config(conf_path: Path) -> ConfigType | None:
     from esphome import yaml_util
 
     try:
-        # Fast path never validates or generates code - no source ranges
-        # needed (see load_yaml). Callers must not feed this config into
-        # read_config/write_cpp: the esp_range consumers in config.py and
-        # cpp_generator.py are isinstance-guarded and would degrade
-        # silently (wrong error/lambda locations) instead of raising.
-        config = yaml_util.load_yaml(
-            cache_path, clear_secrets=False, track_document_range=False
-        )
+        config = yaml_util.load_yaml(cache_path, clear_secrets=False)
     except Exception:  # noqa: BLE001  # pylint: disable=broad-except
         return None
 

esphome/components/adc/sensor.py

@@ -10,8 +10,8 @@ from esphome.components.esp32 import (
 from esphome.components.nrf52.const import AIN_TO_GPIO, EXTRA_ADC
 from esphome.components.zephyr import (
     zephyr_add_overlay,
-    zephyr_add_overlay_builder,
     zephyr_add_prj_conf,
+    zephyr_add_user,
 )
 from esphome.config_helpers import filter_source_files_from_platform
 import esphome.config_validation as cv
@@ -113,18 +113,6 @@ CONFIG_SCHEMA = cv.All(
 CONF_ADC_CHANNEL_ID = "adc_channel_id"
 
 
-def _overlay_io_channels():
-    channel_count = CORE.data[CONF_ADC_CHANNEL_ID]
-    entries = ", ".join(f"<&adc {channel_id}>" for channel_id in range(channel_count))
-    return f"""
-            / {{
-                zephyr,user {{
-                    io-channels = {entries};
-                }};
-            }};
-            """
-
-
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
@@ -185,8 +173,9 @@ async def to_code(config):
         if isinstance(pin_number, int):
             GPIO_TO_AIN = {v: k for k, v in AIN_TO_GPIO.items()}
             pin_number = GPIO_TO_AIN[pin_number]
-        zephyr_add_overlay_builder(_overlay_io_channels)
-        zephyr_add_overlay(f"""
+        zephyr_add_user("io-channels", f"<&adc {channel_id}>")
+        zephyr_add_overlay(
+            f"""
                 &adc {{
                     #address-cells = <1>;
                     #size-cells = <0>;
@@ -201,7 +190,8 @@ async def to_code(config):
                         zephyr,oversampling = <8>;
                     }};
                 }};
-            """)
+            """
+        )
 
 
 FILTER_SOURCE_FILES = filter_source_files_from_platform(

esphome/components/api/__init__.py

@@ -13,7 +13,6 @@ from esphome.const import (
     CONF_CAPTURE_RESPONSE,
     CONF_DATA,
     CONF_DATA_TEMPLATE,
-    CONF_ENCRYPTION,
     CONF_EVENT,
     CONF_ID,
     CONF_KEY,
@@ -103,6 +102,7 @@ SERVICE_ARG_FALLBACK_TYPES: dict[str, MockObj] = {
         for name, t in _SERVICE_ARG_SCALAR_TYPES.items()
     },
 }
+CONF_ENCRYPTION = "encryption"
 CONF_BATCH_DELAY = "batch_delay"
 CONF_CUSTOM_SERVICES = "custom_services"
 CONF_HOMEASSISTANT_SERVICES = "homeassistant_services"

esphome/components/api/api_connection.cpp

@@ -440,7 +440,7 @@ void APIConnection::on_disconnect_response() {
 uint16_t APIConnection::fill_and_encode_entity_state(EntityBase *entity, StateResponseProtoMessage &msg,
                                                      CalculateSizeFn size_fn, MessageEncodeFn encode_fn,
                                                      APIConnection *conn, uint32_t remaining_size) {
-  msg.key = entity->get_entity_key();
+  msg.key = entity->get_object_id_hash();
 #ifdef USE_DEVICES
   msg.device_id = entity->get_device_id();
 #endif
@@ -451,7 +451,7 @@ uint16_t APIConnection::fill_and_encode_entity_info(EntityBase *entity, InfoResp
                                                     CalculateSizeFn size_fn, MessageEncodeFn encode_fn,
                                                     APIConnection *conn, uint32_t remaining_size) {
   // Set common fields that are shared by all entity types
-  msg.key = entity->get_entity_key();
+  msg.key = entity->get_object_id_hash();
 
   if (entity->has_own_name()) {
     msg.name = entity->get_name();
@@ -794,7 +794,6 @@ uint16_t APIConnection::try_send_climate_info(EntityBase *entity, APIConnection
   msg.supports_action = traits.has_feature_flags(climate::CLIMATE_SUPPORTS_ACTION);
   // Current feature flags and other supported parameters
   msg.feature_flags = traits.get_feature_flags();
-  msg.temperature_unit = static_cast<enums::TemperatureUnit>(traits.get_temperature_unit());
   msg.supported_modes = &traits.get_supported_modes();
   msg.visual_min_temperature = traits.get_visual_min_temperature();
   msg.visual_max_temperature = traits.get_visual_max_temperature();
@@ -1141,7 +1140,7 @@ void APIConnection::try_send_camera_image_() {
     bool done = this->image_reader_->available() == to_send;
 
     CameraImageResponse msg;
-    msg.key = camera::Camera::instance()->get_entity_key();
+    msg.key = camera::Camera::instance()->get_object_id_hash();
     msg.set_data(this->image_reader_->peek_data_buffer(), to_send);
     msg.done = done;
 #ifdef USE_DEVICES
@@ -1329,8 +1328,7 @@ void APIConnection::on_voice_assistant_announce_request(const VoiceAssistantAnno
   }
 }
 
-bool APIConnection::send_voice_assistant_get_configuration_response_(
-    const VoiceAssistantConfigurationRequest & /*msg*/) {
+bool APIConnection::send_voice_assistant_get_configuration_response_(const VoiceAssistantConfigurationRequest &msg) {
   VoiceAssistantConfigurationResponse resp;
   if (!this->check_voice_assistant_api_connection_()) {
     // send_message encodes synchronously, so this stack local outlives the encode
@@ -1350,6 +1348,22 @@ bool APIConnection::send_voice_assistant_get_configuration_response_(
     }
   }
 
+  // Filter external wake words
+  for (auto &wake_word : msg.external_wake_words) {
+    if (wake_word.model_type != "micro") {
+      // microWakeWord only
+      continue;
+    }
+
+    resp.available_wake_words.emplace_back();
+    auto &resp_wake_word = resp.available_wake_words.back();
+    resp_wake_word.id = StringRef(wake_word.id);
+    resp_wake_word.wake_word = StringRef(wake_word.wake_word);
+    for (const auto &lang : wake_word.trained_languages) {
+      resp_wake_word.trained_languages.push_back(lang);
+    }
+  }
+
   resp.active_wake_words = &config.active_wake_words;
   resp.max_active_wake_words = config.max_active_wake_words;
   return this->send_message(resp);
@@ -1454,7 +1468,6 @@ uint16_t APIConnection::try_send_water_heater_info(EntityBase *entity, APIConnec
   msg.target_temperature_step = traits.get_target_temperature_step();
   msg.supported_modes = &traits.get_supported_modes();
   msg.supported_features = traits.get_feature_flags();
-  msg.temperature_unit = static_cast<enums::TemperatureUnit>(traits.get_temperature_unit());
   return fill_and_encode_entity_info(wh, msg, conn, remaining_size);
 }
 
@@ -1543,8 +1556,8 @@ void APIConnection::on_serial_proxy_configure_request(const SerialProxyConfigure
              static_cast<uint32_t>(proxies.size()));
     return;
   }
-  proxies[msg.instance]->configure(this, msg.baudrate, msg.flow_control, static_cast<uint8_t>(msg.parity),
-                                   msg.stop_bits, msg.data_size);
+  proxies[msg.instance]->configure(msg.baudrate, msg.flow_control, static_cast<uint8_t>(msg.parity), msg.stop_bits,
+                                   msg.data_size);
 }
 
 void APIConnection::on_serial_proxy_write_request(const SerialProxyWriteRequest &msg) {
@@ -1553,7 +1566,7 @@ void APIConnection::on_serial_proxy_write_request(const SerialProxyWriteRequest
     ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
     return;
   }
-  proxies[msg.instance]->write_from_client(this, msg.data, msg.data_len);
+  proxies[msg.instance]->write_from_client(msg.data, msg.data_len);
 }
 
 void APIConnection::on_serial_proxy_set_modem_pins_request(const SerialProxySetModemPinsRequest &msg) {
@@ -1562,7 +1575,7 @@ void APIConnection::on_serial_proxy_set_modem_pins_request(const SerialProxySetM
     ESP_LOGW(TAG, "Serial proxy instance %" PRIu32 " out of range", msg.instance);
     return;
   }
-  proxies[msg.instance]->set_modem_pins(this, msg.line_states);
+  proxies[msg.instance]->set_modem_pins(msg.line_states);
 }
 
 void APIConnection::on_serial_proxy_get_modem_pins_request(const SerialProxyGetModemPinsRequest &msg) {

esphome/components/api/api_overflow_buffer.cpp

@@ -12,22 +12,6 @@ APIOverflowBuffer::~APIOverflowBuffer() {
 }
 
 ssize_t APIOverflowBuffer::try_drain(socket::Socket *socket) {
-  // socket->write() can re-enter this function: a log message emitted from an
-  // lwip callback during the write goes out over the API and lands back in the
-  // frame helper's write/drain path. If a nested drain ran here it would send
-  // and free the entry the outer drain is still holding, causing a double free.
-  // Report "no progress" instead; the outer drain keeps draining, and the
-  // nested send is enqueued behind the existing backlog.
-  if (this->draining_)
-    return 0;
-
-  // RAII so the flag is cleared on every return path
-  struct DrainGuard {
-    explicit DrainGuard(bool &flag) : flag_(flag) { flag_ = true; }
-    ~DrainGuard() { this->flag_ = false; }
-    bool &flag_;
-  } guard(this->draining_);
-
   while (this->count_ > 0) {
     Entry *front = this->queue_[this->head_];
 
@@ -45,12 +29,11 @@ ssize_t APIOverflowBuffer::try_drain(socket::Socket *socket) {
       return sent;
     }
 
-    // Entry fully sent — unlink it before freeing so a freed pointer is never
-    // reachable from the queue
+    // Entry fully sent — free it and advance
+    Entry::destroy(front);
     this->queue_[this->head_] = nullptr;
     this->head_ = (this->head_ + 1) % API_MAX_SEND_QUEUE;
     this->count_--;
-    Entry::destroy(front);
   }
 
   return 0;  // All drained

esphome/components/api/api_overflow_buffer.h

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

esphome/components/api/client.py

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

esphome/components/bk72xx/__init__.py

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

esphome/components/bk72xx_ble/__init__.py

@@ -1,99 +0,0 @@
-"""BK72xx BLE — BLE controller support for the BLE-5.x LibreTiny Beken chips.
-
-The platform analog of esp32_ble / rp2040_ble: owns the Beken BDK BLE stack
-bring-up and the controller BLE address. Consumers (bk72xx_ble_tracker) build
-on this component and contain no SDK calls of their own.
-
-Supported SoCs (BLE 5.x): BK7231N/BK7236 (BLE 5.1), BK7238/BK7252N/BK7253
-(BLE 5.2), and any future BLE-5.x SoC. Capability is detected at compile time,
-not by a chip list: the C++ guards on `__has_include("ble_api.h")` — the Beken
-BLE 5.x public API header, which the LibreTiny beken-72xx builder ships only
-for BLE-5.x SoCs. BK7231T/BK7251/BK7271 (BLE 4.2) and BK7231Q (no BLE) fail
-with a clear #error.
-
-No framework patch is needed: the LibreTiny beken-72xx builder already compiles
-and links the BLE 5.x stack (CFG_SUPPORT_BLE=1 + CFG_BLE_VERSION=BLE_VERSION_5_x;
-prebuilt libble_<chip>.a per SoC). This component only calls into it via the
-public ble_api.h.
-"""
-
-import logging
-
-import esphome.codegen as cg
-from esphome.components import libretiny
-from esphome.components.libretiny.const import FAMILY_BK7231N, FAMILY_BK7238
-import esphome.config_validation as cv
-from esphome.const import CONF_ENABLE_ON_BOOT, CONF_ID
-from esphome.types import ConfigType
-
-DEPENDENCIES = ["bk72xx"]
-CODEOWNERS = ["@Bl00d-B0b"]
-
-_LOGGER = logging.getLogger(__name__)
-
-bk72xx_ble_ns = cg.esphome_ns.namespace("bk72xx_ble")
-BK72xxBLE = bk72xx_ble_ns.class_("BK72xxBLE", cg.Component)
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(BK72xxBLE),
-        # Default off: on the single-core BK72xx, bringing the BLE stack up during
-        # boot competes with the WiFi connection handshake. Consumers enable the
-        # stack lazily on first use (e.g. the tracker's first scan start).
-        cv.Optional(CONF_ENABLE_ON_BOOT, default=False): cv.boolean,
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-# Once per registered scan listener; sizes the controller's StaticVector
-# listener storage.
-request_scan_listener_slot = cg.slot_counter("BK72XX_BLE_SCAN_LISTENER_COUNT")
-
-
-async def to_code(config: ConfigType) -> None:
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    cg.add(var.set_enable_on_boot(config[CONF_ENABLE_ON_BOOT]))
-
-    # Enable the BLE stack in the build (the '#h' maps to sys_config.h; the value
-    # is a list). ESPHome's libretiny platform normally appends CFG_SUPPORT_BLE=0
-    # on BK7231N/BK7238 (saves ~21KB RAM/~200KB Flash when BLE is unused) to this
-    # SAME key — and add_platformio_option appends list values, it never replaces.
-    # The platform therefore skips its disable when this component is configured,
-    # so this =1 is the single CFG_SUPPORT_BLE define emitted.
-    cg.add_platformio_option("custom_options.sys_config#h", ["CFG_SUPPORT_BLE=1"])
-
-    # Pin the Beken BDK release the BLE 5.x stack is validated against. The
-    # bundled 3.0.33 has an older BLE header/library layout — and with
-    # CFG_SUPPORT_BLE=1 the SDK runs its BLE init unconditionally during boot
-    # (the reason the libretiny platform sets =0 when BLE is unused), so a
-    # mismatched BDK can crash the device before WiFi comes up regardless of
-    # enable_on_boot. Pinning here makes a plain config build against the
-    # validated BDK without any manual platformio_options.
-    _LOGGER.warning(
-        "bk72xx_ble builds with beken-bdk 3.0.78 instead of the platform's bundled "
-        "default: the default's older BLE layout can crash the device at boot when "
-        "BLE is compiled in"
-    )
-    cg.add_platformio_option("custom_versions.beken-bdk", "3.0.78")
-
-    # The BDK exposes the controller's BLE address as `common_default_bdaddr` on
-    # BK7231N, but NOT on BK7238 (its BLE stack has no such symbol; the address is
-    # derived from the WiFi MAC instead — the BDK's own fallback). Tell the C++
-    # which path is available so it doesn't reference a missing symbol.
-    family = libretiny.get_libretiny_family()
-    if family == FAMILY_BK7231N:
-        cg.add_define("BK72XX_BLE_HAS_COMMON_BDADDR")
-    elif family == FAMILY_BK7238:
-        # ESPHome's LibreTiny disables BLE on BK7238 because the SDK can hang at
-        # WiFi STA startup when BLE init runs. This component re-enables BLE, so
-        # warn loudly: BK7238 is accepted but not hardware-verified and may be
-        # WiFi-unstable with BLE on.
-        _LOGGER.warning(
-            "bk72xx_ble on BK7238: enabling BLE is known to risk a WiFi STA startup "
-            "hang on this family and is not yet hardware-verified. Expect possible "
-            "instability."
-        )
-
-    cg.add_define("USE_BK72XX_BLE")

esphome/components/bk72xx_ble/bk72xx_ble.cpp

@@ -1,294 +0,0 @@
-// bk72xx_ble.cpp
-//
-// BLE controller support for the BK72xx BLE-5.x chips (LibreTiny beken-72xx
-// family) — the platform analog of esp32_ble / rp2040_ble. Owns everything that
-// talks to the Beken BDK BLE stack:
-//   - one-time stack bring-up (ble_set_notice_cb() + ble_entry()),
-//   - the controller BLE address,
-//   - the raw controller scan primitives (bk_ble_scan_start/stop),
-//   - the scan-report ring: the BDK notice callback (BLE task) takes a report
-//     from a fixed pool and pushes it on a lock-free SPSC queue; loop() drains,
-//     dispatches on the main task and returns reports to the pool — the same
-//     EventPool + LockFreeQueue handoff esp32_ble uses, zero allocation at
-//     steady state.
-// Consumers contain no SDK calls of their own.
-//
-// NOTE: the Beken BDK BLE 5.x stack is compiled and linked by the LibreTiny
-// beken-72xx builder itself (prebuilt libble_<chip>.a + ble_5_x sources, gated
-// on CFG_SUPPORT_BLE / CFG_BLE_VERSION in sys_config.h). This component only
-// calls into it via the public ble_api.h — no framework patch is required.
-
-#include "bk72xx_ble.h"  // pulls esphome/core/defines.h for USE_BK72XX_BLE
-
-#ifdef USE_BK72XX_BLE
-
-#include <cstring>
-
-#include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"  // get_mac_address_raw()
-#include "esphome/core/log.h"
-
-// ---------------------------------------------------------------------------
-// SDK-capability gate (not a chip allowlist).
-// This component drives the Beken BLE *5.x* controller via its public API,
-// `ble_api.h`, which the LibreTiny beken-72xx builder ships only for the
-// BLE-5.x SoCs (it selects the `ble_pub` 5.x stack from CFG_BLE_VERSION; the
-// 4.2 SoCs build a different, older API with no ble_api.h). Gate on the header
-// itself so any BLE-5.x Beken chip — present or future — is supported without a
-// hard-coded list, and a non-5.x build fails here with a clear message instead
-// of a cryptic "ble_api.h: No such file or directory".
-// ---------------------------------------------------------------------------
-#if defined(CLANG_TIDY)
-// The clang-tidy environment does not carry the full Beken BDK BLE 5.x API
-// (its ble_api.h variant lacks parts of the 5.x surface), so there is nothing
-// accurate to analyze the SDK calls against — skip the file under analysis.
-#define BK72XX_BLE_NO_SDK
-#elif !__has_include("ble_api.h")
-#error \
-    "bk72xx_ble requires a BLE 5.x Beken SDK (ble_api.h). Supported SoCs: BK7231N/BK7236 (BLE 5.1) and BK7238/BK7252N/BK7253 (BLE 5.2). BK7231T/BK7251/BK7271 (BLE 4.2) and BK7231Q (no BLE) are not supported."
-#endif
-
-#ifndef BK72XX_BLE_NO_SDK
-
-// ---------------------------------------------------------------------------
-// Beken BDK BLE 5.x SDK — public API.
-// Exposed on the include path by the LibreTiny beken-72xx builder
-// (cores/.../ble_5_x_rw + driver/include). Wrapped in extern "C" because these
-// are C headers consumed from C++ (a standard C-header-from-C++ pattern).
-// ---------------------------------------------------------------------------
-extern "C" {
-#include "ble_api.h"  // bk_ble_scan_start/stop, ble_entry, ble_set_notice_cb,
-                      // app_ble_get_idle_actv_idx_handle, struct scan_param,
-                      // recv_adv_t, ble_notice_t, BLE_5_REPORT_ADV, SCAN_ACTV
-#ifdef BK72XX_BLE_HAS_COMMON_BDADDR
-#include "common_bt_defines.h"  // struct bd_addr
-// The controller's public BLE address, populated by the BDK during ble_entry().
-// Present on BK7231N; the other BLE-5.x chips' stacks have no such symbol — there the
-// address is derived from the WiFi MAC instead (matching the BDK's own fallback).
-extern struct bd_addr common_default_bdaddr;
-#endif
-// ble_entry() brings up the BDK BLE stack; it is not declared in ble_api.h, so
-// declare it here.
-void ble_entry(void);
-}
-
-namespace esphome::bk72xx_ble {
-
-static const char *const TAG = "bk72xx_ble";
-
-// The BDK notice callback is a plain C function pointer with no user argument,
-// so it reaches the (single) component instance through a file-static pointer.
-static BK72xxBLE *s_ble = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
-// ---------------------------------------------------------------------------
-// BLE notice callback — runs in the BDK BLE task context.
-// The BK controller reports every advertisement as a BLE_5_REPORT_ADV notice
-// carrying a recv_adv_t. Copy it into the queue and return; all dispatch
-// happens in loop() on the main task.
-// ---------------------------------------------------------------------------
-static void ble_notice_callback(ble_notice_t notice, void *param) {
-  if (s_ble == nullptr || param == nullptr)
-    return;
-  if (notice != BLE_5_REPORT_ADV)
-    return;
-
-  const recv_adv_t *info = reinterpret_cast<const recv_adv_t *>(param);
-  // rssi is a signed dBm carried in a uint8_t; cast through int8_t (standard for
-  // a signed dBm value packed in a uint8_t).
-  s_ble->enqueue_scan_report(info->adv_addr, static_cast<int8_t>(info->rssi), info->adv_addr_type, info->data,
-                             info->data_len);
-}
-
-void BK72xxBLE::enqueue_scan_report(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data,
-                                    uint16_t data_len) {
-  BLEScanReport *report = this->report_pool_.allocate();
-  if (report == nullptr) {
-    // Pool exhausted — the queue is full; count and drop.
-    this->report_queue_.increment_dropped_count();
-    return;
-  }
-  memcpy(report->mac, mac, 6);
-  report->rssi = rssi;
-  report->addr_type = addr_type;
-  report->data_len =
-      (data_len <= sizeof(report->data)) ? static_cast<uint8_t>(data_len) : static_cast<uint8_t>(sizeof(report->data));
-  memcpy(report->data, data, report->data_len);
-  // Cannot fail: the pool is sized to the queue capacity.
-  this->report_queue_.push(report);
-}
-
-// ---------------------------------------------------------------------------
-// Component lifecycle
-// ---------------------------------------------------------------------------
-
-void BK72xxBLE::setup() {
-  s_ble = this;
-  // Resolve the MAC early so get_mac_lsb_first() is valid for consumers before
-  // the stack is up (it is re-read once ble_entry() has run).
-  this->resolve_mac_();
-  if (this->enable_on_boot_) {
-    this->enable();
-  }
-}
-
-// AFTER_WIFI, not BLUETOOTH: replicates the proven pre-split timing — the BDK
-// is first touched only once WiFi is up (single-core WiFi/BLE bring-up order).
-float BK72xxBLE::get_setup_priority() const { return setup_priority::AFTER_WIFI; }
-
-void BK72xxBLE::enable() {
-  if (this->state_ != BLEComponentState::STATE_OFF)
-    return;
-  this->state_ = BLEComponentState::ENABLING;
-
-  // One-time BLE stack init: register the notice callback, then bring up the
-  // BDK BLE stack. The BDK has no teardown path — init happens at most once.
-  ble_set_notice_cb(ble_notice_callback);
-  ble_entry();
-
-  delay(100);  // NOLINT — one-time BLE stack init; the SDK needs this settle time
-
-  // Re-read the BLE MAC now that the controller is up (common_default_bdaddr is
-  // populated by ble_entry()); resolve_mac_() may have fallen back earlier.
-  this->resolve_mac_();
-
-#ifdef BK72XX_BLE_HAS_COMMON_BDADDR
-  // Liveness heuristic (BK7231N): a healthy ble_entry() populates
-  // common_default_bdaddr during init, so all-zero after the settle delay
-  // suggests the stack did not come up. The BDK entry point returns void — no
-  // return code exists — so warn rather than fail: scan starts against a dead
-  // stack already fail cleanly downstream (no idle activity handle).
-  bool bdaddr_live = false;
-  for (uint8_t b : common_default_bdaddr.addr) {
-    if (b != 0) {
-      bdaddr_live = true;
-      break;
-    }
-  }
-  if (!bdaddr_live)
-    ESP_LOGW(TAG, "Controller address still unset after init; BLE stack may not have started");
-#endif
-
-  this->state_ = BLEComponentState::ACTIVE;
-  ESP_LOGD(TAG, "BLE stack initialised");
-}
-
-void BK72xxBLE::loop() {
-  // Drain the lock-free ring filled by the BLE task; all per-report work runs
-  // here on the main task, then the report returns to the pool.
-  BLEScanReport *report = this->report_queue_.pop();
-  if (report == nullptr)
-    return;
-  do {
-#ifdef BK72XX_BLE_SCAN_LISTENER_COUNT
-    for (auto *listener : this->scan_listeners_)
-      listener->on_scan_report(*report);
-#endif
-    this->report_pool_.release(report);
-  } while ((report = this->report_queue_.pop()) != nullptr);
-
-  // Log dropped reports — only reachable when reports were processed; drops can
-  // only occur while the queue is full, and only this loop drains it.
-  uint16_t dropped = this->report_queue_.get_and_reset_dropped_count();
-  if (dropped > 0)
-    ESP_LOGW(TAG, "Dropped %u scan reports due to queue overflow", dropped);
-}
-
-void BK72xxBLE::get_mac_lsb_first(uint8_t out[6]) const {
-  for (int i = 0; i < 6; i++)
-    out[i] = this->ble_mac_[i];
-}
-
-void BK72xxBLE::dump_config() {
-  // ble_mac_ is stored LSB-first (BLE convention); print [5..0] for the
-  // MSB-first order Home Assistant shows.
-  ESP_LOGCONFIG(TAG,
-                "BK72xx BLE:\n"
-                "  MAC address: %02X:%02X:%02X:%02X:%02X:%02X\n"
-                "  Active: %s",
-                this->ble_mac_[5], this->ble_mac_[4], this->ble_mac_[3], this->ble_mac_[2], this->ble_mac_[1],
-                this->ble_mac_[0], YESNO(this->is_active()));
-}
-
-// ---------------------------------------------------------------------------
-// MAC resolution
-// ---------------------------------------------------------------------------
-
-void BK72xxBLE::resolve_mac_() {
-#ifdef BK72XX_BLE_HAS_COMMON_BDADDR
-  // BK7231N: the BDK populates common_default_bdaddr (LSB-first, BLE convention)
-  // during ble_entry(). It may still be zero before the stack is up; if so, fall
-  // through to the WiFi-derived MAC below.
-  bool nonzero = false;
-  for (uint8_t b : common_default_bdaddr.addr) {
-    if (b != 0) {
-      nonzero = true;
-      break;
-    }
-  }
-  if (nonzero) {
-    memcpy(this->ble_mac_, common_default_bdaddr.addr, 6);
-    return;
-  }
-#endif
-  // Chips whose BLE stack does not export common_default_bdaddr (BK7238 and the other
-  // BLE-5.x SoCs), or BK7231N before the stack is up: derive the BLE MAC exactly as the
-  // Beken BDK does in bdaddr_env_init() — the WiFi STA MAC with only its last byte
-  // incremented (sta_mac[5] += 1, a plain byte increment with no carry into the next
-  // byte), OUI unchanged. This reproduces the address the controller advertises with
-  // (verified against the BK7231N BLE-5.1 and BK7252N/BK7238 BLE-5.2 SDK sources), so it
-  // matches on every device, including the last-byte == 0xFF edge that a 24-bit increment
-  // would carry differently.
-  uint8_t wifi_mac[6];
-  get_mac_address_raw(wifi_mac);  // MSB-first
-  const uint8_t ble[6] = {wifi_mac[0], wifi_mac[1], wifi_mac[2],
-                          wifi_mac[3], wifi_mac[4], static_cast<uint8_t>(wifi_mac[5] + 1)};
-  // Store LSB-first to match recv_adv_t adv_addr ordering.
-  for (int i = 0; i < 6; i++)
-    this->ble_mac_[i] = ble[5 - i];
-}
-
-// ---------------------------------------------------------------------------
-// Controller scan primitives
-// ---------------------------------------------------------------------------
-
-bool BK72xxBLE::scan_start(uint16_t interval, uint16_t window) {
-  if (!this->is_active())
-    this->enable();
-
-  if (this->scan_actv_idx_ != 0xFF) {
-    // Already scanning — stop first so this call cleanly restarts with the new
-    // parameters (the BDK cannot start a second scan on a busy activity).
-    this->scan_stop();
-  }
-
-  struct scan_param sp;
-  memset(&sp, 0, sizeof(sp));
-  sp.channel_map = 7;  // advertising channels 37/38/39
-  sp.interval = interval;
-  sp.window = window;
-
-  this->scan_actv_idx_ = app_ble_get_idle_actv_idx_handle(SCAN_ACTV);
-  if (this->scan_actv_idx_ == 0xFF) {
-    ESP_LOGE(TAG, "Scan start failed: no idle activity handle");
-    return false;
-  }
-  ble_err_t ret = bk_ble_scan_start(this->scan_actv_idx_, &sp, nullptr);
-  if (ret != ERR_SUCCESS) {
-    ESP_LOGE(TAG, "Scan start failed (err %d)", static_cast<int>(ret));
-    this->scan_actv_idx_ = 0xFF;
-    return false;
-  }
-  return true;
-}
-
-void BK72xxBLE::scan_stop() {
-  if (this->scan_actv_idx_ != 0xFF) {
-    bk_ble_scan_stop(this->scan_actv_idx_, nullptr);
-    this->scan_actv_idx_ = 0xFF;
-  }
-}
-
-}  // namespace esphome::bk72xx_ble
-
-#endif  // BK72XX_BLE_NO_SDK
-#endif  // USE_BK72XX_BLE

esphome/components/bk72xx_ble/bk72xx_ble.h

@@ -1,106 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-
-#ifdef USE_BK72XX_BLE
-
-#include "esphome/core/component.h"
-#include "esphome/core/event_pool.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/lock_free_queue.h"
-
-#include <cstdint>
-
-namespace esphome::bk72xx_ble {
-
-enum class BLEComponentState : uint8_t {
-  STATE_OFF = 0,
-  ENABLING,
-  ACTIVE,
-};
-
-/// One advertisement report from the controller.
-struct BLEScanReport {
-  uint8_t mac[6];  // LSB-first, as the controller delivers it
-  int8_t rssi;     // signed dBm
-  uint8_t addr_type;
-  uint8_t data_len;  // bytes valid in data[]
-  uint8_t data[62];  // legacy advertisement (31) + scan response (31)
-
-  // EventPool contract: nothing is heap-allocated inside a report.
-  void release() {}
-};
-
-/// Consumer interface for controller scan reports. on_scan_report() always runs
-/// on the ESPHome main task: reports are queued from the BDK BLE task and
-/// drained by the controller's loop(), so consumers never deal with cross-task
-/// state (the esp32_ble event-queue pattern).
-class BLEScanListener {
- public:
-  virtual void on_scan_report(const BLEScanReport &report) = 0;
-
- protected:
-  ~BLEScanListener() = default;  // deletion via this interface is not part of the contract
-};
-
-// Maximum reports buffered between the BLE task and loop().
-static constexpr uint8_t MAX_SCAN_REPORT_QUEUE_SIZE = 64;
-
-class BK72xxBLE final : public Component {
- public:
-  void setup() override;
-  void loop() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-
-  /// Bring up the BDK BLE stack (one-time; the BDK has no teardown path).
-  void enable();
-  bool is_active() const { return this->state_ == BLEComponentState::ACTIVE; }
-
-  void set_enable_on_boot(bool enable_on_boot) { this->enable_on_boot_ = enable_on_boot; }
-
-  /// Controller BLE address, least-significant octet first (BLE convention).
-  void get_mac_lsb_first(uint8_t out[6]) const;
-
-#ifdef BK72XX_BLE_SCAN_LISTENER_COUNT
-  /// Register a consumer for scan reports (delivered on the main task via loop()).
-  /// Storage is codegen-sized: the consumer's codegen requests a slot via
-  /// request_scan_listener_slot(), which emits BK72XX_BLE_SCAN_LISTENER_COUNT.
-  void register_scan_listener(BLEScanListener *listener) { this->scan_listeners_.push_back(listener); }
-#endif
-
-  /// Start the controller scan. Interval/window are in BLE units (0.625 ms).
-  /// Enables the stack first if needed. Returns false on controller failure.
-  bool scan_start(uint16_t interval, uint16_t window);
-  /// Stop the controller scan (no-op when not scanning).
-  void scan_stop();
-
-  /// Internal: buffer one controller report (BDK notice callback, BLE task
-  /// context — bounded copy under the scheduler lock, nothing else).
-  void enqueue_scan_report(const uint8_t *mac, int8_t rssi, uint8_t addr_type, const uint8_t *data, uint16_t data_len);
-
- protected:
-  void resolve_mac_();
-
-#ifdef BK72XX_BLE_SCAN_LISTENER_COUNT
-  // Codegen-sized: no heap allocation, no std::vector template instantiation —
-  // the same StaticVector pattern as the tracker's ble_device_base listeners.
-  StaticVector<BLEScanListener *, BK72XX_BLE_SCAN_LISTENER_COUNT> scan_listeners_;
-#endif
-  // Report ring: the BDK notice callback (BLE task) allocates a report from the
-  // pool, fills it and pushes the pointer; loop() pops, dispatches and releases.
-  // Lock-free SPSC, zero allocation at steady state — the esp32_ble pattern.
-  esphome::LockFreeQueue<BLEScanReport, MAX_SCAN_REPORT_QUEUE_SIZE> report_queue_;
-  // Pool sized to queue capacity (SIZE-1): the ring reserves one slot, so
-  // allocate() returns nullptr before push() can fail. This prevents leaking a
-  // pool slot on a failed push and keeps release() off the producer path.
-  esphome::EventPool<BLEScanReport, MAX_SCAN_REPORT_QUEUE_SIZE - 1> report_pool_;
-  uint8_t ble_mac_[6]{0};  // LSB-first (BLE convention)
-  uint8_t scan_actv_idx_{0xFF};
-  BLEComponentState state_{BLEComponentState::STATE_OFF};
-  bool enable_on_boot_{false};
-};
-
-}  // namespace esphome::bk72xx_ble
-
-#endif  // USE_BK72XX_BLE

esphome/components/bk72xx_ble_tracker/__init__.py

@@ -1,180 +0,0 @@
-"""BK72xx BLE Tracker — ESPHome BLE 5.x scanner for the BLE-5.x-capable
-LibreTiny Beken chips (beken-72xx family).
-
-Builds on the bk72xx_ble controller component (stack bring-up, BLE address,
-scan primitives) and implements the platform-neutral ble_device_base BLEHub
-contract: the shared BLE sensors (ble_presence, ble_rssi, ble_scanner,
-bthome_mithermometer, xiaomi_*, …) bind to this tracker through
-cv.use_id(BLEHub) with no BK-specific code.
-
-Scan modes:
-  continuous: true  — scan runs forever; never stops automatically.
-                      Use this when the radio is dedicated to BLE.
-  continuous: false — a started scan runs for `duration` ms, then stops. The
-                      FIRST start is external too: nothing in this component
-                      starts a non-continuous scan on boot — the radio stays
-                      idle until bk72xx_ble_tracker.start_scan fires (e.g.
-                      from an api client-connected automation), so the
-                      single-core radio can service WiFi in between scans.
-"""
-
-from esphome import automation
-import esphome.codegen as cg
-from esphome.components import bk72xx_ble, ble_device_base, ota
-from esphome.components.ble_device_base import automation as ble_automation
-from esphome.components.const import CONF_ON_SCAN_END, CONF_SCAN_PARAMETERS, CONF_WINDOW
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_CONTINUOUS,
-    CONF_DURATION,
-    CONF_ID,
-    CONF_INTERVAL,
-    CONF_MANUFACTURER_ID,
-    CONF_ON_BLE_ADVERTISE,
-    CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE,
-    CONF_ON_BLE_SERVICE_DATA_ADVERTISE,
-    CONF_SERVICE_UUID,
-)
-from esphome.core import ID
-from esphome.types import ConfigType
-
-CONF_BK72XX_BLE_ID = "bk72xx_ble_id"
-
-DEPENDENCIES = ["bk72xx"]
-AUTO_LOAD = ["ble_device_base", "bk72xx_ble"]
-CODEOWNERS = ["@Bl00d-B0b"]
-
-bk72xx_ble_tracker_ns = cg.esphome_ns.namespace("bk72xx_ble_tracker")
-BK72xxBLETracker = bk72xx_ble_tracker_ns.class_(
-    "BK72xxBLETracker", ble_device_base.BLEHub, cg.Component
-)
-
-StartScanAction = bk72xx_ble_tracker_ns.class_("StartScanAction", automation.Action)
-StopScanAction = bk72xx_ble_tracker_ns.class_("StopScanAction", automation.Action)
-
-ESPBTAdvertiseTrigger = ble_automation.ESPBTAdvertiseTrigger
-BLEServiceDataAdvertiseTrigger = ble_automation.BLEServiceDataAdvertiseTrigger
-BLEManufacturerDataAdvertiseTrigger = ble_automation.BLEManufacturerDataAdvertiseTrigger
-BLEEndOfScanTrigger = ble_automation.BLEEndOfScanTrigger
-
-
-# interval defaults to the BK reference scan rate — 100 ms with the shared 30 ms
-# window, a 30 % duty cycle. Converted to the controller's 0.625 ms BLE units in
-# to_code(). (LN882H's SDK recommends a different 100 / 50 ms = 50 %.)
-SCAN_PARAMETERS_SCHEMA = ble_device_base.scan_parameters_schema("100ms")
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(BK72xxBLETracker),
-        cv.GenerateID(CONF_BK72XX_BLE_ID): cv.use_id(bk72xx_ble.BK72xxBLE),
-        cv.Optional(CONF_SCAN_PARAMETERS, default={}): SCAN_PARAMETERS_SCHEMA,
-        cv.Optional(CONF_ON_BLE_ADVERTISE): ble_automation.advertise_trigger_schema(
-            ESPBTAdvertiseTrigger
-        ),
-        cv.Optional(
-            CONF_ON_BLE_SERVICE_DATA_ADVERTISE
-        ): ble_automation.uuid_trigger_schema(
-            BLEServiceDataAdvertiseTrigger,
-            {cv.Required(CONF_SERVICE_UUID): ble_device_base.bt_uuid},
-        ),
-        cv.Optional(
-            CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE
-        ): ble_automation.uuid_trigger_schema(
-            BLEManufacturerDataAdvertiseTrigger,
-            {cv.Required(CONF_MANUFACTURER_ID): ble_device_base.bt_uuid},
-        ),
-        cv.Optional(CONF_ON_SCAN_END): ble_automation.scan_end_trigger_schema(
-            BLEEndOfScanTrigger
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-@automation.register_action(
-    "bk72xx_ble_tracker.start_scan",
-    StartScanAction,
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.use_id(BK72xxBLETracker),
-            # Optional with no default, unlike esp32_ble_tracker: omitting it
-            # keeps whatever scan_parameters.continuous configured, instead of
-            # silently forcing one-shot.
-            cv.Optional(CONF_CONTINUOUS): cv.templatable(cv.boolean),
-        }
-    ),
-    synchronous=True,
-)
-async def start_scan_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: list,
-) -> cg.MockObj:
-    var = cg.new_Pvariable(action_id, template_arg)
-    await cg.register_parented(var, config[CONF_ID])
-    if (continuous := config.get(CONF_CONTINUOUS)) is not None:
-        template_ = await cg.templatable(continuous, args, cg.bool_)
-        cg.add(var.set_continuous(template_))
-    return var
-
-
-@automation.register_action(
-    "bk72xx_ble_tracker.stop_scan",
-    StopScanAction,
-    automation.maybe_simple_id(
-        cv.Schema(
-            {
-                cv.GenerateID(): cv.use_id(BK72xxBLETracker),
-            }
-        )
-    ),
-    synchronous=True,
-)
-async def stop_scan_action_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: list,
-) -> cg.MockObj:
-    var = cg.new_Pvariable(action_id, template_arg)
-    await cg.register_parented(var, config[CONF_ID])
-    return var
-
-
-async def to_code(config: ConfigType) -> None:
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    parent = await cg.get_variable(config[CONF_BK72XX_BLE_ID])
-    cg.add(var.set_parent(parent))
-    # The tracker registers itself as a controller scan listener in setup();
-    # request the codegen-sized StaticVector slot for it.
-    bk72xx_ble.request_scan_listener_slot()
-
-    # Get notified when an OTA update starts, to pause scanning (esp32_ble_tracker parity)
-    ota.request_ota_state_listeners()
-
-    scan = config[CONF_SCAN_PARAMETERS]
-    cg.add(var.set_scan_interval(ble_device_base.to_ble_units(scan[CONF_INTERVAL])))
-    cg.add(var.set_scan_window(ble_device_base.to_ble_units(scan[CONF_WINDOW])))
-    cg.add(var.set_scan_duration(scan[CONF_DURATION].total_milliseconds))
-    cg.add(var.set_configured_continuous(scan[CONF_CONTINUOUS]))
-
-    for conf in config.get(CONF_ON_BLE_ADVERTISE, []):
-        await ble_automation.advertise_trigger_to_code(conf, var)
-
-    for trigger_key, uuid_key, setter_prefix in (
-        (CONF_ON_BLE_SERVICE_DATA_ADVERTISE, CONF_SERVICE_UUID, "set_service_uuid"),
-        (
-            CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE,
-            CONF_MANUFACTURER_ID,
-            "set_manufacturer_uuid",
-        ),
-    ):
-        for conf in config.get(trigger_key, []):
-            await ble_automation.uuid_trigger_to_code(
-                conf, var, uuid_key, setter_prefix
-            )
-
-    for conf in config.get(CONF_ON_SCAN_END, []):
-        await ble_automation.scan_end_trigger_to_code(conf, var)

esphome/components/bk72xx_ble_tracker/automation.h

@@ -1,48 +0,0 @@
-// Automation triggers and actions for bk72xx_ble_tracker: triggers are the
-// neutral ble_device_base classes; only the scan-control actions are
-// platform-specific.
-
-#pragma once
-
-#ifdef USE_LIBRETINY
-
-#include "bk72xx_ble_tracker.h"
-
-#include "esphome/core/automation.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome::bk72xx_ble_tracker {
-
-template<typename... Ts> class StartScanAction final : public Action<Ts...>, public Parented<BK72xxBLETracker> {
- public:
-  TEMPLATABLE_VALUE(bool, continuous)
-  void play(const Ts &...x) override {
-    // With continuous: set, the action wins. Without it, the configured value
-    // is used - stop_scan() clears the runtime flag permanently, so a bare
-    // stop_scan/start_scan pair would otherwise never resume continuous mode.
-    const bool want =
-        this->continuous_.has_value() ? this->continuous_.value(x...) : this->parent_->configured_continuous();
-    if (this->parent_->scan_running()) {
-      // Same mode on a running scan is a no-op (esp32 parity): re-anchoring
-      // the duration window here would let a repeated action keep a one-shot
-      // scan alive forever. A real mode switch re-anchors so a change to
-      // one-shot runs a full duration from now.
-      if (want != this->parent_->scan_continuous()) {
-        this->parent_->set_scan_continuous(want);
-        this->parent_->restart_scan_duration();
-      }
-      return;
-    }
-    this->parent_->set_scan_continuous(want);
-    this->parent_->start_scan();
-  }
-};
-
-template<typename... Ts> class StopScanAction final : public Action<Ts...>, public Parented<BK72xxBLETracker> {
- public:
-  void play(const Ts &...x) override { this->parent_->stop_scan(); }
-};
-
-}  // namespace esphome::bk72xx_ble_tracker
-
-#endif  // USE_LIBRETINY

esphome/components/bk72xx_ble_tracker/bk72xx_ble_tracker.cpp

@@ -1,277 +0,0 @@
-// bk72xx_ble_tracker.cpp
-//
-// BLE scan policy for the BK72xx BLE-5.x chips: parameters, duration/period
-// timers and the rate-limited start retry. All controller access (stack
-// bring-up, scan primitives, the BLE-task → main-task report queue) goes
-// through the bk72xx_ble component — no SDK calls and no cross-task state here.
-
-#ifdef USE_LIBRETINY
-
-#include "bk72xx_ble_tracker.h"
-
-#include <algorithm>
-#include <cinttypes>
-
-#include "esphome/core/hal.h"
-#include "esphome/core/log.h"
-
-namespace esphome::bk72xx_ble_tracker {
-
-static const char *const TAG = "bk72xx_ble_tracker";
-
-// Minimum interval between scan (re)start attempts, so a failing controller start
-// cannot be retried every main-loop iteration (single-core CPU starvation). The
-// interval doubles with consecutive failed starts (1 s up to 64 s) so a controller
-// that never comes up — the controller logs each failure at ERROR — settles into a
-// slow, quiet poll instead of an error line every second for the rest of uptime;
-// a single WARN is emitted when the retry interval first saturates.
-static constexpr uint32_t SCAN_START_RETRY_MS = 1000;
-static constexpr uint8_t SCAN_START_RETRY_MAX_DOUBLINGS = 6;  // 1 s << 6 = 64 s
-
-// ---------------------------------------------------------------------------
-// Component lifecycle
-// ---------------------------------------------------------------------------
-
-void BK72xxBLETracker::setup() {
-  // Receive the controller's scan reports; the controller queues them from the
-  // BLE task and delivers here on the main task.
-  this->parent_->register_scan_listener(this);
-#ifdef USE_OTA_STATE_LISTENER
-  // Pause scanning while an OTA update is in flight — on the single-core BK72xx the
-  // BLE scan competes with the OTA flash writes. Mirrors esp32_ble_tracker.
-  ota::get_global_ota_callback()->add_global_state_listener(this);
-#endif
-}
-
-#ifdef USE_OTA_STATE_LISTENER
-void BK72xxBLETracker::on_ota_global_state(ota::OTAState state, float progress, uint8_t error,
-                                           ota::OTAComponent *comp) {
-  if (state == ota::OTA_STARTED) {
-    this->scan_continuous_before_ota_ = this->scan_continuous_;
-    this->scan_requested_before_ota_ = this->scan_requested_;
-    this->stop_scan();
-  } else if (state == ota::OTA_ERROR || state == ota::OTA_ABORT) {
-    // On success the device reboots, so restore only on a failed/aborted update;
-    // loop() restarts the scan on its next iteration (continuous idle branch).
-    if (this->scan_continuous_before_ota_) {
-      this->scan_continuous_before_ota_ = false;
-      this->scan_continuous_ = true;
-    }
-    // A one-shot request that was still pending (latched, retrying) when the
-    // OTA paused scanning is re-latched, not dropped — loop() resumes the retry.
-    if (this->scan_requested_before_ota_) {
-      this->scan_requested_before_ota_ = false;
-      this->scan_requested_ = true;
-    }
-  }
-}
-#endif  // USE_OTA_STATE_LISTENER
-
-void BK72xxBLETracker::loop() {
-  const uint32_t now = millis();
-  if (this->scan_continuous_) {
-    if (!this->scan_running_) {
-      // A start that succeeded re-anchored the period timer from a later millis(),
-      // so the stale `now` below would underflow the comparison and fire
-      // on_scan_end() for a scan that just began. Resume next iteration.
-      if (this->try_start_with_backoff_(now))
-        return;
-    }
-    // Period timer: fire on_scan_end() once per scan_duration_ window, mirroring
-    // esp32_ble_tracker::cleanup_scan_state_(). Gated on scan_started_once_ so a scan
-    // that never came up (start kept failing) does not fire spurious on_scan_end events.
-    if (this->scan_started_once_ && now - this->scan_period_start_ >= this->scan_duration_) {
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-      for (auto *listener : this->listeners_)
-        listener->on_scan_end();
-      this->discovered_log_.clear();  // reset per-scan "Found device" dedup (esp32_ble_tracker parity)
-#endif
-      this->scan_period_start_ = now;
-    }
-    return;
-  }
-
-  // Non-continuous mode: run for scan_duration_ ms, then stop and fire on_scan_end.
-  // Restart is driven externally (e.g. api: on_client_connected:).
-  //
-  // A requested start that failed (same controller failures the continuous branch
-  // absorbs) is retried with the same backoff — otherwise a failed one-shot start
-  // would be silent: the scan never runs, stop_scan_() is never reached and
-  // on_scan_end() never fires, leaving period-keyed consumers waiting forever.
-  if (this->scan_requested_ && !this->scan_running_) {
-    // Same stale-`now` hazard as the continuous branch: start_scan_() stamps
-    // scan_start_time_ from a later millis(), so the duration check below would
-    // underflow and stop the scan in the iteration that started it.
-    if (this->try_start_with_backoff_(now))
-      return;
-  }
-  if (this->scan_running_ && now - this->scan_start_time_ >= this->scan_duration_) {
-    this->stop_scan_();
-  }
-}
-
-bool BK72xxBLETracker::try_start_with_backoff_(uint32_t now, bool force) {
-  // Rate-limit (re)start attempts. The controller start can fail (no idle activity
-  // handle, WiFi/BLE coexistence) and leave scan_running_ false; retrying every
-  // main-loop iteration would spin the single-core CPU and starve WiFi (device
-  // becomes unresponsive). The interval backs off with consecutive failures so a
-  // controller that never comes up polls slowly and quietly.
-  //
-  // force bypasses the gate for an explicit user start (start_scan()) — but
-  // only while the failure streak is clean. Once the controller is failing,
-  // even user-initiated attempts respect the backoff, so a start_scan() action
-  // on a short cadence cannot hammer a failing controller; the attempt stays
-  // inside the failure accounting below either way.
-  const uint8_t doublings = std::min<uint8_t>(this->failed_start_count_, SCAN_START_RETRY_MAX_DOUBLINGS);
-  if ((!force || this->failed_start_count_ != 0) &&
-      now - this->last_scan_start_attempt_ < (SCAN_START_RETRY_MS << doublings))
-    return false;
-  this->last_scan_start_attempt_ = now;
-  this->start_scan_();
-  if (!this->scan_running_ && this->failed_start_count_ < SCAN_START_RETRY_MAX_DOUBLINGS) {
-    ++this->failed_start_count_;
-    if (this->failed_start_count_ == SCAN_START_RETRY_MAX_DOUBLINGS) {
-      ESP_LOGW(TAG, "Scan start keeps failing; retrying every %" PRIu32 " s",
-               (SCAN_START_RETRY_MS << SCAN_START_RETRY_MAX_DOUBLINGS) / 1000);
-    }
-  }
-  return this->scan_running_;
-}
-
-void BK72xxBLETracker::dump_config() {
-  ESP_LOGCONFIG(TAG,
-                "BK72xx BLE Tracker:\n"
-                "  Scan Duration: %" PRIu32 " s\n"
-                "  Scan Interval: %.0f ms (%" PRIu32 " BLE units)\n"
-                "  Scan Window: %.0f ms (%" PRIu32 " BLE units)\n"
-                "  Scan Type: PASSIVE\n"
-                "  Continuous Scanning: %s",
-                this->scan_duration_ / 1000, this->scan_interval_ * 0.625f, this->scan_interval_,
-                this->scan_window_ * 0.625f, this->scan_window_, YESNO(this->scan_continuous_));
-}
-
-// ---------------------------------------------------------------------------
-// Scan report — delivered by the controller's loop() on the ESPHome main task
-// (the controller queues reports from the BLE task), so publish_state() and
-// listener dispatch run in main-loop context with no cross-task handling here.
-// ---------------------------------------------------------------------------
-
-void BK72xxBLETracker::on_scan_report(const bk72xx_ble::BLEScanReport &report) {
-  // Raw callback (the raw-advertisement path).
-  if (this->raw_advertisement_callback_.is_set()) {
-    const ble_device_base::RawAdvertisement adv{.mac = report.mac,
-                                                .data = report.data,
-                                                .data_len = report.data_len,
-                                                .rssi = report.rssi,
-                                                .addr_type = report.addr_type};
-    this->raw_advertisement_callback_.invoke(adv);
-  }
-
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  ble_device_base::ESPBTDevice device;
-  device.from_scan_result(report.mac, report.rssi, report.addr_type, report.data, report.data_len);
-  bool found = false;
-  for (auto *listener : this->listeners_) {
-    if (listener->parse_device(device)) {
-      found = true;
-    }
-  }
-  // Mirror esp32_ble_tracker: log a newly-seen device only when nothing claimed
-  // it and the scan is one-shot (continuous scans would spam).
-  if (!found && !this->scan_continuous_)
-    this->discovered_log_.log_device(TAG, device);
-#endif  // ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-}
-
-// ---------------------------------------------------------------------------
-// Public scan control
-// ---------------------------------------------------------------------------
-
-void BK72xxBLETracker::start_scan() {
-  // Mirrors esp32_ble_tracker::start_scan(): caller sets scan_continuous_ via
-  // set_scan_continuous() first, then calls start_scan() to begin scanning.
-  //
-  // Nothing to do while a scan is already running: latching here would leave
-  // scan_requested_ set after that scan ends and silently restart a one-shot
-  // scan nobody asked for.
-  if (this->scan_running_)
-    return;
-
-  // The request is latched: if this immediate attempt fails (controller busy,
-  // WiFi/BLE coexistence), loop() keeps retrying it with backoff even in
-  // non-continuous mode, so a one-shot start cannot fail silently.
-  //
-  // Routed through the backoff helper (forced: the user asked for an immediate
-  // attempt) so a failure here still counts toward the backoff escalation and
-  // its WARN. The force bypass only applies while the failure streak is clean —
-  // against a failing controller, repeated start_scan() calls are rate-limited
-  // like any other attempt.
-  this->scan_requested_ = true;
-  this->try_start_with_backoff_(millis(), /* force= */ true);
-}
-
-void BK72xxBLETracker::restart_scan_duration() {
-  if (!this->scan_running_)
-    return;
-  // Re-anchor only the one-shot duration clock. scan_period_start_ (the
-  // continuous-mode on_scan_end period) is deliberately left alone: a
-  // start_scan action fired more often than scan_duration_ would otherwise
-  // suppress on_scan_end indefinitely — and absence detection (ble_rssi's NAN
-  // publish) rides on that period.
-  this->scan_start_time_ = millis();
-}
-
-void BK72xxBLETracker::stop_scan() {
-  this->scan_continuous_ = false;
-  this->scan_requested_ = false;  // also cancels a pending (not yet successful) start
-  this->stop_scan_();
-}
-
-// ---------------------------------------------------------------------------
-// Internal scan start / stop
-// ---------------------------------------------------------------------------
-
-void BK72xxBLETracker::start_scan_() {
-  if (this->scan_running_)
-    return;
-
-  if (!this->parent_->scan_start(static_cast<uint16_t>(this->scan_interval_),
-                                 static_cast<uint16_t>(this->scan_window_)))
-    return;
-
-  const uint32_t now = millis();
-  this->scan_running_ = true;
-  this->scan_requested_ = false;  // the latched one-shot request is satisfied
-  this->failed_start_count_ = 0;  // reset here so direct starts clear the backoff too
-  this->scan_start_time_ = now;
-  // Log every explicit start at DEBUG — stop_scan_() logs every stop at DEBUG, and
-  // in non-continuous mode each period is an explicit start, so asymmetric logging
-  // would read as the scanner failing to come back up.
-  ESP_LOGD(TAG, "Scan started (passive, window=%.0fms, interval=%.0fms)", this->scan_window_ * 0.625f,
-           this->scan_interval_ * 0.625f);
-  // Re-anchor the on_scan_end period to every successful start — first start (so the
-  // period counts from the scan, not from boot) and every restart after a stop (so
-  // resuming after longer than scan_duration, e.g. a failed OTA restoring continuous
-  // mode 10 minutes later, does not fire on_scan_end before an advertisement can
-  // arrive). scan_started_once_ purely gates the period timer.
-  this->scan_period_start_ = now;
-  this->scan_started_once_ = true;
-}
-
-void BK72xxBLETracker::stop_scan_() {
-  if (!this->scan_running_)
-    return;
-  this->parent_->scan_stop();
-  this->scan_running_ = false;
-  ESP_LOGD(TAG, "Scan stopped");
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  for (auto *listener : this->listeners_)
-    listener->on_scan_end();
-  this->discovered_log_.clear();  // reset per-scan "Found device" dedup (esp32_ble_tracker parity)
-#endif
-  this->scan_period_start_ = millis();  // reset period clock so on_scan_end does not double-fire
-}
-
-}  // namespace esphome::bk72xx_ble_tracker
-
-#endif  // USE_LIBRETINY

esphome/components/bk72xx_ble_tracker/bk72xx_ble_tracker.h

@@ -1,181 +0,0 @@
-// bk72xx_ble_tracker.h
-//
-// ESPHome BLE scanner for the BK72xx BLE-5.x chips (LibreTiny beken-72xx family).
-// Implements the platform-neutral ble_device_base::BLEHub contract on top of the
-// bk72xx_ble controller component: parsed ESPBTDevice objects go to registered
-// listeners (bthome_mithermometer, ble_presence, …) and every raw frame to the
-// hub's raw-advertisement callback.
-//
-// This component contains no Beken SDK calls and no cross-task state: the
-// controller (stack bring-up, BLE address, scan primitives, and the BLE-task →
-// main-task report queue) is owned by bk72xx_ble, which delivers every scan
-// report on the ESPHome main task. The tracker owns scan policy — parameters,
-// duration/period timers and the rate-limited start retry.
-//
-// YAML config (values shown are the defaults; interval/window are a 30 % duty
-// cycle, the BK reference scan rate):
-//
-//   bk72xx_ble_tracker:
-//     scan_parameters:
-//       interval:   100ms
-//       window:      30ms
-//       duration:    5min
-//       continuous:  true
-
-#pragma once
-
-#ifdef USE_LIBRETINY
-
-#include "esphome/components/bk72xx_ble/bk72xx_ble.h"
-#include "esphome/components/ble_device_base/ble_device.h"
-#include "esphome/components/ble_device_base/ble_hub.h"
-#include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
-
-#include <cstdint>
-
-#ifdef USE_OTA_STATE_LISTENER
-#include "esphome/components/ota/ota_backend.h"
-#endif
-
-namespace esphome::bk72xx_ble_tracker {
-
-// ---------------------------------------------------------------------------
-// BK72xxBLETracker
-// ---------------------------------------------------------------------------
-
-class BK72xxBLETracker : public Component,
-                         public ble_device_base::BLEHub,
-                         public bk72xx_ble::BLEScanListener,
-                         public Parented<bk72xx_ble::BK72xxBLE>
-#ifdef USE_OTA_STATE_LISTENER
-    ,
-                         public ota::OTAGlobalStateListener
-#endif
-{
- public:
-  // ---- ESPHome Component ----
-  void setup() override;
-  void loop() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
-
-#ifdef USE_OTA_STATE_LISTENER
-  // Pause scanning while an OTA update runs (single-core WiFi/BLE/flash contention);
-  // mirrors esp32_ble_tracker.
-  void on_ota_global_state(ota::OTAState state, float progress, uint8_t error, ota::OTAComponent *comp) override;
-#endif
-
-  // ---- YAML configuration setters ----
-  void set_scan_interval(uint32_t scan_interval) { this->scan_interval_ = scan_interval; }
-  void set_scan_window(uint32_t scan_window) { this->scan_window_ = scan_window; }
-  void set_scan_duration(uint32_t scan_duration) { this->scan_duration_ = scan_duration; }
-  /// Set from YAML (scan_parameters.continuous); also the value
-  /// configured_continuous() reports and a bare start_scan action restores.
-  void set_configured_continuous(bool scan_continuous) {
-    this->scan_continuous_ = scan_continuous;
-    this->scan_continuous_configured_ = scan_continuous;
-  }
-  /// Runtime control (esp32_ble_tracker lambda parity): does not change the
-  /// configured value, so configured_continuous() still reports what YAML
-  /// asked for.
-  void set_scan_continuous(bool scan_continuous) { this->scan_continuous_ = scan_continuous; }
-  bool scan_continuous() const { return this->scan_continuous_; }
-  bool configured_continuous() const { return this->scan_continuous_configured_; }
-  /// Re-anchor the one-shot duration clock of a running scan to now — used
-  /// when an action changes the scan mode without stopping the radio. The
-  /// continuous-mode on_scan_end period is deliberately not touched.
-  void restart_scan_duration();
-
-  // ---- Public scan control ----
-  // Mirrors esp32_ble_tracker: set_scan_continuous() + start_scan() / stop_scan().
-  void start_scan();
-  void stop_scan();
-
-  // ---- ble_device_base::BLEHub contract ----
-  void register_listener(ble_device_base::ESPBTDeviceListener *listener) override {
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-    this->listeners_.push_back(listener);
-#endif
-  }
-  void set_raw_advertisement_callback(ble_device_base::RawAdvertisementCallback callback) override {
-    this->raw_advertisement_callback_ = callback;
-  }
-  ble_device_base::HubCapabilities get_capabilities() const override {
-    // The Beken BDK exposes no active-scan path (passive scanning only), so the
-    // controller never solicits scan responses and never merges them; consumers
-    // relying on scan-response fields (device names) get them only where the
-    // receiver merges per address (Home Assistant does). No GATT client either.
-    // scan_mode_switch stays false for the same reason: with no active-scan
-    // path there is no mode to switch to.
-    return {.active_scan = false, .merges_scan_response = false, .gatt = false, .scan_mode_switch = false};
-  }
-  bool request_scan_mode(bool active) override {
-    // Passive-only controller: a passive request is already honored, an active
-    // one cannot be.
-    return !active;
-  }
-  // The controller stores the address LSB-first (BLE convention); the contract
-  // wants printable (MSB-first) order.
-  void get_adapter_mac(uint8_t out[6]) override {
-    uint8_t mac[6];
-    this->parent_->get_mac_lsb_first(mac);
-    for (int i = 0; i < 6; i++)
-      out[i] = mac[5 - i];
-  }
-  bool scan_running() override { return this->scan_running_; }
-  bool scan_active() override { return false; }  // BK72xx scan is passive-only
-
-  // ---- bk72xx_ble::BLEScanListener ----
-  // Delivered by the controller's loop() on the ESPHome main task — the
-  // BLE-task → main-task handoff already happened in the controller's queue.
-  void on_scan_report(const bk72xx_ble::BLEScanReport &report) override;
-
- protected:
-  void start_scan_();
-  void stop_scan_();
-  /// Attempt a rate-limited (re)start; returns true when the scan is running,
-  /// which means the caller must not compare its cached millis() against the
-  /// timestamps start_scan_() just refreshed. force bypasses the rate gate for
-  /// an explicit user start only while the failure streak is clean; a failing
-  /// controller rate-limits forced attempts too. Failure accounting always runs.
-  bool try_start_with_backoff_(uint32_t now, bool force = false);
-
-  bool scan_running_{false};
-  bool scan_requested_{false};  // latched start_scan() request not yet running; loop() retries with backoff
-  // Defaults: the BK reference — 30 % duty cycle
-  // (interval 100 ms / window 30 ms), in 0.625 ms BLE units.
-  uint32_t scan_interval_{160};  // 160 × 0.625 ms = 100 ms
-  uint32_t scan_window_{48};     // 48 × 0.625 ms = 30 ms (30/100 = 30 %)
-  uint32_t scan_duration_{300000};
-  bool scan_continuous_{true};
-  bool scan_continuous_configured_{true};  // YAML value; stop_scan() must not lose it
-#ifdef USE_OTA_STATE_LISTENER
-  bool scan_continuous_before_ota_{false};  // continuous mode saved at OTA start, restored on OTA failure
-  bool scan_requested_before_ota_{false};   // pending one-shot latch saved at OTA start, re-latched on OTA failure
-#endif
-  uint32_t scan_start_time_{0};
-
-  uint32_t last_scan_start_attempt_{0};  // millis() of last start_scan_() attempt; rate-limits retries
-  uint8_t failed_start_count_{0};        // consecutive failed starts; drives the retry backoff (reset on success)
-  uint32_t scan_period_start_{0};        // millis() at start of current scan period; used to rate-limit on_scan_end()
-  bool scan_started_once_{false};        // true after first successful scan start; gates the period timer
-
-  ble_device_base::RawAdvertisementCallback raw_advertisement_callback_{};
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  // Parsed-advertisement consumers registered through ble_device_base.
-  // Codegen-sized: no heap allocation, no std::vector template instantiations.
-  StaticVector<ble_device_base::ESPBTDeviceListener *, ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT> listeners_;
-#endif
-
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  // Per-period "Found device" DEBUG log with MAC dedup — shared implementation
-  // in ble_device_base, identical output on every tracker backend. Guarded like
-  // its only writer so a no-listener build does not carry an unused vector.
-  ble_device_base::DiscoveredDeviceLog discovered_log_{};
-#endif
-};
-
-}  // namespace esphome::bk72xx_ble_tracker
-
-#endif  // USE_LIBRETINY

esphome/components/ble_client/__init__.py

@@ -9,7 +9,6 @@ from esphome.const import (
     CONF_ID,
     CONF_MAC_ADDRESS,
     CONF_NAME,
-    CONF_NOTIFY,
     CONF_ON_CONNECT,
     CONF_ON_DISCONNECT,
     CONF_SERVICE_UUID,
@@ -17,46 +16,11 @@ from esphome.const import (
     CONF_VALUE,
 )
 from esphome.core import ID
-from esphome.types import ConfigType
 
 AUTO_LOAD = ["esp32_ble_client"]
 CODEOWNERS = ["@buxtronix", "@clydebarrow"]
 DEPENDENCIES = ["esp32_ble_tracker"]
 
-CONF_DESCRIPTOR_UUID = "descriptor_uuid"
-CONF_ON_NOTIFY = "on_notify"
-
-
-def validate_descriptor_not_notify(config: ConfigType) -> ConfigType:
-    """Reject descriptor_uuid combined with notify or on_notify.
-
-    BLE descriptors cannot send notifications; only characteristics can, and
-    ESP-IDF has no descriptor variant of esp_ble_gattc_register_for_notify.
-    """
-    if CONF_DESCRIPTOR_UUID in config and (
-        config.get(CONF_NOTIFY) or CONF_ON_NOTIFY in config
-    ):
-        raise cv.Invalid(
-            f"'{CONF_DESCRIPTOR_UUID}' cannot be used with '{CONF_NOTIFY}' or "
-            f"'{CONF_ON_NOTIFY}': BLE descriptors cannot send notifications; remove "
-            f"'{CONF_DESCRIPTOR_UUID}' to receive characteristic notifications, or "
-            f"remove '{CONF_NOTIFY}' and '{CONF_ON_NOTIFY}' to poll the descriptor"
-        )
-    return config
-
-
-def notify_from_on_notify(config: ConfigType) -> ConfigType:
-    """Enable notifications when an on_notify automation is configured.
-
-    The triggers have no registration path of their own; without notify the
-    automation would validate but never fire.
-    """
-    if CONF_ON_NOTIFY in config and not config[CONF_NOTIFY]:
-        config = config.copy()
-        config[CONF_NOTIFY] = True
-    return config
-
-
 ble_client_ns = cg.esphome_ns.namespace("ble_client")
 BLEClient = ble_client_ns.class_("BLEClient", esp32_ble_client.BLEClientBase)
 BLEClientNode = ble_client_ns.class_("BLEClientNode")

esphome/components/ble_client/ble_client.cpp

@@ -51,9 +51,7 @@ bool BLEClient::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t es
   for (auto *node : this->nodes_)
     node->gattc_event_handler(event, esp_gattc_if, param);
 
-  // The release frees the GATT cache that BLEClientBase's CCCD lookup still needs.
-  // The last REG_FOR_NOTIFY event clears the counter before node dispatch, so the release still runs here.
-  if (!this->services_.empty() && !this->notify_registration_pending() && this->all_nodes_established_()) {
+  if (!this->services_.empty() && this->all_nodes_established_()) {
     this->release_services();
     ESP_LOGD(TAG, "All clients established, services released");
   }

esphome/components/ble_client/ble_client.h

@@ -34,11 +34,6 @@ class BLEClientNode {
   // This should be transitioned to Established once the node no longer needs
   // the services/descriptors/characteristics of the parent client. This will
   // allow some memory to be freed.
-  // The parent frees the peer's GATT cache once every node reports Established.
-  // Never report Established while an operation that reads that cache is outstanding.
-  // - esp_ble_gattc_register_for_notify() completes asynchronously.
-  // - Register from ESP_GATTC_SEARCH_CMPL_EVT, then set this from ESP_GATTC_REG_FOR_NOTIFY_EVT.
-  // - BLEClientBase::register_for_notify() holds the release until the registration completes.
   espbt::ClientState node_state;
 
   BLEClient *parent() { return this->parent_; }

esphome/components/ble_client/sensor/__init__.py

@@ -14,16 +14,13 @@ from esphome.const import (
     UNIT_DECIBEL_MILLIWATT,
 )
 
-from .. import (
-    CONF_DESCRIPTOR_UUID,
-    CONF_ON_NOTIFY,
-    ble_client_ns,
-    notify_from_on_notify,
-    validate_descriptor_not_notify,
-)
+from .. import ble_client_ns
 
 DEPENDENCIES = ["ble_client"]
 
+CONF_DESCRIPTOR_UUID = "descriptor_uuid"
+
+CONF_ON_NOTIFY = "on_notify"
 TYPE_CHARACTERISTIC = "characteristic"
 TYPE_RSSI = "rssi"
 
@@ -88,8 +85,6 @@ CONFIG_SCHEMA = cv.All(
         },
         lower=True,
     ),
-    validate_descriptor_not_notify,
-    notify_from_on_notify,
 )
 
 

esphome/components/ble_client/sensor/ble_sensor.cpp

@@ -61,7 +61,7 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
         break;
       }
       this->handle = chr->handle;
-      if (this->descr_uuid_.is_set()) {
+      if (this->descr_uuid_.get_uuid().len > 0) {
         auto *descr = chr->get_descriptor(this->descr_uuid_);
         if (descr == nullptr) {
           this->status_set_warning();
@@ -77,7 +77,8 @@ void BLESensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t ga
         this->handle = descr->handle;
       }
       if (this->notify_) {
-        auto status = this->parent()->register_for_notify(chr->handle);
+        auto status = esp_ble_gattc_register_for_notify(this->parent()->get_gattc_if(),
+                                                        this->parent()->get_remote_bda(), chr->handle);
         if (status) {
           ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
         }

esphome/components/ble_client/text_sensor/__init__.py

@@ -9,16 +9,13 @@ from esphome.const import (
     CONF_TRIGGER_ID,
 )
 
-from .. import (
-    CONF_DESCRIPTOR_UUID,
-    CONF_ON_NOTIFY,
-    ble_client_ns,
-    notify_from_on_notify,
-    validate_descriptor_not_notify,
-)
+from .. import ble_client_ns
 
 DEPENDENCIES = ["ble_client"]
 
+CONF_DESCRIPTOR_UUID = "descriptor_uuid"
+
+CONF_ON_NOTIFY = "on_notify"
 
 adv_data_t = cg.std_vector.template(cg.uint8)
 adv_data_t_const_ref = adv_data_t.operator("ref").operator("const")
@@ -51,9 +48,7 @@ CONFIG_SCHEMA = cv.All(
         }
     )
     .extend(cv.polling_component_schema("60s"))
-    .extend(ble_client.BLE_CLIENT_SCHEMA),
-    validate_descriptor_not_notify,
-    notify_from_on_notify,
+    .extend(ble_client.BLE_CLIENT_SCHEMA)
 )
 
 

esphome/components/ble_client/text_sensor/ble_text_sensor.cpp

@@ -61,7 +61,7 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         break;
       }
       this->handle = chr->handle;
-      if (this->descr_uuid_.is_set()) {
+      if (this->descr_uuid_.get_uuid().len > 0) {
         auto *descr = chr->get_descriptor(this->descr_uuid_);
         if (descr == nullptr) {
           this->status_set_warning();
@@ -77,7 +77,8 @@ void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
         this->handle = descr->handle;
       }
       if (this->notify_) {
-        auto status = this->parent()->register_for_notify(chr->handle);
+        auto status = esp_ble_gattc_register_for_notify(this->parent()->get_gattc_if(),
+                                                        this->parent()->get_remote_bda(), chr->handle);
         if (status) {
           ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
         }

esphome/components/ble_device_base/__init__.py

@@ -1,219 +0,0 @@
-"""
-ble_device_base — the platform-neutral BLE layer.
-
-Owns the shared advertisement types (ESPBTUUID / ESPBTDevice / ServiceData /
-ESPBLEiBeacon / ESPBTDeviceListener, in ble_device.h) and the tracker contract
-(BLEHub, in ble_hub.h) on every platform.
-
-BLE consumers (sensor components, bluetooth_proxy) bind to whichever tracker the
-configuration declares via `cv.use_id(BLEHub)` — ESPHome resolves any declared
-subclass, so there is no platform table here and no dependency in either
-direction. A sensor appends inject_ble_hub to its CONFIG_SCHEMA (via cv.All) and
-calls register_ble_device() in to_code; a tracker component subclasses BLEHub
-(C++ and codegen class). Adding a new BLE chip requires only a new tracker
-component.
-
-AES-CCM decryption for encrypted advertisements is provided portably in
-ble_aes_ccm.h.
-"""
-
-import re
-
-import esphome.codegen as cg
-from esphome.components.const import CONF_WINDOW
-import esphome.config_validation as cv
-from esphome.const import CONF_ACTIVE, CONF_CONTINUOUS, CONF_DURATION, CONF_INTERVAL
-from esphome.types import ConfigType
-
-CODEOWNERS = ["@Bl00d-B0b"]
-
-CONF_BLE_HUB_ID = "ble_hub_id"
-
-# Number of parsed-advertisement listeners registered in this build; read via
-# cg.get_slot_count() by esp32_ble_tracker's feature coupling.
-LISTENER_COUNT_DEFINE = "ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT"
-
-
-ble_device_base_ns = cg.esphome_ns.namespace("ble_device_base")
-
-# The neutral tracker contract. Every tracker's codegen class declares this as a
-# parent, which is what lets cv.use_id(BLEHub) resolve any of them.
-BLEHub = ble_device_base_ns.class_("BLEHub")
-
-# The neutral listener base (C++: ble_device_base::ESPBTDeviceListener).
-ESPBTDeviceListener = ble_device_base_ns.class_("ESPBTDeviceListener")
-
-
-def inject_ble_hub(config: ConfigType) -> ConfigType:
-    """Validator: auto-resolve the configured BLE tracker into the config.
-
-    Append via cv.All to a BLE consumer's CONFIG_SCHEMA. Uses cv.GenerateID +
-    cv.use_id(BLEHub): an omitted id resolves to the single declared tracker on
-    any platform; multiple trackers can be disambiguated with an explicit
-    ble_hub_id.
-    """
-    return cv.Schema(
-        {cv.GenerateID(CONF_BLE_HUB_ID): cv.use_id(BLEHub)}, extra=cv.ALLOW_EXTRA
-    )(config)
-
-
-def request_irk_support() -> None:
-    """Compile in resolve_irk()'s software-AES path. Called by sensors with an
-    irk: option so builds without IRK do not carry the resolution code."""
-    cg.add_define("USE_BLE_DEVICE_IRK")
-
-
-_request_listener_slot = cg.slot_counter(LISTENER_COUNT_DEFINE)
-
-
-async def register_ble_device(var: cg.MockObj, config: ConfigType) -> cg.MockObj:
-    """Register `var` as a parsed-advertisement listener on the configured hub."""
-    hub = await cg.get_variable(config[CONF_BLE_HUB_ID])
-    cg.add(hub.register_listener(var))
-    _request_listener_slot()
-    return var
-
-
-# ---- shared validation / codegen helpers (platform-neutral) ----
-
-
-def to_ble_units(value: cv.TimePeriod) -> int:
-    """Convert a scan time to the controller's 0.625 ms units.
-
-    Used by both validation and codegen so what is validated is exactly what is
-    programmed — the truncation here is what makes the duty-cycle check below
-    meaningful.
-    """
-    return value.total_microseconds // 625
-
-
-def validate_scan_parameters(config: ConfigType) -> ConfigType:
-    """Reject impossible window/interval/duration combinations at config time.
-
-    The controller cannot scan for longer than the interval, and a too-short
-    duration would end the scan period almost immediately. Catching it here
-    gives a clear error instead of a runtime controller failure and a retry
-    loop.
-    """
-    duration = config[CONF_DURATION]
-    interval = config[CONF_INTERVAL]
-    window = config[CONF_WINDOW]
-
-    if window > interval:
-        raise cv.Invalid(
-            f"Scan window ({window}) needs to be smaller than scan interval ({interval})"
-        )
-
-    # BLE scan interval/window are programmed in 0.625 ms units as a 16-bit value; the
-    # controller only accepts 2.5 ms .. 10240 ms (0x0004 .. 0x4000). Reject out-of-range
-    # values here instead of letting the unit conversion silently overflow.
-    for name, value in (("interval", interval), ("window", window)):
-        if value.total_microseconds < 2500 or value.total_microseconds > 10_240_000:
-            raise cv.Invalid(
-                f"Scan {name} ({value}) must be between 2.5 ms and 10240 ms"
-            )
-
-    # Validate what actually reaches the controller: both values are truncated to
-    # whole 0.625 ms units, so a window/interval pair that differs by less than one
-    # unit collapses to the same value — silently programming a 100 % duty cycle
-    # (radio permanently on) from a config that asked for less.
-    interval_units = to_ble_units(interval)
-    window_units = to_ble_units(window)
-    if window_units == interval_units and window < interval:
-        raise cv.Invalid(
-            f"Scan window ({window}) and interval ({interval}) both truncate to "
-            f"{interval_units} x 0.625 ms, which the controller scans at a 100 % duty "
-            f"cycle. Separate them by at least 0.625 ms."
-        )
-
-    if interval.total_microseconds * 3 > duration.total_microseconds:
-        raise cv.Invalid(
-            f"Scan duration ({duration}) must cover at least three scan intervals "
-            f"({interval}): the scanner listens on one of the three BLE advertising "
-            f"channels per interval, so a shorter duration can miss devices entirely."
-        )
-
-    return config
-
-
-def scan_parameters_schema(
-    interval_default: str,
-    *,
-    window_default: str = "30ms",
-    supports_active: bool = False,
-) -> cv.All:
-    """Build the scan_parameters value schema shared by all BLE trackers.
-
-    interval_default and window_default are per chip (e.g. esp32 320/30 ms,
-    bk72xx/rp2 100/30 ms — the reference scan rates of the respective stacks;
-    LN882H's SDK recommends 100/50 ms). Pass supports_active=True only when
-    the tracker supports active scanning; it exposes the `active` option
-    (whose own default is on, esp32_ble_tracker behavior).
-    """
-    schema = {
-        cv.Optional(CONF_DURATION, default="5min"): cv.positive_time_period_seconds,
-        cv.Optional(CONF_INTERVAL, default=interval_default): cv.positive_time_period,
-        cv.Optional(CONF_WINDOW, default=window_default): cv.positive_time_period,
-        cv.Optional(CONF_CONTINUOUS, default=True): cv.boolean,
-    }
-    if supports_active:
-        schema[cv.Optional(CONF_ACTIVE, default=True)] = cv.boolean
-    return cv.All(cv.Schema(schema), validate_scan_parameters)
-
-
-BT_UUID16_FORMAT = "XXXX"
-BT_UUID32_FORMAT = "XXXXXXXX"
-BT_UUID128_FORMAT = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
-
-_BT_UUID16_RE = re.compile("^[A-F0-9]{4,}$")
-_BT_UUID32_RE = re.compile("^[A-F0-9]{8,}$")
-_BT_UUID128_RE = re.compile(
-    "^[A-F0-9]{8,}-[A-F0-9]{4,}-[A-F0-9]{4,}-[A-F0-9]{4,}-[A-F0-9]{12,}$"
-)
-
-
-# Validator table keyed by input length: (compiled pattern, label used in errors).
-_BT_UUID_FORMATS = {
-    len(BT_UUID16_FORMAT): (_BT_UUID16_RE, "16 bit"),
-    len(BT_UUID32_FORMAT): (_BT_UUID32_RE, "32 bit"),
-    len(BT_UUID128_FORMAT): (_BT_UUID128_RE, "128"),
-}
-
-
-def bt_uuid(value: str) -> str:
-    in_value = cv.string_strict(value)
-    value = in_value.upper()
-
-    fmt = _BT_UUID_FORMATS.get(len(value))
-    if fmt is None:
-        raise cv.Invalid(
-            f"Bluetooth UUID must be in 16 bit '{BT_UUID16_FORMAT}', 32 bit '{BT_UUID32_FORMAT}', or 128 bit '{BT_UUID128_FORMAT}' format"
-        )
-    pattern, label = fmt
-    if not pattern.match(value):
-        raise cv.Invalid(
-            f"Invalid hexadecimal value for {label} UUID format: '{in_value}'"
-        )
-    return value
-
-
-def as_hex(value: str) -> cg.RawExpression:
-    return cg.RawExpression(f"0x{value}ULL")
-
-
-def _hex_array_expression(value: str, reverse: bool) -> cg.RawExpression:
-    value = value.replace("-", "")
-    cpp_array = [
-        f"0x{part}" for part in [value[i : i + 2] for i in range(0, len(value), 2)]
-    ]
-    if reverse:
-        cpp_array.reverse()
-    return cg.RawExpression(f"(uint8_t*)(const uint8_t[16]){{{','.join(cpp_array)}}}")
-
-
-def as_hex_array(value: str) -> cg.RawExpression:
-    return _hex_array_expression(value, reverse=False)
-
-
-def as_reversed_hex_array(value: str) -> cg.RawExpression:
-    return _hex_array_expression(value, reverse=True)

esphome/components/ble_device_base/automation.h

@@ -1,117 +0,0 @@
-// Platform-neutral BLE advertisement triggers: ESPBTDeviceListener subclasses
-// registered on a BLEHub, exposed by each tracker under its own automation
-// names. parse_device()'s return feeds the "Found device" suppression.
-
-#pragma once
-
-#include "ble_device.h"
-#include "ble_hub.h"
-
-#include "esphome/core/automation.h"
-#include "esphome/core/helpers.h"
-
-#include <algorithm>
-#include <initializer_list>
-
-namespace esphome::ble_device_base {
-
-// on_ble_advertise: fires on every BLE advertisement, optionally filtered to one or more MACs.
-class ESPBTAdvertiseTrigger final : public Trigger<const ESPBTDevice &>, public ESPBTDeviceListener {
- public:
-  explicit ESPBTAdvertiseTrigger(BLEHub *parent) { parent->register_listener(this); }
-
-  void set_addresses(std::initializer_list<uint64_t> addresses) { this->addresses_ = addresses; }
-
-  bool parse_device(const ESPBTDevice &device) override {
-    if (!this->addresses_.empty() && std::find(this->addresses_.begin(), this->addresses_.end(),
-                                               device.address_uint64()) == this->addresses_.end()) {
-      return false;
-    }
-    this->trigger(device);
-    return true;
-  }
-
- protected:
-  FixedVector<uint64_t> addresses_;
-};
-
-// on_ble_service_data_advertise: fires when an advertisement contains service
-// data for the given UUID. Optional single-MAC filter.
-class BLEServiceDataAdvertiseTrigger final : public Trigger<const adv_data_t &>, public ESPBTDeviceListener {
- public:
-  explicit BLEServiceDataAdvertiseTrigger(BLEHub *parent) { parent->register_listener(this); }
-
-  void set_service_uuid16(uint64_t uuid) { this->uuid_ = ESPBTUUID::from_uint16(static_cast<uint16_t>(uuid)); }
-  void set_service_uuid32(uint64_t uuid) { this->uuid_ = ESPBTUUID::from_uint32(static_cast<uint32_t>(uuid)); }
-  void set_service_uuid128(const uint8_t *uuid) { this->uuid_ = ESPBTUUID::from_raw(uuid); }
-
-  void set_address(uint64_t address) {
-    this->address_ = address;
-    this->has_address_ = true;
-  }
-
-  bool parse_device(const ESPBTDevice &device) override {
-    if (this->has_address_ && device.address_uint64() != this->address_) {
-      return false;
-    }
-    for (const auto &sd : device.get_service_datas()) {
-      if (sd.uuid == this->uuid_) {
-        this->trigger(sd.data);
-        return true;
-      }
-    }
-    return false;
-  }
-
- protected:
-  ESPBTUUID uuid_{};
-  uint64_t address_{0};
-  bool has_address_{false};
-};
-
-// on_ble_manufacturer_data_advertise: fires when an advertisement contains
-// manufacturer data for the given ID. Optional single-MAC filter.
-class BLEManufacturerDataAdvertiseTrigger final : public Trigger<const adv_data_t &>, public ESPBTDeviceListener {
- public:
-  explicit BLEManufacturerDataAdvertiseTrigger(BLEHub *parent) { parent->register_listener(this); }
-
-  void set_manufacturer_uuid16(uint64_t uuid) { this->uuid_ = ESPBTUUID::from_uint16(static_cast<uint16_t>(uuid)); }
-  void set_manufacturer_uuid32(uint64_t uuid) { this->uuid_ = ESPBTUUID::from_uint32(static_cast<uint32_t>(uuid)); }
-  void set_manufacturer_uuid128(const uint8_t *uuid) { this->uuid_ = ESPBTUUID::from_raw(uuid); }
-
-  void set_address(uint64_t address) {
-    this->address_ = address;
-    this->has_address_ = true;
-  }
-
-  bool parse_device(const ESPBTDevice &device) override {
-    if (this->has_address_ && device.address_uint64() != this->address_) {
-      return false;
-    }
-    for (const auto &md : device.get_manufacturer_datas()) {
-      if (md.uuid == this->uuid_) {
-        this->trigger(md.data);
-        return true;
-      }
-    }
-    return false;
-  }
-
- protected:
-  ESPBTUUID uuid_{};
-  uint64_t address_{0};
-  bool has_address_{false};
-};
-
-// on_scan_end: fires whenever a scan period ends (duration elapsed or stop
-// requested). A listener whose on_scan_end() hook fires the trigger — never
-// claims devices (parse_device always returns false).
-class BLEEndOfScanTrigger final : public Trigger<>, public ESPBTDeviceListener {
- public:
-  explicit BLEEndOfScanTrigger(BLEHub *parent) { parent->register_listener(this); }
-
-  bool parse_device(const ESPBTDevice &device) override { return false; }
-  void on_scan_end() override { this->trigger(); }
-};
-
-}  // namespace esphome::ble_device_base

esphome/components/ble_device_base/automation.py

@@ -1,128 +0,0 @@
-"""Shared codegen for the neutral BLE advertisement triggers (automation.h)."""
-
-from typing import Any
-
-from esphome import automation
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.const import CONF_MAC_ADDRESS, CONF_TRIGGER_ID
-from esphome.cpp_generator import MockObjClass
-from esphome.types import ConfigType
-
-from . import (
-    BT_UUID16_FORMAT,
-    BT_UUID32_FORMAT,
-    BT_UUID128_FORMAT,
-    LISTENER_COUNT_DEFINE,
-    as_hex,
-    as_reversed_hex_array,
-    ble_device_base_ns,
-)
-
-adv_data_t = cg.std_vector.template(cg.uint8)
-adv_data_t_const_ref = adv_data_t.operator("ref").operator("const")
-ESPBTDeviceConstRef = (
-    ble_device_base_ns.class_("ESPBTDevice").operator("ref").operator("const")
-)
-
-ESPBTAdvertiseTrigger = ble_device_base_ns.class_(
-    "ESPBTAdvertiseTrigger", automation.Trigger.template(ESPBTDeviceConstRef)
-)
-BLEServiceDataAdvertiseTrigger = ble_device_base_ns.class_(
-    "BLEServiceDataAdvertiseTrigger", automation.Trigger.template(adv_data_t_const_ref)
-)
-BLEManufacturerDataAdvertiseTrigger = ble_device_base_ns.class_(
-    "BLEManufacturerDataAdvertiseTrigger",
-    automation.Trigger.template(adv_data_t_const_ref),
-)
-BLEEndOfScanTrigger = ble_device_base_ns.class_(
-    "BLEEndOfScanTrigger", automation.Trigger.template()
-)
-
-# UUID string length -> setter width. 16/32-bit go out as plain hex literals,
-# 128-bit as a reversed byte array (BLE wire order). Keyed exhaustively so an
-# impossible length fails as a KeyError instead of silently picking a width
-# (bt_uuid validation upstream only ever produces these three).
-_UUID_WIDTHS = {
-    len(BT_UUID16_FORMAT): "16",
-    len(BT_UUID32_FORMAT): "32",
-    len(BT_UUID128_FORMAT): "128",
-}
-
-
-def uuid_trigger_schema(
-    trigger_class: MockObjClass, extra: dict[Any, Any] | None = None
-):
-    """Schema for a UUID-filtered trigger — pairs with uuid_trigger_to_code().
-
-    `extra` carries the required UUID key (a cv marker, so a dict rather than
-    **kwargs); the optional single-mac filter is what uuid_trigger_to_code()
-    reads back.
-    """
-    return automation.validate_automation(
-        {
-            cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(trigger_class),
-            cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
-            **(extra or {}),
-        }
-    )
-
-
-def advertise_trigger_schema(trigger_class: MockObjClass):
-    """on_ble_advertise schema: multi-mac list filter, unlike the single-mac
-    uuid_trigger_schema() — pairs with advertise_trigger_to_code()."""
-    return automation.validate_automation(
-        {
-            cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(trigger_class),
-            cv.Optional(CONF_MAC_ADDRESS): cv.ensure_list(cv.mac_address),
-        }
-    )
-
-
-def scan_end_trigger_schema(trigger_class: MockObjClass):
-    """on_scan_end schema: id only — pairs with scan_end_trigger_to_code()."""
-    return automation.validate_automation(
-        {cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(trigger_class)}
-    )
-
-
-# Triggers register as ble_device_base listeners in their constructors; count
-# them where they are created so no backend can undercount the StaticVector
-# (push_back past capacity drops silently). Shares the define with
-# register_ble_device() via the core slot-counter factory.
-_count_listener = cg.slot_counter(LISTENER_COUNT_DEFINE)
-
-
-async def advertise_trigger_to_code(conf: ConfigType, var: cg.MockObj) -> None:
-    """Build an on_ble_advertise trigger (optional multi-mac filter)."""
-    trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-    if (macs := conf.get(CONF_MAC_ADDRESS)) is not None:
-        cg.add(trigger.set_addresses([it.as_hex for it in macs]))
-    await automation.build_automation(trigger, [(ESPBTDeviceConstRef, "x")], conf)
-    _count_listener()
-
-
-async def scan_end_trigger_to_code(conf: ConfigType, var: cg.MockObj) -> None:
-    """Build an on_scan_end trigger."""
-    trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-    await automation.build_automation(trigger, [], conf)
-    _count_listener()
-
-
-async def uuid_trigger_to_code(
-    conf: ConfigType, var: cg.MockObj, key: str, setter_prefix: str
-) -> None:
-    """Build a UUID-filtered advertise trigger.
-
-    The UUID width picks the setter: 16-/32-bit go out as a plain hex literal,
-    128-bit as a reversed byte array (BLE wire order).
-    """
-    trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-    uuid = conf[key]
-    width = _UUID_WIDTHS[len(uuid)]
-    value = as_hex(uuid) if width != "128" else as_reversed_hex_array(uuid)
-    cg.add(getattr(trigger, f"{setter_prefix}{width}")(value))
-    if (mac := conf.get(CONF_MAC_ADDRESS)) is not None:
-        cg.add(trigger.set_address(mac.as_hex))
-    await automation.build_automation(trigger, [(adv_data_t_const_ref, "x")], conf)
-    _count_listener()

esphome/components/ble_device_base/ble_aes_ccm.cpp

@@ -1,202 +0,0 @@
-#include "ble_aes_ccm.h"
-
-#include <algorithm>
-#include <cstring>
-
-namespace esphome::ble_device_base {
-
-namespace {
-
-// AES-128 forward cipher only — CCM uses the block cipher in the encrypt
-// direction for both the CTR keystream and the CBC-MAC.
-const uint8_t SBOX[256] = {
-    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,  //
-    0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,  //
-    0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,  //
-    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,  //
-    0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,  //
-    0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,  //
-    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,  //
-    0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,  //
-    0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,  //
-    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,  //
-    0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,  //
-    0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,  //
-    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,  //
-    0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,  //
-    0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,  //
-    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16,  //
-};
-
-const uint8_t RCON[11] = {0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36};
-
-inline uint8_t xtime(uint8_t x) { return static_cast<uint8_t>((x << 1) ^ ((x & 0x80) ? 0x1b : 0x00)); }
-
-// AES-128 forward cipher with on-the-fly key schedule.
-class Aes128 {
- public:
-  explicit Aes128(const uint8_t key[16]) {
-    memcpy(this->rk_, key, 16);
-    for (size_t i = 16; i < 176; i += 4) {
-      uint8_t t[4] = {this->rk_[i - 4], this->rk_[i - 3], this->rk_[i - 2], this->rk_[i - 1]};
-      if (i % 16 == 0) {
-        const uint8_t tmp = t[0];
-        t[0] = static_cast<uint8_t>(SBOX[t[1]] ^ RCON[i / 16]);
-        t[1] = SBOX[t[2]];
-        t[2] = SBOX[t[3]];
-        t[3] = SBOX[tmp];
-      }
-      for (size_t j = 0; j < 4; j++)
-        this->rk_[i + j] = static_cast<uint8_t>(this->rk_[i - 16 + j] ^ t[j]);
-    }
-  }
-
-  void encrypt(const uint8_t in[16], uint8_t out[16]) const {
-    uint8_t s[16];
-    memcpy(s, in, 16);
-    for (size_t i = 0; i < 16; i++)
-      s[i] ^= this->rk_[i];
-
-    for (size_t round = 1; round < 10; round++) {
-      for (uint8_t &b : s)
-        b = SBOX[b];
-      shift_rows(s);
-      for (size_t c = 0; c < 4; c++) {
-        uint8_t *col = s + c * 4;
-        const uint8_t a0 = col[0], a1 = col[1], a2 = col[2], a3 = col[3];
-        const uint8_t h = static_cast<uint8_t>(a0 ^ a1 ^ a2 ^ a3);
-        col[0] ^= static_cast<uint8_t>(h ^ xtime(static_cast<uint8_t>(a0 ^ a1)));
-        col[1] ^= static_cast<uint8_t>(h ^ xtime(static_cast<uint8_t>(a1 ^ a2)));
-        col[2] ^= static_cast<uint8_t>(h ^ xtime(static_cast<uint8_t>(a2 ^ a3)));
-        col[3] ^= static_cast<uint8_t>(h ^ xtime(static_cast<uint8_t>(a3 ^ a0)));
-      }
-      for (size_t i = 0; i < 16; i++)
-        s[i] ^= this->rk_[round * 16 + i];
-    }
-
-    for (uint8_t &b : s)
-      b = SBOX[b];
-    shift_rows(s);
-    for (size_t i = 0; i < 16; i++)
-      s[i] ^= this->rk_[160 + i];
-    memcpy(out, s, 16);
-  }
-
- protected:
-  static void shift_rows(uint8_t s[16]) {
-    uint8_t t = s[1];
-    s[1] = s[5];
-    s[5] = s[9];
-    s[9] = s[13];
-    s[13] = t;
-    t = s[2];
-    s[2] = s[10];
-    s[10] = t;
-    t = s[6];
-    s[6] = s[14];
-    s[14] = t;
-    t = s[3];
-    s[3] = s[15];
-    s[15] = s[11];
-    s[11] = s[7];
-    s[7] = t;
-  }
-
-  uint8_t rk_[176];
-};
-
-}  // namespace
-
-void aes128_encrypt_block(const uint8_t key[16], const uint8_t in[16], uint8_t out[16]) {
-  Aes128 aes(key);
-  aes.encrypt(in, out);
-}
-
-bool aes_ccm_auth_decrypt(const uint8_t key[16], const uint8_t *nonce, size_t nonce_len, const uint8_t *aad,
-                          size_t aad_len, const uint8_t *ciphertext, size_t ct_len, uint8_t *plaintext,
-                          const uint8_t *tag, size_t tag_len) {
-  // CCM length field width L and tag width M (RFC 3610 §2.2). For a 13-byte
-  // nonce L = 2; BTHome uses M = 4.
-  if (nonce_len < 7 || nonce_len > 13 || tag_len < 4 || tag_len > 16)
-    return false;
-  const size_t l = 15 - nonce_len;
-  const size_t m = tag_len;
-
-  const Aes128 aes(key);
-
-  // Build CTR block A_i = [L-1] | nonce | counter(L bytes, big-endian).
-  uint8_t a[16];
-  auto build_ctr = [&](uint32_t counter) {
-    a[0] = static_cast<uint8_t>(l - 1);
-    memcpy(a + 1, nonce, nonce_len);
-    memset(a + 1 + nonce_len, 0, l);
-    for (size_t i = 0; i < l; i++)
-      a[15 - i] = static_cast<uint8_t>((counter >> (8 * i)) & 0xff);
-  };
-
-  // S_0 = E(A_0); its first m bytes mask the transmitted tag.
-  uint8_t s0[16];
-  build_ctr(0);
-  aes.encrypt(a, s0);
-
-  // CTR-decrypt ciphertext into plaintext using S_1, S_2, ...
-  uint8_t ks[16];
-  for (size_t off = 0; off < ct_len; off += 16) {
-    build_ctr(static_cast<uint32_t>(off / 16) + 1);
-    aes.encrypt(a, ks);
-    const size_t n = std::min(static_cast<size_t>(16), ct_len - off);
-    for (size_t i = 0; i < n; i++)
-      plaintext[off + i] = static_cast<uint8_t>(ciphertext[off + i] ^ ks[i]);
-  }
-
-  // CBC-MAC over B_0 | (formatted AAD) | plaintext.
-  uint8_t x[16];
-  uint8_t b0[16];
-  const uint8_t flags = static_cast<uint8_t>((aad_len > 0 ? 0x40 : 0x00) | (((m - 2) / 2) << 3) | (l - 1));
-  b0[0] = flags;
-  memcpy(b0 + 1, nonce, nonce_len);
-  memset(b0 + 1 + nonce_len, 0, l);
-  for (size_t i = 0; i < l; i++)
-    b0[15 - i] = static_cast<uint8_t>((ct_len >> (8 * i)) & 0xff);
-  aes.encrypt(b0, x);  // X_1 = E(B_0)
-
-  if (aad_len > 0) {
-    // Only the < 2^16-2^8 encoding is needed for BLE-sized AAD.
-    uint8_t blk[16] = {0};
-    blk[0] = static_cast<uint8_t>((aad_len >> 8) & 0xff);
-    blk[1] = static_cast<uint8_t>(aad_len & 0xff);
-    size_t ai = 0;
-    size_t pos = 2;
-    while (pos < 16 && ai < aad_len)
-      blk[pos++] = aad[ai++];
-    for (size_t i = 0; i < 16; i++)
-      x[i] ^= blk[i];
-    aes.encrypt(x, x);
-    while (ai < aad_len) {
-      memset(blk, 0, 16);
-      const size_t n = std::min(static_cast<size_t>(16), aad_len - ai);
-      memcpy(blk, aad + ai, n);
-      ai += n;
-      for (size_t i = 0; i < 16; i++)
-        x[i] ^= blk[i];
-      aes.encrypt(x, x);
-    }
-  }
-
-  for (size_t off = 0; off < ct_len; off += 16) {
-    uint8_t blk[16] = {0};
-    const size_t n = std::min(static_cast<size_t>(16), ct_len - off);
-    memcpy(blk, plaintext + off, n);
-    for (size_t i = 0; i < 16; i++)
-      x[i] ^= blk[i];
-    aes.encrypt(x, x);
-  }
-
-  // Expected tag U = T XOR S_0[0..m). Constant-time compare with the received tag.
-  uint8_t diff = 0;
-  for (size_t i = 0; i < m; i++)
-    diff |= static_cast<uint8_t>((x[i] ^ s0[i]) ^ tag[i]);
-  return diff == 0;
-}
-
-}  // namespace esphome::ble_device_base

esphome/components/ble_device_base/ble_aes_ccm.h

@@ -1,34 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <cstdint>
-
-namespace esphome::ble_device_base {
-
-// Self-contained AES-128-CCM authenticated decryption (RFC 3610).
-//
-// Encrypted BLE advertisements (BTHome, several Xiaomi/ATC variants) use
-// AES-128-CCM. The platform crypto that provides it is inconsistent across BLE
-// targets: ESP-IDF exposes PSA/mbedtls, but a LibreTiny SDK may keep its mbedtls
-// internal (e.g. the beken-72xx SDK ships mbedtls with CCM enabled but does not
-// put it on the application include path), so a sensor cannot rely on
-// <mbedtls/ccm.h> being available. This software implementation makes
-// encrypted-advertisement decryption work on every BLE platform without a
-// per-chip crypto dependency. Decryption volume is tiny (one short block per
-// matching advertisement), so software AES is not a meaningful cost.
-//
-// Verifies the CCM authentication tag and, on success, writes `ct_len` decrypted
-// bytes to `plaintext` and returns true. Returns false when authentication fails
-// (the caller must then discard `plaintext`). The CCM parameters follow the
-// caller (BTHome: 13-byte nonce, 4-byte tag, no associated data); `aad` may be
-// null when `aad_len` is 0.
-/// AES-128 single-block encrypt (the same software cipher CCM uses). Used by
-/// ESPBTDevice::resolve_irk() for the Bluetooth "ah" RPA hash, so IRK matching
-/// works identically on every platform with no chip crypto dependency.
-void aes128_encrypt_block(const uint8_t key[16], const uint8_t in[16], uint8_t out[16]);
-
-bool aes_ccm_auth_decrypt(const uint8_t key[16], const uint8_t *nonce, size_t nonce_len, const uint8_t *aad,
-                          size_t aad_len, const uint8_t *ciphertext, size_t ct_len, uint8_t *plaintext,
-                          const uint8_t *tag, size_t tag_len);
-
-}  // namespace esphome::ble_device_base

esphome/components/ble_device_base/ble_device.cpp

@@ -1,549 +0,0 @@
-// ble_device.cpp
-//
-// Platform-neutral implementation of the shared BLE advertisement types.
-// Parses raw BLE advertisement data into ESPBTDevice.
-
-#include "ble_device.h"
-
-#include "ble_aes_ccm.h"
-
-#include "esphome/core/defines.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#include <cstring>
-
-namespace esphome::ble_device_base {
-
-static const char *const TAG = "ble_device_base";
-
-// Longest advertisement payload worth hex-dumping at VERY_VERBOSE
-// (legacy advertising: 31-byte adv + 31-byte scan response).
-static constexpr size_t BLE_ADV_MAX_LOG_BYTES = 62;
-
-// ---------------------------------------------------------------------------
-// ESPBTUUID
-// ---------------------------------------------------------------------------
-
-ESPBTUUID ESPBTUUID::from_uint16(uint16_t uuid) {
-  ESPBTUUID ret;
-  ret.type_ = Type::UUID16;
-  ret.uuid_.uuid16 = uuid;
-  return ret;
-}
-
-ESPBTUUID ESPBTUUID::from_uint32(uint32_t uuid) {
-  ESPBTUUID ret;
-  ret.type_ = Type::UUID32;
-  ret.uuid_.uuid32 = uuid;
-  return ret;
-}
-
-ESPBTUUID ESPBTUUID::from_raw(const uint8_t *data) {
-  ESPBTUUID ret;
-  ret.type_ = Type::UUID128;
-  memcpy(ret.uuid_.uuid128, data, 16);
-  return ret;
-}
-
-ESPBTUUID ESPBTUUID::from_raw_reversed(const uint8_t *data) {
-  ESPBTUUID ret;
-  ret.type_ = Type::UUID128;
-  for (int i = 0; i < 16; i++)
-    ret.uuid_.uuid128[i] = data[15 - i];
-  return ret;
-}
-
-ESPBTUUID ESPBTUUID::from_raw(const char *data, size_t length) {
-  // Same text-parsing semantics as the historical esp32_ble::ESPBTUUID::from_raw.
-  ESPBTUUID ret;
-  if (length == 4) {
-    // 16-bit UUID as 4-character hex string
-    auto parsed = parse_hex<uint16_t>(data, length);
-    if (parsed.has_value()) {
-      ret.type_ = Type::UUID16;
-      ret.uuid_.uuid16 = parsed.value();
-    }
-  } else if (length == 8) {
-    // 32-bit UUID as 8-character hex string
-    auto parsed = parse_hex<uint32_t>(data, length);
-    if (parsed.has_value()) {
-      ret.type_ = Type::UUID32;
-      ret.uuid_.uuid32 = parsed.value();
-    }
-  } else if (length == 16) {
-    // 16 raw bytes (little-endian 128-bit UUID)
-    ret.type_ = Type::UUID128;
-    memcpy(ret.uuid_.uuid128, reinterpret_cast<const uint8_t *>(data), 16);
-  } else if (length == 36) {
-    // Dashed text form XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
-    ret.type_ = Type::UUID128;
-    int n = 0;
-    for (size_t i = 0; i < length; i += 2) {
-      if (data[i] == '-')
-        i++;
-      uint8_t msb = data[i];
-      uint8_t lsb = data[i + 1];
-      if (msb > '9')
-        msb -= 7;
-      if (lsb > '9')
-        lsb -= 7;
-      ret.uuid_.uuid128[15 - n++] = ((msb & 0x0F) << 4) | (lsb & 0x0F);
-    }
-  } else {
-    ESP_LOGE(TAG, "ERROR: UUID value not 4, 8, 16 or 36 bytes - %s", data);
-  }
-  return ret;
-}
-
-#ifdef USE_ESP32
-ESPBTUUID ESPBTUUID::from_uuid(esp_bt_uuid_t uuid) {
-  if (uuid.len == 0)  // the unset sentinel get_uuid() emits
-    return {};
-  if (uuid.len == ESP_UUID_LEN_16)
-    return ESPBTUUID::from_uint16(uuid.uuid.uuid16);
-  if (uuid.len == ESP_UUID_LEN_32)
-    return ESPBTUUID::from_uint32(uuid.uuid.uuid32);
-  return ESPBTUUID::from_raw(uuid.uuid.uuid128);
-}
-
-esp_bt_uuid_t ESPBTUUID::get_uuid() const {
-  esp_bt_uuid_t ret;
-  switch (this->type_) {
-    case Type::UNSET:
-      ret.len = 0;
-      memset(&ret.uuid, 0, sizeof(ret.uuid));
-      break;
-    case Type::UUID16:
-      ret.len = ESP_UUID_LEN_16;
-      ret.uuid.uuid16 = this->uuid_.uuid16;
-      break;
-    case Type::UUID32:
-      ret.len = ESP_UUID_LEN_32;
-      ret.uuid.uuid32 = this->uuid_.uuid32;
-      break;
-    default:
-    case Type::UUID128:
-      ret.len = ESP_UUID_LEN_128;
-      memcpy(ret.uuid.uuid128, this->uuid_.uuid128, ESP_UUID_LEN_128);
-      break;
-  }
-  return ret;
-}
-
-void ESPBTDevice::parse_scan_rst(const esp32_ble::BLEScanResult &scan_result) {
-  this->scan_result_ = &scan_result;
-  // BLEScanResult's bda is most-significant octet first; the neutral ingest
-  // takes the BLE controller (LSB-first) order, so reverse — address_uint64()/
-  // address_str_to() then produce exactly the historical esp32 values.
-  uint8_t mac_lsb_first[6];
-  for (uint8_t i = 0; i < 6; i++)
-    mac_lsb_first[i] = scan_result.bda[5 - i];
-  this->from_scan_result(mac_lsb_first, scan_result.rssi, scan_result.ble_addr_type, scan_result.ble_adv,
-                         scan_result.adv_data_len + scan_result.scan_rsp_len);
-}
-#endif  // USE_ESP32
-
-ESPBTUUID ESPBTUUID::as_128bit() const {
-  // Widening an unset UUID stays unset; expanding it would produce a set 0x0000 base UUID.
-  if (this->type_ == Type::UNSET || this->type_ == Type::UUID128)
-    return *this;
-  uint8_t data[16];
-  this->to_128bit_(data);
-  return ESPBTUUID::from_raw(data);
-}
-
-bool ESPBTUUID::contains(uint8_t data1, uint8_t data2) const {
-  // Adjacent byte-pair search — identical semantics to esp32_ble::ESPBTUUID::contains.
-  switch (this->type_) {
-    case Type::UNSET:
-      return false;
-    case Type::UUID16:
-      return (this->uuid_.uuid16 >> 8) == data2 && (this->uuid_.uuid16 & 0xFF) == data1;
-    case Type::UUID32:
-      for (uint8_t i = 0; i < 3; i++) {
-        bool a = ((this->uuid_.uuid32 >> i * 8) & 0xFF) == data1;
-        bool b = ((this->uuid_.uuid32 >> (i + 1) * 8) & 0xFF) == data2;
-        if (a && b)
-          return true;
-      }
-      return false;
-    case Type::UUID128:
-      for (uint8_t i = 0; i < 15; i++) {
-        if (this->uuid_.uuid128[i] == data1 && this->uuid_.uuid128[i + 1] == data2)
-          return true;
-      }
-      return false;
-  }
-  return false;
-}
-
-const char *ESPBTUUID::to_str(char *buf) const {
-  // Identical output format to esp32_ble::ESPBTUUID::to_str.
-  char *pos = buf;
-  switch (this->type_) {
-    case Type::UNSET:
-      memcpy(buf, "None", 5);
-      return buf;
-    case Type::UUID16:
-      *pos++ = '0';
-      *pos++ = 'x';
-      *pos++ = format_hex_pretty_char(this->uuid_.uuid16 >> 12);
-      *pos++ = format_hex_pretty_char((this->uuid_.uuid16 >> 8) & 0x0F);
-      *pos++ = format_hex_pretty_char((this->uuid_.uuid16 >> 4) & 0x0F);
-      *pos++ = format_hex_pretty_char(this->uuid_.uuid16 & 0x0F);
-      *pos = 0;  // NUL-terminate
-      return buf;
-    case Type::UUID32:
-      *pos++ = '0';
-      *pos++ = 'x';
-      for (int shift = 28; shift >= 0; shift -= 4)
-        *pos++ = format_hex_pretty_char((this->uuid_.uuid32 >> shift) & 0x0F);
-      *pos = 0;  // NUL-terminate
-      return buf;
-    default:
-    case Type::UUID128:
-      // Format: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
-      for (int8_t i = 15; i >= 0; i--) {
-        uint8_t byte = this->uuid_.uuid128[i];
-        *pos++ = format_hex_pretty_char(byte >> 4);
-        *pos++ = format_hex_pretty_char(byte & 0x0F);
-        if (i == 12 || i == 10 || i == 8 || i == 6)
-          *pos++ = '-';
-      }
-      *pos = 0;  // NUL-terminate
-      return buf;
-  }
-}
-
-void ESPBTUUID::to_128bit_(uint8_t out[16]) const {
-  // Bluetooth Base UUID 00000000-0000-1000-8000-00805F9B34FB (LSB-first), with the 16/32-bit
-  // value placed at bytes 12..; identical expansion to esp32_ble::ESPBTUUID::as_128bit().
-  // Callers screen out UNSET first (operator==, as_128bit); it would expand like 0x0000.
-  static const uint8_t BASE[16] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80,
-                                   0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-  if (this->type_ == Type::UUID128) {
-    memcpy(out, this->uuid_.uuid128, 16);
-    return;
-  }
-  memcpy(out, BASE, 16);
-  const uint32_t value = (this->type_ == Type::UUID32) ? this->uuid_.uuid32 : this->uuid_.uuid16;
-  const size_t len = (this->type_ == Type::UUID32) ? 4 : 2;
-  for (size_t i = 0; i < len; i++)
-    out[12 + i] = (value >> (i * 8)) & 0xFF;
-}
-
-bool ESPBTUUID::operator==(const ESPBTUUID &other) const {
-  if (this->type_ == other.type_) {
-    switch (this->type_) {
-      case Type::UNSET:
-        return true;
-      case Type::UUID16:
-        return this->uuid_.uuid16 == other.uuid_.uuid16;
-      case Type::UUID32:
-        return this->uuid_.uuid32 == other.uuid_.uuid32;
-      case Type::UUID128:
-        return memcmp(this->uuid_.uuid128, other.uuid_.uuid128, 16) == 0;
-    }
-    return false;
-  }
-  // Unset never equals a set UUID; 0x0000 is a valid value, distinct from "not configured".
-  if (this->type_ == Type::UNSET || other.type_ == Type::UNSET)
-    return false;
-  // Different widths: expand both to the 128-bit Bluetooth Base UUID form and compare, so a
-  // configured 16/32-bit UUID matches the equivalent 128-bit advertisement (esp32 parity).
-  uint8_t a[16];
-  uint8_t b[16];
-  this->to_128bit_(a);
-  other.to_128bit_(b);
-  return memcmp(a, b, 16) == 0;
-}
-
-// ---------------------------------------------------------------------------
-// ESPBLEiBeacon
-// ---------------------------------------------------------------------------
-
-ESPBLEiBeacon::ESPBLEiBeacon(const uint8_t *data) { memcpy(&this->beacon_data_, data, sizeof(this->beacon_data_)); }
-
-optional<ESPBLEiBeacon> ESPBLEiBeacon::from_manufacturer_data(const ServiceData &data) {
-  // iBeacon manufacturer specific data (after company-ID bytes have been stripped):
-  //   [0x02][0x15][16-byte UUID][2-byte major][2-byte minor][1-byte power] = exactly 23 bytes
-  // Parity with esp32_ble_tracker: gate on the Apple company ID and length only.
-  // (Checking the 0x02/0x15 sub-type prefix would be stricter, but is a behavior
-  // change; it belongs to a follow-up, not this refactor.)
-  if (!data.uuid.contains(0x4C, 0x00))  // Apple company ID 0x004C
-    return {};
-  if (data.data.size() != 23)
-    return {};
-  return ESPBLEiBeacon(data.data.data());
-}
-
-// ---------------------------------------------------------------------------
-// ESPBTDevice
-// ---------------------------------------------------------------------------
-
-const char *ESPBTDevice::address_type_str() const {
-  switch (this->address_type_) {
-    case BLE_ADDR_TYPE_PUBLIC:
-      return "PUBLIC";
-    case BLE_ADDR_TYPE_RANDOM:
-      return "RANDOM";
-    case BLE_ADDR_TYPE_RPA_PUBLIC:
-      return "RPA_PUBLIC";
-    case BLE_ADDR_TYPE_RPA_RANDOM:
-      return "RPA_RANDOM";
-    default:
-      return "UNKNOWN";
-  }
-}
-
-void ESPBTDevice::from_scan_result(const uint8_t *mac, int rssi, uint8_t addr_type, const uint8_t *data,
-                                   uint16_t data_len) {
-  // Ingest is BLE controller order (LSB-first); store in printable (MSB-first)
-  // order so the raw address() accessor matches the historical esp32 layout.
-  for (uint8_t i = 0; i < 6; i++)
-    this->address_[i] = mac[5 - i];
-  this->address_type_ = addr_type;
-  this->rssi_ = rssi;
-  this->name_.clear();
-  this->service_uuids_.clear();
-  this->manufacturer_datas_.clear();
-  this->service_datas_.clear();
-  this->tx_powers_.clear();
-  this->appearance_.reset();
-  this->ad_flag_.reset();
-  this->parse_adv_(data, data_len);
-
-#ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
-  char addr_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
-  ESP_LOGVV(TAG,
-            "Parse Result:\n"
-            "  Address: %s (%s)\n"
-            "  RSSI: %d\n"
-            "  Name: '%s'",
-            this->address_str_to(addr_buf), this->address_type_str(), this->rssi_, this->name_.c_str());
-  for (auto &it : this->tx_powers_) {
-    ESP_LOGVV(TAG, "  TX Power: %d", it);
-  }
-  if (this->appearance_.has_value()) {
-    ESP_LOGVV(TAG, "  Appearance: %u", *this->appearance_);
-  }
-  if (this->ad_flag_.has_value()) {
-    ESP_LOGVV(TAG, "  Ad Flag: %u", *this->ad_flag_);
-  }
-  char uuid_buf[UUID_STR_LEN];
-  for (auto &uuid : this->service_uuids_) {
-    ESP_LOGVV(TAG, "  Service UUID: %s", uuid.to_str(uuid_buf));
-  }
-  char hex_buf[format_hex_pretty_size(BLE_ADV_MAX_LOG_BYTES)];
-  for (auto &mfg_data : this->manufacturer_datas_) {
-    auto ibeacon = ESPBLEiBeacon::from_manufacturer_data(mfg_data);
-    if (ibeacon.has_value()) {
-      ESP_LOGVV(TAG,
-                "  Manufacturer iBeacon:\n"
-                "    UUID: %s\n"
-                "    Major: %u\n"
-                "    Minor: %u\n"
-                "    TXPower: %d",
-                ibeacon.value().get_uuid().to_str(uuid_buf), ibeacon.value().get_major(), ibeacon.value().get_minor(),
-                ibeacon.value().get_signal_power());
-    } else {
-      ESP_LOGVV(TAG, "  Manufacturer ID: %s, data: %s", mfg_data.uuid.to_str(uuid_buf),
-                format_hex_pretty_to(hex_buf, mfg_data.data.data(), mfg_data.data.size()));
-    }
-  }
-  for (auto &svc_data : this->service_datas_) {
-    ESP_LOGVV(TAG,
-              "  Service data:\n"
-              "    UUID: %s\n"
-              "    Data: %s",
-              svc_data.uuid.to_str(uuid_buf),
-              format_hex_pretty_to(hex_buf, svc_data.data.data(), svc_data.data.size()));
-  }
-  ESP_LOGVV(TAG, "  Adv data: %s", format_hex_pretty_to(hex_buf, data, data_len));
-#endif  // ESPHOME_LOG_HAS_VERY_VERBOSE
-}
-
-// Remove before 2027.2.0
-std::string ESPBTDevice::address_str() const {
-  char buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
-  return std::string(this->address_str_to(buf));
-}
-
-const char *ESPBTDevice::address_str_to(char *buf) const {
-  // address_ is stored in printable (MSB-first) order.
-  format_mac_addr_upper(this->address_, buf);
-  return buf;
-}
-
-uint64_t ESPBTDevice::address_uint64() const {
-  // address_ is MSB-first; byte 0 of the result is the LSB (esp32 semantics).
-  uint64_t addr = 0;
-  for (int i = 0; i < 6; i++)
-    addr |= static_cast<uint64_t>(this->address_[i]) << ((5 - i) * 8);
-  return addr;
-}
-
-bool ESPBTDevice::resolve_irk(const uint8_t *irk) const {
-#ifdef USE_BLE_DEVICE_IRK
-  // Bluetooth Core 5.x "ah" function: hash = e(IRK, padding | prand)[low 24 bits].
-  // The resolvable private address is prand (top 3 bytes) | hash (bottom 3 bytes).
-  // Uses the portable software AES-128 shared with the CCM decryptor, so IRK
-  // matching behaves identically on every platform (volume is one block per
-  // advertisement from a matching RPA device — software AES is not a cost).
-  uint8_t ecb_plaintext[16] = {0};
-  uint8_t ecb_ciphertext[16];
-  const uint64_t addr64 = this->address_uint64();
-  ecb_plaintext[13] = (addr64 >> 40) & 0xff;
-  ecb_plaintext[14] = (addr64 >> 32) & 0xff;
-  ecb_plaintext[15] = (addr64 >> 24) & 0xff;
-  aes128_encrypt_block(irk, ecb_plaintext, ecb_ciphertext);
-  return ecb_ciphertext[15] == (addr64 & 0xff) && ecb_ciphertext[14] == ((addr64 >> 8) & 0xff) &&
-         ecb_ciphertext[13] == ((addr64 >> 16) & 0xff);
-#else
-  // No sensor configured an irk: in this build; the AES core is compiled out.
-  (void) irk;
-  return false;
-#endif
-}
-
-void ESPBTDevice::parse_adv_(const uint8_t *payload, uint16_t len) {
-  // BLE AD structure TLV: [length][type][value...]
-  // length includes the type byte.
-  uint16_t offset = 0;
-  while (offset < len) {
-    uint8_t ad_len = payload[offset++];
-    if (ad_len == 0)
-      continue;  // possible zero-padded advertisement data (esp32_ble_tracker skips these too)
-    if (offset + ad_len > len)
-      break;
-    uint8_t ad_type = payload[offset];
-    const uint8_t *ad_data = &payload[offset + 1];
-    uint8_t ad_data_len = ad_len - 1;
-    offset += ad_len;
-
-    switch (ad_type) {
-      case 0x01:  // Flags
-        if (ad_data_len >= 1)
-          this->ad_flag_ = ad_data[0];
-        break;
-
-      case 0x08:  // Shortened Local Name
-      case 0x09:  // Complete Local Name
-        // Keep the longest name seen — a merged adv + scan-response frame may carry both the
-        // shortened and the complete name, and the shortened form must never replace the
-        // complete one (same rule as esp32_ble_tracker's parse_adv_).
-        if (ad_data_len > this->name_.length())
-          this->name_.assign(reinterpret_cast<const char *>(ad_data), ad_data_len);
-        break;
-
-      case 0x0A:  // TX Power Level
-        if (ad_data_len >= 1)
-          this->tx_powers_.push_back(static_cast<int8_t>(ad_data[0]));
-        break;
-
-      case 0x19:  // Appearance
-        if (ad_data_len >= 2)
-          this->appearance_ = static_cast<uint16_t>(ad_data[0]) | (static_cast<uint16_t>(ad_data[1]) << 8);
-        break;
-
-      case 0x02:  // Incomplete List of 16-bit Service UUIDs
-      case 0x03:  // Complete List of 16-bit Service UUIDs
-        for (uint8_t i = 0; (i + 1) < ad_data_len; i += 2) {
-          uint16_t uuid = (static_cast<uint16_t>(ad_data[i + 1]) << 8) | ad_data[i];
-          this->service_uuids_.push_back(ESPBTUUID::from_uint16(uuid));
-        }
-        break;
-
-      case 0x04:  // Incomplete List of 32-bit Service UUIDs
-      case 0x05:  // Complete List of 32-bit Service UUIDs
-        for (uint8_t i = 0; (i + 3) < ad_data_len; i += 4) {
-          uint32_t uuid = (static_cast<uint32_t>(ad_data[i + 3]) << 24) |
-                          (static_cast<uint32_t>(ad_data[i + 2]) << 16) | (static_cast<uint32_t>(ad_data[i + 1]) << 8) |
-                          ad_data[i];
-          this->service_uuids_.push_back(ESPBTUUID::from_uint32(uuid));
-        }
-        break;
-
-      case 0x06:  // Incomplete List of 128-bit Service UUIDs
-      case 0x07:  // Complete List of 128-bit Service UUIDs
-        for (uint8_t i = 0; (i + 15) < ad_data_len; i += 16)
-          this->service_uuids_.push_back(ESPBTUUID::from_raw(&ad_data[i]));
-        break;
-
-      case 0xFF:  // Manufacturer Specific Data
-        if (ad_data_len >= 2) {
-          uint16_t company_id = (static_cast<uint16_t>(ad_data[1]) << 8) | ad_data[0];
-          ServiceData sd;
-          sd.uuid = ESPBTUUID::from_uint16(company_id);
-          sd.data.assign(ad_data + 2, ad_data + ad_data_len);
-          this->manufacturer_datas_.push_back(std::move(sd));
-        }
-        break;
-
-      case 0x16:  // Service Data — 16-bit UUID
-        if (ad_data_len >= 2) {
-          uint16_t uuid = (static_cast<uint16_t>(ad_data[1]) << 8) | ad_data[0];
-          ServiceData sd;
-          sd.uuid = ESPBTUUID::from_uint16(uuid);
-          sd.data.assign(ad_data + 2, ad_data + ad_data_len);
-          this->service_datas_.push_back(std::move(sd));
-        }
-        break;
-
-      case 0x20:  // Service Data — 32-bit UUID
-        if (ad_data_len >= 4) {
-          uint32_t uuid = (static_cast<uint32_t>(ad_data[3]) << 24) | (static_cast<uint32_t>(ad_data[2]) << 16) |
-                          (static_cast<uint32_t>(ad_data[1]) << 8) | ad_data[0];
-          ServiceData sd;
-          sd.uuid = ESPBTUUID::from_uint32(uuid);
-          sd.data.assign(ad_data + 4, ad_data + ad_data_len);
-          this->service_datas_.push_back(std::move(sd));
-        }
-        break;
-
-      case 0x21:  // Service Data — 128-bit UUID
-        if (ad_data_len >= 16) {
-          ServiceData sd;
-          sd.uuid = ESPBTUUID::from_raw(ad_data);
-          sd.data.assign(ad_data + 16, ad_data + ad_data_len);
-          this->service_datas_.push_back(std::move(sd));
-        }
-        break;
-
-      default:
-        break;
-    }
-  }
-}
-
-// ---------------------------------------------------------------------------
-// DiscoveredDeviceLog
-// ---------------------------------------------------------------------------
-
-void DiscoveredDeviceLog::log_device(const char *tag, const ESPBTDevice &device) {
-#ifdef ESPHOME_LOG_HAS_DEBUG
-  // Everything here feeds ESP_LOGD: below DEBUG the whole body (including the
-  // dedup vector growth) would be pure overhead, so compile it out entirely.
-  const uint64_t address = device.address_uint64();
-  for (auto &disc : this->already_discovered_) {
-    if (disc == address)
-      return;
-  }
-  this->already_discovered_.push_back(address);
-
-  char addr_buf[ESPBTDevice::MAC_ADDRESS_PRETTY_BUFFER_SIZE];
-  ESP_LOGD(tag,
-           "Found device %s RSSI=%d\n"
-           "  Address Type: %s",
-           device.address_str_to(addr_buf), device.get_rssi(), device.address_type_str());
-  if (!device.get_name().empty()) {
-    ESP_LOGD(tag, "  Name: '%s'", device.get_name().c_str());
-  }
-  for (auto &tx_power : device.get_tx_powers()) {
-    ESP_LOGD(tag, "  TX Power: %d", tx_power);
-  }
-#endif  // ESPHOME_LOG_HAS_DEBUG
-}
-
-}  // namespace esphome::ble_device_base

esphome/components/ble_device_base/ble_device.h

@@ -1,278 +0,0 @@
-// ble_device.h
-//
-// Platform-neutral BLE advertisement types — the generic base every BLE consumer
-// (sensor components, bluetooth_proxy, automation triggers) builds against:
-//   ESPBTUUID / ServiceData / ESPBLEiBeacon / ESPBTDevice / ESPBTDeviceListener
-//
-// These types are owned here on EVERY platform, with no chip-SDK types in their
-// public surface. Platform trackers produce them:
-//   - esp32_ble_tracker adapts ESP-IDF scan results into ESPBTDevice and
-//     re-exports these names (esp32 only) for backward compatibility;
-//   - the LibreTiny trackers (bk72xx / ln882h) feed from_scan_result() directly.
-
-#pragma once
-
-#include "esphome/core/defines.h"
-#include "esphome/core/helpers.h"
-
-#include <cstdint>
-#include <cstring>
-#include <initializer_list>
-#include <string>
-#include <vector>
-
-#if defined(__cpp_lib_span)
-#include <span>
-#endif
-
-#ifdef USE_ESP32
-// Historical esp32_ble API surface (below, under the same define) uses the
-// ESP-IDF UUID/address/scan-result types directly; never referenced off-esp32.
-#include "esphome/components/esp32_ble/ble_scan_result.h"
-#include <esp_bt_defs.h>
-#endif
-
-namespace esphome::ble_device_base {
-
-using adv_data_t = std::vector<uint8_t>;
-
-// Bluetooth Core address types (spec values; matches ESP-IDF's esp_ble_addr_type_t).
-static constexpr uint8_t BLE_ADDR_TYPE_PUBLIC = 0;
-static constexpr uint8_t BLE_ADDR_TYPE_RANDOM = 1;
-static constexpr uint8_t BLE_ADDR_TYPE_RPA_PUBLIC = 2;
-static constexpr uint8_t BLE_ADDR_TYPE_RPA_RANDOM = 3;
-
-/// Buffer size for UUID string: "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX\0"
-static constexpr size_t UUID_STR_LEN = 37;
-
-// ---------------------------------------------------------------------------
-// ESPBTUUID — 16/32/128-bit Bluetooth UUID value type.
-// API-compatible with the historical esp32_ble::ESPBTUUID; the esp_bt_uuid_t
-// conversions live in esp32_ble (esp32-only adapters), not here.
-// ---------------------------------------------------------------------------
-
-class ESPBTUUID {
- public:
-  ESPBTUUID() = default;
-
-  static ESPBTUUID from_uint16(uint16_t uuid);
-  static ESPBTUUID from_uint32(uint32_t uuid);
-  /// Construct from raw 16-byte little-endian UUID.
-  static ESPBTUUID from_raw(const uint8_t *data);
-  /// Construct from raw 16-byte big-endian UUID (reversed on store).
-  static ESPBTUUID from_raw_reversed(const uint8_t *data);
-  /// Parse from text: 4 hex chars (16-bit), 8 hex chars (32-bit), 16 raw bytes,
-  /// or the 36-char dashed UUID form. Same semantics as esp32_ble historically.
-  static ESPBTUUID from_raw(const char *data, size_t length);
-  static ESPBTUUID from_raw(const char *data) { return from_raw(data, strlen(data)); }
-  static ESPBTUUID from_raw(const std::string &data) { return from_raw(data.c_str(), data.length()); }
-  static ESPBTUUID from_raw(std::initializer_list<uint8_t> data) {
-    return from_raw(reinterpret_cast<const char *>(data.begin()), data.size());
-  }
-
-#ifdef USE_ESP32
-  /// Source compatibility with the historical esp32_ble API (esp32 builds only).
-  static ESPBTUUID from_uuid(esp_bt_uuid_t uuid);
-  esp_bt_uuid_t get_uuid() const;
-#endif
-
-  /// Expand to the 128-bit Bluetooth Base UUID form.
-  ESPBTUUID as_128bit() const;
-
-  /// True if the UUID value contains the adjacent byte pair (data1, data2).
-  bool contains(uint8_t data1, uint8_t data2) const;
-
-  bool operator==(const ESPBTUUID &other) const;
-  bool operator!=(const ESPBTUUID &other) const { return !(*this == other); }
-
-  /// Write "0xABCD" / "0xABCDEF01" / the dashed 128-bit form, or "None" for an
-  /// unset UUID, into buf (>= UUID_STR_LEN bytes) and return buf.
-  const char *to_str(char *buf) const;
-#if defined(__cpp_lib_span)
-  const char *to_str(std::span<char, UUID_STR_LEN> output) const { return this->to_str(output.data()); }
-#endif
-  // UNSET is the default-constructed state; get_uuid() reports it as len 0 (the historical sentinel).
-  enum class Type : uint8_t { UNSET, UUID16, UUID32, UUID128 };
-  Type type() const { return this->type_; }
-  /// True if a UUID has been configured (not default-constructed).
-  bool is_set() const { return this->type_ != Type::UNSET; }
-  uint16_t uuid16() const { return this->uuid_.uuid16; }
-  uint32_t uuid32() const { return this->uuid_.uuid32; }
-  const uint8_t *uuid128() const { return this->uuid_.uuid128; }
-
- protected:
-  // Expand to the 128-bit Bluetooth Base UUID byte form (out is 16 bytes, little-endian).
-  void to_128bit_(uint8_t out[16]) const;
-
-  Type type_{Type::UNSET};
-  union {
-    uint16_t uuid16;
-    uint32_t uuid32;
-    uint8_t uuid128[16];
-  } uuid_{};
-};
-
-// ---------------------------------------------------------------------------
-// ServiceData — UUID-tagged advertisement payload (0x16 / 0xFF AD types)
-// ---------------------------------------------------------------------------
-
-struct ServiceData {
-  ESPBTUUID uuid;
-  adv_data_t data;
-};
-
-// ---------------------------------------------------------------------------
-// ESPBLEiBeacon
-// ---------------------------------------------------------------------------
-
-class ESPBLEiBeacon {
- public:
-  ESPBLEiBeacon() { memset(&this->beacon_data_, 0, sizeof(this->beacon_data_)); }
-  explicit ESPBLEiBeacon(const uint8_t *data);
-  static optional<ESPBLEiBeacon> from_manufacturer_data(const ServiceData &data);
-
-  uint16_t get_major() const { return byteswap(this->beacon_data_.major); }
-  uint16_t get_minor() const { return byteswap(this->beacon_data_.minor); }
-  int8_t get_signal_power() const { return this->beacon_data_.signal_power; }
-  ESPBTUUID get_uuid() const { return ESPBTUUID::from_raw_reversed(this->beacon_data_.proximity_uuid); }
-
- protected:
-  struct PACKED BeaconData {
-    uint8_t sub_type;
-    uint8_t length;
-    uint8_t proximity_uuid[16];
-    uint16_t major;
-    uint16_t minor;
-    int8_t signal_power;
-  } beacon_data_;
-};
-
-/// Pack a controller-order (LSB-first) MAC into the uint64 the API speaks.
-///
-/// The result is the printable-order value esp32 has always sent
-/// (esp32_ble::ble_addr_to_uint64), so both proxy paths agree on the wire.
-/// This takes the raw controller order delivered by BLEHub's raw-advertisement
-/// callback; ESPBTDevice::address_uint64() is the equivalent for an already
-/// parsed device, whose address is stored MSB-first.
-inline uint64_t mac_lsb_first_to_uint64(const uint8_t *mac) {
-  uint64_t addr = 0;
-  for (int i = 0; i < 6; i++)
-    addr |= static_cast<uint64_t>(mac[i]) << (i * 8);
-  return addr;
-}
-
-// ---------------------------------------------------------------------------
-// ESPBTDevice — parsed BLE advertisement
-// ---------------------------------------------------------------------------
-
-class ESPBTDevice {
- public:
-  /// Populate from a raw scan result delivered by a BLE tracker backend.
-  /// mac is least-significant octet first (BLE controller convention).
-  void from_scan_result(const uint8_t *mac, int rssi, uint8_t addr_type, const uint8_t *data, uint16_t data_len);
-
-  // Alias the core constant so the two cannot drift apart.
-  static constexpr size_t MAC_ADDRESS_PRETTY_BUFFER_SIZE = esphome::MAC_ADDRESS_PRETTY_BUFFER_SIZE;
-
-  /// Return MAC as "XX:XX:XX:XX:XX:XX" string.
-  ESPDEPRECATED("Use address_str_to() instead. Removed in 2027.2.0.", "2026.8.0")
-  std::string address_str() const;
-  /// Writes "XX:XX:XX:XX:XX:XX\0" into buf (>= MAC_ADDRESS_PRETTY_BUFFER_SIZE bytes), returns buf.
-  const char *address_str_to(char *buf) const;
-#if defined(__cpp_lib_span)
-  const char *address_str_to(std::span<char, MAC_ADDRESS_PRETTY_BUFFER_SIZE> buf) const {
-    return this->address_str_to(buf.data());
-  }
-#endif
-  /// Return MAC as packed uint64 (byte 0 in LSB — matches esp32's address_uint64).
-  uint64_t address_uint64() const;
-  /// Raw MAC bytes in printable (MSB-first) order — matches the historical
-  /// esp32 layout (ESP-IDF bda order).
-  const uint8_t *address() const { return address_; }
-#ifdef USE_ESP32
-  // Historical esp32 signature: consumers assign the result to esp_ble_addr_type_t.
-  esp_ble_addr_type_t get_address_type() const { return static_cast<esp_ble_addr_type_t>(this->address_type_); }
-  /// Historical esp32 ingest (esp32 builds only): parse an ESP-IDF scan result.
-  void parse_scan_rst(const esp32_ble::BLEScanResult &scan_result);
-  // Exposed through a function for use in lambdas
-  const esp32_ble::BLEScanResult &get_scan_result() const { return *scan_result_; }
-#else
-  uint8_t get_address_type() const { return this->address_type_; }
-#endif
-  /// Human-readable address type ("PUBLIC", "RANDOM", "RPA_PUBLIC", "RPA_RANDOM" or
-  /// "UNKNOWN"), backed by the shared BLE_ADDR_TYPE_* constants above.
-  const char *address_type_str() const;
-
-  int get_rssi() const { return rssi_; }
-  const std::string &get_name() const { return name_; }
-
-  const std::vector<ESPBTUUID> &get_service_uuids() const { return service_uuids_; }
-  const std::vector<ServiceData> &get_manufacturer_datas() const { return manufacturer_datas_; }
-  const std::vector<ServiceData> &get_service_datas() const { return service_datas_; }
-  const std::vector<int8_t> &get_tx_powers() const { return tx_powers_; }
-  const optional<uint16_t> &get_appearance() const { return appearance_; }
-  const optional<uint8_t> &get_ad_flag() const { return ad_flag_; }
-
-  /// Resolve a Resolvable Private Address against a 16-byte IRK (Bluetooth "ah"
-  /// function, AES-128). Uses the portable software AES shared with the CCM
-  /// decryptor; compiled only when a sensor configures irk: (request_irk_support).
-  bool resolve_irk(const uint8_t *irk) const;
-
-  optional<ESPBLEiBeacon> get_ibeacon() const {
-    for (const auto &it : this->manufacturer_datas_) {
-      auto res = ESPBLEiBeacon::from_manufacturer_data(it);
-      if (res.has_value())
-        return res;
-    }
-    return {};
-  }
-
- protected:
-  void parse_adv_(const uint8_t *payload, uint16_t len);
-
-  uint8_t address_[6]{0};
-  uint8_t address_type_{0};
-  int rssi_{0};
-  std::string name_{};
-  std::vector<ESPBTUUID> service_uuids_{};
-  std::vector<ServiceData> manufacturer_datas_{};
-  std::vector<ServiceData> service_datas_{};
-#ifdef USE_ESP32
-  const esp32_ble::BLEScanResult *scan_result_{nullptr};
-#endif
-  std::vector<int8_t> tx_powers_{};
-  optional<uint16_t> appearance_{};
-  optional<uint8_t> ad_flag_{};
-};
-
-// ---------------------------------------------------------------------------
-// DiscoveredDeviceLog — shared per-scan-period "Found device" DEBUG logger
-// ---------------------------------------------------------------------------
-
-/// Per-scan-period "Found device" DEBUG logger, deduplicated by MAC address.
-/// Shared by all tracker backends so the output format and dedup behaviour stay
-/// identical by construction (single implementation instead of per-chip copies).
-class DiscoveredDeviceLog {
- public:
-  /// Log the device at DEBUG the first time its MAC is seen this scan period.
-  void log_device(const char *tag, const ESPBTDevice &device);
-  /// Reset the per-period dedup list (call when a scan period ends).
-  void clear() { this->already_discovered_.clear(); }
-
- protected:
-  std::vector<uint64_t> already_discovered_;
-};
-
-// ---------------------------------------------------------------------------
-// ESPBTDeviceListener — base class for BLE consumers (sensors, proxy, triggers)
-// ---------------------------------------------------------------------------
-
-class ESPBTDeviceListener {
- public:
-  virtual ~ESPBTDeviceListener() = default;
-  /// Called at the end of each scan duration period.
-  virtual void on_scan_end() {}
-  virtual bool parse_device(const ESPBTDevice &device) = 0;
-};
-
-}  // namespace esphome::ble_device_base

esphome/components/ble_device_base/ble_hub.h

@@ -1,100 +0,0 @@
-// ble_hub.h
-//
-// BLEHub — the platform-neutral BLE tracker contract.
-//
-// Every BLE tracker component (esp32_ble_tracker, bk72xx_ble_tracker,
-// ln882h_ble_tracker, future chips) implements this interface; every BLE
-// consumer (sensor components, bluetooth_proxy) binds to it — in YAML via
-// `cv.use_id(BLEHub)`, which resolves whichever tracker the config declares.
-// Adding a new BLE chip therefore requires only a new tracker component that
-// implements BLEHub: no consumer, registry, or base changes.
-//
-// Chip differences are expressed as data (HubCapabilities), never as
-// platform conditionals in consumers.
-
-#pragma once
-
-#include "ble_device.h"
-
-#include <cstdint>
-
-namespace esphome::ble_device_base {
-
-/// One raw advertisement as delivered by the controller — a borrowed view,
-/// valid only for the duration of the invoke() callback.
-struct RawAdvertisement {
-  /// Least-significant octet first (BLE controller convention).
-  const uint8_t *mac;
-  const uint8_t *data;
-  uint16_t data_len;
-  int8_t rssi;  // signed dBm
-  uint8_t addr_type;
-};
-
-/// Subscriber slot for the raw-advertisement stream (the bluetooth_proxy
-/// path). The hub delivers on the ESPHome main loop. Same shape as
-/// logger.h's LogCallback: an instance pointer plus a plain function
-/// pointer — no virtuals, no std::function.
-///
-/// Usage:
-///   hub->set_raw_advertisement_callback({this, [](void *self, const RawAdvertisement &adv) {
-///     static_cast<MyComponent *>(self)->on_raw_advertisement(adv);
-///   }});
-struct RawAdvertisementCallback {
-  void *instance{nullptr};
-  void (*fn)(void *instance, const RawAdvertisement &adv){nullptr};
-  /// A default-constructed slot is "no subscriber"; hubs must guard on this.
-  bool is_set() const { return this->fn != nullptr; }
-  void invoke(const RawAdvertisement &adv) const { this->fn(this->instance, adv); }
-};
-
-/// What a tracker's controller/SDK can do — consumers branch on data, not #ifdefs.
-struct HubCapabilities {
-  /// Controller can send scan requests (active scanning).
-  bool active_scan;
-  /// Controller (or tracker) delivers advertisement + scan response as one merged
-  /// frame. When false, consumers relying on scan-response fields (e.g. names)
-  /// may only see them where the receiver merges per address (Home Assistant does).
-  bool merges_scan_response;
-  /// GATT client connections are available (today: esp32 only, but a chip SDK
-  /// gaining GATT support only has to flip this bit).
-  bool gatt;
-  /// request_scan_mode() is honored at runtime. Distinct from active_scan:
-  /// a passive-only controller (bk72xx) can never switch, and a hub may
-  /// support active scanning yet still refuse the runtime switch
-  /// (esp32_ble_tracker drives its mode through its own tracker API).
-  bool scan_mode_switch;
-};
-
-class BLEHub {
- public:
-  virtual ~BLEHub() = default;
-
-  /// Register a parsed-advertisement consumer (BLE sensors, automation triggers).
-  virtual void register_listener(ESPBTDeviceListener *listener) = 0;
-
-  /// Wire the raw-advertisement stream (bluetooth_proxy). One consumer at a time.
-  virtual void set_raw_advertisement_callback(RawAdvertisementCallback callback) = 0;
-
-  virtual HubCapabilities get_capabilities() const = 0;
-
-  /// Adapter MAC in printable (MSB-first) order, out[0] = MSB.
-  virtual void get_adapter_mac(uint8_t out[6]) = 0;
-
-  virtual bool scan_running() = 0;
-  /// True when the current/configured scan mode is active (scan requests sent).
-  virtual bool scan_active() = 0;
-  /// Request a scan-mode change (active = send scan requests). Returns false
-  /// when the hub cannot honor the request; the caller reports the real state
-  /// back to its subscriber. A hub that returns true applies the mode
-  /// immediately: a running scan is restarted with the new mode, an idle one
-  /// picks it up on its next start. The default cannot-change keeps hubs
-  /// without a mode switch (and out-of-tree trackers) building unchanged.
-  /// Independent of HubCapabilities::active_scan: that bit describes what the
-  /// CONTROLLER can do; whether this method honors requests is advertised by
-  /// HubCapabilities::scan_mode_switch, so consumers can gate features on the
-  /// switch without probing.
-  virtual bool request_scan_mode(bool active) { return false; }
-};
-
-}  // namespace esphome::ble_device_base

esphome/components/ble_scanner/ble_scanner.h

@@ -5,8 +5,6 @@
 #include <ctime>
 
 #include "esphome/core/component.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/string_ref.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/components/text_sensor/text_sensor.h"
 
@@ -20,10 +18,22 @@ class BLEScanner final : public text_sensor::TextSensor,
  public:
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
     char addr_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
-    // Escape special characters in the device name for valid JSON. Control characters stay in the \u00XX form this
-    // sensor has always published.
+    // Escape special characters in the device name for valid JSON
+    const char *name = device.get_name().c_str();
     char escaped_name[128];
-    json_escape_into_buffer(escaped_name, StringRef(device.get_name()), /*short_control_escapes=*/false);
+    size_t pos = 0;
+    for (; *name != '\0' && pos < sizeof(escaped_name) - 7; name++) {
+      uint8_t c = static_cast<uint8_t>(*name);
+      if (c == '"' || c == '\\') {
+        escaped_name[pos++] = '\\';
+        escaped_name[pos++] = c;
+      } else if (c < 0x20) {
+        pos += snprintf(escaped_name + pos, sizeof(escaped_name) - pos, "\\u%04x", c);
+      } else {
+        escaped_name[pos++] = c;
+      }
+    }
+    escaped_name[pos] = '\0';
 
     char buf[256];
     snprintf(buf, sizeof(buf), "{\"timestamp\":%" PRId64 ",\"address\":\"%s\",\"rssi\":%d,\"name\":\"%s\"}",

esphome/components/bluetooth_proxy/__init__.py

@@ -1,50 +1,14 @@
-import functools
 import logging
 
 import esphome.codegen as cg
-from esphome.components import ble_device_base
+from esphome.components import esp32_ble, esp32_ble_client, esp32_ble_tracker
+from esphome.components.esp32 import add_idf_sdkconfig_option
+from esphome.components.esp32_ble import BTLoggers
 import esphome.config_validation as cv
-from esphome.const import CONF_ACTIVE, CONF_ID, PLATFORM_LN882X, PLATFORM_RP2
-from esphome.core import CORE
-from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
-from esphome.types import ConfigType
+from esphome.const import CONF_ACTIVE, CONF_ID
 
-# The esp32 BLE stack (esp32_ble, esp32_ble_client, esp32_ble_tracker) is
-# imported lazily inside _esp32_config_schema()/_to_code_esp32(): importing
-# those modules registers esp32-only automations (ble.enable, ble.disable, ...)
-# as a side effect, and a module-scope import would leak them into every
-# platform's registry the moment a config declares `bluetooth_proxy:` —
-# degrading "Unable to find action" config errors into C++ compile failures.
-
-
-def AUTO_LOAD(config: ConfigType | None = None) -> list[str]:
-    """Components to auto-load for the platform being compiled.
-
-    Callable with no argument so tooling that resolves AUTO_LOAD without a
-    target platform (the device-builder catalog sync does exactly this) gets
-    the union of every arm instead of an empty list — which is what lets it
-    keep cross-referencing the esp32 BLE stack. A real build always has a
-    target platform set, so it takes one of the concrete branches.
-    """
-    if CORE.is_esp32:
-        return ["esp32_ble_client", "esp32_ble_tracker"]
-    if CORE.target_platform in _HUB_PLATFORMS:
-        return ["ble_device_base"]
-    # No target platform, or one this component does not support: tooling
-    # resolving the manifest (including the host-pinned dependency resolver) —
-    # expose every arm so the closure keeps the esp32 BLE stack.
-    return ["ble_device_base", "esp32_ble_client", "esp32_ble_tracker"]
-
-
-# Platforms with an in-tree ble_device_base BLE tracker hub whose controller
-# supports active scanning. Passive-only hubs (bk72xx) are deliberately NOT
-# admitted yet: every current client (aioesphomeapi, bleak-esphome, Home
-# Assistant) assumes an ESPHome proxy can scan actively, so a passive-only
-# proxy would be misdriven — bk72xx follows once the API carries a feature
-# flag clients can trust (FEATURE_ACTIVE_SCAN + a version flag, separate PRs).
-_HUB_PLATFORMS = (PLATFORM_LN882X, PLATFORM_RP2)
-
-DEPENDENCIES = ["api"]
+AUTO_LOAD = ["esp32_ble_client", "esp32_ble_tracker"]
+DEPENDENCIES = ["api", "esp32"]
 CODEOWNERS = ["@jesserockz", "@bdraco"]
 
 _LOGGER = logging.getLogger(__name__)
@@ -56,209 +20,65 @@ DEFAULT_CONNECTION_SLOTS = 3
 
 bluetooth_proxy_ns = cg.esphome_ns.namespace("bluetooth_proxy")
 
-BluetoothProxy = bluetooth_proxy_ns.class_("BluetoothProxy", cg.Component)
-
-# Mirrors esp32_ble.IDF_MAX_CONNECTIONS as a literal so the statically walkable
-# CONFIG_SCHEMA below can state the connection_slots range without importing the
-# esp32 BLE stack. tests/component_tests/bluetooth_proxy/ pins the two together.
-_IDF_MAX_CONNECTIONS = 9
-
-
-@functools.cache
-def _esp32_config_schema() -> cv.All:
-    """Build the esp32 schema, importing the esp32 BLE stack only when used."""
-    from esphome.components import esp32_ble, esp32_ble_client, esp32_ble_tracker
-
-    if esp32_ble.IDF_MAX_CONNECTIONS != _IDF_MAX_CONNECTIONS:
-        raise cv.Invalid(
-            f"bluetooth_proxy's connection-slot limit mirror "
-            f"({_IDF_MAX_CONNECTIONS}) is out of sync with "
-            f"esp32_ble.IDF_MAX_CONNECTIONS ({esp32_ble.IDF_MAX_CONNECTIONS}); "
-            f"update _IDF_MAX_CONNECTIONS in bluetooth_proxy/__init__.py"
-        )
-
-    BluetoothConnection = bluetooth_proxy_ns.class_(
-        "BluetoothConnection", esp32_ble_client.BLEClientBase
-    )
-    CONNECTION_SCHEMA = esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BluetoothConnection),
-        }
-    ).extend(cv.COMPONENT_SCHEMA)
-
-    def validate_connections(config):
-        if CONF_CONNECTIONS in config:
-            if not config[CONF_ACTIVE]:
-                raise cv.Invalid(
-                    "Connections can only be used if the proxy is set to active"
-                )
-        elif config[CONF_ACTIVE]:
-            connection_slots: int = config[CONF_CONNECTION_SLOTS]
-            esp32_ble.consume_connection_slots(connection_slots, "bluetooth_proxy")(
-                config
-            )
-
-            return {
-                **config,
-                CONF_CONNECTIONS: [
-                    CONNECTION_SCHEMA({}) for _ in range(connection_slots)
-                ],
-            }
-        return config
-
-    return cv.All(
-        (
-            cv.Schema(
-                {
-                    **_COMMON_SCHEMA_KEYS,
-                    cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
-                    cv.Optional(CONF_CACHE_SERVICES, default=True): cv.boolean,
-                    cv.Optional(
-                        CONF_CONNECTION_SLOTS,
-                        default=DEFAULT_CONNECTION_SLOTS,
-                    ): cv.All(
-                        cv.positive_int,
-                        cv.Range(min=1, max=esp32_ble.IDF_MAX_CONNECTIONS),
-                    ),
-                    cv.Optional(CONF_CONNECTIONS): cv.All(
-                        cv.ensure_list(CONNECTION_SCHEMA),
-                        cv.Length(min=1, max=esp32_ble.IDF_MAX_CONNECTIONS),
-                    ),
-                }
-            )
-            .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
-            .extend(cv.COMPONENT_SCHEMA)
-        ),
-        validate_connections,
-    )
-
-
-def _validate_no_active(config: ConfigType) -> ConfigType:
-    if config[CONF_ACTIVE]:
-        raise cv.Invalid(
-            "Active connections are not supported on this platform; the proxy "
-            "forwards advertisements only (set active: false)"
-        )
-    return config
-
-
-# Advertisement-only proxy on a neutral BLE hub: the hub's raw-advertisement
-# callback feeds the same API batching. GATT/active connections are excluded at
-# compile time — only the esp32 build compiles the connection stack; nothing
-# reads HubCapabilities::gatt at runtime for this today.
-# Keys both platform schemas must declare identically; each arm spreads this
-# dict so the shared surface cannot drift. CONF_ACTIVE deliberately stays
-# per-arm: its default differs (esp32 True, hub arms False — no GATT).
-_COMMON_SCHEMA_KEYS = {
-    cv.GenerateID(): cv.declare_id(BluetoothProxy),
-}
-
-_BLE_HUB_CONFIG_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            **_COMMON_SCHEMA_KEYS,
-            # Declared directly (BLE_DEVICE_SCHEMA-style): appending a validator
-            # after a strict schema rejects an explicit `ble_hub_id` before it
-            # runs, and that key is the documented way to disambiguate once a
-            # platform has two trackers.
-            cv.GenerateID(ble_device_base.CONF_BLE_HUB_ID): cv.use_id(
-                ble_device_base.BLEHub
-            ),
-            cv.Optional(CONF_ACTIVE, default=False): cv.boolean,
-        }
-    ).extend(cv.COMPONENT_SCHEMA),
-    _validate_no_active,
+BluetoothProxy = bluetooth_proxy_ns.class_(
+    "BluetoothProxy", esp32_ble_tracker.ESPBTDeviceListener, cg.Component
+)
+BluetoothConnection = bluetooth_proxy_ns.class_(
+    "BluetoothConnection", esp32_ble_client.BLEClientBase
 )
 
-
-@schema_extractor("schema")
-def _validate_platform(config: ConfigType) -> ConfigType:
-    """Apply the schema for the platform actually being compiled.
-
-    esp32 keeps the full GATT proxy; every other platform gets the
-    advertisement-only shape, which rejects the connection-oriented options
-    above because its schema does not define them.
-    """
-    if config is SCHEMA_EXTRACT:
-        # The language-schema dumper runs without a platform. Expose the esp32
-        # shape so `connections`, the ids and every default stay in the
-        # generated schema the editor and dashboard consume.
-        return _esp32_config_schema()
-    if CORE.is_esp32:
-        return _esp32_config_schema()(config)
-    if CORE.target_platform not in _HUB_PLATFORMS:
-        # Fail here with the actual reason. Without this gate the error surfaces
-        # later as an unresolvable hub ID ("Are you missing a hub declaration?")
-        # on platforms where no hub component can be declared.
-        raise cv.Invalid(
-            f"bluetooth_proxy is not supported on {CORE.target_platform}: no "
-            "active-scan-capable BLE tracker hub is available for this "
-            "platform. It runs on esp32 (full proxy), and the ln882x and rp2 "
-            "families (advertisement-only)."
-        )
-    return _BLE_HUB_CONFIG_SCHEMA(config)
+CONNECTION_SCHEMA = esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(BluetoothConnection),
+    }
+).extend(cv.COMPONENT_SCHEMA)
 
 
-def _reject_connection_keys_off_esp32(config: ConfigType) -> ConfigType:
-    """Reject connection-oriented options by name on hub-only platforms.
-
-    Runs before the walkable schema below so the user gets "this option does
-    not exist here" instead of the option's esp32 value range (which would
-    imply a smaller number is accepted).
-    """
-    if not isinstance(config, dict) or CORE.is_esp32 or CORE.target_platform is None:
-        return config
-    if CORE.target_platform not in _HUB_PLATFORMS:
-        # No proxy of any kind exists here: fall through so _validate_platform
-        # reports "not supported on {platform}" instead of a key-level message
-        # implying an advertisement-only proxy is available.
-        return config
-    for key in (CONF_CONNECTION_SLOTS, CONF_CACHE_SERVICES, CONF_CONNECTIONS):
-        if key in config:
+def validate_connections(config):
+    if CONF_CONNECTIONS in config:
+        if not config[CONF_ACTIVE]:
             raise cv.Invalid(
-                f"'{key}' requires active connection support, which needs the "
-                "esp32 GATT stack; this platform runs the advertisement-only "
-                "proxy and has no such option",
-                path=[key],
+                "Connections can only be used if the proxy is set to active"
             )
+    elif config[CONF_ACTIVE]:
+        connection_slots: int = config[CONF_CONNECTION_SLOTS]
+        esp32_ble.consume_connection_slots(connection_slots, "bluetooth_proxy")(config)
+
+        return {
+            **config,
+            CONF_CONNECTIONS: [CONNECTION_SCHEMA({}) for _ in range(connection_slots)],
+        }
     return config
 
 
-# CONFIG_SCHEMA stays a statically walkable schema: tooling (the dashboard's
-# field-range extractor among others) introspects it to discover options and
-# their bounds, which a bare dispatch function would hide. It carries the scalar
-# keys with no defaults; _validate_platform then runs the real per-platform
-# schema, which applies the defaults and rejects options the platform does not
-# support.
-#
-# It deliberately does NOT declare `connections`: this outer schema runs before
-# the per-platform one, so any key it transforms is transformed twice. Running
-# CONNECTION_SCHEMA twice re-validates an already-generated ID through
-# declare_id(), which (unlike use_id) has no guard for an ID instance and
-# rejects it as empty. extra=ALLOW_EXTRA passes `connections` through untouched
-# for _ESP32_CONFIG_SCHEMA to validate exactly once.
 CONFIG_SCHEMA = cv.All(
-    _reject_connection_keys_off_esp32,
-    cv.Schema(
-        {
-            cv.Optional(CONF_ACTIVE): cv.boolean,
-            cv.Optional(CONF_CACHE_SERVICES): cv.boolean,
-            cv.Optional(CONF_CONNECTION_SLOTS): cv.All(
-                cv.positive_int,
-                cv.Range(min=1, max=_IDF_MAX_CONNECTIONS),
-            ),
-        },
-        extra=cv.ALLOW_EXTRA,
+    (
+        cv.Schema(
+            {
+                cv.GenerateID(): cv.declare_id(BluetoothProxy),
+                cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
+                cv.Optional(CONF_CACHE_SERVICES, default=True): cv.boolean,
+                cv.Optional(
+                    CONF_CONNECTION_SLOTS,
+                    default=DEFAULT_CONNECTION_SLOTS,
+                ): cv.All(
+                    cv.positive_int,
+                    cv.Range(min=1, max=esp32_ble.IDF_MAX_CONNECTIONS),
+                ),
+                cv.Optional(CONF_CONNECTIONS): cv.All(
+                    cv.ensure_list(CONNECTION_SCHEMA),
+                    cv.Length(min=1, max=esp32_ble.IDF_MAX_CONNECTIONS),
+                ),
+            }
+        )
+        .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
+        .extend(cv.COMPONENT_SCHEMA)
     ),
-    _validate_platform,
+    validate_connections,
 )
 
 
-async def _to_code_esp32(config: ConfigType) -> None:
-    from esphome.components import esp32_ble, esp32_ble_tracker
-    from esphome.components.esp32 import add_idf_sdkconfig_option
-    from esphome.components.esp32_ble import BTLoggers
-
+async def to_code(config):
     # Register the loggers this component needs
     esp32_ble.register_bt_logger(BTLoggers.GATT, BTLoggers.L2CAP, BTLoggers.SMP)
 
@@ -267,12 +87,17 @@ async def _to_code_esp32(config: ConfigType) -> None:
 
     cg.add(var.set_active(config[CONF_ACTIVE]))
     await esp32_ble_tracker.register_raw_ble_device(var, config)
-    await esp32_ble_tracker.register_scanner_state_listener(var, config)
 
     # Define max connections for protobuf fixed array
     connection_count = len(config.get(CONF_CONNECTIONS, []))
     cg.add_define("BLUETOOTH_PROXY_MAX_CONNECTIONS", connection_count)
 
+    # Define batch size for BLE advertisements
+    # Each advertisement is up to 80 bytes when packaged (including protocol overhead)
+    # 16 advertisements × 80 bytes (worst case) = 1280 bytes out of ~1320 bytes usable payload
+    # This achieves ~97% WiFi MTU utilization while staying under the limit
+    cg.add_define("BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE", 16)
+
     for connection_conf in config.get(CONF_CONNECTIONS, []):
         connection_var = cg.new_Pvariable(connection_conf[CONF_ID])
         await cg.register_component(connection_var, connection_conf)
@@ -282,30 +107,4 @@ async def _to_code_esp32(config: ConfigType) -> None:
     if config.get(CONF_CACHE_SERVICES):
         add_idf_sdkconfig_option("CONFIG_BT_GATTC_CACHE_NVS_FLASH", True)
 
-
-async def _to_code_ble_hub(config: ConfigType) -> None:
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    cg.add(var.set_active(config[CONF_ACTIVE]))
-    hub = await cg.get_variable(config[ble_device_base.CONF_BLE_HUB_ID])
-    cg.add(var.set_ble_hub(hub))
-
-    # The api component sizes BluetoothConnectionsFreeResponse.allocated with
-    # this define whenever a proxy is present; no connections off-esp32.
-    cg.add_define("BLUETOOTH_PROXY_MAX_CONNECTIONS", 0)
-
-
-async def to_code(config: ConfigType) -> None:
-    if CORE.is_esp32:
-        await _to_code_esp32(config)
-    else:
-        await _to_code_ble_hub(config)
-
-    # Define batch size for BLE advertisements
-    # Each advertisement is up to 80 bytes when packaged (including protocol overhead)
-    # 16 advertisements × 80 bytes (worst case) = 1280 bytes out of ~1320 bytes usable payload
-    # This achieves ~97% WiFi MTU utilization while staying under the limit
-    cg.add_define("BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE", 16)
-
     cg.add_define("USE_BLUETOOTH_PROXY")

esphome/components/bluetooth_proxy/bluetooth_proxy.cpp

@@ -1,9 +1,6 @@
 #include "bluetooth_proxy.h"
 
-#ifdef USE_BLUETOOTH_PROXY
-
 #include "esphome/components/api/api_server.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "esphome/core/macros.h"
 #include "esphome/core/application.h"
@@ -11,6 +8,8 @@
 #include <cstring>
 #include <limits>
 
+#ifdef USE_ESP32
+
 namespace esphome::bluetooth_proxy {
 
 static const char *const TAG = "bluetooth_proxy";
@@ -24,14 +23,14 @@ static_assert(sizeof(((api::BluetoothLERawAdvertisement *) nullptr)->data) == 62
 
 BluetoothProxy::BluetoothProxy() { global_bluetooth_proxy = this; }
 
-#ifdef USE_ESP32
-
 void BluetoothProxy::setup() {
   this->connections_free_response_.limit = BLUETOOTH_PROXY_MAX_CONNECTIONS;
   this->connections_free_response_.free = BLUETOOTH_PROXY_MAX_CONNECTIONS;
 
   // Capture the configured scan mode from YAML before any API changes
   this->configured_scan_active_ = this->parent_->get_scan_active();
+
+  this->parent_->add_scanner_state_listener(this);
 }
 
 void BluetoothProxy::on_scanner_state(esp32_ble_tracker::ScannerState state) {
@@ -51,62 +50,6 @@ void BluetoothProxy::send_bluetooth_scanner_state_(esp32_ble_tracker::ScannerSta
   this->api_connection_->send_message(resp);
 }
 
-#else  // !USE_ESP32
-
-void BluetoothProxy::setup() {
-  this->connections_free_response_.limit = 0;
-  this->connections_free_response_.free = 0;
-
-  // Capture the configured scan mode from YAML before any API changes
-  this->configured_scan_active_ = this->hub_->scan_active();
-  this->last_scan_running_ = this->hub_->scan_running();
-
-  // The hub delivers raw advertisements on the ESPHome main loop:
-  // mac is least-significant octet first (BLE controller convention).
-  this->hub_->set_raw_advertisement_callback({this, [](void *self, const ble_device_base::RawAdvertisement &adv) {
-                                                static_cast<BluetoothProxy *>(self)->on_raw_advertisement_(adv);
-                                              }});
-}
-
-void BluetoothProxy::on_raw_advertisement_(const ble_device_base::RawAdvertisement &raw) {
-  if (!api::global_api_server->is_connected() || this->api_connection_ == nullptr)
-    return;
-
-  auto &adv = this->response_.advertisements[this->response_.advertisements_len];
-  // raw.mac is LSB-first; this yields the same uint64 the esp32 proxy sends.
-  adv.address = ble_device_base::mac_lsb_first_to_uint64(raw.mac);
-  adv.rssi = raw.rssi;
-  adv.address_type = raw.addr_type;
-  uint8_t length = raw.data_len > sizeof(adv.data) ? sizeof(adv.data) : static_cast<uint8_t>(raw.data_len);
-  adv.data_len = length;
-  std::memcpy(adv.data, raw.data, length);
-
-  this->response_.advertisements_len++;
-
-  ESP_LOGV(TAG, "Queuing raw packet from %02X:%02X:%02X:%02X:%02X:%02X, length %d. RSSI: %d dB", raw.mac[5], raw.mac[4],
-           raw.mac[3], raw.mac[2], raw.mac[1], raw.mac[0], length, raw.rssi);
-
-  // Flush if we have reached BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE
-  if (this->response_.advertisements_len >= BLUETOOTH_PROXY_ADVERTISEMENT_BATCH_SIZE) {
-    this->flush_pending_advertisements_();
-  }
-}
-
-void BluetoothProxy::send_bluetooth_scanner_state_() {
-  api::BluetoothScannerStateResponse resp;
-  resp.state = this->hub_->scan_running() ? api::enums::BluetoothScannerState::BLUETOOTH_SCANNER_STATE_RUNNING
-                                          : api::enums::BluetoothScannerState::BLUETOOTH_SCANNER_STATE_IDLE;
-  resp.mode = this->hub_->scan_active() ? api::enums::BluetoothScannerMode::BLUETOOTH_SCANNER_MODE_ACTIVE
-                                        : api::enums::BluetoothScannerMode::BLUETOOTH_SCANNER_MODE_PASSIVE;
-  resp.configured_mode = this->configured_scan_active_
-                             ? api::enums::BluetoothScannerMode::BLUETOOTH_SCANNER_MODE_ACTIVE
-                             : api::enums::BluetoothScannerMode::BLUETOOTH_SCANNER_MODE_PASSIVE;
-  this->api_connection_->send_message(resp);
-}
-
-#endif  // USE_ESP32
-
-#ifdef USE_ESP32
 void BluetoothProxy::log_connection_request_ignored_(BluetoothConnection *connection, espbt::ClientState state) {
   ESP_LOGW(TAG, "[%d] [%s] Connection request ignored, state: %s", connection->get_connection_index(),
            connection->address_str(), espbt::client_state_to_string(state));
@@ -115,7 +58,6 @@ void BluetoothProxy::log_connection_request_ignored_(BluetoothConnection *connec
 void BluetoothProxy::log_connection_info_(BluetoothConnection *connection, const char *message) {
   ESP_LOGI(TAG, "[%d] [%s] Connecting %s", connection->get_connection_index(), connection->address_str(), message);
 }
-#endif  // USE_ESP32
 
 void BluetoothProxy::log_not_connected_gatt_(const char *action, const char *type) {
   ESP_LOGW(TAG, "Cannot %s GATT %s, not connected", action, type);
@@ -127,8 +69,6 @@ void BluetoothProxy::handle_gatt_not_connected_(uint64_t address, uint16_t handl
   this->send_gatt_error(address, handle, ESP_GATT_NOT_CONNECTED);
 }
 
-#ifdef USE_ESP32
-
 #ifdef USE_ESP32_BLE_DEVICE
 bool BluetoothProxy::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
   // This method should never be called since bluetooth_proxy always uses raw advertisements
@@ -169,38 +109,18 @@ bool BluetoothProxy::parse_devices(const esp32_ble::BLEScanResult *scan_results,
   return true;
 }
 
-#endif  // USE_ESP32
-
 void BluetoothProxy::log_advertisement_flush_() {
   ESP_LOGV(TAG, "Sent batch of %u BLE advertisements", this->response_.advertisements_len);
 }
 
 void BluetoothProxy::dump_config() {
-#ifdef USE_ESP32
   ESP_LOGCONFIG(TAG,
                 "Bluetooth Proxy:\n"
                 "  Active: %s\n"
                 "  Connections: %d",
                 YESNO(this->active_), this->connection_count_);
-#else
-  // Advertisement-only: print configured facts. dump_config runs right after
-  // setup, before the radio is up, so live scan state would always read
-  // "stopped" here — the loop's BluetoothScannerStateResponse carries the
-  // changing value instead.
-  char mac_str[18];
-  this->get_bluetooth_mac_address_pretty(mac_str);
-  ESP_LOGCONFIG(TAG,
-                "Bluetooth Proxy:\n"
-                "  Mode: advertisement-only (no GATT connections)\n"
-                "  Configured scan: %s\n"
-                "  Adapter MAC: %s",
-                this->configured_scan_active_ ? "active" : "passive",
-                mac_str[0] != '\0' ? mac_str : "unavailable (adapter not up yet)");
-#endif
 }
 
-#ifdef USE_ESP32
-
 void BluetoothProxy::loop() {
   // Run advertisement flush / connection cleanup every 100ms
   uint32_t now = App.get_loop_component_start_time();
@@ -327,15 +247,20 @@ void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest
       esp_bd_addr_t address;
       uint64_to_bd_addr(msg.address, address);
       esp_err_t ret = esp_ble_remove_bond_device(address);
-      this->send_device_unpairing(msg.address, ret == ESP_OK, ret);
+      this->send_device_pairing(msg.address, ret == ESP_OK, ret);
       break;
     }
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE: {
       esp_bd_addr_t address;
       uint64_to_bd_addr(msg.address, address);
       esp_err_t ret = esp_ble_gattc_cache_clean(address);
-      // Shares the sender with the neutral path, which also null-checks api_connection_.
-      this->send_device_clear_cache(msg.address, ret == ESP_OK, ret);
+      api::BluetoothDeviceClearCacheResponse call;
+      call.address = msg.address;
+      call.success = ret == ESP_OK;
+      call.error = ret;
+
+      this->api_connection_->send_message(call);
+
       break;
     }
     case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT: {
@@ -453,124 +378,6 @@ void BluetoothProxy::bluetooth_set_connection_params(const api::BluetoothSetConn
   this->api_connection_->send_message(resp);
 }
 
-void BluetoothProxy::bluetooth_scanner_set_mode(bool active) {
-  if (this->parent_->get_scan_active() == active) {
-    return;
-  }
-  ESP_LOGD(TAG, "Setting scanner mode to %s", active ? "active" : "passive");
-  this->parent_->set_scan_active(active);
-  this->parent_->stop_scan();
-  this->parent_->set_scan_continuous(
-      true);  // Set this to true to automatically start scanning again when it has cleaned up.
-}
-
-#else  // !USE_ESP32
-
-// Advertisement-only proxy. GATT client connections are excluded at compile
-// time — this whole arm is selected by #ifdef USE_ESP32, and nothing consults
-// HubCapabilities at runtime today — so every connection-oriented request is
-// answered with a clean error instead of silence, and Home Assistant treats
-// the proxy as passive.
-
-void BluetoothProxy::loop() {
-  // Run advertisement flush / scanner-state poll every 100ms
-  uint32_t now = App.get_loop_component_start_time();
-  if (now - this->last_advertisement_flush_time_ < 100)
-    return;
-  this->last_advertisement_flush_time_ = now;
-
-  if (!api::global_api_server->is_connected() || this->api_connection_ == nullptr)
-    return;
-
-  // The hub has no scanner-state listener interface; poll and report on change.
-  bool running = this->hub_->scan_running();
-  if (running != this->last_scan_running_) {
-    this->last_scan_running_ = running;
-    this->send_bluetooth_scanner_state_();
-  }
-
-  this->flush_pending_advertisements_();
-}
-
-void BluetoothProxy::bluetooth_device_request(const api::BluetoothDeviceRequest &msg) {
-  switch (msg.request_type) {
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITH_CACHE:
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT_V3_WITHOUT_CACHE:
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CONNECT:
-      ESP_LOGW(TAG, "Active connections are not supported on this platform");
-      this->send_device_connection(msg.address, false, 0, ESP_GATT_NOT_CONNECTED);
-      break;
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_DISCONNECT:
-      // Not an error: the device is already disconnected, which is the requested state.
-      this->send_device_connection(msg.address, false);
-      this->send_connections_free();
-      break;
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_PAIR:
-      this->send_device_pairing(msg.address, false, ESP_GATT_NOT_CONNECTED);
-      break;
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_UNPAIR:
-      this->send_device_unpairing(msg.address, false, ESP_GATT_NOT_CONNECTED);
-      break;
-    case api::enums::BLUETOOTH_DEVICE_REQUEST_TYPE_CLEAR_CACHE:
-      this->send_device_clear_cache(msg.address, false, ESP_GATT_NOT_CONNECTED);
-      break;
-  }
-}
-
-void BluetoothProxy::bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg) {
-  this->handle_gatt_not_connected_(msg.address, msg.handle, "read", "characteristic");
-}
-
-void BluetoothProxy::bluetooth_gatt_write(const api::BluetoothGATTWriteRequest &msg) {
-  this->handle_gatt_not_connected_(msg.address, msg.handle, "write", "characteristic");
-}
-
-void BluetoothProxy::bluetooth_gatt_read_descriptor(const api::BluetoothGATTReadDescriptorRequest &msg) {
-  this->handle_gatt_not_connected_(msg.address, msg.handle, "read", "descriptor");
-}
-
-void BluetoothProxy::bluetooth_gatt_write_descriptor(const api::BluetoothGATTWriteDescriptorRequest &msg) {
-  this->handle_gatt_not_connected_(msg.address, msg.handle, "write", "descriptor");
-}
-
-void BluetoothProxy::bluetooth_gatt_send_services(const api::BluetoothGATTGetServicesRequest &msg) {
-  this->handle_gatt_not_connected_(msg.address, 0, "get", "services");
-}
-
-void BluetoothProxy::bluetooth_gatt_notify(const api::BluetoothGATTNotifyRequest &msg) {
-  this->handle_gatt_not_connected_(msg.address, msg.handle, "notify", "characteristic");
-}
-
-void BluetoothProxy::bluetooth_set_connection_params(const api::BluetoothSetConnectionParamsRequest &msg) {
-  if (this->api_connection_ == nullptr)
-    return;
-  api::BluetoothSetConnectionParamsResponse resp;
-  resp.address = msg.address;
-  resp.error = ESP_GATT_NOT_CONNECTED;
-  this->api_connection_->send_message(resp);
-}
-
-void BluetoothProxy::bluetooth_scanner_set_mode(bool active) {
-  if (this->hub_->scan_active() != active) {
-    ESP_LOGD(TAG, "Setting scanner mode to %s", active ? "active" : "passive");
-    if (!this->hub_->request_scan_mode(active)) {
-      // Passive-only controller asked for active scanning; the state report
-      // below carries the real, unchanged mode so the subscriber does not
-      // assume the change happened.
-      ESP_LOGW(TAG, "Scanner mode %s not supported by this tracker", active ? "active" : "passive");
-    }
-  }
-  if (this->api_connection_ != nullptr) {
-    // Keep loop()'s change detector in step with the state sent here, so a
-    // failed restart (scan_running_ dropped by the tracker) is not reported
-    // twice — once now and again on the next tick.
-    this->last_scan_running_ = this->hub_->scan_running();
-    this->send_bluetooth_scanner_state_();
-  }
-}
-
-#endif  // USE_ESP32
-
 void BluetoothProxy::subscribe_api_connection(api::APIConnection *api_connection, uint32_t flags) {
   if (this->api_connection_ != nullptr && this->api_connection_ != api_connection) {
     // A previous subscriber still holds the slot. This is almost always a stale
@@ -585,13 +392,9 @@ void BluetoothProxy::subscribe_api_connection(api::APIConnection *api_connection
              this->api_connection_->get_peername_to(old_peername));
   }
   this->api_connection_ = api_connection;
-#ifdef USE_ESP32
   this->parent_->recalculate_advertisement_parser_types();
+
   this->send_bluetooth_scanner_state_(this->parent_->get_scanner_state());
-#else
-  this->last_scan_running_ = this->hub_->scan_running();
-  this->send_bluetooth_scanner_state_();
-#endif
 }
 
 void BluetoothProxy::unsubscribe_api_connection(api::APIConnection *api_connection) {
@@ -600,12 +403,10 @@ void BluetoothProxy::unsubscribe_api_connection(api::APIConnection *api_connecti
     return;
   }
   this->api_connection_ = nullptr;
-#ifdef USE_ESP32
   this->parent_->recalculate_advertisement_parser_types();
-#endif
 }
 
-void BluetoothProxy::send_device_connection(uint64_t address, bool connected, uint16_t mtu, proxy_err_t error) {
+void BluetoothProxy::send_device_connection(uint64_t address, bool connected, uint16_t mtu, esp_err_t error) {
   if (this->api_connection_ == nullptr)
     return;
   api::BluetoothDeviceConnectionResponse call;
@@ -633,7 +434,7 @@ void BluetoothProxy::send_gatt_services_done(uint64_t address) {
   this->api_connection_->send_message(call);
 }
 
-void BluetoothProxy::send_gatt_error(uint64_t address, uint16_t handle, proxy_err_t error) {
+void BluetoothProxy::send_gatt_error(uint64_t address, uint16_t handle, esp_err_t error) {
   if (this->api_connection_ == nullptr)
     return;
   api::BluetoothGATTErrorResponse call;
@@ -643,7 +444,7 @@ void BluetoothProxy::send_gatt_error(uint64_t address, uint16_t handle, proxy_er
   this->api_connection_->send_message(call);
 }
 
-void BluetoothProxy::send_device_pairing(uint64_t address, bool paired, proxy_err_t error) {
+void BluetoothProxy::send_device_pairing(uint64_t address, bool paired, esp_err_t error) {
   if (this->api_connection_ == nullptr)
     return;
   api::BluetoothDevicePairingResponse call;
@@ -654,7 +455,7 @@ void BluetoothProxy::send_device_pairing(uint64_t address, bool paired, proxy_er
   this->api_connection_->send_message(call);
 }
 
-void BluetoothProxy::send_device_unpairing(uint64_t address, bool success, proxy_err_t error) {
+void BluetoothProxy::send_device_unpairing(uint64_t address, bool success, esp_err_t error) {
   if (this->api_connection_ == nullptr)
     return;
   api::BluetoothDeviceUnpairingResponse call;
@@ -665,21 +466,19 @@ void BluetoothProxy::send_device_unpairing(uint64_t address, bool success, proxy
   this->api_connection_->send_message(call);
 }
 
-// Shared by both platform paths: the neutral bluetooth_device_request() uses it to
-// answer a clear-cache request with a clean error, so it must not be esp32-guarded.
-void BluetoothProxy::send_device_clear_cache(uint64_t address, bool success, proxy_err_t error) {
-  if (this->api_connection_ == nullptr)
+void BluetoothProxy::bluetooth_scanner_set_mode(bool active) {
+  if (this->parent_->get_scan_active() == active) {
     return;
-  api::BluetoothDeviceClearCacheResponse call;
-  call.address = address;
-  call.success = success;
-  call.error = error;
-
-  this->api_connection_->send_message(call);
+  }
+  ESP_LOGD(TAG, "Setting scanner mode to %s", active ? "active" : "passive");
+  this->parent_->set_scan_active(active);
+  this->parent_->stop_scan();
+  this->parent_->set_scan_continuous(
+      true);  // Set this to true to automatically start scanning again when it has cleaned up.
 }
 
 BluetoothProxy *global_bluetooth_proxy = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
 }  // namespace esphome::bluetooth_proxy
 
-#endif  // USE_BLUETOOTH_PROXY
+#endif  // USE_ESP32

esphome/components/bluetooth_proxy/bluetooth_proxy.h

@@ -1,8 +1,6 @@
 #pragma once
 
-#include "esphome/core/defines.h"
-
-#ifdef USE_BLUETOOTH_PROXY
+#ifdef USE_ESP32
 
 #include <array>
 #include <map>
@@ -10,12 +8,11 @@
 
 #include "esphome/components/api/api_connection.h"
 #include "esphome/components/api/api_pb2.h"
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-
-#ifdef USE_ESP32
 #include "esphome/components/esp32_ble_client/ble_client_base.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
 
 #include "bluetooth_connection.h"
 
@@ -23,31 +20,14 @@
 #include <esp_bt.h>
 #endif
 #include <esp_bt_device.h>
-#else
-#include "esphome/components/ble_device_base/ble_hub.h"
-#endif  // USE_ESP32
 
 namespace esphome::bluetooth_proxy {
 
-// Proxy-owned error type for the API error fields, which are plain integers on
-// the wire. Aliases esp_err_t on esp32 (where the values come from IDF calls);
-// a bare int elsewhere. Owning the name instead of probing for esp_err_t keeps
-// the header independent of how a hub platform's SDK spells its error type.
-#ifdef USE_ESP32
-using proxy_err_t = esp_err_t;
-static constexpr proxy_err_t PROXY_OK = ESP_OK;
-#else
-using proxy_err_t = int;
-static constexpr proxy_err_t PROXY_OK = 0;
-#endif
-
-static constexpr proxy_err_t ESP_GATT_NOT_CONNECTED = -1;
+static constexpr esp_err_t ESP_GATT_NOT_CONNECTED = -1;
 static constexpr int DONE_SENDING_SERVICES = -2;
 static constexpr int INIT_SENDING_SERVICES = -3;
 
-#ifdef USE_ESP32
 using namespace esp32_ble_client;
-#endif
 
 // Legacy versions:
 // Version 1: Initial version without active connections
@@ -73,28 +53,21 @@ enum BluetoothProxySubscriptionFlag : uint32_t {
   SUBSCRIPTION_RAW_ADVERTISEMENTS = 1 << 0,
 };
 
-#ifdef USE_ESP32
 class BluetoothProxy final : public esp32_ble_tracker::ESPBTDeviceListener,
                              public esp32_ble_tracker::BLEScannerStateListener,
                              public Component {
   friend class BluetoothConnection;  // Allow connection to update connections_free_response_
-#else
-class BluetoothProxy final : public Component {
-#endif
  public:
   BluetoothProxy();
-#ifdef USE_ESP32
 #ifdef USE_ESP32_BLE_DEVICE
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
 #endif
   bool parse_devices(const esp32_ble::BLEScanResult *scan_results, size_t count) override;
-  esp32_ble_tracker::AdvertisementParserType get_advertisement_parser_type() override;
-#endif  // USE_ESP32
   void dump_config() override;
   void setup() override;
   void loop() override;
+  esp32_ble_tracker::AdvertisementParserType get_advertisement_parser_type() override;
 
-#ifdef USE_ESP32
   // maybe_unused: in a passive proxy (active: false) MAX is 0, the body below is removed, and connection is unused.
   void register_connection([[maybe_unused]] BluetoothConnection *connection) {
     // Guard the always-false comparison (-Wtype-limits) in a passive proxy (active: false), where MAX is 0.
@@ -105,14 +78,6 @@ class BluetoothProxy final : public Component {
     }
 #endif
   }
-#else
-  void set_ble_hub(ble_device_base::BLEHub *hub) { this->hub_ = hub; }
-  // Run after the hub's setup() (the trackers use AFTER_WIFI): setup() below
-  // snapshots scan_active()/scan_running() and installs the raw callback, and
-  // the BLEHub contract does not promise those are settled any earlier than
-  // the hub's own setup().
-  float get_setup_priority() const override { return setup_priority::AFTER_WIFI - 1.0f; }
-#endif  // USE_ESP32
 
   void bluetooth_device_request(const api::BluetoothDeviceRequest &msg);
   void bluetooth_gatt_read(const api::BluetoothGATTReadRequest &msg);
@@ -127,18 +92,17 @@ class BluetoothProxy final : public Component {
   void unsubscribe_api_connection(api::APIConnection *api_connection);
   api::APIConnection *get_api_connection() { return this->api_connection_; }
 
-  void send_device_connection(uint64_t address, bool connected, uint16_t mtu = 0, proxy_err_t error = PROXY_OK);
+  void send_device_connection(uint64_t address, bool connected, uint16_t mtu = 0, esp_err_t error = ESP_OK);
   void send_connections_free();
   void send_connections_free(api::APIConnection *api_connection);
   void send_gatt_services_done(uint64_t address);
-  void send_gatt_error(uint64_t address, uint16_t handle, proxy_err_t error);
-  void send_device_pairing(uint64_t address, bool paired, proxy_err_t error = PROXY_OK);
-  void send_device_unpairing(uint64_t address, bool success, proxy_err_t error = PROXY_OK);
-  void send_device_clear_cache(uint64_t address, bool success, proxy_err_t error = PROXY_OK);
+  void send_gatt_error(uint64_t address, uint16_t handle, esp_err_t error);
+  void send_device_pairing(uint64_t address, bool paired, esp_err_t error = ESP_OK);
+  void send_device_unpairing(uint64_t address, bool success, esp_err_t error = ESP_OK);
+  void send_device_clear_cache(uint64_t address, bool success, esp_err_t error = ESP_OK);
 
   void bluetooth_scanner_set_mode(bool active);
 
-#ifdef USE_ESP32
   static void uint64_to_bd_addr(uint64_t address, esp_bd_addr_t bd_addr) {
     bd_addr[0] = (address >> 40) & 0xff;
     bd_addr[1] = (address >> 32) & 0xff;
@@ -147,15 +111,12 @@ class BluetoothProxy final : public Component {
     bd_addr[4] = (address >> 8) & 0xff;
     bd_addr[5] = (address >> 0) & 0xff;
   }
-#endif
 
   void set_active(bool active) { this->active_ = active; }
   bool has_active() { return this->active_; }
 
-#ifdef USE_ESP32
   /// BLEScannerStateListener interface
   void on_scanner_state(esp32_ble_tracker::ScannerState state) override;
-#endif
 
   uint32_t get_legacy_version() const {
     if (this->active_) {
@@ -168,17 +129,7 @@ class BluetoothProxy final : public Component {
     uint32_t flags = 0;
     flags |= BluetoothProxyFeature::FEATURE_PASSIVE_SCAN;
     flags |= BluetoothProxyFeature::FEATURE_RAW_ADVERTISEMENTS;
-#ifdef USE_ESP32
     flags |= BluetoothProxyFeature::FEATURE_STATE_AND_MODE;
-#else
-    // Advertise mode switching only where the hub honors request_scan_mode();
-    // scan_mode_switch is the capability bit for exactly that (#18079) —
-    // active_scan alone is not enough, a hub may support active scanning yet
-    // refuse the runtime switch.
-    if (this->hub_->get_capabilities().scan_mode_switch) {
-      flags |= BluetoothProxyFeature::FEATURE_STATE_AND_MODE;
-    }
-#endif
     if (this->active_) {
       flags |= BluetoothProxyFeature::FEATURE_ACTIVE_CONNECTIONS;
       flags |= BluetoothProxyFeature::FEATURE_REMOTE_CACHING;
@@ -191,37 +142,16 @@ class BluetoothProxy final : public Component {
   }
 
   void get_bluetooth_mac_address_pretty(std::span<char, 18> output) {
-#ifdef USE_ESP32
     const uint8_t *mac = esp_bt_dev_get_address();
     if (mac != nullptr) {
       format_mac_addr_upper(mac, output.data());
     } else {
       output[0] = '\0';
     }
-#else
-    uint8_t mac[6] = {};
-    this->hub_->get_adapter_mac(mac);
-    // Mirror the esp32 arm's unavailable -> empty-string fallback: some hubs
-    // (rp2040's BTstack) only learn the address once the link layer is up, and
-    // report all-zero until then.
-    bool nonzero = false;
-    for (uint8_t b : mac)
-      nonzero |= b != 0;
-    if (nonzero) {
-      format_mac_addr_upper(mac, output.data());
-    } else {
-      output[0] = '\0';
-    }
-#endif
   }
 
  protected:
-#ifdef USE_ESP32
   void send_bluetooth_scanner_state_(esp32_ble_tracker::ScannerState state);
-#else
-  void send_bluetooth_scanner_state_();
-  void on_raw_advertisement_(const ble_device_base::RawAdvertisement &raw);
-#endif
 
   /// Caller must ensure api_connection_ is non-null and API server is connected.
   void flush_pending_advertisements_() {
@@ -235,11 +165,9 @@ class BluetoothProxy final : public Component {
   }
   void log_advertisement_flush_();
 
-#ifdef USE_ESP32
   BluetoothConnection *get_connection_(uint64_t address, bool reserve);
   void log_connection_request_ignored_(BluetoothConnection *connection, espbt::ClientState state);
   void log_connection_info_(BluetoothConnection *connection, const char *message);
-#endif
   void log_not_connected_gatt_(const char *action, const char *type);
   void handle_gatt_not_connected_(uint64_t address, uint16_t handle, const char *action, const char *type);
 
@@ -247,12 +175,8 @@ class BluetoothProxy final : public Component {
   // Group 1: Pointers (4 bytes each, naturally aligned)
   api::APIConnection *api_connection_{nullptr};
 
-#ifdef USE_ESP32
   // Group 2: Fixed-size array of connection pointers
   std::array<BluetoothConnection *, BLUETOOTH_PROXY_MAX_CONNECTIONS> connections_{};
-#else
-  ble_device_base::BLEHub *hub_{nullptr};
-#endif
 
   // BLE advertisement batching
   api::BluetoothLERawAdvertisementsResponse response_;
@@ -267,13 +191,11 @@ class BluetoothProxy final : public Component {
   bool active_;
   uint8_t connection_count_{0};
   bool configured_scan_active_{false};  // Configured scan mode from YAML
-#ifndef USE_ESP32
-  bool last_scan_running_{false};  // Last scanner state reported to the subscriber
-#endif
+  // 3 bytes used, 1 byte padding
 };
 
 extern BluetoothProxy *global_bluetooth_proxy;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
 }  // namespace esphome::bluetooth_proxy
 
-#endif  // USE_BLUETOOTH_PROXY
+#endif  // USE_ESP32

esphome/components/bthome_mithermometer/bthome_ble.cpp

@@ -25,9 +25,6 @@ static constexpr size_t BTHOME_NONCE_SIZE = 13;
 static constexpr size_t BTHOME_MIC_SIZE = 4;
 static constexpr size_t BTHOME_COUNTER_SIZE = 4;
 
-// Both callers are log macros (LOGCONFIG / LOGVV); below CONFIG level they
-// compile away and an ungated helper trips -Wunused-function.
-#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_CONFIG
 static const char *format_mac_address(std::span<char, MAC_ADDRESS_PRETTY_BUFFER_SIZE> buffer, uint64_t address) {
   std::array<uint8_t, MAC_ADDRESS_SIZE> mac{};
   for (size_t i = 0; i < MAC_ADDRESS_SIZE; i++) {
@@ -37,7 +34,6 @@ static const char *format_mac_address(std::span<char, MAC_ADDRESS_PRETTY_BUFFER_
   format_mac_addr_upper(mac.data(), buffer.data());
   return buffer.data();
 }
-#endif  // ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_CONFIG
 
 static bool get_bthome_value_length(uint8_t obj_type, size_t &value_length) {
   switch (obj_type) {

esphome/components/captive_portal/__init__.py

@@ -1,7 +1,7 @@
 import logging
 
 import esphome.codegen as cg
-from esphome.components import web_server_base, wifi
+from esphome.components import web_server_base
 from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
 from esphome.config_helpers import filter_source_files_from_platform
 import esphome.config_validation as cv
@@ -101,9 +101,6 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID], paren)
     await cg.register_component(var, config)
     cg.add_define("USE_CAPTIVE_PORTAL")
-    # The portal reads wifi scan results from the web server task; this makes the
-    # wifi component guard them with a lock on multi-threaded platforms.
-    wifi.request_wifi_scan_results_lock()
 
     if config[CONF_COMPRESSION] == "gzip":
         cg.add_define("USE_CAPTIVE_PORTAL_GZIP")

esphome/components/captive_portal/captive_index.h

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

esphome/components/captive_portal/captive_portal.cpp

@@ -2,8 +2,6 @@
 #ifdef USE_CAPTIVE_PORTAL
 #include "esphome/core/log.h"
 #include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/string_ref.h"
 #include "esphome/components/wifi/wifi_component.h"
 #include "captive_index.h"
 
@@ -26,30 +24,23 @@ void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
   stream->printf(R"({"mac":"%s","name":"%s","aps":[{})", mac_str, App.get_name().c_str());
 #endif
 
-  // An SSID can contain a " or \ that would break the JSON, so escape it before writing it out. An SSID is at most
-  // 32 bytes (IEEE 802.11), so this is large enough that nothing is ever dropped. Reused for every scan result.
-  char escaped_ssid[32 * JSON_ESCAPE_MAX_EXPANSION + 1];
-  {
-    // Invariant: only bounded in-memory work under the lock; the network send
-    // happens later in request->send()
-    wifi::ScanResultsLock lock(wifi::global_wifi_component);
-    for (const auto &scan : wifi::global_wifi_component->get_scan_result()) {
-      if (scan.get_is_hidden())
-        continue;
+  for (auto &scan : wifi::global_wifi_component->get_scan_result()) {
+    if (scan.get_is_hidden())
+      continue;
 
-      json_escape_into_buffer(escaped_ssid, scan.get_ssid());
+      // Assumes no " in ssid, possible unicode isses?
 #ifdef USE_ESP8266
-      stream->print(ESPHOME_F(",{\"ssid\":\""));
-      stream->print(escaped_ssid);
-      stream->print(ESPHOME_F("\",\"rssi\":"));
-      stream->print(scan.get_rssi());
-      stream->print(ESPHOME_F(",\"lock\":"));
-      stream->print(scan.get_with_auth());
-      stream->print(ESPHOME_F("}"));
+    stream->print(ESPHOME_F(",{\"ssid\":\""));
+    stream->print(scan.get_ssid().c_str());
+    stream->print(ESPHOME_F("\",\"rssi\":"));
+    stream->print(scan.get_rssi());
+    stream->print(ESPHOME_F(",\"lock\":"));
+    stream->print(scan.get_with_auth());
+    stream->print(ESPHOME_F("}"));
 #else
-      stream->printf(R"(,{"ssid":"%s","rssi":%d,"lock":%d})", escaped_ssid, scan.get_rssi(), scan.get_with_auth());
+    stream->printf(R"(,{"ssid":"%s","rssi":%d,"lock":%d})", scan.get_ssid().c_str(), scan.get_rssi(),
+                   scan.get_with_auth());
 #endif
-    }
   }
   stream->print(ESPHOME_F("]}"));
   request->send(stream);

esphome/components/climate/__init__.py

@@ -274,7 +274,7 @@ def climate_schema(
 
 @setup_entity("climate")
 async def setup_climate_core_(var, config):
-    visual = config.get(CONF_VISUAL, {})
+    visual = config[CONF_VISUAL]
     if (min_temp := visual.get(CONF_MIN_TEMPERATURE)) is not None:
         cg.add_define("USE_CLIMATE_VISUAL_OVERRIDES")
         cg.add(var.set_visual_min_temperature_override(min_temp))

esphome/components/climate/climate_traits.h

@@ -205,9 +205,6 @@ class ClimateTraits {
   float get_visual_max_humidity() const { return this->visual_max_humidity_; }
   void set_visual_max_humidity(float visual_max_humidity) { this->visual_max_humidity_ = visual_max_humidity; }
 
-  TemperatureUnit get_temperature_unit() const { return this->temperature_unit_; }
-  void set_temperature_unit(TemperatureUnit unit) { this->temperature_unit_ = unit; }
-
  protected:
   void set_mode_support_(climate::ClimateMode mode, bool supported) {
     if (supported) {
@@ -277,7 +274,6 @@ class ClimateTraits {
   climate::ClimateFanModeMask supported_fan_modes_;
   climate::ClimateSwingModeMask supported_swing_modes_;
   climate::ClimatePresetMask supported_presets_;
-  TemperatureUnit temperature_unit_{TemperatureUnit::CELSIUS};
 
   /** Custom mode storage - pointers to vectors owned by the Climate base class.
    *

esphome/components/const/__init__.py

@@ -24,26 +24,21 @@ CONF_IAQ = "iaq"
 CONF_IGNORE_NOT_FOUND = "ignore_not_found"
 CONF_LIBRETINY = "libretiny"
 CONF_LOOP = "loop"
-CONF_NOX_INDEX = "nox_index"
 CONF_ON_PACKET = "on_packet"
 CONF_ON_RECEIVE = "on_receive"
-CONF_ON_SCAN_END = "on_scan_end"
 CONF_ON_STATE_CHANGE = "on_state_change"
 CONF_PARITY = "parity"
 CONF_RECEIVER_FREQUENCY = "receiver_frequency"
 CONF_REQUEST_HEADERS = "request_headers"
 CONF_ROWS = "rows"
-CONF_SCAN_PARAMETERS = "scan_parameters"
 CONF_SHA256 = "sha256"
 CONF_STATE_SAVE_INTERVAL = "state_save_interval"
 CONF_STOP_BITS = "stop_bits"
 CONF_USE_PSRAM = "use_psram"
-CONF_VOC_INDEX = "voc_index"
 CONF_VOLUME_INCREMENT = "volume_increment"
 CONF_VOLUME_INITIAL = "volume_initial"
 CONF_VOLUME_MAX = "volume_max"
 CONF_VOLUME_MIN = "volume_min"
-CONF_WINDOW = "window"
 
 ICON_CURRENT_DC = "mdi:current-dc"
 ICON_SOLAR_PANEL = "mdi:solar-panel"

esphome/components/epaper_spi/colorconv.h

@@ -81,134 +81,4 @@ constexpr NATIVE_COLOR color_to_bwr(Color color, NATIVE_COLOR hw_black, NATIVE_C
   return color_to_bwyr<NATIVE_COLOR>(color, hw_black, hw_white, /*hw_yellow=*/hw_white, hw_red);
 }
 
-/** Map RGB color to discrete BWYRGB hex 6 color key
- *
- * Divides the RGB cube into 8 corners by which components are "on" (over 128), same as
- * color_to_bwyr, but also resolves the green and blue corners instead of folding them into
- * white/black.
- *
- * @tparam NATIVE_COLOR  Type of native hardware color values
- * @param color     RGB color to convert from
- * @param hw_black  Native value for black
- * @param hw_white  Native value for white
- * @param hw_yellow Native value for yellow
- * @param hw_red    Native value for red
- * @param hw_green  Native value for green
- * @param hw_blue   Native value for blue
- * @return          Converted native hardware color value
- * @internal Constexpr. Does not depend on side effects ("pure").
- */
-template<typename NATIVE_COLOR>
-constexpr NATIVE_COLOR color_to_bwyrgb(Color color, NATIVE_COLOR hw_black, NATIVE_COLOR hw_white,
-                                       NATIVE_COLOR hw_yellow, NATIVE_COLOR hw_red, NATIVE_COLOR hw_green,
-                                       NATIVE_COLOR hw_blue) {
-  const auto [min_rgb, max_rgb] = std::minmax({color.r, color.g, color.b});
-
-  if ((max_rgb - min_rgb) < COLORCONV_GRAY_THRESHOLD) {
-    if ((static_cast<int>(color.r) + color.g + color.b) > 382) {
-      return hw_white;
-    }
-    return hw_black;
-  }
-
-  const bool r_on = (color.r > 128);
-  const bool g_on = (color.g > 128);
-  const bool b_on = (color.b > 128);
-
-  if (r_on && g_on && !b_on) {
-    return hw_yellow;
-  }
-  if (r_on && !g_on && !b_on) {
-    return hw_red;
-  }
-  if (!r_on && g_on && !b_on) {
-    return hw_green;
-  }
-  if (!r_on && !g_on && b_on) {
-    return hw_blue;
-  }
-  // Handle "impure" colors (cyan, magenta) by folding into the closest primary.
-  if (!r_on && g_on && b_on) {
-    return hw_green;  // cyan
-  }
-  if (r_on && !g_on) {
-    return hw_red;  // magenta
-  }
-  if (r_on) {
-    // All high (but not gray) -> white
-    return hw_white;
-  }
-  // !r_on && !g_on && !b_on
-  // All low (but not gray) -> black
-  return hw_black;
-}
-
-/** Map RGB color to discrete BWYRGBO hex 7 color key
- *
- * Same corner logic as color_to_bwyrgb, except the red/yellow corner is split three ways
- * instead of two, for panels with a dedicated orange ink.
- *
- * @tparam NATIVE_COLOR  Type of native hardware color values
- * @param color     RGB color to convert from
- * @param hw_black  Native value for black
- * @param hw_white  Native value for white
- * @param hw_yellow Native value for yellow
- * @param hw_red    Native value for red
- * @param hw_green  Native value for green
- * @param hw_blue   Native value for blue
- * @param hw_orange Native value for orange
- * @return          Converted native hardware color value
- * @internal Constexpr. Does not depend on side effects ("pure").
- */
-template<typename NATIVE_COLOR>
-constexpr NATIVE_COLOR color_to_bwyrgbo(Color color, NATIVE_COLOR hw_black, NATIVE_COLOR hw_white,
-                                        NATIVE_COLOR hw_yellow, NATIVE_COLOR hw_red, NATIVE_COLOR hw_green,
-                                        NATIVE_COLOR hw_blue, NATIVE_COLOR hw_orange) {
-  const auto [min_rgb, max_rgb] = std::minmax({color.r, color.g, color.b});
-
-  if ((max_rgb - min_rgb) < COLORCONV_GRAY_THRESHOLD) {
-    if ((static_cast<int>(color.r) + color.g + color.b) > 382) {
-      return hw_white;
-    }
-    return hw_black;
-  }
-
-  const bool r_on = (color.r > 128);
-  const bool g_on = (color.g > 128);
-  const bool b_on = (color.b > 128);
-
-  if (r_on && !b_on) {
-    // Between red and yellow: split the gradient in three instead of two, since this panel has a
-    // dedicated orange ink. Named orange (e.g. 0xFFA500) has g close to the midpoint, so the
-    // plain g_on (>128) threshold used by color_to_bwyrgb can't tell it apart from yellow.
-    if (color.g > 170) {
-      return hw_yellow;
-    }
-    if (color.g > 85) {
-      return hw_orange;
-    }
-    return hw_red;
-  }
-  if (!r_on && g_on && !b_on) {
-    return hw_green;
-  }
-  if (!r_on && !g_on && b_on) {
-    return hw_blue;
-  }
-  // Handle "impure" colors (cyan, magenta) by folding into the closest primary.
-  if (!r_on && g_on && b_on) {
-    return hw_green;  // cyan
-  }
-  if (r_on && !g_on) {
-    return hw_red;  // magenta
-  }
-  if (r_on) {
-    // All high (but not gray) -> white
-    return hw_white;
-  }
-  // !r_on && !g_on && !b_on
-  // All low (but not gray) -> black
-  return hw_black;
-}
-
 }  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_spi_4bpp.cpp

@@ -1,82 +0,0 @@
-#include "epaper_spi_4bpp.h"
-
-#include "esphome/core/log.h"
-
-namespace esphome::epaper_spi {
-
-static constexpr const char *const TAG = "epaper_spi.4bpp";
-
-void EPaper4bpp::fill(Color color) {
-  // If clipping is active, fall back to base implementation
-  if (this->get_clipping().is_set()) {
-    EPaperBase::fill(color);
-    return;
-  }
-
-  auto pixel_color = this->color_to_native(color);
-
-  // We store 2 pixels per byte
-  this->buffer_.fill(pixel_color + (pixel_color << 4));
-
-  // Whole buffer just changed; mark the entire canvas dirty.
-  this->x_low_ = 0;
-  this->y_low_ = 0;
-  this->x_high_ = this->width_;
-  this->y_high_ = this->height_;
-}
-
-void EPaper4bpp::clear() {
-  // clear buffer to white, just like real paper.
-  this->fill(COLOR_ON);
-}
-
-void HOT EPaper4bpp::draw_pixel_at(int x, int y, Color color) {
-  if (!this->rotate_coordinates_(x, y))
-    return;
-  auto pixel_bits = this->color_to_native(color);
-  uint32_t pixel_position = x + y * this->get_width_internal();
-  uint32_t byte_position = pixel_position / 2;
-  auto original = this->buffer_[byte_position];
-  if ((pixel_position & 1) != 0) {
-    this->buffer_[byte_position] = (original & 0xF0) | pixel_bits;
-  } else {
-    this->buffer_[byte_position] = (original & 0x0F) | (pixel_bits << 4);
-  }
-}
-
-bool HOT EPaper4bpp::transfer_data() {
-  const uint32_t start_time = App.get_loop_component_start_time();
-  const size_t buffer_length = this->buffer_length_;
-  if (this->current_data_index_ == 0) {
-    this->command(CMD_TRANSFER_DATA);
-  }
-
-  size_t buf_idx = 0;
-  uint8_t bytes_to_send[MAX_TRANSFER_SIZE];
-  while (this->current_data_index_ != buffer_length) {
-    bytes_to_send[buf_idx++] = this->buffer_[this->current_data_index_++];
-
-    if (buf_idx == sizeof bytes_to_send) {
-      this->start_data_();
-      this->write_array(bytes_to_send, buf_idx);
-      this->disable();
-      ESP_LOGV(TAG, "Wrote %d bytes at %ums", buf_idx, (unsigned) millis());
-      buf_idx = 0;
-
-      if (millis() - start_time > MAX_TRANSFER_TIME) {
-        // Let the main loop run and come back next loop
-        return false;
-      }
-    }
-  }
-  // Finished the entire dataset
-  if (buf_idx != 0) {
-    this->start_data_();
-    this->write_array(bytes_to_send, buf_idx);
-    this->disable();
-  }
-  this->current_data_index_ = 0;
-  return true;
-}
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_spi_4bpp.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include "epaper_spi.h"
-
-namespace esphome::epaper_spi {
-
-/**
- * Intermediate base for panels with a 4-bit-per-pixel native buffer layout (2 pixels per byte).
- *
- * Owns buffer sizing, fill()/clear()/draw_pixel_at() and the chunked SPI transfer loop shared by
- * this family of controllers. Concrete subclasses supply only their RGB -> 4-bit color mapping via
- * color_to_native() plus their IC-specific power/refresh/sleep command sequences.
- */
-class EPaper4bpp : public EPaperBase {
- public:
-  EPaper4bpp(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_COLOR) {
-    this->buffer_length_ = width * height / 2;  // 2 pixels per byte
-  }
-
-  void fill(Color color) override;
-  void clear() override;
-
- protected:
-  void draw_pixel_at(int x, int y, Color color) override;
-  bool transfer_data() override;
-
-  /// Map an RGB color to this panel's native 4-bit color key (low nibble).
-  virtual uint8_t color_to_native(Color color) = 0;
-
-  static constexpr uint8_t CMD_TRANSFER_DATA = 0x10;
-};
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_spi_inkplate6color.cpp

@@ -1,47 +0,0 @@
-// Reference: https://github.com/SolderedElectronics/Inkplate-Arduino-library (src/boards/Inkplate6COLOR)
-
-#include "epaper_spi_inkplate6color.h"
-#include "colorconv.h"
-
-#include "esphome/core/log.h"
-
-namespace esphome::epaper_spi {
-
-static constexpr const char *const TAG = "epaper_spi.inkplate6color";
-
-// Native hardware color codes for this panel's 4-bit color values.
-enum Inkplate6ColorHex : uint8_t {
-  BLACK = 0,
-  WHITE = 1,
-  GREEN = 2,
-  BLUE = 3,
-  RED = 4,
-  YELLOW = 5,
-  ORANGE = 6,
-};
-
-uint8_t EPaperInkplate6Color::color_to_native(Color color) {
-  return color_to_bwyrgbo<uint8_t>(color, BLACK, WHITE, YELLOW, RED, GREEN, BLUE, ORANGE);
-}
-
-void EPaperInkplate6Color::power_on() {
-  ESP_LOGV(TAG, "Power on");
-  this->command(0x04);
-}
-
-void EPaperInkplate6Color::power_off() {
-  ESP_LOGV(TAG, "Power off");
-  this->command(0x02);
-}
-
-void EPaperInkplate6Color::refresh_screen(bool partial) {
-  ESP_LOGV(TAG, "Refresh");  // full refresh only; partial is unused
-  this->cmd_data(0x12, {0x00});
-}
-
-void EPaperInkplate6Color::deep_sleep() {
-  ESP_LOGV(TAG, "Deep sleep");
-  this->cmd_data(0x07, {0xA5});
-}
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_spi_inkplate6color.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include "epaper_spi_4bpp.h"
-
-namespace esphome::epaper_spi {
-
-// Soldered Inkplate 6COLOR: 600x448 7-color (black/white/green/blue/red/yellow/orange) e-paper,
-// UC8159-family controller.
-class EPaperInkplate6Color final : public EPaper4bpp {
- public:
-  using EPaper4bpp::EPaper4bpp;
-
- protected:
-  uint8_t color_to_native(Color color) override;
-
-  void refresh_screen(bool partial) override;
-  void power_on() override;
-  void power_off() override;
-  void deep_sleep() override;
-};
-
-}  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_spi_spectra_e6.cpp

@@ -1,23 +1,76 @@
 #include "epaper_spi_spectra_e6.h"
-#include "colorconv.h"
+
+#include <algorithm>
 
 #include "esphome/core/log.h"
 
 namespace esphome::epaper_spi {
 static constexpr const char *const TAG = "epaper_spi.6c";
+static constexpr unsigned char GRAY_THRESHOLD = 50;
 
-// Native hardware color codes for this panel's 4-bit color values.
-enum E6Color : uint8_t {
-  BLACK = 0,
-  WHITE = 1,
-  YELLOW = 2,
-  RED = 3,
-  BLUE = 5,
-  GREEN = 6,
+enum E6Color {
+  BLACK,
+  WHITE,
+  YELLOW,
+  RED,
+  SKIP_1,
+  BLUE,
+  GREEN,
+  CYAN,
+  SKIP_2,
 };
 
-uint8_t EPaperSpectraE6::color_to_native(Color color) {
-  return color_to_bwyrgb<uint8_t>(color, BLACK, WHITE, YELLOW, RED, GREEN, BLUE);
+static uint8_t color_to_hex(Color color) {
+  // --- Step 1: Check for Grayscale (Black or White) ---
+  // We define "grayscale" as a color where the min and max components
+  // are close to each other.
+  unsigned char max_rgb = std::max({color.r, color.g, color.b});
+  unsigned char min_rgb = std::min({color.r, color.g, color.b});
+
+  if ((max_rgb - min_rgb) < GRAY_THRESHOLD) {
+    // It's a shade of gray. Map to BLACK or WHITE.
+    // We split the luminance at the halfway point (382 = (255*3)/2)
+    if ((static_cast<int>(color.r) + color.g + color.b) > 382) {
+      return WHITE;
+    }
+    return BLACK;
+  }
+  // --- Step 2: Check for Primary/Secondary Colors ---
+  // If it's not gray, it's a color. We check which components are
+  // "on" (over 128) vs "off". This divides the RGB cube into 8 corners.
+  bool r_on = (color.r > 128);
+  bool g_on = (color.g > 128);
+  bool b_on = (color.b > 128);
+
+  if (r_on && g_on && !b_on) {
+    return YELLOW;
+  }
+  if (r_on && !g_on && !b_on) {
+    return RED;
+  }
+  if (!r_on && g_on && !b_on) {
+    return GREEN;
+  }
+  if (!r_on && !g_on && b_on) {
+    return BLUE;
+  }
+  // Handle "impure" colors (Cyan, Magenta)
+  if (!r_on && g_on && b_on) {
+    // Cyan (G+B) -> Closest is Green or Blue. Pick Green.
+    return GREEN;
+  }
+  if (r_on && !g_on) {
+    // Magenta (R+B) -> Closest is Red or Blue. Pick Red.
+    return RED;
+  }
+  // Handle the remaining corners (White-ish, Black-ish)
+  if (r_on) {
+    // All high (but not gray) -> White
+    return WHITE;
+  }
+  // !r_on && !g_on && !b_on
+  // All low (but not gray) -> Black
+  return BLACK;
 }
 
 void EPaperSpectraE6::power_on() {
@@ -39,4 +92,71 @@ void EPaperSpectraE6::deep_sleep() {
   ESP_LOGV(TAG, "Deep sleep");
   this->cmd_data(0x07, {0xA5});
 }
+
+void EPaperSpectraE6::fill(Color color) {
+  // If clipping is active, fall back to base implementation
+  if (this->get_clipping().is_set()) {
+    EPaperBase::fill(color);
+    return;
+  }
+
+  auto pixel_color = color_to_hex(color);
+
+  // We store 2 pixels per byte
+  this->buffer_.fill(pixel_color + (pixel_color << 4));
+}
+
+void EPaperSpectraE6::clear() {
+  // clear buffer to white, just like real paper.
+  this->fill(COLOR_ON);
+}
+
+void HOT EPaperSpectraE6::draw_pixel_at(int x, int y, Color color) {
+  if (!this->rotate_coordinates_(x, y))
+    return;
+  auto pixel_bits = color_to_hex(color);
+  uint32_t pixel_position = x + y * this->get_width_internal();
+  uint32_t byte_position = pixel_position / 2;
+  auto original = this->buffer_[byte_position];
+  if ((pixel_position & 1) != 0) {
+    this->buffer_[byte_position] = (original & 0xF0) | pixel_bits;
+  } else {
+    this->buffer_[byte_position] = (original & 0x0F) | (pixel_bits << 4);
+  }
+}
+
+bool HOT EPaperSpectraE6::transfer_data() {
+  const uint32_t start_time = App.get_loop_component_start_time();
+  const size_t buffer_length = this->buffer_length_;
+  if (this->current_data_index_ == 0) {
+    this->command(0x10);
+  }
+
+  size_t buf_idx = 0;
+  uint8_t bytes_to_send[MAX_TRANSFER_SIZE];
+  while (this->current_data_index_ != buffer_length) {
+    bytes_to_send[buf_idx++] = this->buffer_[this->current_data_index_++];
+
+    if (buf_idx == sizeof bytes_to_send) {
+      this->start_data_();
+      this->write_array(bytes_to_send, buf_idx);
+      this->disable();
+      ESP_LOGV(TAG, "Wrote %d bytes at %ums", buf_idx, (unsigned) millis());
+      buf_idx = 0;
+
+      if (millis() - start_time > MAX_TRANSFER_TIME) {
+        // Let the main loop run and come back next loop
+        return false;
+      }
+    }
+  }
+  // Finished the entire dataset
+  if (buf_idx != 0) {
+    this->start_data_();
+    this->write_array(bytes_to_send, buf_idx);
+    this->disable();
+  }
+  this->current_data_index_ = 0;
+  return true;
+}
 }  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_spi_spectra_e6.h

@@ -1,20 +1,28 @@
 #pragma once
 
-#include "epaper_spi_4bpp.h"
+#include "epaper_spi.h"
 
 namespace esphome::epaper_spi {
 
-class EPaperSpectraE6 final : public EPaper4bpp {
+class EPaperSpectraE6 final : public EPaperBase {
  public:
-  using EPaper4bpp::EPaper4bpp;
+  EPaperSpectraE6(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_COLOR) {
+    this->buffer_length_ = width * height / 2;  // 2 pixels per byte
+  }
+
+  void fill(Color color) override;
+  void clear() override;
 
  protected:
-  uint8_t color_to_native(Color color) override;
-
   void refresh_screen(bool partial) override;
   void power_on() override;
   void power_off() override;
   void deep_sleep() override;
+  void draw_pixel_at(int x, int y, Color color) override;
+
+  bool transfer_data() override;
 };
 
 }  // namespace esphome::epaper_spi

esphome/components/epaper_spi/models/__init__.py

@@ -15,7 +15,7 @@ class EpaperModel:
         self,
         name: str,
         class_name: str,
-        initsequence=(),
+        initsequence=None,
         **defaults,
     ):
         name = name.upper()

esphome/components/epaper_spi/models/inkplate6color.py

@@ -1,57 +0,0 @@
-# Reference: https://github.com/SolderedElectronics/Inkplate-Arduino-library (src/boards/Inkplate6COLOR)
-
-from esphome.components.mipi import delay
-
-from . import EpaperModel
-
-
-class Inkplate6ColorModel(EpaperModel):
-    def __init__(self, name, class_name="EPaperInkplate6Color", **kwargs):
-        super().__init__(name, class_name, **kwargs)
-
-    # fmt: off
-    def get_init_sequence(self, config: dict):
-        width, height = self.get_dimensions(config)
-        return (
-            (0x00, 0xEF, 0x08,),  # panel setting
-            (0x01, 0x37, 0x00, 0x05, 0x05,),  # power setting
-            (0x03, 0x00,),  # power off sequence setting
-            (0x06, 0xC7, 0xC7, 0x1D,),  # booster soft start
-            (0x41, 0x00,),  # temperature sensor enable
-            (0x50, 0x37,),  # VCOM and data interval
-            (0x60, 0x20,),  # TCON setting
-            (0x61, width // 256, width % 256, height // 256, height % 256,),  # resolution set
-            (0xE3, 0xAA,),  # power saving
-            delay(100),
-            (0x50, 0x37,),  # VCOM and data interval, resent once the power-saving setting settles
-        )
-
-
-# Native orientation is landscape (600x448).
-inkplate6color = Inkplate6ColorModel(
-    "inkplate6color",
-    width=600,
-    height=448,
-    # Vendor library drives the panel at 2MHz; the controller doesn't reliably support faster rates.
-    data_rate="2MHz",
-    # Vendor library waits 200ms after releasing reset before talking to the panel.
-    reset_duration="200ms",
-    # A full 7-color refresh takes tens of seconds; disallow faster updates to avoid FSM update loops.
-    minimum_update_interval="30s",
-    # Panel's native buffer orientation is rotated 180 degrees relative to the logical
-    # rotation=0 orientation; confirmed on real hardware.
-    mirror_x=True,
-    mirror_y=True,
-    # Default GPIO pins for the on-board Inkplate 6COLOR wiring.
-    reset_pin=19,
-    dc_pin=33,
-    cs_pin=27,
-    busy_pin={
-        "number": 32,
-        "inverted": True,  # hardware: LOW=busy, HIGH=idle
-        "mode": {
-            "input": True,
-            "pullup": True,
-        },
-    },
-)

esphome/components/esp32/__init__.py

@@ -119,7 +119,6 @@ CONF_SIGNING_SCHEME = "signing_scheme"
 CONF_SRAM1_AS_IRAM = "sram1_as_iram"
 CONF_SUBTYPE = "subtype"
 CONF_VERIFICATION_KEY = "verification_key"
-CONF_VERIFICATION_KEYS = "verification_keys"
 
 ARDUINO_FRAMEWORK_NAME = "framework-arduinoespressif32"
 ARDUINO_FRAMEWORK_PKG = f"pioarduino/{ARDUINO_FRAMEWORK_NAME}"
@@ -148,12 +147,6 @@ SIGNING_SCHEMES = {
     "ecdsa_v1": "CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME",
 }
 
-# A Secure Boot v2 image carries at most three signature blocks, and hardware
-# secure boot exposes three eFuse key slots. The trusted-key list isn't bound by
-# the per-image limit (an incoming image need only match one trusted key), but
-# cap it at three to mirror those hardware limits.
-SIGNED_OTA_MAX_KEYS = 3
-
 # Chip variants that only support one V2 signing scheme.
 # Based on SOC_SECURE_BOOT_V2_RSA / SOC_SECURE_BOOT_V2_ECC in soc_caps.h.
 # Variants not listed in either set support both RSA and ECDSA V2
@@ -635,6 +628,7 @@ class NetworkSdkconfigData:
     wifi_ap: bool = False  # WiFi AP mode configured
     ethernet: bool = False  # Ethernet component active
     bluetooth: bool = False  # any BLE component active
+    ble_42: bool = False  # BLE 4.2 features needed
     software_coexistence: bool = False  # WiFi/BT software coexistence requested
     # esp32 advanced enable_lwip_dhcp_server option (True/False/None=unset)
     enable_lwip_dhcp_server: bool | None = None
@@ -660,10 +654,12 @@ def request_ethernet() -> None:
     _network_sdkconfig().ethernet = True
 
 
-def request_bluetooth() -> None:
-    """Request the Bluetooth controller."""
+def request_bluetooth(ble_42: bool = False) -> None:
+    """Request the Bluetooth controller. Pass ble_42=True for 4.2 features."""
     net = _network_sdkconfig()
     net.bluetooth = True
+    if ble_42:
+        net.ble_42 = True
 
 
 def request_software_coexistence() -> None:
@@ -818,16 +814,14 @@ def _is_framework_url(source: str) -> bool:
 # The default/recommended arduino framework version
 #  - https://github.com/espressif/arduino-esp32/releases
 ARDUINO_FRAMEWORK_VERSION_LOOKUP = {
-    "recommended": cv.Version(3, 3, 11),
-    "latest": cv.Version(3, 3, 11),
-    "dev": cv.Version(3, 3, 11),
+    "recommended": cv.Version(3, 3, 9),
+    "latest": cv.Version(3, 3, 9),
+    "dev": cv.Version(3, 3, 9),
 }
 ARDUINO_PLATFORM_VERSION_LOOKUP = {
     cv.Version(
         4, 0, 0, "alpha1"
     ): "https://github.com/pioarduino/platform-espressif32.git#prep_IDF6",
-    cv.Version(3, 3, 11): cv.Version(55, 3, 311),
-    cv.Version(3, 3, 10): cv.Version(55, 3, 39),
     cv.Version(3, 3, 9): cv.Version(55, 3, 39),
     cv.Version(3, 3, 8): cv.Version(55, 3, 38, "1"),
     cv.Version(3, 3, 7): cv.Version(55, 3, 37),
@@ -850,8 +844,6 @@ ARDUINO_PLATFORM_VERSION_LOOKUP = {
 # See: https://github.com/pioarduino/esp-idf/releases
 ARDUINO_IDF_VERSION_LOOKUP = {
     cv.Version(4, 0, 0, "alpha1"): cv.Version(6, 0, 1),
-    cv.Version(3, 3, 11): cv.Version(5, 5, 5),
-    cv.Version(3, 3, 10): cv.Version(5, 5, 5),
     cv.Version(3, 3, 9): cv.Version(5, 5, 4),
     cv.Version(3, 3, 8): cv.Version(5, 5, 4),
     cv.Version(3, 3, 7): cv.Version(5, 5, 3, "1"),
@@ -873,9 +865,9 @@ ARDUINO_IDF_VERSION_LOOKUP = {
 # The default/recommended esp-idf framework version
 #  - https://github.com/espressif/esp-idf/releases
 ESP_IDF_FRAMEWORK_VERSION_LOOKUP = {
-    "recommended": cv.Version(5, 5, 5),
-    "latest": cv.Version(5, 5, 5),
-    "dev": cv.Version(5, 5, 5),
+    "recommended": cv.Version(5, 5, 4),
+    "latest": cv.Version(5, 5, 4),
+    "dev": cv.Version(5, 5, 4),
 }
 
 ESP_IDF_PLATFORM_VERSION_LOOKUP = {
@@ -885,7 +877,6 @@ ESP_IDF_PLATFORM_VERSION_LOOKUP = {
     cv.Version(
         6, 0, 0
     ): "https://github.com/pioarduino/platform-espressif32.git#prep_IDF6",
-    cv.Version(5, 5, 5): cv.Version(55, 3, 311),
     cv.Version(5, 5, 4): cv.Version(55, 3, 39),
     cv.Version(5, 5, 3, "1"): cv.Version(55, 3, 37),
     cv.Version(5, 5, 3): cv.Version(55, 3, 37),
@@ -906,8 +897,8 @@ ESP_IDF_PLATFORM_VERSION_LOOKUP = {
 # The platform-espressif32 version
 #  - https://github.com/pioarduino/platform-espressif32/releases
 PLATFORM_VERSION_LOOKUP = {
-    "recommended": cv.Version(55, 3, 311),
-    "latest": cv.Version(55, 3, 311),
+    "recommended": cv.Version(55, 3, 39),
+    "latest": cv.Version(55, 3, 39),
     "dev": "https://github.com/pioarduino/platform-espressif32.git#develop",
 }
 
@@ -1035,9 +1026,7 @@ def _check_esp_idf_versions(config: ConfigType) -> ConfigType:
 
 
 def _validate_toolchain(value) -> Toolchain:
-    return Toolchain(
-        cv.one_of(Toolchain.PLATFORMIO, Toolchain.ESP_IDF, lower=True)(value)
-    )
+    return Toolchain(cv.one_of(*(t.value for t in Toolchain), lower=True)(value))
 
 
 def _resolve_toolchain(value: ConfigType) -> ConfigType:
@@ -1171,98 +1160,10 @@ def _ota_downgrade_protection_errors(
     return errs
 
 
-def _sbv2_rsa_key_digest(path: Path) -> bytes:
-    """SHA-256 of a public key's Secure Boot v2 signature-block key region.
-
-    This hashes the 776-byte {n, e, rinv, m'} region exactly as the ROM lays it
-    out -- i.e. the value the device computes per signature block and the one
-    ``espsecure digest-sbv2-public-key`` prints, not a hash of the DER key.
-    """
-    import hashlib
-    import struct
-
-    from cryptography.exceptions import UnsupportedAlgorithm
-    from cryptography.hazmat.primitives.asymmetric import rsa
-    from cryptography.hazmat.primitives.serialization import (
-        load_pem_private_key,
-        load_pem_public_key,
-    )
-
-    data = path.read_bytes()
-    try:
-        if b"PUBLIC KEY" in data:
-            public_key = load_pem_public_key(data)
-        else:
-            # verification_keys only needs the public half; warn so the private
-            # key doesn't end up committed alongside the config.
-            _LOGGER.warning(
-                "'%s' is a private key, but '%s' needs only the public key. Use a "
-                "public-key PEM or the 64-hex digest (espsecure "
-                "digest-sbv2-public-key) so the private key stays out of your config.",
-                path,
-                CONF_VERIFICATION_KEYS,
-            )
-            public_key = load_pem_private_key(data, password=None).public_key()
-    except (ValueError, TypeError, UnsupportedAlgorithm) as err:
-        raise cv.Invalid(f"Could not load key '{path}': {err}") from err
-    if not isinstance(public_key, rsa.RSAPublicKey) or public_key.key_size != 3072:
-        raise cv.Invalid(
-            f"'{CONF_VERIFICATION_KEYS}' entries must be RSA-3072 keys; "
-            f"'{path}' is not."
-        )
-    numbers = public_key.public_numbers()
-    n, e = numbers.n, numbers.e
-    m = (-pow(n, -1, 1 << 32)) & 0xFFFFFFFF
-    rinv = (1 << (public_key.key_size * 2)) % n
-    blob = struct.pack(
-        "<384sI384sI",
-        n.to_bytes(384, "big")[::-1],
-        e,
-        rinv.to_bytes(384, "big")[::-1],
-        m,
-    )
-    return hashlib.sha256(blob).digest()
-
-
-def _validate_trusted_key(value: Any) -> str:
-    """Normalize a trusted key to its 64-hex-char signature-block digest.
-
-    Accepts either the digest directly (so CI can inject it without shipping a
-    key file) or a PEM key file whose digest is computed here. Typed ``Any``
-    because YAML hands validators the parsed value -- e.g. an unquoted ``0x...``
-    digest arrives as an int, which the guard below rejects with advice to quote.
-    """
-    # An unquoted 0x... or all-digit digest is parsed by YAML as an int before it
-    # reaches here, so it never looks like a string digest -- reject it clearly
-    # rather than letting it fall through to cv.file_ as a bogus path.
-    if not isinstance(value, str):
-        raise cv.Invalid(
-            f"Expected a key file path or a 64-character hex digest, got {value!r}. "
-            f"Quote the digest so YAML keeps it as text (an unquoted '0x...' or "
-            f"all-digit value is parsed as a number)."
-        )
-    stripped = value.strip()
-    if re.fullmatch(r"[0-9A-Fa-f]{64}", stripped):
-        return stripped.lower()
-    # An all-hex value that isn't exactly 64 chars is a mangled digest, not a
-    # path: a truncated or 0x-prefixed CI variable would otherwise fall through
-    # and fail as "file not found", pointing at the wrong problem.
-    if re.fullmatch(r"(?:0x)?[0-9A-Fa-f]+", stripped):
-        raise cv.Invalid(
-            f"'{stripped}' looks like a key digest but must be exactly 64 hex "
-            f"characters (a SHA-256, no '0x' prefix); check for truncation."
-        )
-    return _sbv2_rsa_key_digest(cv.file_(value)).hex()
-
-
 _SIGNED_OTA_VERIFICATION_SCHEMA = cv.Schema(
     {
         cv.Optional(CONF_SIGNING_KEY): cv.file_,
         cv.Optional(CONF_VERIFICATION_KEY): cv.file_,
-        cv.Optional(CONF_VERIFICATION_KEYS): cv.All(
-            cv.ensure_list(_validate_trusted_key),
-            cv.Length(min=1, max=SIGNED_OTA_MAX_KEYS),
-        ),
         cv.Optional(CONF_SIGNING_SCHEME, default="rsa3072"): cv.one_of(
             *SIGNING_SCHEMES, lower=True
         ),
@@ -1296,15 +1197,9 @@ def _validate_signed_ota_keys(config: ConfigType) -> ConfigType:
     block appended to each image, so verifying externally-signed binaries
     needs no key in the config at all -- omitting both keys selects that
     external-signing mode.
-
-    For external RSA (rsa3072, no signing key), an optional 'verification_keys'
-    list names the keys the running app trusts. ESPHome then verifies OTA
-    signatures against that compiled-in set instead of IDF's single-block
-    check, which enables key rotation and multi-provider backup keys.
     """
     has_signing_key = CONF_SIGNING_KEY in config
     has_verification_key = CONF_VERIFICATION_KEY in config
-    has_verification_keys = CONF_VERIFICATION_KEYS in config
     scheme = config[CONF_SIGNING_SCHEME]
     if has_signing_key and has_verification_key:
         raise cv.Invalid(
@@ -1312,34 +1207,6 @@ def _validate_signed_ota_keys(config: ConfigType) -> ConfigType:
             f"'{CONF_VERIFICATION_KEY}', not both.",
             path=[CONF_VERIFICATION_KEY],
         )
-    if has_verification_keys:
-        if scheme != "rsa3072":
-            raise cv.Invalid(
-                f"'{CONF_VERIFICATION_KEYS}' is only used with signing scheme "
-                f"'rsa3072' (externally-signed RSA images). With '{scheme}' the "
-                f"public key travels in each image's signature block.",
-                path=[CONF_VERIFICATION_KEYS],
-            )
-        if has_signing_key:
-            raise cv.Invalid(
-                f"'{CONF_VERIFICATION_KEYS}' verifies externally-signed images "
-                f"and cannot be combined with '{CONF_SIGNING_KEY}' (which signs "
-                f"during the build). Provide one or the other.",
-                path=[CONF_VERIFICATION_KEYS],
-            )
-        if has_verification_key:
-            raise cv.Invalid(
-                f"Provide at most one of '{CONF_VERIFICATION_KEY}' and "
-                f"'{CONF_VERIFICATION_KEYS}', not both.",
-                path=[CONF_VERIFICATION_KEYS],
-            )
-        keys = config[CONF_VERIFICATION_KEYS]
-        if len(set(keys)) != len(keys):
-            raise cv.Invalid(
-                f"'{CONF_VERIFICATION_KEYS}' entries must be unique (duplicate "
-                f"keys add nothing and waste a trusted-set slot).",
-                path=[CONF_VERIFICATION_KEYS],
-            )
     if scheme == "ecdsa_v1":
         if not has_signing_key and not has_verification_key:
             raise cv.Invalid(
@@ -1367,13 +1234,6 @@ def final_validate(config):
 
     from .gpio import final_validate_pins
 
-    # Remove before 2027.2.0
-    if CORE.using_toolchain_platformio:
-        _LOGGER.warning(
-            "The 'platformio' toolchain for ESP32 is deprecated and will be removed "
-            "in ESPHome 2027.2.0. Please use 'toolchain: esp-idf' instead."
-        )
-
     errs = []
     conf_fw = config[CONF_FRAMEWORK]
     advanced = conf_fw[CONF_ADVANCED]
@@ -2181,12 +2041,12 @@ async def _reconcile_network_sdkconfig() -> None:
         if name not in opts:
             add_idf_sdkconfig_option(name, value)
 
-    # Bluetooth: only ever enable when requested. The IDF default is off.
-    # According to the IDF docs, only one of 4.2 or 5.0 should be enabled.
+    # Bluetooth: only ever enable when requested. The IDF default is off and
+    # nothing sets these False today, so never write False here.
     if net.bluetooth:
         set_opt("CONFIG_BT_ENABLED", True)
-        set_opt("CONFIG_BT_BLE_42_FEATURES_SUPPORTED", True)
-        set_opt("CONFIG_BT_BLE_50_FEATURES_SUPPORTED", False)
+        if net.ble_42:
+            set_opt("CONFIG_BT_BLE_42_FEATURES_SUPPORTED", True)
 
     # WiFi stack: disable only when Ethernet is present and WiFi is not. WiFi
     # relies on the IDF default (enabled), so it is never written True here.
@@ -2319,8 +2179,6 @@ async def to_code(config):
     cg.set_cpp_standard("gnu++20")
     cg.add_build_flag("-DUSE_ESP32")
     cg.add_define("USE_NATIVE_64BIT_TIME")
-    # NVS finds stored preferences by key, so preference key migration is possible
-    cg.add_define("USE_PREFERENCE_KEY_LOOKUP")
     cg.add_build_flag("-Wl,-z,noexecstack")
     # Deferred so KEY_COMPONENTS is fully populated -- see the coroutine.
     CORE.add_job(_finalize_arduino_aware_flags)
@@ -2685,68 +2543,9 @@ async def to_code(config):
     # Enable signed app verification without hardware secure boot
     if signed_ota := advanced.get(CONF_SIGNED_OTA_VERIFICATION):
         add_idf_sdkconfig_option("CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT", True)
+        add_idf_sdkconfig_option("CONFIG_SECURE_SIGNED_ON_UPDATE_NO_SECURE_BOOT", True)
 
         scheme = signed_ota[CONF_SIGNING_SCHEME]
-        # For externally-signed RSA images with a declared 'verification_keys'
-        # list, ESPHome verifies the OTA signature itself instead of using IDF's
-        # on-update check. IDF only matches the incoming image's first signature
-        # block against the running app's first, which blocks key rotation and
-        # multi-provider backup keys; ESPHome accepts an image signed by any key
-        # in the compiled-in trusted set. Without 'verification_keys' there is no
-        # trust anchor, so fall back to IDF's built-in check.
-        # The build still produces the padded unsigned image (via SECURE_
-        # SIGNED_APPS_NO_SECURE_BOOT above); only the on-update check moves.
-        # SECURE_SIGNED_ON_UPDATE_NO_SECURE_BOOT defaults to y under
-        # SECURE_SIGNED_APPS_NO_SECURE_BOOT, so it must be set explicitly:
-        # False to hand verification to ESPHome, True to keep IDF's check.
-        # Setting it False also drives the hidden CONFIG_SECURE_SIGNED_APPS to
-        # n; the 4 KiB padding and reserved signature sector the verifier
-        # depends on survive only because --secure-pad-v2 keys off
-        # CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME (set below), not that symbol.
-        external_rsa = scheme == "rsa3072" and CONF_SIGNING_KEY not in signed_ota
-        verification_keys = signed_ota.get(CONF_VERIFICATION_KEYS)
-        # verification_keys is accepted only for external RSA (rsa3072 with no
-        # signing_key), enforced in _validate_signed_ota_keys. Assert the
-        # post-condition so validator/codegen drift fails the build loudly
-        # instead of silently dropping the declared trust anchor and downgrading
-        # to IDF's single-block check.
-        assert not verification_keys or external_rsa
-        multi_key = external_rsa and verification_keys
-        # Turning IDF's on-update check off is global -- it also drops the
-        # signature check from esp_ota_set_boot_partition() on the partition-table
-        # path and safe_mode's recovery rollback. Both deliberately select an
-        # already-installed image (or an MD5-checked partition table), not a
-        # freshly-downloaded one, so ESPHome's verifier only needs to cover the
-        # app and bootloader OTA paths, where a new image is actually written.
-        add_idf_sdkconfig_option(
-            "CONFIG_SECURE_SIGNED_ON_UPDATE_NO_SECURE_BOOT", not multi_key
-        )
-        if multi_key:
-            cg.add_define("USE_OTA_SIGNED_VERIFICATION_MULTI_KEY")
-            # Compile the trusted key digests in as the immutable trust anchor.
-            # Each is the SHA-256 of a key's signature-block region; the verifier
-            # accepts an OTA whose signature block matches one of these.
-            digests = [bytes.fromhex(k) for k in verification_keys]
-            # Echo the resolved digests so a stale or mistyped key (which builds
-            # cleanly but leaves the device updatable only by serial reflash) is
-            # visible in the build log.
-            _LOGGER.info(
-                "Signed OTA verification trusts %d key digest(s): %s",
-                len(digests),
-                ", ".join(d.hex() for d in digests),
-            )
-            cg.add_define("OTA_TRUSTED_KEY_COUNT", len(digests))
-            cg.add_define(
-                "OTA_TRUSTED_KEY_DIGESTS",
-                cg.RawExpression(
-                    "{"
-                    + ",".join(
-                        "{" + ",".join(f"0x{b:02x}" for b in d) + "}" for d in digests
-                    )
-                    + "}"
-                ),
-            )
-
         for key, flag in SIGNING_SCHEMES.items():
             add_idf_sdkconfig_option(flag, scheme == key)
 
@@ -3306,10 +3105,9 @@ def _parse_register(config, regex, line):
 
 
 STACKTRACE_ESP32_PC_RE = re.compile(r".*PC\s*:\s*(?:0x)?(4[0-9a-fA-F]{7}).*")
-STACKTRACE_ESP32_EXCVADDR_RE = re.compile(r".*EXCVADDR\s*:\s*(?:0x)?(4[0-9a-fA-F]{7})")
+STACKTRACE_ESP32_EXCVADDR_RE = re.compile(r"EXCVADDR\s*:\s*(?:0x)?(4[0-9a-fA-F]{7})")
 STACKTRACE_ESP32_C3_PC_RE = re.compile(r"MEPC\s*:\s*(?:0x)?(4[0-9a-fA-F]{7})")
 STACKTRACE_ESP32_C3_RA_RE = re.compile(r"RA\s*:\s*(?:0x)?(4[0-9a-fA-F]{7})")
-STACKTRACE_ESP32_C3_MTVAL_RE = re.compile(r".*MTVAL\s*:\s*(?:0x)?(4[0-9a-fA-F]{7})")
 STACKTRACE_BAD_ALLOC_RE = re.compile(
     r"^last failed alloc call: (4[0-9a-fA-F]{7})\((\d+)\)$"
 )
@@ -3327,10 +3125,9 @@ def process_stacktrace(config, line, backtrace_state):
     # ESP32 PC/EXCVADDR
     _parse_register(config, STACKTRACE_ESP32_PC_RE, line)
     _parse_register(config, STACKTRACE_ESP32_EXCVADDR_RE, line)
-    # ESP32-C3 PC/RA/MTVAL
+    # ESP32-C3 PC/RA
     _parse_register(config, STACKTRACE_ESP32_C3_PC_RE, line)
     _parse_register(config, STACKTRACE_ESP32_C3_RA_RE, line)
-    _parse_register(config, STACKTRACE_ESP32_C3_MTVAL_RE, line)
 
     # bad alloc
     match = re.match(STACKTRACE_BAD_ALLOC_RE, line)

esphome/components/esp32/const.py

@@ -1,22 +1,9 @@
 import esphome.codegen as cg
 
-# Re-exported for the many esp32-side users; defined in esphome.const
-# and esphome.espidf so the upload/logs fast path can use them without
-# importing this package.
-from esphome.const import (  # noqa: F401  # pylint: disable=unused-import
-    KEY_ESP32,
-    KEY_FLASH_SIZE,
-    KEY_IDF_VERSION,
-    KEY_VARIANT,
-)
-
-# Back compat for external components only; in-tree callers import it
-# from esphome.espidf directly.
-from esphome.espidf import (  # noqa: F401  # pylint: disable=unused-import
-    variant_to_idf_target,
-)
-
+KEY_ESP32 = "esp32"
 KEY_BOARD = "board"
+KEY_FLASH_SIZE = "flash_size"
+KEY_VARIANT = "variant"
 KEY_SDKCONFIG_OPTIONS = "sdkconfig_options"
 KEY_COMPONENTS = "components"
 KEY_EXCLUDE_COMPONENTS = "exclude_components"
@@ -28,6 +15,7 @@ KEY_PATH = "path"
 KEY_SUBMODULES = "submodules"
 KEY_EXTRA_BUILD_FILES = "extra_build_files"
 KEY_FULL_CERT_BUNDLE = "full_cert_bundle"
+KEY_IDF_VERSION = "idf_version"
 KEY_NETWORK_SDKCONFIG = "network_sdkconfig"
 
 VARIANT_ESP32 = "ESP32"
@@ -75,5 +63,4 @@ VARIANT_FRIENDLY = {
     VARIANT_ESP32S31: "ESP32-S31",
 }
 
-
 esp32_ns = cg.esphome_ns.namespace("esp32")

esphome/components/esp32/crash_handler.cpp

@@ -4,7 +4,6 @@
 #ifdef USE_ESP32_CRASH_HANDLER
 
 #include "crash_handler.h"
-#include "esphome/core/build_info_data.h"
 #include "esphome/core/log.h"
 
 #include <cinttypes>
@@ -123,7 +122,7 @@ static uint8_t IRAM_ATTR capture_riscv_backtrace(RvExcFrame *frame, uint32_t *ou
 // Magic is second to validate the data. Remaining fields can change between versions.
 // Version is uint32_t because it would be padded to 4 bytes anyway before the next
 // uint32_t field, so we use the full width rather than wasting 3 bytes of padding.
-static constexpr uint32_t CRASH_DATA_VERSION = 4;
+static constexpr uint32_t CRASH_DATA_VERSION = 2;
 struct RawCrashData {
   uint32_t version;
   uint32_t magic;
@@ -133,9 +132,7 @@ struct RawCrashData {
   uint8_t exception;        // panic_exception_t enum (FAULT/ABORT/IWDT/TWDT/DEBUG)
   uint8_t pseudo_excause;   // Whether cause is a pseudo exception (Xtensa SoC-level panic)
   uint32_t backtrace[MAX_BACKTRACE];
-  uint32_t cause;       // Architecture-specific: exccause (Xtensa) or mcause (RISC-V)
-  uint32_t fault_addr;  // Faulting memory address: excvaddr (Xtensa) or mtval (RISC-V)
-  uint32_t build_time;  // ESPHOME_BUILD_TIME of the firmware that captured this record
+  uint32_t cause;  // Architecture-specific: exccause (Xtensa) or mcause (RISC-V)
   uint8_t crashed_core;
 #if SOC_CPU_CORES_NUM > 1
   static_assert(SOC_CPU_CORES_NUM == 2, "Dual-core logic assumes exactly 2 cores");
@@ -154,16 +151,6 @@ namespace esphome::esp32 {
 
 static const char *const TAG = "esp32.crash";
 
-// RAM copy of the build timestamp. The generated constant lives in flash,
-// which the panic handler must not read (cache may be disabled during
-// cache-error panics), so the wrapper stamps the record from this mirror
-// instead. Filled during C++ dynamic initialization, well before arch_init();
-// ESPHOME_BUILD_TIME itself is constant-initialized, so the read is ordered.
-// Unqualified name on purpose: the runtime header declares it in namespace
-// esphome, while the static-analysis stub defines it as a macro.
-// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-static uint32_t s_current_build_time = static_cast<uint32_t>(ESPHOME_BUILD_TIME);
-
 void crash_handler_read_and_clear() {
   if (s_raw_crash_data.magic == CRASH_MAGIC && s_raw_crash_data.version == CRASH_DATA_VERSION) {
     s_crash_data_valid = true;
@@ -253,16 +240,6 @@ static const char *get_exception_reason() {
       nullptr,
       "LoadProhibited",
       "StoreProhibited",
-      nullptr,
-      nullptr,
-      "Cp0Dis",
-      "Cp1Dis",
-      "Cp2Dis",
-      "Cp3Dis",
-      "Cp4Dis",
-      "Cp5Dis",
-      "Cp6Dis",
-      "Cp7Dis",
   };
   uint32_t cause = s_raw_crash_data.cause;
   if (cause < sizeof(REASON) / sizeof(REASON[0]) && REASON[cause] != nullptr)
@@ -343,66 +320,6 @@ static int append_addrs_to_hint(char *buf, int size, int pos, const uint32_t *ad
   return pos;
 }
 
-// Register holding the faulting memory address, named as in ESP-IDF's live
-// register dump. The lowercase form is for old-build reports, where the
-// stacktrace decoders must not match the line.
-#if CONFIG_IDF_TARGET_ARCH_XTENSA
-static const char *const FAULT_ADDR_REG = "EXCVADDR";
-static const char *const FAULT_ADDR_REG_LOWER = "excvaddr";
-#elif CONFIG_IDF_TARGET_ARCH_RISCV
-static const char *const FAULT_ADDR_REG = "MTVAL";
-static const char *const FAULT_ADDR_REG_LOWER = "mtval";
-#endif
-
-// Whether the fault address is meaningful — real CPU faults only, not
-// aborts/watchdogs or SoC-level pseudo exceptions.
-static bool has_fault_addr() {
-  return s_raw_crash_data.exception == PANIC_EXCEPTION_FAULT && !s_raw_crash_data.pseudo_excause;
-}
-
-// Append both cores' backtrace addresses to buf; returns the new position.
-static int append_all_backtraces(char *buf, int size, int pos) {
-  pos = append_addrs_to_hint(buf, size, pos, s_raw_crash_data.backtrace, s_raw_crash_data.backtrace_count,
-                             s_raw_crash_data.reg_frame_count);
-#if SOC_CPU_CORES_NUM > 1
-  pos = append_addrs_to_hint(buf, size, pos, s_raw_crash_data.other_backtrace, s_raw_crash_data.other_backtrace_count,
-                             s_raw_crash_data.other_reg_frame_count);
-#endif
-  return pos;
-}
-
-// The record was captured by a different firmware build (it survives soft
-// resets, including the OTA reboot), so symbolizing its addresses against the
-// current ELF would produce misleading symbols. Print them with lowercase
-// labels the stacktrace decoders deliberately do not match, and skip the
-// addr2line hint. One line per address so nothing is lost to a shared buffer.
-// No is_return_addr() filtering here: it would inspect the current build's
-// code bytes, which say nothing about addresses captured by the old build.
-static uint8_t log_foreign_backtrace(const uint32_t *addrs, uint8_t count, uint8_t bt_num) {
-  for (uint8_t i = 0; i < count; i++) {
-    ESP_LOGE(TAG, "  bt%d: 0x%08" PRIX32, bt_num++, addrs[i]);
-  }
-  return bt_num;
-}
-
-static void log_foreign_addresses() {
-  ESP_LOGE(TAG, "  Captured by a different firmware build; addresses belong to that build's ELF");
-  ESP_LOGE(TAG, "  pc: 0x%08" PRIX32, s_raw_crash_data.pc);
-  if (has_fault_addr()) {
-    ESP_LOGE(TAG, "  %s: 0x%08" PRIX32, FAULT_ADDR_REG_LOWER, s_raw_crash_data.fault_addr);
-  }
-  uint8_t bt_num = log_foreign_backtrace(s_raw_crash_data.backtrace, s_raw_crash_data.backtrace_count, 0);
-#if SOC_CPU_CORES_NUM > 1
-  if (s_raw_crash_data.other_backtrace_count > 0) {
-    // Lowercase like the address labels: carries no address, matches no decoder.
-    ESP_LOGE(TAG, "  other core (%d):", 1 - s_raw_crash_data.crashed_core);
-    log_foreign_backtrace(s_raw_crash_data.other_backtrace, s_raw_crash_data.other_backtrace_count, bt_num);
-  }
-#else
-  (void) bt_num;  // Single-core targets have no second list to continue numbering into.
-#endif
-}
-
 // Intentionally uses separate ESP_LOGE calls per line instead of combining into
 // one multi-line log message. This ensures each address appears as its own line
 // on the serial console, making it possible to see partial output if the device
@@ -415,23 +332,12 @@ void crash_handler_log() {
   ESP_LOGE(TAG, "*** CRASH DETECTED ON PREVIOUS BOOT ***");
   const char *reason = get_exception_reason();
   if (reason != nullptr) {
-    ESP_LOGE(TAG, "  Reason: %s - %s (cause %" PRIu32 ")", get_exception_type(), reason, s_raw_crash_data.cause);
+    ESP_LOGE(TAG, "  Reason: %s - %s", get_exception_type(), reason);
   } else {
     ESP_LOGE(TAG, "  Reason: %s", get_exception_type());
   }
   ESP_LOGE(TAG, "  Crashed core: %d", s_raw_crash_data.crashed_core);
-  if (s_raw_crash_data.build_time != s_current_build_time) {
-    // Captured by a different firmware build: the record survives soft resets
-    // including the OTA reboot, so its addresses belong to a previous ELF.
-    log_foreign_addresses();
-    return;
-  }
   ESP_LOGE(TAG, "  PC:  0x%08" PRIX32 "  (fault location)", s_raw_crash_data.pc);
-  // Uses the same register name as ESP-IDF's live register dump so the CLI
-  // decodes the address when it happens to be a code address.
-  if (has_fault_addr()) {
-    ESP_LOGE(TAG, "  %s: 0x%08" PRIX32 "  (faulting address)", FAULT_ADDR_REG, s_raw_crash_data.fault_addr);
-  }
   log_backtrace(s_raw_crash_data.backtrace, s_raw_crash_data.backtrace_count, s_raw_crash_data.reg_frame_count);
 
 #if SOC_CPU_CORES_NUM > 1
@@ -446,7 +352,14 @@ void crash_handler_log() {
   // Build addr2line hint with all captured addresses for easy copy-paste
   char hint[256];
   int pos = snprintf(hint, sizeof(hint), "Use: addr2line -pfiaC -e firmware.elf 0x%08" PRIX32, s_raw_crash_data.pc);
-  append_all_backtraces(hint, sizeof(hint), pos);
+  pos = append_addrs_to_hint(hint, sizeof(hint), pos, s_raw_crash_data.backtrace, s_raw_crash_data.backtrace_count,
+                             s_raw_crash_data.reg_frame_count);
+#if SOC_CPU_CORES_NUM > 1
+  append_addrs_to_hint(hint, sizeof(hint), pos, s_raw_crash_data.other_backtrace,
+                       s_raw_crash_data.other_backtrace_count, s_raw_crash_data.other_reg_frame_count);
+#else
+  (void) pos;  // There is no second-core append on single-core targets, so pos would otherwise be unread.
+#endif
   ESP_LOGE(TAG, "%s", hint);
 }
 
@@ -469,14 +382,6 @@ void IRAM_ATTR __wrap_esp_panic_handler(panic_info_t *info) {
   s_raw_crash_data.exception = (uint8_t) info->exception;
   s_raw_crash_data.pseudo_excause = info->pseudo_excause ? 1 : 0;
   s_raw_crash_data.crashed_core = (uint8_t) info->core;
-  // Zero unconditionally so a null frame doesn't leave stale .noinit data from a previous boot
-  s_raw_crash_data.cause = 0;
-  s_raw_crash_data.fault_addr = 0;
-  // Record which build's ELF the captured addresses belong to (RAM read, panic-safe).
-  // Still 0 if the panic precedes C++ dynamic initialization, so such a crash
-  // reports as a foreign build — conservative: addresses are shown raw instead
-  // of decoded.
-  s_raw_crash_data.build_time = esphome::esp32::s_current_build_time;
 #if SOC_CPU_CORES_NUM > 1
   s_raw_crash_data.other_backtrace_count = 0;
   s_raw_crash_data.other_reg_frame_count = 0;
@@ -487,7 +392,6 @@ void IRAM_ATTR __wrap_esp_panic_handler(panic_info_t *info) {
   if (info->frame != nullptr) {
     auto *xt_frame = (XtExcFrame *) info->frame;
     s_raw_crash_data.cause = xt_frame->exccause;
-    s_raw_crash_data.fault_addr = xt_frame->excvaddr;
     s_raw_crash_data.backtrace_count = walk_xtensa_backtrace(xt_frame, s_raw_crash_data.backtrace, MAX_BACKTRACE);
   }
 
@@ -510,7 +414,6 @@ void IRAM_ATTR __wrap_esp_panic_handler(panic_info_t *info) {
   if (info->frame != nullptr) {
     auto *rv_frame = (RvExcFrame *) info->frame;
     s_raw_crash_data.cause = rv_frame->mcause;
-    s_raw_crash_data.fault_addr = rv_frame->mtval;
     s_raw_crash_data.backtrace_count =
         capture_riscv_backtrace(rv_frame, s_raw_crash_data.backtrace, MAX_BACKTRACE, &s_raw_crash_data.reg_frame_count);
   }

esphome/components/esp32/preferences.cpp

@@ -176,21 +176,12 @@ ESPPreferenceObject ESP32Preferences::make_preference(size_t length, uint32_t ty
     }
     s_open_err = ESP_OK;
   }
-  // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
-  return ESPPreferenceObject(new ESP32PreferenceBackend(this->make_backend_(type)));
-}
+  auto *pref = new ESP32PreferenceBackend();  // NOLINT(cppcoreguidelines-owning-memory)
+  pref->nvs_handle = this->nvs_handle;
+  pref->key = type;
+  pref->in_flash = true;
 
-ESP32PreferenceBackend ESP32Preferences::make_backend_(uint32_t type) const {
-  // in_flash keeps its default of true, selecting the NVS path
-  ESP32PreferenceBackend backend;
-  backend.nvs_handle = this->nvs_handle;
-  backend.key = type;
-  return backend;
-}
-
-bool ESP32Preferences::load_from_key(uint32_t type, uint8_t *data, size_t len) {
-  ESP32PreferenceBackend backend = this->make_backend_(type);
-  return backend.load(data, len);
+  return ESPPreferenceObject(pref);
 }
 
 #ifdef USE_ESP32_RTC_PREFERENCES_STORAGE

esphome/components/esp32/preferences.h

@@ -23,15 +23,12 @@ class ESP32Preferences final : public PreferencesMixin<ESP32Preferences> {
   ESPPreferenceObject make_preference(size_t length, uint32_t type, bool in_flash);
   // Two-argument form defaults to NVS (flash) storage, preserving historic ESP32 behavior.
   ESPPreferenceObject make_preference(size_t length, uint32_t type);
-  /// One-shot read of a stored preference by key, without allocating a backend
-  bool load_from_key(uint32_t type, uint8_t *data, size_t len);
   bool sync();
   bool reset();
 
   uint32_t nvs_handle;
 
  protected:
-  ESP32PreferenceBackend make_backend_(uint32_t type) const;
   bool is_changed_(uint32_t nvs_handle, const NVSData &to_save, const char *key_str);
 
 #ifdef USE_ESP32_RTC_PREFERENCES_STORAGE

esphome/components/esp32_ble/__init__.py

@@ -1,19 +1,12 @@
 from collections.abc import Callable, MutableMapping
+from dataclasses import dataclass
 from enum import Enum
 import logging
+import re
 from typing import Any
 
 from esphome import automation
 import esphome.codegen as cg
-
-# bt_uuid validation lives in the platform-neutral ble_device_base; re-exported
-# here for backward compatibility.
-from esphome.components.ble_device_base import (  # noqa: F401  # pylint: disable=unused-import
-    BT_UUID16_FORMAT as bt_uuid16_format,
-    BT_UUID32_FORMAT as bt_uuid32_format,
-    BT_UUID128_FORMAT as bt_uuid128_format,
-    bt_uuid,
-)
 from esphome.components.const import CONF_USE_PSRAM
 from esphome.components.esp32 import (
     add_idf_sdkconfig_option,
@@ -31,11 +24,10 @@ from esphome.const import (
     CONF_NAME,
     CONF_NAME_ADD_MAC_SUFFIX,
 )
-from esphome.core import CORE, TimePeriod
+from esphome.core import CORE, CoroPriority, TimePeriod, coroutine_with_priority
 import esphome.final_validate as fv
 from esphome.types import ConfigType
 
-AUTO_LOAD = ["ble_device_base"]  # ble_uuid.h builds on the neutral ESPBTUUID
 DEPENDENCIES = ["esp32"]
 CODEOWNERS = ["@jesserockz", "@Rapsssito", "@bdraco"]
 DOMAIN = "esp32_ble"
@@ -133,21 +125,18 @@ def _get_required_loggers() -> set[BTLoggers]:
     return CORE.data.setdefault(ESP32_BLE_REQUIRED_LOGGERS_KEY, set())
 
 
-# Handler slot counters sizing the StaticCallbackManager storage in ble.h;
-# one request per register_* call below.
-_request_gap_event_slot = cg.slot_counter("ESPHOME_ESP32_BLE_GAP_EVENT_HANDLER_COUNT")
-_request_gap_scan_event_slot = cg.slot_counter(
-    "ESPHOME_ESP32_BLE_GAP_SCAN_EVENT_HANDLER_COUNT"
-)
-_request_gattc_event_slot = cg.slot_counter(
-    "ESPHOME_ESP32_BLE_GATTC_EVENT_HANDLER_COUNT"
-)
-_request_gatts_event_slot = cg.slot_counter(
-    "ESPHOME_ESP32_BLE_GATTS_EVENT_HANDLER_COUNT"
-)
-_request_ble_status_event_slot = cg.slot_counter(
-    "ESPHOME_ESP32_BLE_BLE_STATUS_EVENT_HANDLER_COUNT"
-)
+# Dataclass for handler registration counts
+@dataclass
+class HandlerCounts:
+    gap_event: int = 0
+    gap_scan_event: int = 0
+    gattc_event: int = 0
+    gatts_event: int = 0
+    ble_status_event: int = 0
+
+
+# Track handler registration counts for StaticVector sizing
+_handler_counts = HandlerCounts()
 
 
 def _add_callback(
@@ -173,8 +162,8 @@ def _add_callback(
 
 
 def register_gap_event_handler(parent_var: cg.MockObj, handler_var: cg.MockObj) -> None:
-    """Register a GAP event handler and request a handler slot."""
-    _request_gap_event_slot()
+    """Register a GAP event handler and track the count."""
+    _handler_counts.gap_event += 1
     _add_callback(
         parent_var,
         "add_gap_event_callback",
@@ -187,8 +176,8 @@ def register_gap_event_handler(parent_var: cg.MockObj, handler_var: cg.MockObj)
 def register_gap_scan_event_handler(
     parent_var: cg.MockObj, handler_var: cg.MockObj
 ) -> None:
-    """Register a GAP scan event handler and request a handler slot."""
-    _request_gap_scan_event_slot()
+    """Register a GAP scan event handler and track the count."""
+    _handler_counts.gap_scan_event += 1
     _add_callback(
         parent_var,
         "add_gap_scan_event_callback",
@@ -201,8 +190,8 @@ def register_gap_scan_event_handler(
 def register_gattc_event_handler(
     parent_var: cg.MockObj, handler_var: cg.MockObj
 ) -> None:
-    """Register a GATTc event handler and request a handler slot."""
-    _request_gattc_event_slot()
+    """Register a GATTc event handler and track the count."""
+    _handler_counts.gattc_event += 1
     _add_callback(
         parent_var,
         "add_gattc_event_callback",
@@ -215,8 +204,8 @@ def register_gattc_event_handler(
 def register_gatts_event_handler(
     parent_var: cg.MockObj, handler_var: cg.MockObj
 ) -> None:
-    """Register a GATTs event handler and request a handler slot."""
-    _request_gatts_event_slot()
+    """Register a GATTs event handler and track the count."""
+    _handler_counts.gatts_event += 1
     _add_callback(
         parent_var,
         "add_gatts_event_callback",
@@ -229,8 +218,8 @@ def register_gatts_event_handler(
 def register_ble_status_event_handler(
     parent_var: cg.MockObj, handler_var: cg.MockObj
 ) -> None:
-    """Register a BLE status event handler and request a handler slot."""
-    _request_ble_status_event_slot()
+    """Register a BLE status event handler and track the count."""
+    _handler_counts.ble_status_event += 1
     _add_callback(
         parent_var,
         "add_ble_status_event_callback",
@@ -383,6 +372,43 @@ def _validate_key_sizes(config: ConfigType) -> ConfigType:
 CONFIG_SCHEMA = cv.All(CONFIG_SCHEMA, _validate_key_sizes)
 
 
+bt_uuid16_format = "XXXX"
+bt_uuid32_format = "XXXXXXXX"
+bt_uuid128_format = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"
+
+
+def bt_uuid(value):
+    in_value = cv.string_strict(value)
+    value = in_value.upper()
+
+    if len(value) == len(bt_uuid16_format):
+        pattern = re.compile("^[A-F0-9]{4,}$")
+        if not pattern.match(value):
+            raise cv.Invalid(
+                f"Invalid hexadecimal value for 16 bit UUID format: '{in_value}'"
+            )
+        return value
+    if len(value) == len(bt_uuid32_format):
+        pattern = re.compile("^[A-F0-9]{8,}$")
+        if not pattern.match(value):
+            raise cv.Invalid(
+                f"Invalid hexadecimal value for 32 bit UUID format: '{in_value}'"
+            )
+        return value
+    if len(value) == len(bt_uuid128_format):
+        pattern = re.compile(
+            "^[A-F0-9]{8,}-[A-F0-9]{4,}-[A-F0-9]{4,}-[A-F0-9]{4,}-[A-F0-9]{12,}$"
+        )
+        if not pattern.match(value):
+            raise cv.Invalid(
+                f"Invalid hexadecimal value for 128 UUID format: '{in_value}'"
+            )
+        return value
+    raise cv.Invalid(
+        f"Bluetooth UUID must be in 16 bit '{bt_uuid16_format}', 32 bit '{bt_uuid32_format}', or 128 bit '{bt_uuid128_format}' format"
+    )
+
+
 def validate_variant(_):
     variant = get_esp32_variant()
     if variant in NO_BLUETOOTH_VARIANTS:
@@ -520,6 +546,36 @@ def final_validation(config):
 FINAL_VALIDATE_SCHEMA = final_validation
 
 
+# This needs to be run as a job with CoroPriority.FINAL priority so that all components have
+# a chance to register their handlers before the counts are added to defines.
+@coroutine_with_priority(CoroPriority.FINAL)
+async def _add_ble_handler_defines():
+    # Add defines for StaticVector sizing based on handler registration counts
+    # Only define if count > 0 to avoid allocating unnecessary memory
+    if _handler_counts.gap_event > 0:
+        cg.add_define(
+            "ESPHOME_ESP32_BLE_GAP_EVENT_HANDLER_COUNT", _handler_counts.gap_event
+        )
+    if _handler_counts.gap_scan_event > 0:
+        cg.add_define(
+            "ESPHOME_ESP32_BLE_GAP_SCAN_EVENT_HANDLER_COUNT",
+            _handler_counts.gap_scan_event,
+        )
+    if _handler_counts.gattc_event > 0:
+        cg.add_define(
+            "ESPHOME_ESP32_BLE_GATTC_EVENT_HANDLER_COUNT", _handler_counts.gattc_event
+        )
+    if _handler_counts.gatts_event > 0:
+        cg.add_define(
+            "ESPHOME_ESP32_BLE_GATTS_EVENT_HANDLER_COUNT", _handler_counts.gatts_event
+        )
+    if _handler_counts.ble_status_event > 0:
+        cg.add_define(
+            "ESPHOME_ESP32_BLE_BLE_STATUS_EVENT_HANDLER_COUNT",
+            _handler_counts.ble_status_event,
+        )
+
+
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     cg.add(var.set_enable_on_boot(config[CONF_ENABLE_ON_BOOT]))
@@ -548,7 +604,7 @@ async def to_code(config):
     max_connections = config.get(CONF_MAX_CONNECTIONS, DEFAULT_MAX_CONNECTIONS)
     cg.add_define("USE_ESP32_BLE_MAX_CONNECTIONS", max_connections)
 
-    request_bluetooth()
+    request_bluetooth(ble_42=True)
 
     # When PSRAM and BT are used together, Bluedroid should prefer SPIRAM for
     # heap allocations and use dynamic (heap-based) environment memory tables
@@ -605,6 +661,9 @@ async def to_code(config):
         cg.add_define("USE_ESP32_BLE_ADVERTISING")
         cg.add_define("USE_ESP32_BLE_UUID")
 
+    # Schedule the handler defines to be added after all components register
+    CORE.add_job(_add_ble_handler_defines)
+
 
 @automation.register_condition("ble.enabled", BLEEnabledCondition, cv.Schema({}))
 async def ble_enabled_to_code(config, condition_id, template_arg, args):

esphome/components/esp32_ble/ble.cpp

@@ -58,7 +58,6 @@ static constexpr uint32_t HOSTED_BT_WDT_TIMEOUT_MS = 60000;
   case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT: \
   case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT: \
   case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT: \
-  case ESP_GAP_BLE_SCAN_RSP_DATA_RAW_SET_COMPLETE_EVT: \
   case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: \
   case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT
 

esphome/components/esp32_ble/ble_advertising.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "esphome/core/defines.h"
-#include "ble_uuid.h"
 
 #include <array>
 #include <functional>
@@ -16,6 +15,8 @@
 
 namespace esphome::esp32_ble {
 
+class ESPBTUUID;
+
 class BLEAdvertising {
  public:
   BLEAdvertising(uint32_t advertising_cycle_time);

esphome/components/esp32_ble/ble_event.h

@@ -207,7 +207,7 @@ class BLEEvent {
         StatusOnlyData scan_complete;  // 1 byte
         // Advertising complete events all have same structure
         // Used by: esp32_ble_beacon, esp32_ble server components
-        // ADV_DATA_SET, SCAN_RSP_DATA_SET, ADV_DATA_RAW_SET, SCAN_RSP_DATA_RAW_SET, ADV_START, ADV_STOP
+        // ADV_DATA_SET, SCAN_RSP_DATA_SET, ADV_DATA_RAW_SET, ADV_START, ADV_STOP
         StatusOnlyData adv_complete;  // 1 byte
         // RSSI complete event
         // Used by: ble_client (ble_rssi_sensor component)
@@ -324,9 +324,6 @@ class BLEEvent {
       case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT:  // Used by: esp32_ble_beacon
         this->event_.gap.adv_complete.status = p->adv_data_raw_cmpl.status;
         break;
-      case ESP_GAP_BLE_SCAN_RSP_DATA_RAW_SET_COMPLETE_EVT:  // Used by: raw advertisers with scan response
-        this->event_.gap.adv_complete.status = p->scan_rsp_data_raw_cmpl.status;
-        break;
       case ESP_GAP_BLE_ADV_START_COMPLETE_EVT:  // Used by: esp32_ble_beacon
         this->event_.gap.adv_complete.status = p->adv_start_cmpl.status;
         break;

esphome/components/esp32_ble/ble_uuid.cpp

@@ -0,0 +1,187 @@
+#include "ble_uuid.h"
+
+#ifdef USE_ESP32
+#ifdef USE_ESP32_BLE_UUID
+
+#include <cstring>
+#include <cstdio>
+#include <cinttypes>
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome::esp32_ble {
+
+static const char *const TAG = "esp32_ble";
+
+ESPBTUUID::ESPBTUUID() : uuid_() {}
+ESPBTUUID ESPBTUUID::from_uint16(uint16_t uuid) {
+  ESPBTUUID ret;
+  ret.uuid_.len = ESP_UUID_LEN_16;
+  ret.uuid_.uuid.uuid16 = uuid;
+  return ret;
+}
+ESPBTUUID ESPBTUUID::from_uint32(uint32_t uuid) {
+  ESPBTUUID ret;
+  ret.uuid_.len = ESP_UUID_LEN_32;
+  ret.uuid_.uuid.uuid32 = uuid;
+  return ret;
+}
+ESPBTUUID ESPBTUUID::from_raw(const uint8_t *data) {
+  ESPBTUUID ret;
+  ret.uuid_.len = ESP_UUID_LEN_128;
+  memcpy(ret.uuid_.uuid.uuid128, data, ESP_UUID_LEN_128);
+  return ret;
+}
+ESPBTUUID ESPBTUUID::from_raw_reversed(const uint8_t *data) {
+  ESPBTUUID ret;
+  ret.uuid_.len = ESP_UUID_LEN_128;
+  for (uint8_t i = 0; i < ESP_UUID_LEN_128; i++)
+    ret.uuid_.uuid.uuid128[ESP_UUID_LEN_128 - 1 - i] = data[i];
+  return ret;
+}
+ESPBTUUID ESPBTUUID::from_raw(const char *data, size_t length) {
+  ESPBTUUID ret;
+  if (length == 4) {
+    // 16-bit UUID as 4-character hex string
+    auto parsed = parse_hex<uint16_t>(data, length);
+    if (parsed.has_value()) {
+      ret.uuid_.len = ESP_UUID_LEN_16;
+      ret.uuid_.uuid.uuid16 = parsed.value();
+    }
+  } else if (length == 8) {
+    // 32-bit UUID as 8-character hex string
+    auto parsed = parse_hex<uint32_t>(data, length);
+    if (parsed.has_value()) {
+      ret.uuid_.len = ESP_UUID_LEN_32;
+      ret.uuid_.uuid.uuid32 = parsed.value();
+    }
+  } else if (length == 16) {  // how we can have 16 byte length string reprezenting 128 bit uuid??? needs to be
+                              // investigated (lack of time)
+    ret.uuid_.len = ESP_UUID_LEN_128;
+    memcpy(ret.uuid_.uuid.uuid128, reinterpret_cast<const uint8_t *>(data), 16);
+  } else if (length == 36) {
+    // If the length of the string is 36 bytes then we will assume it is a long hex string in
+    // UUID format.
+    ret.uuid_.len = ESP_UUID_LEN_128;
+    int n = 0;
+    for (size_t i = 0; i < length; i += 2) {
+      if (data[i] == '-')
+        i++;
+      uint8_t msb = data[i];
+      uint8_t lsb = data[i + 1];
+
+      if (msb > '9')
+        msb -= 7;
+      if (lsb > '9')
+        lsb -= 7;
+      ret.uuid_.uuid.uuid128[15 - n++] = ((msb & 0x0F) << 4) | (lsb & 0x0F);
+    }
+  } else {
+    ESP_LOGE(TAG, "ERROR: UUID value not 2, 4, 16 or 36 bytes - %s", data);
+  }
+  return ret;
+}
+ESPBTUUID ESPBTUUID::from_uuid(esp_bt_uuid_t uuid) {
+  ESPBTUUID ret;
+  ret.uuid_.len = uuid.len;
+  if (uuid.len == ESP_UUID_LEN_16) {
+    ret.uuid_.uuid.uuid16 = uuid.uuid.uuid16;
+  } else if (uuid.len == ESP_UUID_LEN_32) {
+    ret.uuid_.uuid.uuid32 = uuid.uuid.uuid32;
+  } else if (uuid.len == ESP_UUID_LEN_128) {
+    memcpy(ret.uuid_.uuid.uuid128, uuid.uuid.uuid128, ESP_UUID_LEN_128);
+  }
+  return ret;
+}
+ESPBTUUID ESPBTUUID::as_128bit() const {
+  if (this->uuid_.len == ESP_UUID_LEN_128) {
+    return *this;
+  }
+  uint8_t data[] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  uint32_t uuid32;
+  if (this->uuid_.len == ESP_UUID_LEN_32) {
+    uuid32 = this->uuid_.uuid.uuid32;
+  } else {
+    uuid32 = this->uuid_.uuid.uuid16;
+  }
+  for (uint16_t i = 0; i < this->uuid_.len; i++) {
+    data[12 + i] = ((uuid32 >> i * 8) & 0xFF);
+  }
+  return ESPBTUUID::from_raw(data);
+}
+bool ESPBTUUID::contains(uint8_t data1, uint8_t data2) const {
+  if (this->uuid_.len == ESP_UUID_LEN_16) {
+    return (this->uuid_.uuid.uuid16 >> 8) == data2 && (this->uuid_.uuid.uuid16 & 0xFF) == data1;
+  } else if (this->uuid_.len == ESP_UUID_LEN_32) {
+    for (uint8_t i = 0; i < 3; i++) {
+      bool a = ((this->uuid_.uuid.uuid32 >> i * 8) & 0xFF) == data1;
+      bool b = ((this->uuid_.uuid.uuid32 >> (i + 1) * 8) & 0xFF) == data2;
+      if (a && b)
+        return true;
+    }
+  } else {
+    for (uint8_t i = 0; i < 15; i++) {
+      if (this->uuid_.uuid.uuid128[i] == data1 && this->uuid_.uuid.uuid128[i + 1] == data2)
+        return true;
+    }
+  }
+  return false;
+}
+bool ESPBTUUID::operator==(const ESPBTUUID &uuid) const {
+  if (this->uuid_.len == uuid.uuid_.len) {
+    switch (this->uuid_.len) {
+      case ESP_UUID_LEN_16:
+        return this->uuid_.uuid.uuid16 == uuid.uuid_.uuid.uuid16;
+      case ESP_UUID_LEN_32:
+        return this->uuid_.uuid.uuid32 == uuid.uuid_.uuid.uuid32;
+      case ESP_UUID_LEN_128:
+        return memcmp(this->uuid_.uuid.uuid128, uuid.uuid_.uuid.uuid128, ESP_UUID_LEN_128) == 0;
+      default:
+        return false;
+    }
+  }
+  return this->as_128bit() == uuid.as_128bit();
+}
+esp_bt_uuid_t ESPBTUUID::get_uuid() const { return this->uuid_; }
+const char *ESPBTUUID::to_str(std::span<char, UUID_STR_LEN> output) const {
+  char *pos = output.data();
+
+  switch (this->uuid_.len) {
+    case ESP_UUID_LEN_16:
+      *pos++ = '0';
+      *pos++ = 'x';
+      *pos++ = format_hex_pretty_char(this->uuid_.uuid.uuid16 >> 12);
+      *pos++ = format_hex_pretty_char((this->uuid_.uuid.uuid16 >> 8) & 0x0F);
+      *pos++ = format_hex_pretty_char((this->uuid_.uuid.uuid16 >> 4) & 0x0F);
+      *pos++ = format_hex_pretty_char(this->uuid_.uuid.uuid16 & 0x0F);
+      *pos = '\0';
+      return output.data();
+
+    case ESP_UUID_LEN_32:
+      *pos++ = '0';
+      *pos++ = 'x';
+      for (int shift = 28; shift >= 0; shift -= 4) {
+        *pos++ = format_hex_pretty_char((this->uuid_.uuid.uuid32 >> shift) & 0x0F);
+      }
+      *pos = '\0';
+      return output.data();
+
+    default:
+    case ESP_UUID_LEN_128:
+      // Format: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+      for (int8_t i = 15; i >= 0; i--) {
+        uint8_t byte = this->uuid_.uuid.uuid128[i];
+        *pos++ = format_hex_pretty_char(byte >> 4);
+        *pos++ = format_hex_pretty_char(byte & 0x0F);
+        if (i == 12 || i == 10 || i == 8 || i == 6) {
+          *pos++ = '-';
+        }
+      }
+      *pos = '\0';
+      return output.data();
+  }
+}
+}  // namespace esphome::esp32_ble
+
+#endif  // USE_ESP32_BLE_UUID
+#endif  // USE_ESP32

esphome/components/esp32_ble/ble_uuid.h

@@ -1,21 +1,56 @@
 #pragma once
 
 #include "esphome/core/defines.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
 
 #ifdef USE_ESP32
 #ifdef USE_ESP32_BLE_UUID
 
-// The BLE UUID type is owned by the platform-neutral ble_device_base layer;
-// this header re-exports it under the historical esp32_ble name (esp32 only).
-// The full historical API surface — including from_uuid()/get_uuid() with the
-// ESP-IDF esp_bt_uuid_t type — is preserved on esp32 builds.
-
-#include "esphome/components/ble_device_base/ble_device.h"
+#include <initializer_list>
+#include <span>
+#include <string>
+#include <esp_bt_defs.h>
 
 namespace esphome::esp32_ble {
 
-using ble_device_base::UUID_STR_LEN;
-using ESPBTUUID = ble_device_base::ESPBTUUID;
+/// Buffer size for UUID string: "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX\0"
+static constexpr size_t UUID_STR_LEN = 37;
+
+class ESPBTUUID {
+ public:
+  ESPBTUUID();
+
+  static ESPBTUUID from_uint16(uint16_t uuid);
+
+  static ESPBTUUID from_uint32(uint32_t uuid);
+
+  static ESPBTUUID from_raw(const uint8_t *data);
+  static ESPBTUUID from_raw_reversed(const uint8_t *data);
+
+  static ESPBTUUID from_raw(const char *data, size_t length);
+  static ESPBTUUID from_raw(const char *data) { return from_raw(data, strlen(data)); }
+  static ESPBTUUID from_raw(const std::string &data) { return from_raw(data.c_str(), data.length()); }
+  static ESPBTUUID from_raw(std::initializer_list<uint8_t> data) {
+    return from_raw(reinterpret_cast<const char *>(data.begin()), data.size());
+  }
+
+  static ESPBTUUID from_uuid(esp_bt_uuid_t uuid);
+
+  ESPBTUUID as_128bit() const;
+
+  bool contains(uint8_t data1, uint8_t data2) const;
+
+  bool operator==(const ESPBTUUID &uuid) const;
+  bool operator!=(const ESPBTUUID &uuid) const { return !(*this == uuid); }
+
+  esp_bt_uuid_t get_uuid() const;
+
+  const char *to_str(std::span<char, UUID_STR_LEN> output) const;
+
+ protected:
+  esp_bt_uuid_t uuid_;
+};
 
 }  // namespace esphome::esp32_ble
 

esphome/components/esp32_ble_beacon/__init__.py

@@ -86,4 +86,4 @@ async def to_code(config):
 
     cg.add_define("USE_ESP32_BLE_ADVERTISING")
 
-    request_bluetooth()
+    request_bluetooth(ble_42=True)

esphome/components/esp32_ble_client/ble_client_base.cpp

@@ -125,9 +125,6 @@ void BLEClientBase::connect() {
   }
   ESP_LOGI(TAG, "[%d] [%s] 0x%02x Connecting", this->connection_index_, this->address_str_, this->remote_addr_type_);
   this->paired_ = false;
-  // A registration whose event never arrived must not block this connection's release.
-  this->services_released_ = false;
-  this->pending_notify_regs_ = 0;
   // Enable loop for state processing
   this->enable_loop();
   // Immediately transition to CONNECTING to prevent duplicate connection attempts
@@ -203,26 +200,10 @@ void BLEClientBase::release_services() {
   this->services_.clear();
 #endif
 #ifndef CONFIG_BT_GATTC_CACHE_NVS_FLASH
-  // Only the cache clean makes the stack's database unsafe to walk.
-  this->services_released_ = true;
   esp_ble_gattc_cache_clean(this->remote_bda_);
 #endif
 }
 
-esp_err_t BLEClientBase::register_for_notify(uint16_t char_handle) {
-  esp_err_t err = esp_ble_gattc_register_for_notify(this->gattc_if_, this->remote_bda_, char_handle);
-  if (err != ESP_OK)
-    return err;
-  if (this->pending_notify_regs_ == UINT8_MAX) {
-    // Saturating undercounts, so the release can run before the last registration completes.
-    // Wrapping to zero would undercount by the full range instead, which is worse.
-    this->log_warning_("Too many outstanding notify registrations to track");
-    return err;
-  }
-  this->pending_notify_regs_++;
-  return err;
-}
-
 void BLEClientBase::log_event_(const char *name) {
   ESP_LOGD(TAG, "[%d] [%s] %s", this->connection_index_, this->address_str_, name);
 }
@@ -517,20 +498,12 @@ bool BLEClientBase::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_
     }
     case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
       this->log_gattc_data_event_("REG_FOR_NOTIFY");
-      // The event carries no conn_id, so this is the only place the request can be retired.
-      if (this->pending_notify_regs_ > 0)
-        this->pending_notify_regs_--;
       if (this->connection_type_ == espbt::ConnectionType::V3_WITH_CACHE ||
           this->connection_type_ == espbt::ConnectionType::V3_WITHOUT_CACHE) {
         // Client is responsible for flipping the descriptor value
         // when using the cache
         break;
       }
-      if (this->services_released_) {
-        // The lookup below walks the freed GATT cache, and Bluedroid asserts on it rather than erroring.
-        this->log_warning_("REG_FOR_NOTIFY after services released, notifications not enabled");
-        break;
-      }
       esp_gattc_descr_elem_t desc_result;
       uint16_t count = 1;
       esp_gatt_status_t descr_status = esp_ble_gattc_get_descr_by_char_handle(

esphome/components/esp32_ble_client/ble_client_base.h

@@ -44,12 +44,6 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   void unconditional_disconnect();
   void release_services();
 
-  /// Register for notifications, holding the service release until the registration completes.
-  esp_err_t register_for_notify(uint16_t char_handle);
-
-  /// True while a register_for_notify() request has not completed.
-  bool notify_registration_pending() const { return this->pending_notify_regs_ > 0; }
-
   bool connected() { return this->state() == espbt::ClientState::ESTABLISHED; }
 
   void set_auto_connect(bool auto_connect) { this->auto_connect_ = auto_connect; }
@@ -131,15 +125,9 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   espbt::ConnectionType connection_type_{espbt::ConnectionType::V1};
   uint8_t connection_index_;
   uint8_t service_count_{0};  // ESP32 has max handles < 255, typical devices have < 50 services
-  // Outstanding register_for_notify() requests
-  // A count, not per-request state, so a raw esp_ble_gattc_register_for_notify() on the same client can retire one
-  // services_released_ is the backstop if that ever lets the release run early
-  uint8_t pending_notify_regs_{0};
   bool auto_connect_{false};
   bool paired_{false};
-  // Set only when release_services() cleans the stack's GATT cache, which no API may then walk
-  bool services_released_{false};
-  // 8 bytes used, no padding
+  // 6 bytes used, 2 bytes padding
 
   void log_event_(const char *name);
   void log_gattc_lifecycle_event_(const char *name);

esphome/components/esp32_ble_tracker/__init__.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
+from dataclasses import dataclass
 import logging
 
 from esphome import automation
 import esphome.codegen as cg
-from esphome.components import ble_device_base, esp32_ble, ota
-from esphome.components.const import CONF_ON_SCAN_END, CONF_SCAN_PARAMETERS, CONF_WINDOW
+from esphome.components import esp32_ble, ota
 from esphome.components.esp32 import (
     add_idf_sdkconfig_option,
     request_bluetooth,
@@ -39,11 +39,14 @@ from esphome.core import CORE, CoroPriority, coroutine_with_priority
 from esphome.enum import StrEnum
 from esphome.types import ConfigType
 
-AUTO_LOAD = ["ble_device_base", "esp32_ble"]
+AUTO_LOAD = ["esp32_ble"]
 DEPENDENCIES = ["esp32"]
 CODEOWNERS = ["@bdraco"]
 
 CONF_ESP32_BLE_ID = "esp32_ble_id"
+CONF_SCAN_PARAMETERS = "scan_parameters"
+CONF_WINDOW = "window"
+CONF_ON_SCAN_END = "on_scan_end"
 CONF_SOFTWARE_COEXISTENCE = "software_coexistence"
 
 _LOGGER = logging.getLogger(__name__)
@@ -54,8 +57,16 @@ class BLEFeatures(StrEnum):
     ESP_BT_DEVICE = "ESP_BT_DEVICE"
 
 
-# CORE.data key for state management
+# Dataclass for registration counts
+@dataclass
+class RegistrationCounts:
+    listeners: int = 0
+    clients: int = 0
+
+
+# CORE.data keys for state management
 ESP32_BLE_TRACKER_REQUIRED_FEATURES_KEY = "esp32_ble_tracker_required_features"
+ESP32_BLE_TRACKER_REGISTRATION_COUNTS_KEY = "esp32_ble_tracker_registration_counts"
 
 
 def _get_required_features() -> set[BLEFeatures]:
@@ -63,13 +74,11 @@ def _get_required_features() -> set[BLEFeatures]:
     return CORE.data.setdefault(ESP32_BLE_TRACKER_REQUIRED_FEATURES_KEY, set())
 
 
-# Slot counters sizing the tracker's StaticVector storage; one request per
-# registered listener, client, or scanner state listener.
-_request_listener_slot = cg.slot_counter("ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT")
-_request_client_slot = cg.slot_counter("ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT")
-_request_scanner_state_listener_slot = cg.slot_counter(
-    "ESPHOME_ESP32_BLE_TRACKER_SCANNER_STATE_LISTENER_COUNT"
-)
+def _get_registration_counts() -> RegistrationCounts:
+    """Get the registration counts from CORE.data."""
+    return CORE.data.setdefault(
+        ESP32_BLE_TRACKER_REGISTRATION_COUNTS_KEY, RegistrationCounts()
+    )
 
 
 def register_ble_features(features: set[BLEFeatures]) -> None:
@@ -84,7 +93,6 @@ def register_ble_features(features: set[BLEFeatures]) -> None:
 esp32_ble_tracker_ns = cg.esphome_ns.namespace("esp32_ble_tracker")
 ESP32BLETracker = esp32_ble_tracker_ns.class_(
     "ESP32BLETracker",
-    ble_device_base.BLEHub,
     cg.Component,
     cg.Parented.template(esp32_ble.ESP32BLE),
 )
@@ -117,6 +125,25 @@ ESP32BLEStopScanAction = esp32_ble_tracker_ns.class_(
 )
 
 
+def validate_scan_parameters(config):
+    duration = config[CONF_DURATION]
+    interval = config[CONF_INTERVAL]
+    window = config[CONF_WINDOW]
+
+    if window > interval:
+        raise cv.Invalid(
+            f"Scan window ({window}) needs to be smaller than scan interval ({interval})"
+        )
+
+    if interval.total_milliseconds * 3 > duration.total_milliseconds:
+        raise cv.Invalid(
+            "Scan duration needs to be at least three times the scan interval to"
+            "cover all BLE channels."
+        )
+
+    return config
+
+
 def validate_max_connections_deprecated(config: ConfigType) -> ConfigType:
     if CONF_MAX_CONNECTIONS in config:
         _LOGGER.warning(
@@ -126,18 +153,26 @@ def validate_max_connections_deprecated(config: ConfigType) -> ConfigType:
     return config
 
 
-# 320 ms is the ESP-IDF reference scan interval; the shared schema also
-# tightens validation to the controller's 2.5 ms .. 10240 ms range and rejects
-# window/interval pairs that collapse to the same 0.625 ms unit count.
-SCAN_PARAMETERS_SCHEMA = ble_device_base.scan_parameters_schema(
-    "320ms", supports_active=True
-)
+def as_hex(value):
+    return cg.RawExpression(f"0x{value}ULL")
 
-# Codegen helpers are owned by ble_device_base; kept under the historical names
-# here for the components that import them from this module.
-as_hex = ble_device_base.as_hex
-as_hex_array = ble_device_base.as_hex_array
-as_reversed_hex_array = ble_device_base.as_reversed_hex_array
+
+def as_hex_array(value):
+    value = value.replace("-", "")
+    cpp_array = [
+        f"0x{part}" for part in [value[i : i + 2] for i in range(0, len(value), 2)]
+    ]
+    return cg.RawExpression(f"(uint8_t*)(const uint8_t[16]){{{','.join(cpp_array)}}}")
+
+
+def as_reversed_hex_array(value):
+    value = value.replace("-", "")
+    cpp_array = [
+        f"0x{part}" for part in [value[i : i + 2] for i in range(0, len(value), 2)]
+    ]
+    return cg.RawExpression(
+        f"(uint8_t*)(const uint8_t[16]){{{','.join(reversed(cpp_array))}}}"
+    )
 
 
 CONFIG_SCHEMA = cv.All(
@@ -148,7 +183,24 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_MAX_CONNECTIONS): cv.All(
                 cv.positive_int, cv.Range(min=0, max=IDF_MAX_CONNECTIONS)
             ),
-            cv.Optional(CONF_SCAN_PARAMETERS, default={}): SCAN_PARAMETERS_SCHEMA,
+            cv.Optional(CONF_SCAN_PARAMETERS, default={}): cv.All(
+                cv.Schema(
+                    {
+                        cv.Optional(
+                            CONF_DURATION, default="5min"
+                        ): cv.positive_time_period_seconds,
+                        cv.Optional(
+                            CONF_INTERVAL, default="320ms"
+                        ): cv.positive_time_period_milliseconds,
+                        cv.Optional(
+                            CONF_WINDOW, default="30ms"
+                        ): cv.positive_time_period_milliseconds,
+                        cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
+                        cv.Optional(CONF_CONTINUOUS, default=True): cv.boolean,
+                    }
+                ),
+                validate_scan_parameters,
+            ),
             cv.Optional(CONF_ON_BLE_ADVERTISE): automation.validate_automation(
                 {
                     cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
@@ -202,10 +254,6 @@ async def to_code(config):
     # Register the loggers this component needs
     esp32_ble.register_bt_logger(BTLoggers.BLE_SCAN)
 
-    # Behavior parity with the pre-split tracker: IRK resolution is always
-    # available on esp32 (sensors with irk: worked without opting in).
-    ble_device_base.request_irk_support()
-
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
@@ -218,8 +266,8 @@ async def to_code(config):
 
     params = config[CONF_SCAN_PARAMETERS]
     cg.add(var.set_scan_duration(params[CONF_DURATION]))
-    cg.add(var.set_scan_interval(ble_device_base.to_ble_units(params[CONF_INTERVAL])))
-    cg.add(var.set_scan_window(ble_device_base.to_ble_units(params[CONF_WINDOW])))
+    cg.add(var.set_scan_interval(int(params[CONF_INTERVAL].total_milliseconds / 0.625)))
+    cg.add(var.set_scan_window(int(params[CONF_WINDOW].total_milliseconds / 0.625)))
     cg.add(var.set_scan_active(params[CONF_ACTIVE]))
     cg.add(var.set_scan_continuous(params[CONF_CONTINUOUS]))
 
@@ -231,15 +279,17 @@ async def to_code(config):
     ):
         register_ble_features({BLEFeatures.ESP_BT_DEVICE})
 
+    registration_counts = _get_registration_counts()
+
     for conf in config.get(CONF_ON_BLE_ADVERTISE, []):
-        _request_listener_slot()
+        registration_counts.listeners += 1
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         if CONF_MAC_ADDRESS in conf:
             addr_list = [it.as_hex for it in conf[CONF_MAC_ADDRESS]]
             cg.add(trigger.set_addresses(addr_list))
         await automation.build_automation(trigger, [(ESPBTDeviceConstRef, "x")], conf)
     for conf in config.get(CONF_ON_BLE_SERVICE_DATA_ADVERTISE, []):
-        _request_listener_slot()
+        registration_counts.listeners += 1
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         if len(conf[CONF_SERVICE_UUID]) == len(bt_uuid16_format):
             cg.add(trigger.set_service_uuid16(as_hex(conf[CONF_SERVICE_UUID])))
@@ -252,7 +302,7 @@ async def to_code(config):
             cg.add(trigger.set_address(conf[CONF_MAC_ADDRESS].as_hex))
         await automation.build_automation(trigger, [(adv_data_t_const_ref, "x")], conf)
     for conf in config.get(CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE, []):
-        _request_listener_slot()
+        registration_counts.listeners += 1
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         if len(conf[CONF_MANUFACTURER_ID]) == len(bt_uuid16_format):
             cg.add(trigger.set_manufacturer_uuid16(as_hex(conf[CONF_MANUFACTURER_ID])))
@@ -265,7 +315,7 @@ async def to_code(config):
             cg.add(trigger.set_address(conf[CONF_MAC_ADDRESS].as_hex))
         await automation.build_automation(trigger, [(adv_data_t_const_ref, "x")], conf)
     for conf in config.get(CONF_ON_SCAN_END, []):
-        _request_listener_slot()
+        registration_counts.listeners += 1
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
 
@@ -296,16 +346,22 @@ async def to_code(config):
 async def _add_ble_features():
     # Add feature-specific defines based on what's needed
     required_features = _get_required_features()
-    # Sensors registered through the neutral ble_device_base path (BLEHub) need
-    # the parsed-device pipeline compiled in, exactly like esp32-path listeners.
-    if cg.get_slot_count(ble_device_base.LISTENER_COUNT_DEFINE):
-        # The neutral (BLEHub) listener count define itself is emitted by
-        # ble_device_base's own job; only the feature coupling lives here.
-        required_features.add(BLEFeatures.ESP_BT_DEVICE)
     if BLEFeatures.ESP_BT_DEVICE in required_features:
         cg.add_define("USE_ESP32_BLE_DEVICE")
         cg.add_define("USE_ESP32_BLE_UUID")
 
+    # Add defines for StaticVector sizing based on registration counts
+    # Only define if count > 0 to avoid allocating unnecessary memory
+    registration_counts = _get_registration_counts()
+    if registration_counts.listeners > 0:
+        cg.add_define(
+            "ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT", registration_counts.listeners
+        )
+    if registration_counts.clients > 0:
+        cg.add_define(
+            "ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT", registration_counts.clients
+        )
+
 
 ESP32_BLE_START_SCAN_ACTION_SCHEMA = cv.Schema(
     {
@@ -358,7 +414,7 @@ async def register_ble_device(
     var: cg.SafeExpType, config: ConfigType
 ) -> cg.SafeExpType:
     register_ble_features({BLEFeatures.ESP_BT_DEVICE})
-    _request_listener_slot()
+    _get_registration_counts().listeners += 1
     paren = await cg.get_variable(config[CONF_ESP32_BLE_ID])
     cg.add(paren.register_listener(var))
     return var
@@ -366,7 +422,7 @@ async def register_ble_device(
 
 async def register_client(var: cg.SafeExpType, config: ConfigType) -> cg.SafeExpType:
     register_ble_features({BLEFeatures.ESP_BT_DEVICE})
-    _request_client_slot()
+    _get_registration_counts().clients += 1
     paren = await cg.get_variable(config[CONF_ESP32_BLE_ID])
     cg.add(paren.register_client(var))
     return var
@@ -380,7 +436,7 @@ async def register_raw_ble_device(
     This does NOT register the ESP_BT_DEVICE feature, meaning ESPBTDevice
     will not be compiled in if this is the only registration method used.
     """
-    _request_listener_slot()
+    _get_registration_counts().listeners += 1
     paren = await cg.get_variable(config[CONF_ESP32_BLE_ID])
     cg.add(paren.register_listener(var))
     return var
@@ -394,21 +450,7 @@ async def register_raw_client(
     This does NOT register the ESP_BT_DEVICE feature, meaning ESPBTDevice
     will not be compiled in if this is the only registration method used.
     """
-    _request_client_slot()
+    _get_registration_counts().clients += 1
     paren = await cg.get_variable(config[CONF_ESP32_BLE_ID])
     cg.add(paren.register_client(var))
     return var
-
-
-async def register_scanner_state_listener(
-    var: cg.SafeExpType, config: ConfigType
-) -> cg.SafeExpType:
-    """Register a listener for scanner state changes.
-
-    The slot request here is what sizes the tracker's listener storage; a
-    build with no registrations compiles the storage out entirely.
-    """
-    _request_scanner_state_listener_slot()
-    paren = await cg.get_variable(config[CONF_ESP32_BLE_ID])
-    cg.add(paren.add_scanner_state_listener(var))
-    return var

esphome/components/esp32_ble_tracker/automation.h

@@ -3,8 +3,6 @@
 #include "esphome/core/automation.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 
-#include <vector>
-
 #ifdef USE_ESP32
 
 namespace esphome::esp32_ble_tracker {

esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp

@@ -27,6 +27,15 @@
 #include <esp_coexist.h>
 #endif
 
+#ifdef USE_ESP32_BLE_DEVICE
+#ifdef USE_BLE_TRACKER_PSA_AES
+#include <psa/crypto.h>
+#else
+#define MBEDTLS_AES_ALT
+#include <aes_alt.h>
+#endif
+#endif  // USE_ESP32_BLE_DEVICE
+
 // bt_trace.h
 #undef TAG
 
@@ -34,6 +43,9 @@ namespace esphome::esp32_ble_tracker {
 
 static const char *const TAG = "esp32_ble_tracker";
 
+// BLE advertisement max: 31 bytes adv data + 31 bytes scan response
+static constexpr size_t BLE_ADV_MAX_LOG_BYTES = 62;
+
 ESP32BLETracker *global_esp32_ble_tracker = nullptr;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
 const char *client_state_to_string(ClientState state) {
@@ -251,14 +263,10 @@ void ESP32BLETracker::start_scan_(bool first) {
 #ifdef ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT
     for (auto *listener : this->listeners_)
       listener->on_scan_end();
-#endif
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-    for (auto *listener : this->neutral_listeners_)
-      listener->on_scan_end();
 #endif
   }
 #ifdef USE_ESP32_BLE_DEVICE
-  this->discovered_log_.clear();
+  this->already_discovered_.clear();
 #endif
   this->scan_params_.scan_type = this->scan_active_ ? BLE_SCAN_TYPE_ACTIVE : BLE_SCAN_TYPE_PASSIVE;
   this->scan_params_.own_addr_type = BLE_ADDR_TYPE_PUBLIC;
@@ -296,21 +304,6 @@ void ESP32BLETracker::register_client(ESPBTClient *client) {
 #endif
 }
 
-void ESP32BLETracker::register_listener(ble_device_base::ESPBTDeviceListener *listener) {
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  // Neutral BLEHub path (migrated sensors): parsed-advertisement consumers only.
-  this->neutral_listeners_.push_back(listener);
-  this->parse_advertisements_ = true;
-#endif
-}
-
-void ESP32BLETracker::get_adapter_mac(uint8_t out[6]) {
-  get_mac_address_raw(out);  // WiFi base MAC, MSB-first
-  // BT MAC = base MAC + 2 on the last octet only, wrapping without carry —
-  // exactly ESP-IDF's esp_read_mac(ESP_MAC_BT): mac[5] += MAC_ADDR_UNIVERSE_BT_OFFSET.
-  out[5] += 2;
-}
-
 void ESP32BLETracker::register_listener(ESPBTDeviceListener *listener) {
 #ifdef ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT
   listener->set_parent(this);
@@ -322,13 +315,6 @@ void ESP32BLETracker::register_listener(ESPBTDeviceListener *listener) {
 void ESP32BLETracker::recalculate_advertisement_parser_types() {
   this->raw_advertisements_ = false;
   this->parse_advertisements_ = false;
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  // Neutral (BLEHub) listeners are parsed-advertisement consumers and are not in
-  // listeners_; without this, any later esp32-path registration (e.g. the proxy's
-  // GATT clients) would recompute the flags and silently drop parsed dispatch.
-  if (!this->neutral_listeners_.empty())
-    this->parse_advertisements_ = true;
-#endif
 #ifdef ESPHOME_ESP32_BLE_TRACKER_LISTENER_COUNT
   for (auto *listener : this->listeners_) {
     if (listener->get_advertisement_parser_type() == AdvertisementParserType::PARSED_ADVERTISEMENTS) {
@@ -443,13 +429,275 @@ void ESP32BLETracker::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_i
 void ESP32BLETracker::set_scanner_state_(ScannerState state) {
   this->scanner_state_ = state;
   this->state_version_++;
-#ifdef ESPHOME_ESP32_BLE_TRACKER_SCANNER_STATE_LISTENER_COUNT
   for (auto *listener : this->scanner_state_listeners_) {
     listener->on_scanner_state(state);
   }
+}
+
+#ifdef USE_ESP32_BLE_DEVICE
+ESPBLEiBeacon::ESPBLEiBeacon(const uint8_t *data) { memcpy(&this->beacon_data_, data, sizeof(beacon_data_)); }
+optional<ESPBLEiBeacon> ESPBLEiBeacon::from_manufacturer_data(const ServiceData &data) {
+  if (!data.uuid.contains(0x4C, 0x00))
+    return {};
+
+  if (data.data.size() != 23)
+    return {};
+  return ESPBLEiBeacon(data.data.data());
+}
+
+void ESPBTDevice::parse_scan_rst(const BLEScanResult &scan_result) {
+  this->scan_result_ = &scan_result;
+  for (uint8_t i = 0; i < ESP_BD_ADDR_LEN; i++)
+    this->address_[i] = scan_result.bda[i];
+  this->address_type_ = static_cast<esp_ble_addr_type_t>(scan_result.ble_addr_type);
+  this->rssi_ = scan_result.rssi;
+
+  // Parse advertisement data directly
+  uint8_t total_len = scan_result.adv_data_len + scan_result.scan_rsp_len;
+  this->parse_adv_(scan_result.ble_adv, total_len);
+
+#ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
+  ESP_LOGVV(TAG, "Parse Result:");
+  const char *address_type;
+  switch (this->address_type_) {
+    case BLE_ADDR_TYPE_PUBLIC:
+      address_type = "PUBLIC";
+      break;
+    case BLE_ADDR_TYPE_RANDOM:
+      address_type = "RANDOM";
+      break;
+    case BLE_ADDR_TYPE_RPA_PUBLIC:
+      address_type = "RPA_PUBLIC";
+      break;
+    case BLE_ADDR_TYPE_RPA_RANDOM:
+      address_type = "RPA_RANDOM";
+      break;
+    default:
+      address_type = "UNKNOWN";
+      break;
+  }
+  ESP_LOGVV(TAG, "  Address: %02X:%02X:%02X:%02X:%02X:%02X (%s)", this->address_[0], this->address_[1],
+            this->address_[2], this->address_[3], this->address_[4], this->address_[5], address_type);
+
+  ESP_LOGVV(TAG, "  RSSI: %d", this->rssi_);
+  ESP_LOGVV(TAG, "  Name: '%s'", this->name_.c_str());
+  for (auto &it : this->tx_powers_) {
+    ESP_LOGVV(TAG, "  TX Power: %d", it);
+  }
+  if (this->appearance_.has_value()) {
+    ESP_LOGVV(TAG, "  Appearance: %u", *this->appearance_);
+  }
+  if (this->ad_flag_.has_value()) {
+    ESP_LOGVV(TAG, "  Ad Flag: %u", *this->ad_flag_);
+  }
+  for (auto &uuid : this->service_uuids_) {
+    char uuid_buf[esp32_ble::UUID_STR_LEN];
+    uuid.to_str(uuid_buf);
+    ESP_LOGVV(TAG, "  Service UUID: %s", uuid_buf);
+  }
+  char hex_buf[format_hex_pretty_size(BLE_ADV_MAX_LOG_BYTES)];
+  for (auto &data : this->manufacturer_datas_) {
+    auto ibeacon = ESPBLEiBeacon::from_manufacturer_data(data);
+    if (ibeacon.has_value()) {
+      ESP_LOGVV(TAG, "  Manufacturer iBeacon:");
+      char uuid_buf[esp32_ble::UUID_STR_LEN];
+      ibeacon.value().get_uuid().to_str(uuid_buf);
+      ESP_LOGVV(TAG, "    UUID: %s", uuid_buf);
+      ESP_LOGVV(TAG, "    Major: %u", ibeacon.value().get_major());
+      ESP_LOGVV(TAG, "    Minor: %u", ibeacon.value().get_minor());
+      ESP_LOGVV(TAG, "    TXPower: %d", ibeacon.value().get_signal_power());
+    } else {
+      char uuid_buf[esp32_ble::UUID_STR_LEN];
+      data.uuid.to_str(uuid_buf);
+      ESP_LOGVV(TAG, "  Manufacturer ID: %s, data: %s", uuid_buf,
+                format_hex_pretty_to(hex_buf, data.data.data(), data.data.size()));
+    }
+  }
+  for (auto &data : this->service_datas_) {
+    ESP_LOGVV(TAG, "  Service data:");
+    char uuid_buf[esp32_ble::UUID_STR_LEN];
+    data.uuid.to_str(uuid_buf);
+    ESP_LOGVV(TAG, "    UUID: %s", uuid_buf);
+    ESP_LOGVV(TAG, "    Data: %s", format_hex_pretty_to(hex_buf, data.data.data(), data.data.size()));
+  }
+
+  ESP_LOGVV(TAG, "  Adv data: %s",
+            format_hex_pretty_to(hex_buf, scan_result.ble_adv, scan_result.adv_data_len + scan_result.scan_rsp_len));
 #endif
 }
 
+void ESPBTDevice::parse_adv_(const uint8_t *payload, uint8_t len) {
+  size_t offset = 0;
+
+  while (offset + 2 < len) {
+    const uint8_t field_length = payload[offset++];  // First byte is length of adv record
+    if (field_length == 0) {
+      continue;  // Possible zero padded advertisement data
+    }
+
+    // Validate field fits in remaining payload
+    if (offset + field_length > len) {
+      break;
+    }
+
+    // first byte of adv record is adv record type
+    const uint8_t record_type = payload[offset++];
+    const uint8_t *record = &payload[offset];
+    const uint8_t record_length = field_length - 1;
+    offset += record_length;
+
+    // See also Generic Access Profile Assigned Numbers:
+    // https://www.bluetooth.com/specifications/assigned-numbers/generic-access-profile/ See also ADVERTISING AND SCAN
+    // RESPONSE DATA FORMAT: https://www.bluetooth.com/specifications/bluetooth-core-specification/ (vol 3, part C, 11)
+    // See also Core Specification Supplement: https://www.bluetooth.com/specifications/bluetooth-core-specification/
+    // (called CSS here)
+
+    switch (record_type) {
+      case ESP_BLE_AD_TYPE_NAME_SHORT:
+      case ESP_BLE_AD_TYPE_NAME_CMPL: {
+        // CSS 1.2 LOCAL NAME
+        // "The Local Name data type shall be the same as, or a shortened version of, the local name assigned to the
+        // device." CSS 1: Optional in this context; shall not appear more than once in a block.
+        // SHORTENED LOCAL NAME
+        // "The Shortened Local Name data type defines a shortened version of the Local Name data type. The Shortened
+        // Local Name data type shall not be used to advertise a name that is longer than the Local Name data type."
+        if (record_length > this->name_.length()) {
+          this->name_ = std::string(reinterpret_cast<const char *>(record), record_length);
+        }
+        break;
+      }
+      case ESP_BLE_AD_TYPE_TX_PWR: {
+        // CSS 1.5 TX POWER LEVEL
+        // "The TX Power Level data type indicates the transmitted power level of the packet containing the data type."
+        // CSS 1: Optional in this context (may appear more than once in a block).
+        this->tx_powers_.push_back(*record);
+        break;
+      }
+      case ESP_BLE_AD_TYPE_APPEARANCE: {
+        // CSS 1.12 APPEARANCE
+        // "The Appearance data type defines the external appearance of the device."
+        // See also https://www.bluetooth.com/specifications/gatt/characteristics/
+        // CSS 1: Optional in this context; shall not appear more than once in a block and shall not appear in both
+        // the AD and SRD of the same extended advertising interval.
+        this->appearance_ = *reinterpret_cast<const uint16_t *>(record);
+        break;
+      }
+      case ESP_BLE_AD_TYPE_FLAG: {
+        // CSS 1.3 FLAGS
+        // "The Flags data type contains one bit Boolean flags. The Flags data type shall be included when any of the
+        // Flag bits are non-zero and the advertising packet is connectable, otherwise the Flags data type may be
+        // omitted."
+        // CSS 1: Optional in this context; shall not appear more than once in a block.
+        this->ad_flag_ = *record;
+        break;
+      }
+      // CSS 1.1 SERVICE UUID
+      // The Service UUID data type is used to include a list of Service or Service Class UUIDs.
+      // There are six data types defined for the three sizes of Service UUIDs that may be returned:
+      // CSS 1: Optional in this context (may appear more than once in a block).
+      case ESP_BLE_AD_TYPE_16SRV_CMPL:
+      case ESP_BLE_AD_TYPE_16SRV_PART: {
+        // • 16-bit Bluetooth Service UUIDs
+        for (uint8_t i = 0; i < record_length / 2; i++) {
+          this->service_uuids_.push_back(ESPBTUUID::from_uint16(*reinterpret_cast<const uint16_t *>(record + 2 * i)));
+        }
+        break;
+      }
+      case ESP_BLE_AD_TYPE_32SRV_CMPL:
+      case ESP_BLE_AD_TYPE_32SRV_PART: {
+        // • 32-bit Bluetooth Service UUIDs
+        for (uint8_t i = 0; i < record_length / 4; i++) {
+          this->service_uuids_.push_back(ESPBTUUID::from_uint32(*reinterpret_cast<const uint32_t *>(record + 4 * i)));
+        }
+        break;
+      }
+      case ESP_BLE_AD_TYPE_128SRV_CMPL:
+      case ESP_BLE_AD_TYPE_128SRV_PART: {
+        // • Global 128-bit Service UUIDs
+        this->service_uuids_.push_back(ESPBTUUID::from_raw(record));
+        break;
+      }
+      case ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE: {
+        // CSS 1.4 MANUFACTURER SPECIFIC DATA
+        // "The Manufacturer Specific data type is used for manufacturer specific data. The first two data octets shall
+        // contain a company identifier from Assigned Numbers. The interpretation of any other octets within the data
+        // shall be defined by the manufacturer specified by the company identifier."
+        // CSS 1: Optional in this context (may appear more than once in a block).
+        if (record_length < 2) {
+          ESP_LOGV(TAG, "Record length too small for ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE");
+          break;
+        }
+        ServiceData data{};
+        data.uuid = ESPBTUUID::from_uint16(*reinterpret_cast<const uint16_t *>(record));
+        data.data.assign(record + 2UL, record + record_length);
+        this->manufacturer_datas_.push_back(data);
+        break;
+      }
+
+      // CSS 1.11 SERVICE DATA
+      // "The Service Data data type consists of a service UUID with the data associated with that service."
+      // CSS 1: Optional in this context (may appear more than once in a block).
+      case ESP_BLE_AD_TYPE_SERVICE_DATA: {
+        // «Service Data - 16 bit UUID»
+        // Size: 2 or more octets
+        // The first 2 octets contain the 16 bit Service UUID fol- lowed by additional service data
+        if (record_length < 2) {
+          ESP_LOGV(TAG, "Record length too small for ESP_BLE_AD_TYPE_SERVICE_DATA");
+          break;
+        }
+        ServiceData data{};
+        data.uuid = ESPBTUUID::from_uint16(*reinterpret_cast<const uint16_t *>(record));
+        data.data.assign(record + 2UL, record + record_length);
+        this->service_datas_.push_back(data);
+        break;
+      }
+      case ESP_BLE_AD_TYPE_32SERVICE_DATA: {
+        // «Service Data - 32 bit UUID»
+        // Size: 4 or more octets
+        // The first 4 octets contain the 32 bit Service UUID fol- lowed by additional service data
+        if (record_length < 4) {
+          ESP_LOGV(TAG, "Record length too small for ESP_BLE_AD_TYPE_32SERVICE_DATA");
+          break;
+        }
+        ServiceData data{};
+        data.uuid = ESPBTUUID::from_uint32(*reinterpret_cast<const uint32_t *>(record));
+        data.data.assign(record + 4UL, record + record_length);
+        this->service_datas_.push_back(data);
+        break;
+      }
+      case ESP_BLE_AD_TYPE_128SERVICE_DATA: {
+        // «Service Data - 128 bit UUID»
+        // Size: 16 or more octets
+        // The first 16 octets contain the 128 bit Service UUID followed by additional service data
+        if (record_length < 16) {
+          ESP_LOGV(TAG, "Record length too small for ESP_BLE_AD_TYPE_128SERVICE_DATA");
+          break;
+        }
+        ServiceData data{};
+        data.uuid = ESPBTUUID::from_raw(record);
+        data.data.assign(record + 16UL, record + record_length);
+        this->service_datas_.push_back(data);
+        break;
+      }
+      case ESP_BLE_AD_TYPE_INT_RANGE:
+        // Avoid logging this as it's very verbose
+        break;
+      default: {
+        ESP_LOGV(TAG, "Unhandled type: advType: 0x%02x", record_type);
+        break;
+      }
+    }
+  }
+}
+
+std::string ESPBTDevice::address_str() const {
+  char buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
+  return this->address_str_to(buf);
+}
+
+uint64_t ESPBTDevice::address_uint64() const { return esp32_ble::ble_addr_to_uint64(this->address_); }
+#endif  // USE_ESP32_BLE_DEVICE
+
 void ESP32BLETracker::dump_config() {
   ESP_LOGCONFIG(TAG, "BLE Tracker:");
   ESP_LOGCONFIG(TAG,
@@ -473,12 +721,102 @@ void ESP32BLETracker::dump_config() {
 
 #ifdef USE_ESP32_BLE_DEVICE
 void ESP32BLETracker::print_bt_device_info(const ESPBTDevice &device) {
-  // Shared implementation in ble_device_base — identical output and per-period
-  // MAC dedup on every tracker backend.
-  this->discovered_log_.log_device(TAG, device);
+  const uint64_t address = device.address_uint64();
+  for (auto &disc : this->already_discovered_) {
+    if (disc == address)
+      return;
+  }
+  this->already_discovered_.push_back(address);
+
+  char addr_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
+  ESP_LOGD(TAG, "Found device %s RSSI=%d", device.address_str_to(addr_buf), device.get_rssi());
+
+  const char *address_type_s;
+  switch (device.get_address_type()) {
+    case BLE_ADDR_TYPE_PUBLIC:
+      address_type_s = "PUBLIC";
+      break;
+    case BLE_ADDR_TYPE_RANDOM:
+      address_type_s = "RANDOM";
+      break;
+    case BLE_ADDR_TYPE_RPA_PUBLIC:
+      address_type_s = "RPA_PUBLIC";
+      break;
+    case BLE_ADDR_TYPE_RPA_RANDOM:
+      address_type_s = "RPA_RANDOM";
+      break;
+    default:
+      address_type_s = "UNKNOWN";
+      break;
+  }
+
+  ESP_LOGD(TAG, "  Address Type: %s", address_type_s);
+  if (!device.get_name().empty()) {
+    ESP_LOGD(TAG, "  Name: '%s'", device.get_name().c_str());
+  }
+  for (auto &tx_power : device.get_tx_powers()) {
+    ESP_LOGD(TAG, "  TX Power: %d", tx_power);
+  }
 }
 
-// resolve_irk() is provided by ble_device_base (portable software AES).
+bool ESPBTDevice::resolve_irk(const uint8_t *irk) const {
+  static constexpr size_t AES_BLOCK_SIZE = 16;
+  static constexpr size_t AES_KEY_BITS = 128;
+
+  uint8_t ecb_key[AES_BLOCK_SIZE];
+  uint8_t ecb_plaintext[AES_BLOCK_SIZE];
+  uint8_t ecb_ciphertext[AES_BLOCK_SIZE];
+
+  uint64_t addr64 = esp32_ble::ble_addr_to_uint64(this->address_);
+
+  memcpy(&ecb_key, irk, AES_BLOCK_SIZE);
+  memset(&ecb_plaintext, 0, AES_BLOCK_SIZE);
+
+  ecb_plaintext[13] = (addr64 >> 40) & 0xff;
+  ecb_plaintext[14] = (addr64 >> 32) & 0xff;
+  ecb_plaintext[15] = (addr64 >> 24) & 0xff;
+
+#ifdef USE_BLE_TRACKER_PSA_AES
+  // Use PSA Crypto API (mbedtls 4.0 / IDF 6.0+)
+  psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
+  psa_set_key_type(&attributes, PSA_KEY_TYPE_AES);
+  psa_set_key_bits(&attributes, AES_KEY_BITS);
+  psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_ENCRYPT);
+  psa_set_key_algorithm(&attributes, PSA_ALG_ECB_NO_PADDING);
+
+  mbedtls_svc_key_id_t key_id;
+  if (psa_import_key(&attributes, ecb_key, AES_BLOCK_SIZE, &key_id) != PSA_SUCCESS) {
+    return false;
+  }
+
+  size_t output_length;
+  psa_status_t status = psa_cipher_encrypt(key_id, PSA_ALG_ECB_NO_PADDING, ecb_plaintext, AES_BLOCK_SIZE,
+                                           ecb_ciphertext, AES_BLOCK_SIZE, &output_length);
+  psa_destroy_key(key_id);
+  if (status != PSA_SUCCESS || output_length != AES_BLOCK_SIZE) {
+    return false;
+  }
+#else
+  // Use legacy mbedtls AES API (IDF < 6.0)
+  mbedtls_aes_context ctx = {0, 0, {0}};
+  mbedtls_aes_init(&ctx);
+
+  if (mbedtls_aes_setkey_enc(&ctx, ecb_key, AES_KEY_BITS) != 0) {
+    mbedtls_aes_free(&ctx);
+    return false;
+  }
+
+  if (mbedtls_aes_crypt_ecb(&ctx, ESP_AES_ENCRYPT, ecb_plaintext, ecb_ciphertext) != 0) {
+    mbedtls_aes_free(&ctx);
+    return false;
+  }
+
+  mbedtls_aes_free(&ctx);
+#endif
+
+  return ecb_ciphertext[15] == (addr64 & 0xff) && ecb_ciphertext[14] == ((addr64 >> 8) & 0xff) &&
+         ecb_ciphertext[13] == ((addr64 >> 16) & 0xff);
+}
 
 #endif  // USE_ESP32_BLE_DEVICE
 
@@ -510,12 +848,6 @@ void ESP32BLETracker::process_scan_result_(const BLEScanResult &scan_result) {
         found = true;
     }
 #endif
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-    for (auto *listener : this->neutral_listeners_) {
-      if (listener->parse_device(device))
-        found = true;
-    }
-#endif
 
 #ifdef ESPHOME_ESP32_BLE_TRACKER_CLIENT_COUNT
     for (auto *client : this->clients_) {
@@ -535,7 +867,7 @@ void ESP32BLETracker::process_scan_result_(const BLEScanResult &scan_result) {
 void ESP32BLETracker::cleanup_scan_state_(bool is_stop_complete) {
   ESP_LOGV(TAG, "Scan %scomplete, set scanner state to IDLE.", is_stop_complete ? "stop " : "");
 #ifdef USE_ESP32_BLE_DEVICE
-  this->discovered_log_.clear();
+  this->already_discovered_.clear();
 #endif
   // Reset timeout state machine instead of cancelling scheduler timeout
   this->scan_timeout_state_ = ScanTimeoutState::INACTIVE;
@@ -544,10 +876,6 @@ void ESP32BLETracker::cleanup_scan_state_(bool is_stop_complete) {
   for (auto *listener : this->listeners_)
     listener->on_scan_end();
 #endif
-#ifdef ESPHOME_BLE_DEVICE_BASE_LISTENER_COUNT
-  for (auto *listener : this->neutral_listeners_)
-    listener->on_scan_end();
-#endif
 
   this->set_scanner_state_(ScannerState::IDLE);
 }