Merge remote-tracking branch 'origin/dev' into web-server-logs

# Conflicts: # esphome/__main__.py # tests/unit_tests/test_main.py
[core] Add esphome logs over web_server HTTP SSE
2026-06-29 12:06:13 +00:00 · 2026-06-21 15:03:00 -05:00 · 2026-06-21 10:50:49 -05:00 · 2026-06-21 09:48:27 -05:00
829 changed files with 10442 additions and 6099 deletions
@@ -17,12 +17,12 @@ runs:
  steps:
    - name: Set up Python ${{ inputs.python-version }}
      id: python
-      uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
      with:
        python-version: ${{ inputs.python-version }}
    - name: Restore Python virtual environment
      id: cache-venv
-      uses: actions/cache/restore@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+      uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
      with:
        path: venv
        # yamllint disable-line rule:line-length
@@ -147,9 +147,19 @@ async function detectCoreChanges(changedFiles) {
 }

 // Strategy: PR size detection
-async function detectPRSize(prFiles, totalAdditions, totalDeletions, isMegaPR, SMALL_PR_THRESHOLD, MEDIUM_PR_THRESHOLD, TOO_BIG_THRESHOLD) {
+async function detectPRSize(prFiles, totalAdditions, totalDeletions, totalChanges, isMegaPR, SMALL_PR_THRESHOLD, MEDIUM_PR_THRESHOLD, TOO_BIG_THRESHOLD) {
  const labels = new Set();

+  if (totalChanges <= SMALL_PR_THRESHOLD) {
+    labels.add('small-pr');
+    return labels;
+  }
+
+  if (totalChanges <= MEDIUM_PR_THRESHOLD) {
+    labels.add('medium-pr');
+    return labels;
+  }
+
  const testAdditions = prFiles
    .filter(file => file.filename.startsWith('tests/'))
    .reduce((sum, file) => sum + (file.additions || 0), 0);
@@ -157,24 +167,7 @@ async function detectPRSize(prFiles, totalAdditions, totalDeletions, isMegaPR, S
    .filter(file => file.filename.startsWith('tests/'))
    .reduce((sum, file) => sum + (file.deletions || 0), 0);

-  const nonTestAdditions = totalAdditions - testAdditions;
-  const nonTestDeletions = totalDeletions - testDeletions;
-
-  // small/medium count churn (additions + deletions) so a balanced refactor isn't undersized.
-  const nonTestChurn = nonTestAdditions + nonTestDeletions;
-
-  if (nonTestChurn <= SMALL_PR_THRESHOLD) {
-    labels.add('small-pr');
-    return labels;
-  }
-
-  if (nonTestChurn <= MEDIUM_PR_THRESHOLD) {
-    labels.add('medium-pr');
-    return labels;
-  }
-
-  // too-big uses net line delta (additions - deletions), matching the review message in reviews.js.
-  const nonTestChanges = nonTestAdditions - nonTestDeletions;
+  const nonTestChanges = (totalAdditions - testAdditions) - (totalDeletions - testDeletions);

  // Don't add too-big if mega-pr label is already present
  if (nonTestChanges > TOO_BIG_THRESHOLD && !isMegaPR) {
@@ -123,7 +123,7 @@ module.exports = async ({ github, context }) => {
    detectNewComponents(github, context, prFiles),
    detectNewPlatforms(github, context, prFiles, apiData),
    detectCoreChanges(changedFiles),
-    detectPRSize(prFiles, totalAdditions, totalDeletions, isMegaPR, SMALL_PR_THRESHOLD, MEDIUM_PR_THRESHOLD, TOO_BIG_THRESHOLD),
+    detectPRSize(prFiles, totalAdditions, totalDeletions, totalChanges, isMegaPR, SMALL_PR_THRESHOLD, MEDIUM_PR_THRESHOLD, TOO_BIG_THRESHOLD),
    detectDashboardChanges(changedFiles),
    detectGitHubActionsChanges(changedFiles),
    detectCodeOwner(github, context, changedFiles),
@@ -1,6 +1,6 @@
 const { describe, it } = require('node:test');
 const assert = require('node:assert/strict');
-const { detectNewPlatforms, detectNewComponents, detectPRSize } = require('../detectors');
+const { detectNewPlatforms, detectNewComponents } = require('../detectors');

 // Minimal GitHub API mock — only repos.getContent is called by detectNewPlatforms/detectNewComponents
 // to check for CONFIG_SCHEMA in newly added files.
@@ -145,79 +145,3 @@ describe('detectNewComponents', () => {
    assert.equal(result.labels.size, 0);
  });
 });
-
-// ---------------------------------------------------------------------------
-// detectPRSize
-// ---------------------------------------------------------------------------
-
-describe('detectPRSize', () => {
-  const SMALL = 30;
-  const MEDIUM = 100;
-  const TOO_BIG = 1000;
-
-  function size(prFiles, isMegaPR = false) {
-    const totalAdditions = prFiles.reduce((sum, file) => sum + (file.additions || 0), 0);
-    const totalDeletions = prFiles.reduce((sum, file) => sum + (file.deletions || 0), 0);
-    return detectPRSize(prFiles, totalAdditions, totalDeletions, isMegaPR, SMALL, MEDIUM, TOO_BIG);
-  }
-
-  it('counts only non-test changes toward small-pr', async () => {
-    // 10 source + 5000 test lines -> non-test churn of 10 is still small.
-    const labels = await size([
-      { filename: 'esphome/components/foo/foo.cpp', additions: 10, deletions: 0 },
-      { filename: 'tests/components/foo/test.esp32-idf.yaml', additions: 5000, deletions: 0 },
-    ]);
-    assert.ok(labels.has('small-pr'));
-    assert.equal(labels.size, 1);
-  });
-
-  it('counts additions and deletions as churn (not net delta)', async () => {
-    // A balanced refactor (40 added, 40 removed) is 80 lines of churn -> medium, not small.
-    const labels = await size([
-      { filename: 'esphome/components/foo/foo.cpp', additions: 40, deletions: 40 },
-    ]);
-    assert.ok(labels.has('medium-pr'));
-    assert.equal(labels.size, 1);
-  });
-
-  it('labels medium-pr when non-test changes exceed small threshold', async () => {
-    const labels = await size([
-      { filename: 'esphome/components/foo/foo.cpp', additions: 60, deletions: 0 },
-      { filename: 'tests/components/foo/test.esp32-idf.yaml', additions: 5000, deletions: 0 },
-    ]);
-    assert.ok(labels.has('medium-pr'));
-    assert.equal(labels.size, 1);
-  });
-
-  it('uses net delta (not churn) for too-big', async () => {
-    // 600 added + 600 removed: 1200 churn (above too-big) but 0 net delta -> not too-big.
-    const labels = await size([
-      { filename: 'esphome/components/foo/foo.cpp', additions: 600, deletions: 600 },
-    ]);
-    assert.equal(labels.size, 0);
-  });
-
-  it('labels too-big when non-test changes exceed the big threshold', async () => {
-    const labels = await size([
-      { filename: 'esphome/components/foo/foo.cpp', additions: 2000, deletions: 0 },
-      { filename: 'tests/components/foo/test.esp32-idf.yaml', additions: 5000, deletions: 0 },
-    ]);
-    assert.ok(labels.has('too-big'));
-    assert.equal(labels.size, 1);
-  });
-
-  it('does not label too-big when mega-pr is set', async () => {
-    const labels = await size([
-      { filename: 'esphome/components/foo/foo.cpp', additions: 2000, deletions: 0 },
-    ], true);
-    assert.equal(labels.size, 0);
-  });
-
-  it('produces no size label for a large mega-pr in the gap above medium', async () => {
-    // Non-test changes land between MEDIUM and TOO_BIG: not small/medium, and mega-pr suppresses too-big.
-    const labels = await size([
-      { filename: 'esphome/components/foo/foo.cpp', additions: 500, deletions: 0 },
-    ], true);
-    assert.equal(labels.size, 0);
-  });
-});
@@ -41,6 +41,7 @@ function hasCoreChanges(changedFiles) {
 */
 function hasDashboardChanges(changedFiles) {
  return changedFiles.some(file =>
+    file.startsWith('esphome/dashboard/') ||
    file.startsWith('esphome/components/dashboard_import/')
  );
 }
@@ -23,7 +23,7 @@ jobs:
      - name: Checkout
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      - name: Set up Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
          python-version: "3.11"
      - name: Set up uv
@@ -63,7 +63,7 @@ jobs:
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      - name: Set up Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
          python-version: "3.11"
      - name: Set up Docker Buildx
@@ -147,7 +147,7 @@ jobs:
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      - name: Set up Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
          python-version: "3.11"
      - name: Set up Docker Buildx
@@ -34,12 +34,12 @@ jobs:
        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@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore Python virtual environment
        id: cache-venv
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: venv
          # yamllint disable-line rule:line-length
@@ -162,7 +162,7 @@ jobs:
          ref: main
          path: device-builder
      - name: Set up Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
          python-version: "3.13"
      - name: Set up uv
@@ -250,7 +250,7 @@ jobs:
          token: ${{ secrets.CODECOV_TOKEN }}
      - name: Save Python virtual environment cache
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: venv
          key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -295,7 +295,7 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
      - name: Restore components graph cache
-        uses: actions/cache/restore@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: .temp/components_graph.json
          key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}
@@ -339,7 +339,7 @@ jobs:
          echo "benchmarks=$(echo "$output" | jq -r '.benchmarks')" >> $GITHUB_OUTPUT
      - name: Save components graph cache
        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: .temp/components_graph.json
          key: components-graph-${{ hashFiles('esphome/components/**/*.py') }}
@@ -360,12 +360,12 @@ jobs:
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      - name: Set up Python 3.13
        id: python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
          python-version: "3.13"
      - name: Restore Python virtual environment
        id: cache-venv
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: venv
          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
@@ -456,7 +456,7 @@ jobs:
          echo "binary=$BINARY" >> $GITHUB_OUTPUT

      - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@a4a36bb07c0638b0b4ca52bf1f3dad1b4289e52f # v4.18.1
+        uses: CodSpeedHQ/action@63f3e98b61959fe67f146a3ff022e4136fe9bb9c # v4.17.6
        with:
          run: |
            . venv/bin/activate
@@ -509,14 +509,14 @@ jobs:

      - name: Cache platformio
        if: github.ref == 'refs/heads/dev' && matrix.pio_cache_key
-        uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}

      - name: Cache platformio
        if: github.ref != 'refs/heads/dev' && matrix.pio_cache_key
-        uses: actions/cache/restore@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.platformio
          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
@@ -822,8 +822,8 @@ jobs:
      - name: Cache apt packages
        uses: awalsh128/cache-apt-pkgs-action@acb598e5ddbc6f68a970c5da0688d2f3a9f04d05 # v1.5.3
        with:
-          packages: libsdl2-dev ccache
-          version: 1.1
+          packages: libsdl2-dev
+          version: 1.0

      - name: Check out code from GitHub
        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
@@ -941,11 +941,6 @@ jobs:
            echo "All components in this batch are validate-only -- skipping compile stage."
          fi

-      - name: Print ccache statistics
-        # esphome stores the cache under the IDF tools path; expand the leading
-        # ~ in ESPHOME_ESP_IDF_PREFIX so ccache reads the dir the build used.
-        run: CCACHE_DIR="${ESPHOME_ESP_IDF_PREFIX/#\~/$HOME}/ccache" ccache -s
-
  test-esp32-platformio:
    name: Test esp32 components with PlatformIO
    runs-on: ubuntu-24.04
@@ -1098,7 +1093,7 @@ jobs:
      - name: Restore cached memory analysis
        id: cache-memory-analysis
        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true'
-        uses: actions/cache/restore@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: memory-analysis-target.json
          key: ${{ steps.cache-key.outputs.cache-key }}
@@ -1122,7 +1117,7 @@ jobs:

      - name: Cache platformio
        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true'
-        uses: actions/cache/restore@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.platformio
          key: platformio-memory-${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}-${{ hashFiles('platformio.ini') }}
@@ -1164,7 +1159,7 @@ jobs:

      - name: Save memory analysis to cache
        if: steps.check-script.outputs.skip != 'true' && steps.check-tests.outputs.skip != 'true' && steps.cache-memory-analysis.outputs.cache-hit != 'true' && steps.build.outcome == 'success'
-        uses: actions/cache/save@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: memory-analysis-target.json
          key: ${{ steps.cache-key.outputs.cache-key }}
@@ -1211,7 +1206,7 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}
          cache-key: ${{ needs.common.outputs.cache-key }}
      - name: Cache platformio
-        uses: actions/cache/restore@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
+        uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
        with:
          path: ~/.platformio
          key: platformio-memory-${{ fromJSON(needs.determine-jobs.outputs.memory_impact).platform }}-${{ hashFiles('platformio.ini') }}
@@ -0,0 +1,119 @@
+name: Add Dashboard Deprecation Comment
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+
+# All API calls (pulls.listFiles + issues.{list,create,update}Comment) are performed with
+# the App token minted below, so the workflow's GITHUB_TOKEN does not need any scopes.
+permissions: {}
+
+jobs:
+  dashboard-deprecation-comment:
+    name: Dashboard deprecation comment
+    runs-on: ubuntu-latest
+    # Release-bump PRs (bump-X.Y.Z -> beta, beta -> release) inevitably
+    # roll up everything merged into dev since the last cut, which can
+    # include dashboard changes that have already been reviewed once.
+    # The bot's purpose is to warn new contributors before they invest
+    # time -- that only applies to PRs entering dev.
+    if: github.event.pull_request.base.ref == 'dev'
+    steps:
+      - name: Generate a token
+        id: generate-token
+        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
+        with:
+          client-id: ${{ vars.ESPHOME_GITHUB_APP_CLIENT_ID }}
+          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
+          # pulls.listFiles + issues.{list,create,update}Comment on PRs. For PR resources
+          # the issues.*Comment APIs require the pull-requests scope, not issues.
+          permission-pull-requests: write
+
+      - name: Add dashboard deprecation comment
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          github-token: ${{ steps.generate-token.outputs.token }}
+          script: |
+            const commentMarker = "<!-- This comment was generated automatically by the dashboard-deprecation-comment workflow. -->";
+
+            const commentBody = `Thanks for opening this PR!
+
+            Heads up: the legacy ESPHome dashboard (\`esphome/dashboard/\` and \`tests/dashboard/\`) is **deprecated** and is being replaced by [ESPHome Device Builder](https://github.com/esphome/device-builder). We are not adding new features to the legacy dashboard and it will eventually be removed from this repository.
+
+            What this means for your PR:
+
+            - **New features / enhancements**: please port the change to [esphome/device-builder](https://github.com/esphome/device-builder) instead. We are unlikely to review or merge new dashboard features here.
+            - **Bug fixes**: small fixes may still be considered, but please check first whether the same issue exists in Device Builder, where the fix will have a longer life.
+            - **Security issues**: please do not file a public PR. Report privately via [GitHub security advisories](https://github.com/esphome/esphome/security/advisories/new) so we can coordinate a fix.
+
+            We appreciate the contribution and apologize for the friction; flagging this early so your time isn't spent on a change that may not land.
+
+            ---
+            (Added by the PR bot)
+
+            ${commentMarker}`;
+
+            async function getDashboardChanges(github, owner, repo, prNumber) {
+                const changedFiles = await github.paginate(
+                    github.rest.pulls.listFiles,
+                    {
+                        owner: owner,
+                        repo: repo,
+                        pull_number: prNumber,
+                        per_page: 100,
+                    }
+                );
+
+                return changedFiles.filter(file =>
+                    file.filename.startsWith('esphome/dashboard/') ||
+                    file.filename.startsWith('tests/dashboard/')
+                );
+            }
+
+            async function findBotComment(github, owner, repo, prNumber) {
+                const comments = await github.paginate(
+                    github.rest.issues.listComments,
+                    {
+                        owner: owner,
+                        repo: repo,
+                        issue_number: prNumber,
+                        per_page: 100,
+                    }
+                );
+
+                return comments.find(comment =>
+                    comment.body.includes(commentMarker) && comment.user.type === "Bot"
+                );
+            }
+
+            const prNumber = context.payload.pull_request.number;
+            const { owner, repo } = context.repo;
+
+            const dashboardChanges = await getDashboardChanges(github, owner, repo, prNumber);
+            const existingComment = await findBotComment(github, owner, repo, prNumber);
+
+            if (dashboardChanges.length === 0) {
+                // PR doesn't (or no longer) touches the legacy dashboard. If we previously
+                // commented (e.g. files were removed in a later push), leave the comment in
+                // place for history rather than thrash on edit/delete.
+                return;
+            }
+
+            if (existingComment) {
+                if (existingComment.body === commentBody) {
+                    return;
+                }
+                await github.rest.issues.updateComment({
+                    owner: owner,
+                    repo: repo,
+                    comment_id: existingComment.id,
+                    body: commentBody,
+                });
+            } else {
+                await github.rest.issues.createComment({
+                    owner: owner,
+                    repo: repo,
+                    issue_number: prNumber,
+                    body: commentBody,
+                });
+            }
@@ -62,7 +62,7 @@ jobs:
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      - name: Set up Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
          python-version: "3.x"
      - name: Build
@@ -94,7 +94,7 @@ jobs:
    steps:
      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
      - name: Set up Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
          python-version: "3.11"

@@ -37,7 +37,7 @@ jobs:
          path: lib/home-assistant

      - name: Setup Python
-        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
        with:
          python-version: "3.14"

@@ -14,7 +14,7 @@ This document provides essential context for AI models interacting with this pro
 *   **Build Systems:** PlatformIO is the primary build system. CMake is used as an alternative.
 *   **Configuration:** YAML.
 *   **Key Libraries/Dependencies:**
-    *   **Python:** `voluptuous` (for configuration validation), `PyYAML` (for parsing configuration files), `paho-mqtt` (for MQTT communication), `aioesphomeapi` (for the native API).
+    *   **Python:** `voluptuous` (for configuration validation), `PyYAML` (for parsing configuration files), `paho-mqtt` (for MQTT communication), `tornado` (for the web server), `aioesphomeapi` (for the native API).
    *   **C++:** `ArduinoJson` (for JSON serialization/deserialization), `AsyncMqttClient-esphome` (for MQTT), `ESPAsyncWebServer` (for the web server).
 *   **Package Manager(s):** `pip` (for Python dependencies), `platformio` (for C++/PlatformIO dependencies).
 *   **Communication Protocols:** Protobuf (for native API), MQTT, HTTP.
@@ -35,6 +35,7 @@ This document provides essential context for AI models interacting with this pro
    2.  **Code Generation** (`esphome/codegen.py`, `esphome/cpp_generator.py`): Manages Python to C++ code generation, template processing, and build flag management.
    3.  **Component System** (`esphome/components/`): Contains modular hardware and software components with platform-specific implementations and dependency management.
    4.  **Core Framework** (`esphome/core/`): Manages the application lifecycle, hardware abstraction, and component registration.
+    5.  **Dashboard** (`esphome/dashboard/`): A web-based interface for device configuration, management, and OTA updates.

 *   **Platform Support:**
    1.  **ESP32** (`components/esp32/`): Espressif ESP32 family. Supports multiple variants (Original, C2, C3, C5, C6, H2, P4, S2, S3) with ESP-IDF framework. Arduino framework supports only a subset of the variants (Original, C3, S2, S3).
@@ -455,6 +456,7 @@ This document provides essential context for AI models interacting with this pro
    *   **Debug Tools:**
        - `esphome config <file>.yaml` to validate configuration.
        - `esphome compile <file>.yaml` to compile without uploading.
+        - Check the Dashboard for real-time logs.
        - Use component-specific debug logging.
    *   **Common Issues:**
        - **Import Errors**: Check component dependencies and `PYTHONPATH`.
@@ -656,7 +658,7 @@ This document provides essential context for AI models interacting with this pro
        If you need a real-world example, search for components that use `@dataclass` with `CORE.data` in the codebase. Note: Some components may use `TypedDict` for dictionary-based storage; both patterns are acceptable depending on your needs.

        **Why this matters:**
-        - Module-level globals persist between compilation runs if the host process (e.g. device-builder) doesn't fork/exec
+        - Module-level globals persist between compilation runs if the dashboard doesn't fork/exec
        - `CORE.data` automatically clears between runs
        - Namespacing under `DOMAIN` prevents key collisions between components
        - `@dataclass` provides type safety and cleaner attribute access
@@ -578,7 +578,6 @@ esphome/components/wake_on_lan/* @clydebarrow @willwill2will54
 esphome/components/watchdog/* @oarcher
 esphome/components/water_heater/* @dhoeben
 esphome/components/waveshare_epaper/* @clydebarrow
-esphome/components/waveshare_io_ch32v003/* @latonita
 esphome/components/web_server/ota/* @esphome/core
 esphome/components/web_server_base/* @esphome/core
 esphome/components/web_server_idf/* @dentra
@@ -88,6 +88,8 @@ These *are* security bugs in this repo, and we want to hear about them privately
  holds the API key / OTA / web credentials).
 - Anything in the dashboard / device-builder — report that in its own repository
  (linked at the top).
+- The legacy bundled dashboard in this repo (`esphome/dashboard/`) — it is
+  deprecated and being replaced by Device Builder; report dashboard issues there.
 - Deployments where the operator removed protections or exposed credentials. See
  the security best practices guide:
  https://esphome.io/guides/security_best_practices/
@@ -1,5 +1,5 @@
 ARG BUILD_VERSION=dev
-ARG BUILD_BASE_VERSION=2026.06.1
+ARG BUILD_BASE_VERSION=2026.06.0
 ARG BUILD_TYPE=docker

 FROM ghcr.io/esphome/docker-base:debian-${BUILD_BASE_VERSION} AS base-source-docker
@@ -11,6 +11,16 @@ FROM base-source-${BUILD_TYPE} AS base
 RUN git config --system --add safe.directory "*" \
    && git config --system advice.detachedHead false

+# Install build tools for Python packages that require compilation
+# (e.g., ruamel.yaml.clib used by ESP-IDF's idf-component-manager).
+# Also install libusb-1.0 at runtime so the ESP-IDF tools installer can
+# validate openocd-esp32 (it dynamically links libusb-1.0.so.0); without
+# it idf_tools.py rejects the openocd install with exit 127 and aborts
+# the whole framework setup.
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends build-essential libusb-1.0-0 \
+    && rm -rf /var/lib/apt/lists/*
+
 ENV PIP_DISABLE_PIP_VERSION_CHECK=1

 RUN pip install --no-cache-dir -U pip uv==0.10.1
@@ -22,7 +32,7 @@ RUN \
    -r /requirements.txt

 # Install the ESPHome Device Builder dashboard.
-RUN uv pip install --no-cache-dir esphome-device-builder==1.0.18
+RUN uv pip install --no-cache-dir esphome-device-builder==1.0.12

 RUN \
    platformio settings set enable_telemetry No \
@@ -19,6 +19,14 @@ if bashio::config.true 'leave_front_door_open'; then
    export DISABLE_HA_AUTHENTICATION=true
 fi

+if bashio::config.true 'streamer_mode'; then
+    export ESPHOME_STREAMER_MODE=true
+fi
+
+if bashio::config.has_value 'relative_url'; then
+    export ESPHOME_DASHBOARD_RELATIVE_URL=$(bashio::config 'relative_url')
+fi
+
 if bashio::config.has_value 'default_compile_process_limit'; then
    export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=$(bashio::config 'default_compile_process_limit')
 else
@@ -28,13 +28,13 @@ from esphome.const import (
    ALLOWED_NAME_CHARS,
    ARGUMENT_HELP_DEVICE,
    CONF_API,
-    CONF_AUTH,
    CONF_BAUD_RATE,
    CONF_BROKER,
    CONF_DEASSERT_RTS_DTR,
    CONF_DISABLED,
    CONF_ESPHOME,
    CONF_LEVEL,
+    CONF_LOG,
    CONF_LOG_TOPIC,
    CONF_LOGGER,
    CONF_MDNS,
@@ -48,10 +48,15 @@ from esphome.const import (
    CONF_PORT,
    CONF_SUBSTITUTIONS,
    CONF_TOPIC,
-    CONF_USERNAME,
+    CONF_VERSION,
    CONF_WEB_SERVER,
    CONF_WIFI,
    ENV_NOGITIGNORE,
+    KEY_CORE,
+    KEY_TARGET_PLATFORM,
+    PLATFORM_ESP32,
+    PLATFORM_ESP8266,
+    PLATFORM_RP2040,
    SECRETS_FILES,
    Toolchain,
 )
@@ -275,8 +280,8 @@ def _unresolved_default_error(purpose: Purpose, defaults: list[str]) -> str:
        if purpose == Purpose.LOGGING and not has_api():
            return (
                "Cannot view logs over the network: no 'api:' component is "
-                "configured. Network log streaming requires the native API; add "
-                "an 'api:' component, enable MQTT logging, or view logs over USB."
+                "configured. Add an 'api:' component, enable MQTT logging, add a "
+                "'web_server:' component, or view logs over USB."
            )
        if purpose == Purpose.UPLOADING and not has_ota():
            return (
@@ -316,9 +321,12 @@ def choose_upload_log_host(
                ]
                resolved.append(choose_prompt(options, purpose=purpose))
            elif device == "OTA":
+                # Logs can stream over a network transport via the native API
+                # or the web_server HTTP SSE feed.
+                network_logging = has_api() or has_web_server_logging()
                # ensure IP adresses are used first
                if is_ip_address(CORE.address) and (
-                    (purpose == Purpose.LOGGING and has_api())
+                    (purpose == Purpose.LOGGING and network_logging)
                    or (purpose == Purpose.UPLOADING and has_ota())
                ):
                    resolved.extend(_resolve_with_cache(CORE.address, purpose))
@@ -330,7 +338,11 @@ def choose_upload_log_host(
                    if has_mqtt_logging():
                        resolved.append("MQTT")

-                    if has_api() and has_non_ip_address() and has_resolvable_address():
+                    if (
+                        network_logging
+                        and has_non_ip_address()
+                        and has_resolvable_address()
+                    ):
                        resolved.extend(_ota_hostnames_for_default(purpose))

                elif purpose == Purpose.UPLOADING:
@@ -354,7 +366,7 @@ def choose_upload_log_host(
    bootsel_permission_error = False
    if (
        purpose == Purpose.UPLOADING
-        and CORE.is_rp2040
+        and CORE.data.get(KEY_CORE, {}).get(KEY_TARGET_PLATFORM) == PLATFORM_RP2040
        and (picotool := _find_picotool()) is not None
    ):
        bootsel = detect_rp2040_bootsel(picotool)
@@ -392,7 +404,7 @@ def choose_upload_log_host(
            mqtt_config = CORE.config[CONF_MQTT]
            options.append((f"MQTT ({mqtt_config[CONF_BROKER]})", "MQTT"))

-        if has_api():
+        if has_api() or has_web_server_logging():
            add_ota_options()

    elif purpose == Purpose.UPLOADING and has_ota():
@@ -401,7 +413,7 @@ def choose_upload_log_host(
    # Show helpful BOOTSEL instructions for RP2040 when no BOOTSEL device is found
    if (
        purpose == Purpose.UPLOADING
-        and CORE.is_rp2040
+        and CORE.data.get(KEY_CORE, {}).get(KEY_TARGET_PLATFORM) == PLATFORM_RP2040
        and not any(get_port_type(opt[1]) == PortType.BOOTSEL for opt in options)
    ):
        if bootsel_permission_error:
@@ -485,6 +497,21 @@ def has_web_server_ota() -> bool:
    )


+def has_web_server_logging() -> bool:
+    """Check if logs can be streamed over the web_server HTTP SSE endpoint.
+
+    The ``web_server`` component exposes a ``/events`` Server-Sent Events
+    stream that carries ``event: log`` frames. This requires version 2+ (the
+    v1 UI has no ``/events`` endpoint) and the ``log`` option enabled (default).
+    """
+    web_conf = CORE.config.get(CONF_WEB_SERVER)
+    if web_conf is None:
+        return False
+    if web_conf.get(CONF_VERSION, 2) == 1:
+        return False
+    return web_conf.get(CONF_LOG, True)
+
+
 def has_mqtt_ip_lookup() -> bool:
    """Check if MQTT is available and IP lookup is supported."""
    from esphome.components.mqtt import CONF_DISCOVER_IP
@@ -522,7 +549,7 @@ def has_resolvable_address() -> bool:
    if has_ip_address():
        return True

-    # device-builder pre-resolves the device and passes the IPs via
+    # The dashboard pre-resolves the device and passes the IPs via
    # --mdns-address-cache/--dns-address-cache; honor a cached address even when the
    # device has mDNS disabled (e.g. a .local host found via ping).
    if CORE.address_cache and CORE.address_cache.get_addresses(CORE.address):
@@ -979,7 +1006,7 @@ def upload_using_platformio(config: ConfigType, port: str) -> int:
    # RP2040 platform-raspberrypi build recipe expects firmware.bin.signed for
    # the upload target, but 'nobuild' skips the build phase that creates it.
    # Create it here so the upload doesn't fail.
-    if CORE.is_rp2040:
+    if CORE.data.get(KEY_CORE, {}).get(KEY_TARGET_PLATFORM) == PLATFORM_RP2040:
        idedata = toolchain.get_idedata(config)
        build_dir = Path(idedata.firmware_elf_path).parent
        firmware_bin = build_dir / "firmware.bin"
@@ -1164,10 +1191,10 @@ def upload_program(
        check_permissions(host)

        exit_code = 1
-        if CORE.is_esp32 or CORE.is_esp8266:
+        if CORE.target_platform in (PLATFORM_ESP32, PLATFORM_ESP8266):
            file = getattr(args, "file", None)
            exit_code = upload_using_esptool(config, host, file, args.upload_speed)
-        elif CORE.is_rp2040 or CORE.is_libretiny:
+        elif CORE.target_platform == PLATFORM_RP2040 or CORE.is_libretiny:
            exit_code = upload_using_platformio(config, host)
        # else: Unknown target platform, exit_code remains 1

@@ -1285,25 +1312,23 @@ def _upload_via_native_api(
 def _upload_via_web_server(
    config: ConfigType, network_devices: list[str], binary: Path
 ) -> tuple[int, str | None]:
-    web_conf = config.get(CONF_WEB_SERVER)
-    if not web_conf:
-        raise EsphomeError(
-            f"Cannot upload via web_server OTA: the {CONF_WEB_SERVER} component "
-            f"is not configured."
-        )
-
-    remote_port = int(web_conf[CONF_PORT])
-    auth = web_conf.get(CONF_AUTH) or {}
-    username = auth.get(CONF_USERNAME)
-    password = auth.get(CONF_PASSWORD)
-
    from esphome import web_server_ota
+    from esphome.web_server_helpers import get_web_server_connection

+    remote_port, username, password = get_web_server_connection(config)
    return web_server_ota.run_ota(
        network_devices, remote_port, username, password, binary
    )


+def _show_logs_via_web_server(config: ConfigType, network_devices: list[str]) -> int:
+    from esphome import web_server_logs
+    from esphome.web_server_helpers import get_web_server_connection
+
+    port, username, password = get_web_server_connection(config)
+    return web_server_logs.run_logs(network_devices, port, username, password)
+
+
 # Layout of esp_partition_info_t on flash. Each entry is 32 bytes, leading with a
 # 16-bit little-endian magic. ESP-IDF defines ESP_PARTITION_MAGIC = 0x50AA (stored as
 # bytes 0xAA, 0x50) for partition entries and ESP_PARTITION_MAGIC_MD5 = 0xEBEB for the
@@ -1432,6 +1457,13 @@ def show_logs(config: ConfigType, args: ArgsProtocol, devices: list[str]) -> int
            config, args.topic, args.username, args.password, args.client_id
        )

+    # Fall back to the web_server HTTP SSE log stream for devices that have
+    # web_server: but no api: (the logging counterpart to web_server OTA).
+    if has_web_server_logging() and (
+        network_devices := _resolve_network_devices(devices, config, args)
+    ):
+        return _show_logs_via_web_server(config, network_devices)
+
    raise EsphomeError("No remote or local logging method configured (api/mqtt/logger)")


@@ -1624,7 +1656,10 @@ def command_run(args: ArgsProtocol, config: ConfigType) -> int | None:

    # After BOOTSEL upload, wait for a new serial port to appear
    # so it shows up in the log chooser
-    if successful_device is None and CORE.is_rp2040:
+    if (
+        successful_device is None
+        and CORE.data.get(KEY_CORE, {}).get(KEY_TARGET_PLATFORM) == PLATFORM_RP2040
+    ):
        _wait_for_serial_port(known_ports=pre_upload_ports)
        # If exactly one new serial port appeared, use it directly
        serial_ports = get_serial_ports()
@@ -1707,13 +1742,9 @@ def command_bundle(args: ArgsProtocol, config: ConfigType) -> int | None:


 def command_dashboard(args: ArgsProtocol) -> int | None:
-    raise EsphomeError(
-        "The built-in dashboard has been removed from ESPHome. "
-        "Install and run ESPHome Device Builder instead:\n"
-        "  pip install esphome-device-builder\n"
-        "  esphome-device-builder\n"
-        "See https://github.com/esphome/device-builder for more information."
-    )
+    from esphome.dashboard import dashboard
+
+    return dashboard.start_dashboard(args)


 def run_multiple_configs(
@@ -2375,22 +2406,44 @@ def parse_args(argv):
        "configuration", help="Your YAML file or configuration directory.", nargs="*"
    )

-    # The dashboard moved to ESPHome Device Builder; the command is kept only to
-    # print a redirect (see command_dashboard). Accept and ignore the old flags
-    # so legacy invocations reach that message instead of failing on argparse
-    # "unrecognized arguments".
-    parser_dashboard = subparsers.add_parser("dashboard")
-    parser_dashboard.add_argument("configuration", nargs="?", help=argparse.SUPPRESS)
-    parser_dashboard.add_argument("--port", help=argparse.SUPPRESS)
-    parser_dashboard.add_argument("--address", help=argparse.SUPPRESS)
-    parser_dashboard.add_argument("--username", help=argparse.SUPPRESS)
-    parser_dashboard.add_argument("--password", help=argparse.SUPPRESS)
-    parser_dashboard.add_argument("--socket", help=argparse.SUPPRESS)
-    parser_dashboard.add_argument(
-        "--open-ui", action="store_true", help=argparse.SUPPRESS
+    parser_dashboard = subparsers.add_parser(
+        "dashboard", help="Create a simple web server for a dashboard."
    )
    parser_dashboard.add_argument(
-        "--ha-addon", action="store_true", help=argparse.SUPPRESS
+        "configuration", help="Your YAML configuration file directory."
+    )
+    parser_dashboard.add_argument(
+        "--port",
+        help="The HTTP port to open connections on. Defaults to 6052.",
+        type=int,
+        default=6052,
+    )
+    parser_dashboard.add_argument(
+        "--address",
+        help="The address to bind to.",
+        type=str,
+        default="0.0.0.0",
+    )
+    parser_dashboard.add_argument(
+        "--username",
+        help="The optional username to require for authentication.",
+        type=str,
+        default="",
+    )
+    parser_dashboard.add_argument(
+        "--password",
+        help="The optional password to require for authentication.",
+        type=str,
+        default="",
+    )
+    parser_dashboard.add_argument(
+        "--open-ui", help="Open the dashboard UI in a browser.", action="store_true"
+    )
+    parser_dashboard.add_argument(
+        "--ha-addon", help=argparse.SUPPRESS, action="store_true"
+    )
+    parser_dashboard.add_argument(
+        "--socket", help="Make the dashboard serve under a unix socket", type=str
    )

    parser_vscode = subparsers.add_parser("vscode")
@@ -2485,7 +2538,11 @@ def run_esphome(argv):
    elif args.quiet:
        args.log_level = "CRITICAL"

-    setup_log(log_level=args.log_level)
+    setup_log(
+        log_level=args.log_level,
+        # Show timestamp for dashboard access logs
+        include_timestamp=args.command == "dashboard",
+    )

    if args.command in PRE_CONFIG_ACTIONS:
        try:
@@ -66,18 +66,15 @@ float ADCSensor::sample() {
  }

  uint8_t pin = this->pin_->get_pin();
-#if defined(CYW43_USES_VSYS_PIN) && defined(USE_WIFI)
+#ifdef CYW43_USES_VSYS_PIN
  if (pin == PICO_VSYS_PIN) {
    // Measuring VSYS on Raspberry Pico W needs to be wrapped with
    // `cyw43_thread_enter()`/`cyw43_thread_exit()` as discussed in
    // https://github.com/raspberrypi/pico-sdk/issues/1222, since Wifi chip and
-    // VSYS ADC both share GPIO29.
-    // The USE_WIFI guard is required because CYW43_USES_VSYS_PIN can be defined
-    // transitively (e.g. via lwip_wrap.h) even on non-WiFi boards where the CYW43
-    // driver is never initialized; calling cyw43_thread_enter() there hard-faults.
+    // VSYS ADC both share GPIO29
    cyw43_thread_enter();
  }
-#endif  // defined(CYW43_USES_VSYS_PIN) && defined(USE_WIFI)
+#endif  // CYW43_USES_VSYS_PIN

  adc_gpio_init(pin);
  adc_select_input(pin - 26);
@@ -87,11 +84,11 @@ float ADCSensor::sample() {
    aggr.add_sample(raw);
  }

-#if defined(CYW43_USES_VSYS_PIN) && defined(USE_WIFI)
+#ifdef CYW43_USES_VSYS_PIN
  if (pin == PICO_VSYS_PIN) {
    cyw43_thread_exit();
  }
-#endif  // defined(CYW43_USES_VSYS_PIN) && defined(USE_WIFI)
+#endif  // CYW43_USES_VSYS_PIN

  if (this->output_raw_) {
    return aggr.aggregate();
@@ -326,8 +326,14 @@ FileDecoderState AudioDecoder::decode_mp3_() {
  } else if (result == micro_mp3::MP3_NEED_MORE_DATA) {
    return FileDecoderState::MORE_TO_PROCESS;
  } else if (result == micro_mp3::MP3_OUTPUT_BUFFER_TOO_SMALL) {
-    // Fallback to worst-case size
-    this->free_buffer_required_ = this->mp3_decoder_->get_min_output_buffer_bytes();
+    // Reallocate to decode the frame on the next call
+    if (this->mp3_decoder_->get_channels() > 0) {
+      this->free_buffer_required_ =
+          this->mp3_decoder_->get_samples_per_frame() * this->mp3_decoder_->get_channels() * sizeof(int16_t);
+    } else {
+      // Fallback to worst-case size if channel info isn't available
+      this->free_buffer_required_ = this->mp3_decoder_->get_min_output_buffer_bytes();
+    }
    if (!this->output_transfer_buffer_->reallocate(this->free_buffer_required_)) {
      return FileDecoderState::FAILED;
    }
@@ -8,7 +8,7 @@

 namespace esphome::b_parasite {

-class BParasite final : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+class BParasite : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
 public:
  void set_address(uint64_t address) { address_ = address; };
  void set_bindkey(const std::string &bindkey);
@@ -211,17 +211,6 @@ CONFIG_SCHEMA = (
    .add_extra(set_reference_values)
 )

-# BL0940 datasheet: 4800 baud, 8 data bits, no parity (stop bits are 1.5 -- not
-# representable in the uart schema, so it isn't asserted).
-FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
-    "bl0940",
-    baud_rate=4800,
-    data_bits=8,
-    parity="NONE",
-    require_rx=True,
-    require_tx=True,
-)
-

 async def to_code(config):
    var = cg.new_Pvariable(config[CONF_ID])
@@ -25,14 +25,11 @@ void BLENUS::write_array(const uint8_t *data, size_t len) {
  if (atomic_get(&this->tx_status_) == TX_DISABLED) {
    return;
  }
-  // ring_buf_put() performs a partial write when the buffer is nearly full, which would commit a
-  // truncated fragment and corrupt the stream. Only write when the whole payload fits, so the byte
-  // stream never contains a partial message.
-  if (ring_buf_space_get(&global_ble_tx_ring_buf) < len) {
-    ESP_LOGE(TAG, "TX dropping %u bytes", len);
+  auto sent = ring_buf_put(&global_ble_tx_ring_buf, data, len);
+  if (sent < len) {
+    ESP_LOGE(TAG, "TX dropping %u bytes", len - sent);
    return;
  }
-  ring_buf_put(&global_ble_tx_ring_buf, data, len);
 #ifdef USE_UART_DEBUGGER
  for (size_t i = 0; i < len; i++) {
    this->debug_callback_.call(uart::UART_DIRECTION_TX, data[i]);
@@ -200,10 +197,6 @@ void BLENUS::setup() {
 void BLENUS::on_log(uint8_t level, const char *tag, const char *message, size_t message_len) {
  (void) level;
  (void) tag;
-  // make sure there is space for '\n' or entire message is dropped
-  if (ring_buf_space_get(&global_ble_tx_ring_buf) < message_len + 1) {
-    return;
-  }
  this->write_array(reinterpret_cast<const uint8_t *>(message), message_len);
  const char c = '\n';
  this->write_array(reinterpret_cast<const uint8_t *>(&c), 1);
@@ -12,9 +12,7 @@

 namespace esphome::ble_scanner {

-class BLEScanner final : public text_sensor::TextSensor,
-                         public esp32_ble_tracker::ESPBTDeviceListener,
-                         public Component {
+class BLEScanner : public text_sensor::TextSensor, public esp32_ble_tracker::ESPBTDeviceListener, public Component {
 public:
  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
    char addr_buf[MAC_ADDRESS_PRETTY_BUFFER_SIZE];
@@ -5,7 +5,7 @@

 namespace esphome::bm8563 {

-class BM8563 final : public time::RealTimeClock, public i2c::I2CDevice {
+class BM8563 : public time::RealTimeClock, public i2c::I2CDevice {
 public:
  void setup() override;
  void update() override;
@@ -34,17 +34,17 @@ class BM8563 final : public time::RealTimeClock, public i2c::I2CDevice {
  uint8_t byte_to_bcd2_(uint8_t value);
 };

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

-template<typename... Ts> class ReadAction final : public Action<Ts...>, public Parented<BM8563> {
+template<typename... Ts> class ReadAction : public Action<Ts...>, public Parented<BM8563> {
 public:
  void play(const Ts &...x) override { this->parent_->read_time(); }
 };

-template<typename... Ts> class TimerAction final : public Action<Ts...>, public Parented<BM8563> {
+template<typename... Ts> class TimerAction : public Action<Ts...>, public Parented<BM8563> {
 public:
  TEMPLATABLE_VALUE(uint32_t, duration)

@@ -7,7 +7,7 @@ namespace esphome::bme280_i2c {

 static const char *const TAG = "bme280_i2c.sensor";

-class BME280I2CComponent final : public esphome::bme280_base::BME280Component, public i2c::I2CDevice {
+class BME280I2CComponent : public esphome::bme280_base::BME280Component, public i2c::I2CDevice {
  bool read_byte(uint8_t a_register, uint8_t *data) override;
  bool write_byte(uint8_t a_register, uint8_t data) override;
  bool read_bytes(uint8_t a_register, uint8_t *data, size_t len) override;
@@ -5,9 +5,9 @@

 namespace esphome::bme280_spi {

-class BME280SPIComponent final : public esphome::bme280_base::BME280Component,
-                                 public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
-                                                       spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_200KHZ> {
+class BME280SPIComponent : public esphome::bme280_base::BME280Component,
+                           public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                                 spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_200KHZ> {
  void setup() override;
  bool read_byte(uint8_t a_register, uint8_t *data) override;
  bool write_byte(uint8_t a_register, uint8_t data) override;
@@ -65,7 +65,7 @@ struct BME680CalibrationData {
  int8_t ambient_temperature;
 };

-class BME680Component final : public PollingComponent, public i2c::I2CDevice {
+class BME680Component : public PollingComponent, public i2c::I2CDevice {
 public:
  /// Set the temperature oversampling value. Defaults to 16X.
  void set_temperature_oversampling(BME680Oversampling temperature_oversampling);
@@ -1,6 +1,5 @@
 import esphome.codegen as cg
 from esphome.components import esp32, i2c
-from esphome.components.const import CONF_STATE_SAVE_INTERVAL
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_SAMPLE_RATE, CONF_TEMPERATURE_OFFSET, Framework

@@ -13,6 +12,7 @@ MULTI_CONF = True
 CONF_BME680_BSEC_ID = "bme680_bsec_id"
 CONF_IAQ_MODE = "iaq_mode"
 CONF_SUPPLY_VOLTAGE = "supply_voltage"
+CONF_STATE_SAVE_INTERVAL = "state_save_interval"

 bme680_bsec_ns = cg.esphome_ns.namespace("bme680_bsec")

@@ -34,7 +34,7 @@ enum SampleRate {

 #define BME680_BSEC_SAMPLE_RATE_LOG(r) (r == SAMPLE_RATE_DEFAULT ? "Default" : (r == SAMPLE_RATE_ULP ? "ULP" : "LP"))

-class BME680BSECComponent final : public Component, public i2c::I2CDevice {
+class BME680BSECComponent : public Component, public i2c::I2CDevice {
 public:
  void set_device_id(const std::string &devid) { this->device_id_.assign(devid); }
  void set_temperature_offset(float offset) { this->temperature_offset_ = offset; }
@@ -1,10 +1,5 @@
 import esphome.codegen as cg
 from esphome.components import sensor
-from esphome.components.const import (
-    CONF_BREATH_VOC_EQUIVALENT,
-    CONF_CO2_EQUIVALENT,
-    CONF_IAQ,
-)
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_GAS_RESISTANCE,
@@ -34,6 +29,9 @@ from . import CONF_BME680_BSEC_ID, SAMPLE_RATE_OPTIONS, BME680BSECComponent

 DEPENDENCIES = ["bme680_bsec"]

+CONF_BREATH_VOC_EQUIVALENT = "breath_voc_equivalent"
+CONF_CO2_EQUIVALENT = "co2_equivalent"
+CONF_IAQ = "iaq"
 ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"
 UNIT_IAQ = "IAQ"

@@ -3,7 +3,6 @@ from pathlib import Path

 from esphome import core, external_files
 import esphome.codegen as cg
-from esphome.components.const import CONF_STATE_SAVE_INTERVAL
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_ID,
@@ -25,6 +24,7 @@ CONF_ALGORITHM_OUTPUT = "algorithm_output"
 CONF_BME68X_BSEC2_ID = "bme68x_bsec2_id"
 CONF_IAQ_MODE = "iaq_mode"
 CONF_OPERATING_AGE = "operating_age"
+CONF_STATE_SAVE_INTERVAL = "state_save_interval"
 CONF_SUPPLY_VOLTAGE = "supply_voltage"

 bme68x_bsec2_ns = cg.esphome_ns.namespace("bme68x_bsec2")
@@ -1,10 +1,5 @@
 import esphome.codegen as cg
 from esphome.components import sensor
-from esphome.components.const import (
-    CONF_BREATH_VOC_EQUIVALENT,
-    CONF_CO2_EQUIVALENT,
-    CONF_IAQ,
-)
 import esphome.config_validation as cv
 from esphome.const import (
    CONF_GAS_RESISTANCE,
@@ -34,6 +29,9 @@ from . import CONF_BME68X_BSEC2_ID, SAMPLE_RATE_OPTIONS, BME68xBSEC2Component

 DEPENDENCIES = ["bme68x_bsec2"]

+CONF_BREATH_VOC_EQUIVALENT = "breath_voc_equivalent"
+CONF_CO2_EQUIVALENT = "co2_equivalent"
+CONF_IAQ = "iaq"
 CONF_IAQ_STATIC = "iaq_static"
 ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"
 UNIT_IAQ = "IAQ"
@@ -11,7 +11,7 @@

 namespace esphome::bme68x_bsec2_i2c {

-class BME68xBSEC2I2CComponent final : public bme68x_bsec2::BME68xBSEC2Component, public i2c::I2CDevice {
+class BME68xBSEC2I2CComponent : public bme68x_bsec2::BME68xBSEC2Component, public i2c::I2CDevice {
  void setup() override;
  void dump_config() override;

@@ -6,7 +6,7 @@

 namespace esphome::bmi160 {

-class BMI160Component final : public PollingComponent, public i2c::I2CDevice {
+class BMI160Component : public PollingComponent, public i2c::I2CDevice {
 public:
  void setup() override;
  void dump_config() override;
@@ -78,7 +78,7 @@ enum BMI270GyroODR : uint8_t {
 // ---Data class

 // Main component class
-class BMI270Component final : public motion::MotionComponent, public i2c::I2CDevice {
+class BMI270Component : public motion::MotionComponent, public i2c::I2CDevice {
 public:
  // Lifecycle
  void setup() override;
@@ -6,7 +6,7 @@

 namespace esphome::bmp085 {

-class BMP085Component final : public PollingComponent, public i2c::I2CDevice {
+class BMP085Component : public PollingComponent, public i2c::I2CDevice {
 public:
  void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }
  void set_pressure(sensor::Sensor *pressure) { pressure_ = pressure; }
@@ -8,7 +8,7 @@ namespace esphome::bmp280_i2c {
 static const char *const TAG = "bmp280_i2c.sensor";

 /// This class implements support for the BMP280 Temperature+Pressure i2c sensor.
-class BMP280I2CComponent final : public esphome::bmp280_base::BMP280Component, public i2c::I2CDevice {
+class BMP280I2CComponent : public esphome::bmp280_base::BMP280Component, public i2c::I2CDevice {
 public:
  bool bmp_read_byte(uint8_t a_register, uint8_t *data) override { return read_byte(a_register, data); }
  bool bmp_write_byte(uint8_t a_register, uint8_t data) override { return write_byte(a_register, data); }
@@ -5,9 +5,9 @@

 namespace esphome::bmp280_spi {

-class BMP280SPIComponent final : public esphome::bmp280_base::BMP280Component,
-                                 public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
-                                                       spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_200KHZ> {
+class BMP280SPIComponent : public esphome::bmp280_base::BMP280Component,
+                           public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                                 spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_200KHZ> {
  void setup() override;
  bool bmp_read_byte(uint8_t a_register, uint8_t *data) override;
  bool bmp_write_byte(uint8_t a_register, uint8_t data) override;
@@ -4,7 +4,7 @@

 namespace esphome::bmp3xx_i2c {

-class BMP3XXI2CComponent final : public bmp3xx_base::BMP3XXComponent, public i2c::I2CDevice {
+class BMP3XXI2CComponent : public bmp3xx_base::BMP3XXComponent, public i2c::I2CDevice {
  bool read_byte(uint8_t a_register, uint8_t *data) override;
  bool write_byte(uint8_t a_register, uint8_t data) override;
  bool read_bytes(uint8_t a_register, uint8_t *data, size_t len) override;
@@ -4,9 +4,9 @@

 namespace esphome::bmp3xx_spi {

-class BMP3XXSPIComponent final : public bmp3xx_base::BMP3XXComponent,
-                                 public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
-                                                       spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_1MHZ> {
+class BMP3XXSPIComponent : public bmp3xx_base::BMP3XXComponent,
+                           public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                                 spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_1MHZ> {
  void setup() override;
  bool read_byte(uint8_t a_register, uint8_t *data) override;
  bool write_byte(uint8_t a_register, uint8_t data) override;
@@ -8,7 +8,7 @@ namespace esphome::bmp581_i2c {
 static const char *const TAG = "bmp581_i2c.sensor";

 /// This class implements support for the BMP581 Temperature+Pressure i2c sensor.
-class BMP581I2CComponent final : public esphome::bmp581_base::BMP581Component, public i2c::I2CDevice {
+class BMP581I2CComponent : public esphome::bmp581_base::BMP581Component, public i2c::I2CDevice {
 public:
  bool bmp_read_byte(uint8_t a_register, uint8_t *data) override { return read_byte(a_register, data); }
  bool bmp_write_byte(uint8_t a_register, uint8_t data) override { return write_byte(a_register, data); }
@@ -6,9 +6,9 @@
 namespace esphome::bmp581_spi {

 // BMP581 is technically compatible with SPI Mode0 and Mode3. Default to Mode3.
-class BMP581SPIComponent final : public esphome::bmp581_base::BMP581Component,
-                                 public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH,
-                                                       spi::CLOCK_PHASE_TRAILING, spi::DATA_RATE_200KHZ> {
+class BMP581SPIComponent : public esphome::bmp581_base::BMP581Component,
+                           public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH,
+                                                 spi::CLOCK_PHASE_TRAILING, spi::DATA_RATE_200KHZ> {
 public:
  void setup() override;
  bool bmp_read_byte(uint8_t a_register, uint8_t *data) override;
@@ -7,7 +7,7 @@

 namespace esphome::bp1658cj {

-class BP1658CJ final : public Component {
+class BP1658CJ : public Component {
 public:
  class Channel;

@@ -29,7 +29,7 @@ class BP1658CJ final : public Component {
  /// Send new values if they were updated.
  void loop() override;

-  class Channel final : public output::FloatOutput {
+  class Channel : public output::FloatOutput {
   public:
    void set_parent(BP1658CJ *parent) { parent_ = parent; }
    void set_channel(uint8_t channel) { channel_ = channel; }
@@ -7,7 +7,7 @@

 namespace esphome::bp5758d {

-class BP5758D final : public Component {
+class BP5758D : public Component {
 public:
  class Channel;

@@ -23,7 +23,7 @@ class BP5758D final : public Component {
  /// Send new values if they were updated.
  void loop() override;

-  class Channel final : public output::FloatOutput {
+  class Channel : public output::FloatOutput {
   public:
    void set_parent(BP5758D *parent) { parent_ = parent; }
    void set_channel(uint8_t channel) { channel_ = channel; }
@@ -12,7 +12,7 @@

 namespace esphome::bthome_mithermometer {

-class BTHomeMiThermometer final : public esp32_ble_tracker::ESPBTDeviceListener, public Component {
+class BTHomeMiThermometer : public esp32_ble_tracker::ESPBTDeviceListener, public Component {
 public:
  void set_address(uint64_t address) { this->address_ = address; }
  void set_bindkey(std::initializer_list<uint8_t> bindkey);
@@ -6,7 +6,7 @@

 namespace esphome::button {

-template<typename... Ts> class PressAction final : public Action<Ts...> {
+template<typename... Ts> class PressAction : public Action<Ts...> {
 public:
  explicit PressAction(Button *button) : button_(button) {}

@@ -16,7 +16,7 @@ template<typename... Ts> class PressAction final : public Action<Ts...> {
  Button *button_;
 };

-class ButtonPressTrigger final : public Trigger<> {
+class ButtonPressTrigger : public Trigger<> {
 public:
  ButtonPressTrigger(Button *button) {
    button->add_on_press_callback([this]() { this->trigger(); });
@@ -5,7 +5,7 @@

 namespace esphome::camera_encoder {

-class EncoderBufferImpl final : public camera::EncoderBuffer {
+class EncoderBufferImpl : public camera::EncoderBuffer {
 public:
  // --- EncoderBuffer  ---
  bool set_buffer_size(size_t size) override;
@@ -11,7 +11,7 @@
 namespace esphome::camera_encoder {

 /// Encoder that uses the software-based JPEG implementation from Espressif's esp32-camera component.
-class ESP32CameraJPEGEncoder final : public camera::Encoder {
+class ESP32CameraJPEGEncoder : public camera::Encoder {
 public:
  /// Constructs a ESP32CameraJPEGEncoder instance.
  /// @param quality Sets the quality of the encoded image (1-100).
@@ -106,7 +106,7 @@ class Canbus : public Component {
  virtual Error read_message(struct CanFrame *frame) = 0;
 };

-template<typename... Ts> class CanbusSendAction final : public Action<Ts...>, public Parented<Canbus> {
+template<typename... Ts> class CanbusSendAction : public Action<Ts...>, public Parented<Canbus> {
 public:
  void set_data_template(std::vector<uint8_t> (*func)(Ts...)) {
    // Stateless lambdas (generated by ESPHome) implicitly convert to function pointers
@@ -154,7 +154,7 @@ template<typename... Ts> class CanbusSendAction final : public Action<Ts...>, pu
  } data_;
 };

-class CanbusTrigger final : public Trigger<std::vector<uint8_t>, uint32_t, bool>, public Component {
+class CanbusTrigger : public Trigger<std::vector<uint8_t>, uint32_t, bool>, public Component {
  friend class Canbus;

 public:
@@ -26,7 +26,7 @@ enum {
  CAP1188_SENSITVITY = 0x1f,
 };

-class CAP1188Channel final : public binary_sensor::BinarySensor {
+class CAP1188Channel : public binary_sensor::BinarySensor {
 public:
  void set_channel(uint8_t channel) { channel_ = channel; }
  void process(uint8_t data) { this->publish_state(static_cast<bool>(data & (1 << this->channel_))); }
@@ -35,7 +35,7 @@ class CAP1188Channel final : public binary_sensor::BinarySensor {
  uint8_t channel_{0};
 };

-class CAP1188Component final : public Component, public i2c::I2CDevice {
+class CAP1188Component : public Component, public i2c::I2CDevice {
 public:
  void register_channel(CAP1188Channel *channel) { this->channels_.push_back(channel); }
  void set_touch_threshold(uint8_t touch_threshold) { this->touch_threshold_ = touch_threshold; };
@@ -14,7 +14,7 @@

 namespace esphome::captive_portal {

-class CaptivePortal final : public AsyncWebHandler, public Component {
+class CaptivePortal : public AsyncWebHandler, public Component {
 public:
  CaptivePortal(web_server_base::WebServerBase *base);
  void setup() override;
@@ -16,9 +16,9 @@ class CC1101Listener {
  virtual void on_packet(const std::vector<uint8_t> &packet, float freq_offset, float rssi, uint8_t lqi) = 0;
 };

-class CC1101Component final : public Component,
-                              public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
-                                                    spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_1MHZ> {
+class CC1101Component : public Component,
+                        public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                              spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_1MHZ> {
 public:
  CC1101Component();

@@ -119,27 +119,27 @@ class CC1101Component final : public Component,
 };

 // Action Wrappers
-template<typename... Ts> class BeginTxAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class BeginTxAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  void play(const Ts &...x) override { this->parent_->begin_tx(); }
 };

-template<typename... Ts> class BeginRxAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class BeginRxAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  void play(const Ts &...x) override { this->parent_->begin_rx(); }
 };

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

-template<typename... Ts> class SetIdleAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetIdleAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  void play(const Ts &...x) override { this->parent_->set_idle(); }
 };

-template<typename... Ts> class SendPacketAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SendPacketAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  void set_data_template(std::function<std::vector<uint8_t>(Ts...)> func) { this->data_func_ = func; }
  void set_data_static(const uint8_t *data, size_t len) {
@@ -163,80 +163,79 @@ template<typename... Ts> class SendPacketAction final : public Action<Ts...>, pu
  size_t data_static_len_{0};
 };

-template<typename... Ts> class SetSymbolRateAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetSymbolRateAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(float, symbol_rate)
  void play(const Ts &...x) override { this->parent_->set_symbol_rate(this->symbol_rate_.value(x...)); }
 };

-template<typename... Ts> class SetFrequencyAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetFrequencyAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(float, frequency)
  void play(const Ts &...x) override { this->parent_->set_frequency(this->frequency_.value(x...)); }
 };

-template<typename... Ts> class SetOutputPowerAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetOutputPowerAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(float, output_power)
  void play(const Ts &...x) override { this->parent_->set_output_power(this->output_power_.value(x...)); }
 };

-template<typename... Ts> class SetModulationTypeAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetModulationTypeAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(Modulation, modulation_type)
  void play(const Ts &...x) override { this->parent_->set_modulation_type(this->modulation_type_.value(x...)); }
 };

-template<typename... Ts> class SetRxAttenuationAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetRxAttenuationAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(RxAttenuation, rx_attenuation)
  void play(const Ts &...x) override { this->parent_->set_rx_attenuation(this->rx_attenuation_.value(x...)); }
 };

-template<typename... Ts>
-class SetDcBlockingFilterAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetDcBlockingFilterAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(bool, dc_blocking_filter)
  void play(const Ts &...x) override { this->parent_->set_dc_blocking_filter(this->dc_blocking_filter_.value(x...)); }
 };

-template<typename... Ts> class SetManchesterAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetManchesterAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(bool, manchester)
  void play(const Ts &...x) override { this->parent_->set_manchester(this->manchester_.value(x...)); }
 };

-template<typename... Ts> class SetFilterBandwidthAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetFilterBandwidthAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(float, filter_bandwidth)
  void play(const Ts &...x) override { this->parent_->set_filter_bandwidth(this->filter_bandwidth_.value(x...)); }
 };

-template<typename... Ts> class SetFskDeviationAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetFskDeviationAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(float, fsk_deviation)
  void play(const Ts &...x) override { this->parent_->set_fsk_deviation(this->fsk_deviation_.value(x...)); }
 };

-template<typename... Ts> class SetMskDeviationAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetMskDeviationAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(uint8_t, msk_deviation)
  void play(const Ts &...x) override { this->parent_->set_msk_deviation(this->msk_deviation_.value(x...)); }
 };

-template<typename... Ts> class SetChannelAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetChannelAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(uint8_t, channel)
  void play(const Ts &...x) override { this->parent_->set_channel(this->channel_.value(x...)); }
 };

-template<typename... Ts> class SetChannelSpacingAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetChannelSpacingAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(float, channel_spacing)
  void play(const Ts &...x) override { this->parent_->set_channel_spacing(this->channel_spacing_.value(x...)); }
 };

-template<typename... Ts> class SetIfFrequencyAction final : public Action<Ts...>, public Parented<CC1101Component> {
+template<typename... Ts> class SetIfFrequencyAction : public Action<Ts...>, public Parented<CC1101Component> {
 public:
  TEMPLATABLE_VALUE(float, if_frequency)
  void play(const Ts &...x) override { this->parent_->set_if_frequency(this->if_frequency_.value(x...)); }
@@ -8,7 +8,7 @@

 namespace esphome::ccs811 {

-class CCS811Component final : public PollingComponent, public i2c::I2CDevice {
+class CCS811Component : public PollingComponent, public i2c::I2CDevice {
 public:
  void set_co2(sensor::Sensor *co2) { co2_ = co2; }
  void set_tvoc(sensor::Sensor *tvoc) { tvoc_ = tvoc; }
@@ -7,7 +7,7 @@

 namespace esphome::cd74hc4067 {

-class CD74HC4067Component final : public Component {
+class CD74HC4067Component : public Component {
 public:
  /// Set up the internal sensor array.
  void setup() override;
@@ -38,7 +38,7 @@ class CD74HC4067Component final : public Component {
  uint32_t switch_delay_;
 };

-class CD74HC4067Sensor final : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
+class CD74HC4067Sensor : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
 public:
  CD74HC4067Sensor(CD74HC4067Component *parent);

@@ -6,7 +6,7 @@

 namespace esphome::ch422g {

-class CH422GComponent final : public Component, public i2c::I2CDevice {
+class CH422GComponent : public Component, public i2c::I2CDevice {
 public:
  CH422GComponent() = default;

@@ -42,7 +42,7 @@ class CH422GComponent final : public Component, public i2c::I2CDevice {
 };

 /// Helper class to expose a CH422G pin as a GPIO pin.
-class CH422GGPIOPin final : public GPIOPin {
+class CH422GGPIOPin : public GPIOPin {
 public:
  void setup() override{};
  void pin_mode(gpio::Flags flags) override;
@@ -6,7 +6,7 @@

 namespace esphome::ch423 {

-class CH423Component final : public Component, public i2c::I2CDevice {
+class CH423Component : public Component, public i2c::I2CDevice {
 public:
  CH423Component() = default;

@@ -41,7 +41,7 @@ class CH423Component final : public Component, public i2c::I2CDevice {
 };

 /// Helper class to expose a CH423 pin as a GPIO pin.
-class CH423GPIOPin final : public GPIOPin {
+class CH423GPIOPin : public GPIOPin {
 public:
  void setup() override{};
  void pin_mode(gpio::Flags flags) override;
@@ -17,7 +17,7 @@ static const uint8_t CHSC6X_REG_STATUS_Y_COR = 0x04;
 static const uint8_t CHSC6X_REG_STATUS_LEN = 0x05;
 static const uint8_t CHSC6X_CHIP_ID = 0x2e;

-class CHSC6XTouchscreen final : public touchscreen::Touchscreen, public i2c::I2CDevice {
+class CHSC6XTouchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice {
 public:
  void setup() override;
  void update_touches() override;
@@ -17,7 +17,7 @@ namespace esphome::climate {
 // (e.g. `const T & &` if Ts already carries a reference, or `const const
 // T &` if Ts already carries a const). This keeps trigger args no-copy
 // regardless of whether the trigger supplies `T`, `T &`, or `const T &`.
-template<typename... Ts> class ControlAction final : public Action<Ts...> {
+template<typename... Ts> class ControlAction : public Action<Ts...> {
 public:
  using ApplyFn = void (*)(ClimateCall &, const std::remove_cvref_t<Ts> &...);
  ControlAction(Climate *climate, ApplyFn apply) : climate_(climate), apply_(apply) {}
@@ -33,14 +33,14 @@ template<typename... Ts> class ControlAction final : public Action<Ts...> {
  ApplyFn apply_;
 };

-class ControlTrigger final : public Trigger<ClimateCall &> {
+class ControlTrigger : public Trigger<ClimateCall &> {
 public:
  ControlTrigger(Climate *climate) {
    climate->add_on_control_callback([this](ClimateCall &x) { this->trigger(x); });
  }
 };

-class StateTrigger final : public Trigger<Climate &> {
+class StateTrigger : public Trigger<Climate &> {
 public:
  StateTrigger(Climate *climate) {
    climate->add_on_state_callback([this](Climate &x) { this->trigger(x); });
@@ -10,7 +10,7 @@ namespace esphome::climate_ir_lg {
 const uint8_t TEMP_MIN = 18;  // Celsius
 const uint8_t TEMP_MAX = 30;  // Celsius

-class LgIrClimate final : public climate_ir::ClimateIR {
+class LgIrClimate : public climate_ir::ClimateIR {
 public:
  LgIrClimate()
      : climate_ir::ClimateIR(TEMP_MIN, TEMP_MAX, 1.0f, true, true,
@@ -7,7 +7,7 @@

 namespace esphome::cm1106 {

-class CM1106Component final : public PollingComponent, public uart::UARTDevice {
+class CM1106Component : public PollingComponent, public uart::UARTDevice {
 public:
  void setup() override;
  void update() override;
@@ -23,7 +23,7 @@ class CM1106Component final : public PollingComponent, public uart::UARTDevice {
  bool cm1106_write_command_(const uint8_t *command, size_t command_len, uint8_t *response, size_t response_len);
 };

-template<typename... Ts> class CM1106CalibrateZeroAction final : public Action<Ts...> {
+template<typename... Ts> class CM1106CalibrateZeroAction : public Action<Ts...> {
 public:
  CM1106CalibrateZeroAction(CM1106Component *cm1106) : cm1106_(cm1106) {}

@@ -6,7 +6,7 @@

 namespace esphome::color_temperature {

-class CTLightOutput final : public light::LightOutput {
+class CTLightOutput : public light::LightOutput {
 public:
  void set_color_temperature(output::FloatOutput *color_temperature) { color_temperature_ = color_temperature; }
  void set_brightness(output::FloatOutput *brightness) { brightness_ = brightness; }
@@ -58,7 +58,7 @@ class CombinationOneParameterComponent : public CombinationComponent {
  FixedVector<SensorSource> sensor_sources_;
 };

-class KalmanCombinationComponent final : public CombinationOneParameterComponent {
+class KalmanCombinationComponent : public CombinationOneParameterComponent {
 public:
  void dump_config() override;
  void setup() override;
@@ -85,7 +85,7 @@ class KalmanCombinationComponent final : public CombinationOneParameterComponent
  float variance_{INFINITY};
 };

-class LinearCombinationComponent final : public CombinationOneParameterComponent {
+class LinearCombinationComponent : public CombinationOneParameterComponent {
 public:
  void dump_config() override { this->log_config_(LOG_STR("linear")); }
  void setup() override;
@@ -93,49 +93,49 @@ class LinearCombinationComponent final : public CombinationOneParameterComponent
  void handle_new_value(float value);
 };

-class MaximumCombinationComponent final : public CombinationNoParameterComponent {
+class MaximumCombinationComponent : public CombinationNoParameterComponent {
 public:
  void dump_config() override { this->log_config_(LOG_STR("max")); }

  void handle_new_value(float value) override;
 };

-class MeanCombinationComponent final : public CombinationNoParameterComponent {
+class MeanCombinationComponent : public CombinationNoParameterComponent {
 public:
  void dump_config() override { this->log_config_(LOG_STR("mean")); }

  void handle_new_value(float value) override;
 };

-class MedianCombinationComponent final : public CombinationNoParameterComponent {
+class MedianCombinationComponent : public CombinationNoParameterComponent {
 public:
  void dump_config() override { this->log_config_(LOG_STR("median")); }

  void handle_new_value(float value) override;
 };

-class MinimumCombinationComponent final : public CombinationNoParameterComponent {
+class MinimumCombinationComponent : public CombinationNoParameterComponent {
 public:
  void dump_config() override { this->log_config_(LOG_STR("min")); }

  void handle_new_value(float value) override;
 };

-class MostRecentCombinationComponent final : public CombinationNoParameterComponent {
+class MostRecentCombinationComponent : public CombinationNoParameterComponent {
 public:
  void dump_config() override { this->log_config_(LOG_STR("most_recently_updated")); }

  void handle_new_value(float value) override;
 };

-class RangeCombinationComponent final : public CombinationNoParameterComponent {
+class RangeCombinationComponent : public CombinationNoParameterComponent {
 public:
  void dump_config() override { this->log_config_(LOG_STR("range")); }

  void handle_new_value(float value) override;
 };

-class SumCombinationComponent final : public CombinationNoParameterComponent {
+class SumCombinationComponent : public CombinationNoParameterComponent {
 public:
  void dump_config() override { this->log_config_(LOG_STR("sum")); }

@@ -8,10 +8,8 @@ BYTE_ORDER_BIG = "big_endian"
 CONF_ACCELEROMETER_ODR = "accelerometer_odr"
 CONF_ACCELEROMETER_RANGE = "accelerometer_range"
 CONF_B_CONSTANT = "b_constant"
-CONF_BREATH_VOC_EQUIVALENT = "breath_voc_equivalent"
 CONF_BYTE_ORDER = "byte_order"
 CONF_CLIMATE_ID = "climate_id"
-CONF_CO2_EQUIVALENT = "co2_equivalent"
 CONF_COLOR_DEPTH = "color_depth"
 CONF_CRC_ENABLE = "crc_enable"
 CONF_DATA_BITS = "data_bits"
@@ -19,7 +17,6 @@ CONF_DRAW_ROUNDING = "draw_rounding"
 CONF_ENABLED = "enabled"
 CONF_GYROSCOPE_ODR = "gyroscope_odr"
 CONF_GYROSCOPE_RANGE = "gyroscope_range"
-CONF_IAQ = "iaq"
 CONF_IGNORE_NOT_FOUND = "ignore_not_found"
 CONF_LIBRETINY = "libretiny"
 CONF_LOOP = "loop"
@@ -31,7 +28,6 @@ CONF_RECEIVER_FREQUENCY = "receiver_frequency"
 CONF_REQUEST_HEADERS = "request_headers"
 CONF_ROWS = "rows"
 CONF_SHA256 = "sha256"
-CONF_STATE_SAVE_INTERVAL = "state_save_interval"
 CONF_STOP_BITS = "stop_bits"
 CONF_USE_PSRAM = "use_psram"
 CONF_VOLUME_INCREMENT = "volume_increment"
@@ -10,7 +10,7 @@ namespace esphome::coolix {
 const uint8_t COOLIX_TEMP_MIN = 17;  // Celsius
 const uint8_t COOLIX_TEMP_MAX = 30;  // Celsius

-class CoolixClimate final : public climate_ir::ClimateIR {
+class CoolixClimate : public climate_ir::ClimateIR {
 public:
  CoolixClimate()
      : climate_ir::ClimateIR(COOLIX_TEMP_MIN, COOLIX_TEMP_MAX, 1.0f, true, true,
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopyBinarySensor final : public binary_sensor::BinarySensor, public Component {
+class CopyBinarySensor : public binary_sensor::BinarySensor, public Component {
 public:
  void set_source(binary_sensor::BinarySensor *source) { source_ = source; }
  void setup() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopyButton final : public button::Button, public Component {
+class CopyButton : public button::Button, public Component {
 public:
  void set_source(button::Button *source) { source_ = source; }
  void dump_config() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopyCover final : public cover::Cover, public Component {
+class CopyCover : public cover::Cover, public Component {
 public:
  void set_source(cover::Cover *source) { source_ = source; }
  void setup() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopyFan final : public fan::Fan, public Component {
+class CopyFan : public fan::Fan, public Component {
 public:
  void set_source(fan::Fan *source) { source_ = source; }
  void setup() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopyLock final : public lock::Lock, public Component {
+class CopyLock : public lock::Lock, public Component {
 public:
  void set_source(lock::Lock *source) { source_ = source; }
  void setup() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopyNumber final : public number::Number, public Component {
+class CopyNumber : public number::Number, public Component {
 public:
  void set_source(number::Number *source) { source_ = source; }
  void setup() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopySelect final : public select::Select, public Component {
+class CopySelect : public select::Select, public Component {
 public:
  void set_source(select::Select *source) { source_ = source; }
  void setup() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopySensor final : public sensor::Sensor, public Component {
+class CopySensor : public sensor::Sensor, public Component {
 public:
  void set_source(sensor::Sensor *source) { source_ = source; }
  void setup() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopySwitch final : public switch_::Switch, public Component {
+class CopySwitch : public switch_::Switch, public Component {
 public:
  void set_source(switch_::Switch *source) { source_ = source; }
  void setup() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopyText final : public text::Text, public Component {
+class CopyText : public text::Text, public Component {
 public:
  void set_source(text::Text *source) { source_ = source; }
  void setup() override;
@@ -5,7 +5,7 @@

 namespace esphome::copy {

-class CopyTextSensor final : public text_sensor::TextSensor, public Component {
+class CopyTextSensor : public text_sensor::TextSensor, public Component {
 public:
  void set_source(text_sensor::TextSensor *source) { source_ = source; }
  void setup() override;
@@ -6,7 +6,7 @@

 namespace esphome::cover {

-template<typename... Ts> class OpenAction final : public Action<Ts...> {
+template<typename... Ts> class OpenAction : public Action<Ts...> {
 public:
  explicit OpenAction(Cover *cover) : cover_(cover) {}

@@ -16,7 +16,7 @@ template<typename... Ts> class OpenAction final : public Action<Ts...> {
  Cover *cover_;
 };

-template<typename... Ts> class CloseAction final : public Action<Ts...> {
+template<typename... Ts> class CloseAction : public Action<Ts...> {
 public:
  explicit CloseAction(Cover *cover) : cover_(cover) {}

@@ -26,7 +26,7 @@ template<typename... Ts> class CloseAction final : public Action<Ts...> {
  Cover *cover_;
 };

-template<typename... Ts> class StopAction final : public Action<Ts...> {
+template<typename... Ts> class StopAction : public Action<Ts...> {
 public:
  explicit StopAction(Cover *cover) : cover_(cover) {}

@@ -36,7 +36,7 @@ template<typename... Ts> class StopAction final : public Action<Ts...> {
  Cover *cover_;
 };

-template<typename... Ts> class ToggleAction final : public Action<Ts...> {
+template<typename... Ts> class ToggleAction : public Action<Ts...> {
 public:
  explicit ToggleAction(Cover *cover) : cover_(cover) {}

@@ -59,7 +59,7 @@ template<typename... Ts> class ToggleAction final : public Action<Ts...> {
 // T &` if Ts already carries a const). This keeps trigger args no-copy
 // regardless of whether the trigger supplies `T`, `T &`, or `const T &`.

-template<typename... Ts> class ControlAction final : public Action<Ts...> {
+template<typename... Ts> class ControlAction : public Action<Ts...> {
 public:
  using ApplyFn = void (*)(CoverCall &, const std::remove_cvref_t<Ts> &...);
  ControlAction(Cover *cover, ApplyFn apply) : cover_(cover), apply_(apply) {}
@@ -75,7 +75,7 @@ template<typename... Ts> class ControlAction final : public Action<Ts...> {
  ApplyFn apply_;
 };

-template<typename... Ts> class CoverPublishAction final : public Action<Ts...> {
+template<typename... Ts> class CoverPublishAction : public Action<Ts...> {
 public:
  using ApplyFn = void (*)(Cover *, const std::remove_cvref_t<Ts> &...);
  CoverPublishAction(Cover *cover, ApplyFn apply) : cover_(cover), apply_(apply) {}
@@ -90,7 +90,7 @@ template<typename... Ts> class CoverPublishAction final : public Action<Ts...> {
  ApplyFn apply_;
 };

-template<bool OPEN, typename... Ts> class CoverPositionCondition final : public Condition<Ts...> {
+template<bool OPEN, typename... Ts> class CoverPositionCondition : public Condition<Ts...> {
 public:
  CoverPositionCondition(Cover *cover) : cover_(cover) {}

@@ -103,7 +103,7 @@ template<bool OPEN, typename... Ts> class CoverPositionCondition final : public
 template<typename... Ts> using CoverIsOpenCondition = CoverPositionCondition<true, Ts...>;
 template<typename... Ts> using CoverIsClosedCondition = CoverPositionCondition<false, Ts...>;

-template<bool OPEN> class CoverPositionTrigger final : public Trigger<> {
+template<bool OPEN> class CoverPositionTrigger : public Trigger<> {
 public:
  CoverPositionTrigger(Cover *a_cover) : cover_(a_cover) {
    a_cover->add_on_state_callback([this]() {
@@ -123,7 +123,7 @@ template<bool OPEN> class CoverPositionTrigger final : public Trigger<> {
 using CoverOpenedTrigger = CoverPositionTrigger<true>;
 using CoverClosedTrigger = CoverPositionTrigger<false>;

-template<CoverOperation OP> class CoverTrigger final : public Trigger<> {
+template<CoverOperation OP> class CoverTrigger : public Trigger<> {
 public:
  CoverTrigger(Cover *a_cover) : cover_(a_cover) {
    a_cover->add_on_state_callback([this]() {
@@ -52,9 +52,9 @@ enum CS5460APGAGain {
  CS5460A_PGA_GAIN_50X = 0b1,
 };

-class CS5460AComponent final : public Component,
-                               public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
-                                                     spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_1MHZ> {
+class CS5460AComponent : public Component,
+                         public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                               spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_1MHZ> {
 public:
  void set_samples(uint32_t samples) { samples_ = samples; }
  void set_phase_offset(int8_t phase_offset) { phase_offset_ = phase_offset; }
@@ -108,7 +108,7 @@ class CS5460AComponent final : public Component,
  uint32_t prev_raw_energy_{0};
 };

-template<typename... Ts> class CS5460ARestartAction final : public Action<Ts...> {
+template<typename... Ts> class CS5460ARestartAction : public Action<Ts...> {
 public:
  CS5460ARestartAction(CS5460AComponent *cs5460a) : cs5460a_(cs5460a) {}

@@ -16,7 +16,7 @@ struct CSE7761DataStruct {
 };

 /// This class implements support for the CSE7761 UART power sensor.
-class CSE7761Component final : public PollingComponent, public uart::UARTDevice {
+class CSE7761Component : public PollingComponent, public uart::UARTDevice {
 public:
  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
  void set_active_power_1_sensor(sensor::Sensor *power_sensor_1) { power_sensor_1_ = power_sensor_1; }
@@ -9,7 +9,7 @@ namespace esphome::cse7766 {

 static constexpr size_t CSE7766_RAW_DATA_SIZE = 24;

-class CSE7766Component final : public Component, public uart::UARTDevice {
+class CSE7766Component : public Component, public uart::UARTDevice {
 public:
  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
@@ -6,10 +6,10 @@

 namespace esphome::cst226 {

-class CST226Button final : public binary_sensor::BinarySensor,
-                           public Component,
-                           public CST226ButtonListener,
-                           public Parented<CST226Touchscreen> {
+class CST226Button : public binary_sensor::BinarySensor,
+                     public Component,
+                     public CST226ButtonListener,
+                     public Parented<CST226Touchscreen> {
 public:
  void setup() override;
  void dump_config() override;
@@ -15,7 +15,7 @@ class CST226ButtonListener {
  virtual void update_button(bool state) = 0;
 };

-class CST226Touchscreen final : public touchscreen::Touchscreen, public i2c::I2CDevice {
+class CST226Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice {
 public:
  void setup() override;
  void update_touches() override;
@@ -37,7 +37,7 @@ class CST816ButtonListener {
  virtual void update_button(bool state) = 0;
 };

-class CST816Touchscreen final : public touchscreen::Touchscreen, public i2c::I2CDevice {
+class CST816Touchscreen : public touchscreen::Touchscreen, public i2c::I2CDevice {
 public:
  void setup() override;
  void update_touches() override;
@@ -7,7 +7,7 @@

 namespace esphome::ct_clamp {

-class CTClampSensor final : public sensor::Sensor, public PollingComponent {
+class CTClampSensor : public sensor::Sensor, public PollingComponent {
 public:
  void update() override;
  void loop() override;
@@ -8,7 +8,7 @@

 namespace esphome::current_based {

-class CurrentBasedCover final : public cover::Cover, public Component {
+class CurrentBasedCover : public cover::Cover, public Component {
 public:
  void setup() override;
  void loop() override;
@@ -6,7 +6,7 @@

 namespace esphome::cwww {

-class CWWWLightOutput final : public light::LightOutput {
+class CWWWLightOutput : public light::LightOutput {
 public:
  void set_cold_white(output::FloatOutput *cold_white) { cold_white_ = cold_white; }
  void set_warm_white(output::FloatOutput *warm_white) { warm_white_ = warm_white; }
@@ -9,7 +9,7 @@ namespace esphome::dac7678 {

 class DAC7678Output;

-class DAC7678Channel final : public output::FloatOutput, public Parented<DAC7678Output> {
+class DAC7678Channel : public output::FloatOutput, public Parented<DAC7678Output> {
 public:
  void set_channel(uint8_t channel) { channel_ = channel; }

@@ -24,7 +24,7 @@ class DAC7678Channel final : public output::FloatOutput, public Parented<DAC7678
 };

 /// DAC7678 float output component.
-class DAC7678Output final : public Component, public i2c::I2CDevice {
+class DAC7678Output : public Component, public i2c::I2CDevice {
 public:
  DAC7678Output() {}

@@ -39,7 +39,7 @@ const uint32_t DAIKIN_MESSAGE_SPACE = 32300;
 // State Frame size
 const uint8_t DAIKIN_STATE_FRAME_SIZE = 19;

-class DaikinClimate final : public climate_ir::ClimateIR {
+class DaikinClimate : public climate_ir::ClimateIR {
 public:
  DaikinClimate()
      : climate_ir::ClimateIR(DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX, 1.0f, true, true,
@@ -45,7 +45,7 @@ const uint8_t DAIKIN_DBG_TOLERANCE = 25;
 // State Frame size
 const uint8_t DAIKIN_STATE_FRAME_SIZE = 19;

-class DaikinArcClimate final : public climate_ir::ClimateIR {
+class DaikinArcClimate : public climate_ir::ClimateIR {
 public:
  DaikinArcClimate()
      : climate_ir::ClimateIR(DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX, 0.5f, true, true,
@@ -48,7 +48,7 @@ const uint8_t DAIKIN_BRC_PREAMBLE_SIZE = 7;
 // Transmit Frame size - includes a preamble
 const uint8_t DAIKIN_BRC_TRANSMIT_FRAME_SIZE = DAIKIN_BRC_PREAMBLE_SIZE + DAIKIN_BRC_STATE_FRAME_SIZE;

-class DaikinBrcClimate final : public climate_ir::ClimateIR {
+class DaikinBrcClimate : public climate_ir::ClimateIR {
 public:
  DaikinBrcClimate()
      : climate_ir::ClimateIR(DAIKIN_BRC_TEMP_MIN_C, DAIKIN_BRC_TEMP_MAX_C, 0.5f, true, true,
@@ -6,7 +6,7 @@

 namespace esphome::dallas_temp {

-class DallasTemperatureSensor final : public PollingComponent, public sensor::Sensor, public one_wire::OneWireDevice {
+class DallasTemperatureSensor : public PollingComponent, public sensor::Sensor, public one_wire::OneWireDevice {
 public:
  void setup() override;
  void update() override;
@@ -17,7 +17,7 @@

 namespace esphome::daly_bms {

-class DalyBmsComponent final : public PollingComponent, public uart::UARTDevice {
+class DalyBmsComponent : public PollingComponent, public uart::UARTDevice {
 public:
  DalyBmsComponent() = default;

@@ -77,7 +77,7 @@ async def to_code(config):
    url = config[CONF_PACKAGE_IMPORT_URL]
    if config[CONF_IMPORT_FULL_CONFIG]:
        url += "?full_config"
-    cg.add(dashboard_import_ns.set_package_import_url(cg.FlashStringLiteral(url)))
+    cg.add(dashboard_import_ns.set_package_import_url(url))


 def import_config(
@@ -92,6 +92,7 @@ def import_config(
    """Materialise a dashboard-imported device's YAML on disk.

    Used by:
+    - esphome.dashboard (legacy dashboard)
    - device-builder (esphome/device-builder) — called from the
      ``devices/import`` WS handler to seed the YAML for an adopted
      factory firmware. Coordinate before changing the kwargs or the
@@ -2,10 +2,9 @@

 namespace esphome::dashboard_import {

-static const char EMPTY_URL[] PROGMEM = "";                                        // NOLINT
-static ProgmemStr g_package_import_url = reinterpret_cast<ProgmemStr>(EMPTY_URL);  // NOLINT
+static const char *g_package_import_url = "";  // NOLINT

-ProgmemStr get_package_import_url() { return g_package_import_url; }
-void set_package_import_url(ProgmemStr url) { g_package_import_url = url; }
+const char *get_package_import_url() { return g_package_import_url; }
+void set_package_import_url(const char *url) { g_package_import_url = url; }

 }  // namespace esphome::dashboard_import
@@ -1,10 +1,8 @@
 #pragma once

-#include "esphome/core/progmem.h"
-
 namespace esphome::dashboard_import {

-ProgmemStr get_package_import_url();
-void set_package_import_url(ProgmemStr url);
+const char *get_package_import_url();
+void set_package_import_url(const char *url);

 }  // namespace esphome::dashboard_import
@@ -96,7 +96,7 @@ class DateCall {
  optional<uint8_t> day_;
 };

-template<typename... Ts> class DateSetAction final : public Action<Ts...>, public Parented<DateEntity> {
+template<typename... Ts> class DateSetAction : public Action<Ts...>, public Parented<DateEntity> {
 public:
  TEMPLATABLE_VALUE(ESPTime, date)

@@ -31,7 +31,7 @@ class DateTimeBase : public EntityBase {
 #endif
 };

-class DateTimeStateTrigger final : public Trigger<ESPTime> {
+class DateTimeStateTrigger : public Trigger<ESPTime> {
 public:
  explicit DateTimeStateTrigger(DateTimeBase *parent) : parent_(parent) {
    parent->add_on_state_callback([this]() { this->trigger(this->parent_->state_as_esptime()); });
@@ -121,7 +121,7 @@ class DateTimeCall {
  optional<uint8_t> second_;
 };

-template<typename... Ts> class DateTimeSetAction final : public Action<Ts...>, public Parented<DateTimeEntity> {
+template<typename... Ts> class DateTimeSetAction : public Action<Ts...>, public Parented<DateTimeEntity> {
 public:
  TEMPLATABLE_VALUE(ESPTime, datetime)

@@ -136,7 +136,7 @@ template<typename... Ts> class DateTimeSetAction final : public Action<Ts...>, p
 };

 #ifdef USE_TIME
-class OnDateTimeTrigger final : public Trigger<>, public Component, public Parented<DateTimeEntity> {
+class OnDateTimeTrigger : public Trigger<>, public Component, public Parented<DateTimeEntity> {
 public:
  void loop() override;

@@ -98,7 +98,7 @@ class TimeCall {
  optional<uint8_t> second_;
 };

-template<typename... Ts> class TimeSetAction final : public Action<Ts...>, public Parented<TimeEntity> {
+template<typename... Ts> class TimeSetAction : public Action<Ts...>, public Parented<TimeEntity> {
 public:
  TEMPLATABLE_VALUE(ESPTime, time)

@@ -113,7 +113,7 @@ template<typename... Ts> class TimeSetAction final : public Action<Ts...>, publi
 };

 #ifdef USE_TIME
-class OnTimeTrigger final : public Trigger<>, public Component, public Parented<TimeEntity> {
+class OnTimeTrigger : public Trigger<>, public Component, public Parented<TimeEntity> {
 public:
  void loop() override;

@@ -21,7 +21,7 @@ static constexpr size_t WAKEUP_CAUSE_BUFFER_SIZE = 128;

 // buf_append_printf is now provided by esphome/core/helpers.h

-class DebugComponent final : public PollingComponent {
+class DebugComponent : public PollingComponent {
 public:
  void loop() override;
  void update() override;
@@ -70,7 +70,7 @@ template<typename... Ts> class PreventDeepSleepAction;
 * and set_run_duration, then set how long the deep sleep should last using set_sleep_duration and optionally
 * on the ESP32 set_wakeup_pin.
 */
-class DeepSleepComponent final : public Component {
+class DeepSleepComponent : public Component {
 public:
  /// Set the duration in ms the component should sleep once it's in deep sleep mode.
  void set_sleep_duration(uint32_t time_ms);
@@ -161,7 +161,7 @@ class DeepSleepComponent final : public Component {

 extern bool global_has_deep_sleep;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)

-template<typename... Ts> class EnterDeepSleepAction final : public Action<Ts...> {
+template<typename... Ts> class EnterDeepSleepAction : public Action<Ts...> {
 public:
  EnterDeepSleepAction(DeepSleepComponent *deep_sleep) : deep_sleep_(deep_sleep) {}
  TEMPLATABLE_VALUE(uint32_t, sleep_duration);
@@ -233,13 +233,12 @@ template<typename... Ts> class EnterDeepSleepAction final : public Action<Ts...>
 #endif
 };

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

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