Bumped version to 20260624.1

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

.github/workflows/e2e.yaml

@@ -0,0 +1,244 @@
+name: E2E Tests
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+  pull_request:
+    branches:
+      - dev
+      - master
+  workflow_dispatch:
+
+env:
+  NODE_OPTIONS: --max_old_space_size=6144
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  # ── Build the demo once and share it across test jobs via artifact ──────────
+  build-demo:
+    name: Build demo
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out files from GitHub
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Setup Node
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Build demo
+        run: ./node_modules/.bin/gulp build-demo
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload demo build
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: demo-dist
+          path: demo/dist/
+          if-no-files-found: error
+          retention-days: 3
+
+  # ── Build the e2e test app and share it via artifact ────────────────────────
+  build-e2e-test-app:
+    name: Build e2e test app
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out files from GitHub
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Setup Node
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Build e2e test app
+        run: ./node_modules/.bin/gulp build-e2e-test-app
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload e2e test app build
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: e2e-test-app-dist
+          path: test/e2e/app/dist/
+          if-no-files-found: error
+          retention-days: 3
+
+  # ── Build the gallery and share it via artifact ─────────────────────────────
+  build-gallery:
+    name: Build gallery
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out files from GitHub
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Setup Node
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Build gallery
+        run: ./node_modules/.bin/gulp build-gallery
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload gallery build
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: gallery-dist
+          path: gallery/dist/
+          if-no-files-found: error
+          retention-days: 3
+
+  # ── Run Playwright tests locally against Chromium ──────────────────────────
+  e2e-local:
+    name: E2E (local Chromium)
+    needs: [build-demo, build-e2e-test-app, build-gallery]
+    runs-on: ubuntu-latest
+    # Fail fast if anything hangs. The whole suite should take < 15 minutes on
+    # Chromium; anything longer is almost certainly an install or webServer
+    # hang.
+    timeout-minutes: 30
+    steps:
+      - name: Check out files from GitHub
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Setup Node
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      # Cache the downloaded browser build keyed on the pinned Playwright
+      # version (yarn.lock), so re-runs skip the ~170 MB download.
+      - name: Cache Playwright browsers
+        uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+
+      - name: Install Playwright browsers
+        run: yarn playwright install --with-deps chromium
+        timeout-minutes: 10
+
+      - name: Download demo build
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        with:
+          name: demo-dist
+          path: demo/dist/
+
+      - name: Download e2e test app build
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        with:
+          name: e2e-test-app-dist
+          path: test/e2e/app/dist/
+
+      - name: Download gallery build
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        with:
+          name: gallery-dist
+          path: gallery/dist/
+
+      - name: Run Playwright tests (local)
+        run: yarn test:e2e
+        timeout-minutes: 15
+
+      - name: Upload blob report
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        if: always()
+        with:
+          name: blob-report-local
+          path: test/e2e/reports/
+          retention-days: 3
+
+  # ── Merge local blob reports and post PR comment ───────────────────────────
+  report:
+    name: Report
+    needs: [e2e-local]
+    runs-on: ubuntu-latest
+    if: ${{ !cancelled() }}
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Check out files from GitHub
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: Setup Node
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        with:
+          node-version-file: ".nvmrc"
+          cache: yarn
+
+      - name: Install dependencies
+        run: yarn install --immutable
+
+      - name: Download blob report (local)
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
+        continue-on-error: true
+        with:
+          name: blob-report-local
+          path: test/e2e/reports/
+
+      - name: Stage blobs for merge
+        run: node test/e2e/collect-blob-reports.mjs
+
+      - name: Merge blob reports
+        run: npx playwright merge-reports -c test/e2e/playwright.merge.config.ts test/e2e/reports/blob
+
+      - name: Upload merged HTML report
+        id: upload-report
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: playwright-report
+          path: test/e2e/reports/combined/
+          retention-days: 14
+
+      - name: Post report link to PR
+        if: github.event_name == 'pull_request' && needs.e2e-local.result == 'failure'
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const runUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
+            const body = `## Playwright E2E tests failed\n\nThe combined HTML report is available as a workflow artifact.\n\n[View workflow run](${runUrl})`;
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body,
+            });

.gitignore

@@ -54,8 +54,16 @@ src/cast/dev_const.ts
 # test coverage
 test/coverage/
 
+# Playwright e2e output
+test/e2e/reports/
+test/e2e/test-results/
+# E2E test app build output
+test/e2e/app/dist/
+
 # AI tooling
 .claude
 .cursor
 .opencode
+.serena
+
 test/benchmarks/results/

.nvmrc

@@ -1 +1 @@
-24.17.0
+24.18.0

.yarn/patches/babel-plugin-template-html-minifier-npm-4.1.0-9a3c00055a.patch

@@ -1,18 +0,0 @@
-diff --git a/lib/cook-raw-quasi.js b/lib/cook-raw-quasi.js
-index 3ea8fa7be8e357c1066d7417caeeecd841415208..6bf04ab0bed8897b5ff2898ca835867aec5cee6a 100644
---- a/lib/cook-raw-quasi.js
-+++ b/lib/cook-raw-quasi.js
-@@ -1,10 +1,11 @@
- 'use strict';
- 
--function cookRawQuasi({transform}, raw) {
-+function cookRawQuasi({transformSync}, raw) {
- 	// This nasty hack is needed until https://github.com/babel/babel/issues/9242 is resolved.
- 	const args = {raw};
- 
--	transform('cooked`' + args.raw + '`', {
-+	// Babel 8 removed synchronous `transform`; use `transformSync` instead.
-+	transformSync('cooked`' + args.raw + '`', {
- 		babelrc: false,
- 		configFile: false,
- 		plugins: [

build-scripts/bundle.cjs

@@ -1,4 +1,3 @@
-/* global require, module, __dirname, process */
 const path = require("path");
 const env = require("./env.cjs");
 const paths = require("./paths.cjs");
@@ -84,12 +83,7 @@ module.exports.swcOptions = () => ({
   },
 });
 
-module.exports.babelOptions = ({
-  latestBuild,
-  isProdBuild,
-  isTestBuild,
-  sw,
-}) => ({
+module.exports.babelOptions = ({ latestBuild, isTestBuild, sw }) => ({
   babelrc: false,
   compact: false,
   assumptions: {
@@ -102,13 +96,22 @@ module.exports.babelOptions = ({
     [
       "@babel/preset-env",
       {
-        useBuiltIns: "usage",
-        corejs: dependencies["core-js"],
         shippedProposals: true,
       },
     ],
   ],
   plugins: [
+    // Inject Core-JS polyfills on demand. Babel 8 removed preset-env's
+    // `useBuiltIns`/`corejs` options, so the equivalent polyfill provider is
+    // configured directly here (`usage-global` matches the old `useBuiltIns: "usage"`).
+    [
+      "babel-plugin-polyfill-corejs3",
+      {
+        method: "usage-global",
+        version: dependencies["core-js"],
+        shippedProposals: true,
+      },
+    ],
     [
       path.join(BABEL_PLUGINS, "inline-constants-plugin.cjs"),
       {
@@ -116,32 +119,14 @@ module.exports.babelOptions = ({
         ignoreModuleNotFound: true,
       },
     ],
-    // Minify template literals for production
-    isProdBuild && [
-      "template-html-minifier",
-      {
-        modules: {
-          ...Object.fromEntries(
-            ["lit", "lit-element", "lit-html"].map((m) => [
-              m,
-              [
-                "html",
-                { name: "svg", encapsulation: "svg" },
-                { name: "css", encapsulation: "style" },
-              ],
-            ])
-          ),
-          "@polymer/polymer/lib/utils/html-tag.js": ["html"],
-        },
-        strictCSS: true,
-        htmlMinifier: module.exports.htmlMinifierOptions,
-        failOnError: false, // we can turn this off in case of false positives
-      },
-    ],
-    // Import helpers and regenerator from runtime package
+    // Import helpers and regenerator from runtime package.
+    // `moduleName` is pinned so helpers resolve from `@babel/runtime`: the
+    // corejs3 polyfill provider above otherwise redirects them to the
+    // (uninstalled) `@babel/runtime-corejs3`, which preset-env used to suppress
+    // internally when it owned the polyfill injection via `useBuiltIns`.
     [
       "@babel/plugin-transform-runtime",
-      { version: dependencies["@babel/runtime"] },
+      { version: dependencies["@babel/runtime"], moduleName: "@babel/runtime" },
     ],
     "@babel/plugin-transform-class-properties",
     "@babel/plugin-transform-private-methods",
@@ -320,4 +305,22 @@ module.exports.config = {
       isLandingPageBuild: true,
     };
   },
+
+  e2eTestApp({ isProdBuild, latestBuild, isStatsBuild }) {
+    return {
+      name: "e2e-test-app" + nameSuffix(latestBuild),
+      entry: {
+        main: path.resolve(paths.e2eTestApp_dir, "src/entrypoint.ts"),
+      },
+      outputPath: outputPath(paths.e2eTestApp_output_root, latestBuild),
+      publicPath: publicPath(latestBuild),
+      defineOverlay: {
+        __VERSION__: JSON.stringify(`E2E-TEST-${env.version()}`),
+        __DEMO__: true,
+      },
+      isProdBuild,
+      latestBuild,
+      isStatsBuild,
+    };
+  },
 };

build-scripts/eslint.config.mjs

@@ -1,9 +1,13 @@
 // @ts-check
 
+import globals from "globals";
 import tseslint from "typescript-eslint";
 import rootConfig from "../eslint.config.mjs";
 
 export default tseslint.config(...rootConfig, {
+  languageOptions: {
+    globals: globals.node,
+  },
   rules: {
     "no-console": "off",
     "import-x/no-extraneous-dependencies": "off",

build-scripts/get-built-in-node-module-shim.cjs

@@ -1,4 +1,3 @@
-/* global module */
 // Browser-only replacement for core-js/internals/get-built-in-node-module.
 // The original helper evaluates `Function('return require("...")')()`
 // when it detects a Node environment, which causes a runtime

build-scripts/gulp/clean.js

@@ -45,3 +45,10 @@ gulp.task(
     ])
   )
 );
+
+gulp.task(
+  "clean-e2e-test-app",
+  gulp.parallel("clean-translations", async () =>
+    deleteSync([paths.e2eTestApp_output_root, paths.build_dir])
+  )
+);

build-scripts/gulp/e2e-test-app.js

@@ -0,0 +1,41 @@
+import gulp from "gulp";
+import "./clean.js";
+import "./entry-html.js";
+import "./gather-static.js";
+import "./gen-icons-json.js";
+import "./translations.js";
+import "./rspack.js";
+
+gulp.task(
+  "develop-e2e-test-app",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "development";
+    },
+    "clean-e2e-test-app",
+    "translations-enable-merge-backend",
+    gulp.parallel(
+      "gen-icons-json",
+      "gen-pages-e2e-test-app-dev",
+      "build-translations",
+      "build-locale-data"
+    ),
+    "copy-static-e2e-test-app",
+    "rspack-dev-server-e2e-test-app"
+  )
+);
+
+gulp.task(
+  "build-e2e-test-app",
+  gulp.series(
+    async function setEnv() {
+      process.env.NODE_ENV = "production";
+    },
+    "clean-e2e-test-app",
+    "translations-enable-merge-backend",
+    gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
+    "copy-static-e2e-test-app",
+    "rspack-prod-e2e-test-app",
+    "gen-pages-e2e-test-app-prod"
+  )
+);

build-scripts/gulp/entry-html.js

@@ -1,4 +1,3 @@
-/* global process */
 // Tasks to generate entry HTML
 
 import {
@@ -268,3 +267,24 @@ gulp.task(
     paths.landingPage_output_es5
   )
 );
+
+const E2E_TEST_APP_PAGE_ENTRIES = { "index.html": ["main"] };
+
+gulp.task(
+  "gen-pages-e2e-test-app-dev",
+  genPagesDevTask(
+    E2E_TEST_APP_PAGE_ENTRIES,
+    paths.e2eTestApp_dir,
+    paths.e2eTestApp_output_root
+  )
+);
+
+gulp.task(
+  "gen-pages-e2e-test-app-prod",
+  genPagesProdTask(
+    E2E_TEST_APP_PAGE_ENTRIES,
+    paths.e2eTestApp_dir,
+    paths.e2eTestApp_output_root,
+    paths.e2eTestApp_output_latest
+  )
+);

build-scripts/gulp/gather-static.js

@@ -201,3 +201,23 @@ gulp.task("copy-static-landing-page", async () => {
   copyFonts(paths.landingPage_output_static);
   copyTranslations(paths.landingPage_output_static);
 });
+
+gulp.task("copy-static-e2e-test-app", async () => {
+  // Copy app static files (icons, polyfills, etc.)
+  fs.copySync(
+    polyPath("public/static"),
+    path.resolve(paths.e2eTestApp_output_root, "static")
+  );
+  // Copy e2e test app public files (manifest, sw stubs)
+  const e2ePublic = path.resolve(paths.e2eTestApp_dir, "public");
+  if (fs.existsSync(e2ePublic)) {
+    fs.copySync(e2ePublic, paths.e2eTestApp_output_root);
+  }
+
+  copyPolyfills(paths.e2eTestApp_output_static);
+  copyMapPanel(paths.e2eTestApp_output_static);
+  copyFonts(paths.e2eTestApp_output_static);
+  copyTranslations(paths.e2eTestApp_output_static);
+  copyLocaleData(paths.e2eTestApp_output_static);
+  copyMdiIcons(paths.e2eTestApp_output_static);
+});

build-scripts/gulp/index.mjs

@@ -4,6 +4,7 @@ import "./clean.js";
 import "./compress.js";
 import "./demo.js";
 import "./download-translations.js";
+import "./e2e-test-app.js";
 import "./entry-html.js";
 import "./fetch-nightly-translations.js";
 import "./gallery.js";

build-scripts/gulp/licenses.js

@@ -1,6 +1,6 @@
 // Gulp task to generate third-party license notices.
 
-import { readFile, access } from "fs/promises";
+import { readFile, access, readdir } from "fs/promises";
 import { generateLicenseFile } from "generate-license-file";
 import gulp from "gulp";
 import path from "path";
@@ -11,58 +11,98 @@ const OUTPUT_FILE = path.join(
   "third-party-licenses.txt"
 );
 
+const NODE_MODULES = path.resolve(paths.root_dir, "node_modules");
+
 // The echarts package ships an Apache-2.0 NOTICE file that must be
 // redistributed alongside the compiled output per Apache License §4(d).
-const NOTICE_FILES = [
-  path.resolve(paths.root_dir, "node_modules/echarts/NOTICE"),
-];
+const NOTICE_FILES = [path.join(NODE_MODULES, "echarts/NOTICE")];
 
-// type-fest ships two license files (MIT for code, CC0 for types).
-// We use the MIT license since that covers the bundled code.
+// Some packages need a manual license override (e.g. they ship multiple
+// license files and we must pick the right one for the bundled code).
 //
 // Each entry is pinned to a specific version. If a package is updated,
 // this list must be reviewed and the version updated after verifying
-// that the new version's license still matches. The build will fail
-// if the installed version does not match the pinned version.
+// that the new version's license still matches. The build will fail if
+// the pinned version is no longer installed.
 const LICENSE_OVERRIDES = [
   {
     // type-fest ships two license files (MIT for code, CC0 for types).
     // We use the MIT license since that covers the bundled code.
     packageName: "type-fest",
     version: "5.7.0",
-    licensePath: path.resolve(
-      paths.root_dir,
-      "node_modules/type-fest/license-mit"
-    ),
+    licenseFile: "license-mit",
   },
 ];
 
+// Locate the directory of an installed package matching an exact version.
+//
+// The copy we care about may be hoisted to the top-level node_modules or
+// nested under a dependency when a different version occupies the hoisted
+// slot (e.g. a build-only dependency pulling in an older release). Searching
+// both keeps this check independent of yarn's hoisting decisions, which can
+// shift when unrelated dependencies are added.
+async function findPackageDir(packageName, version) {
+  const candidateDirs = [path.join(NODE_MODULES, packageName)];
+
+  // Collect one level of nesting: node_modules/<dep>/node_modules/<pkg> and
+  // node_modules/@scope/<dep>/node_modules/<pkg>.
+  let topLevel = [];
+  try {
+    topLevel = await readdir(NODE_MODULES, { withFileTypes: true });
+  } catch {
+    // node_modules unreadable — fall back to the hoisted candidate only.
+  }
+  for (const entry of topLevel) {
+    if (!entry.isDirectory() || entry.name === packageName) {
+      continue;
+    }
+    if (entry.name.startsWith("@")) {
+      const scopeDir = path.join(NODE_MODULES, entry.name);
+      // eslint-disable-next-line no-await-in-loop
+      const scoped = await readdir(scopeDir, { withFileTypes: true }).catch(
+        () => []
+      );
+      for (const dep of scoped) {
+        if (dep.isDirectory()) {
+          candidateDirs.push(
+            path.join(scopeDir, dep.name, "node_modules", packageName)
+          );
+        }
+      }
+    } else {
+      candidateDirs.push(
+        path.join(NODE_MODULES, entry.name, "node_modules", packageName)
+      );
+    }
+  }
+
+  for (const dir of candidateDirs) {
+    // eslint-disable-next-line no-await-in-loop
+    const pkg = await readFile(path.join(dir, "package.json"), "utf-8")
+      .then(JSON.parse)
+      .catch(() => null);
+    if (pkg?.version === version) {
+      return dir;
+    }
+  }
+  return null;
+}
+
 gulp.task("gen-licenses", async () => {
   const licenseOverrides = {};
 
-  for (const { packageName, version, licensePath } of LICENSE_OVERRIDES) {
-    const pkgJsonPath = path.resolve(
-      paths.root_dir,
-      `node_modules/${packageName}/package.json`
-    );
+  for (const { packageName, version, licenseFile } of LICENSE_OVERRIDES) {
+    // eslint-disable-next-line no-await-in-loop
+    const packageDir = await findPackageDir(packageName, version);
 
-    let packageJSON;
-    try {
-      // eslint-disable-next-line no-await-in-loop
-      packageJSON = JSON.parse(await readFile(pkgJsonPath, "utf-8"));
-    } catch {
+    if (!packageDir) {
       throw new Error(
-        `package.json for "${packageName}" not found or unreadable at ${pkgJsonPath}`
-      );
-    }
-
-    if (packageJSON.version !== version) {
-      throw new Error(
-        `License override for "${packageName}" is pinned to version ${version}, but found version ${packageJSON.version}. ` +
+        `License override for "${packageName}" is pinned to version ${version}, but that version is not installed. ` +
           `Please verify the new version's license and update the override in build-scripts/gulp/licenses.js.`
       );
     }
 
+    const licensePath = path.join(packageDir, licenseFile);
     try {
       // eslint-disable-next-line no-await-in-loop
       await access(licensePath);

build-scripts/gulp/rspack.js

@@ -14,6 +14,7 @@ import {
   createDemoConfig,
   createGalleryConfig,
   createLandingPageConfig,
+  createE2eTestAppConfig,
 } from "../rspack.cjs";
 
 const bothBuilds = (createConfigFunc, params) => [
@@ -231,3 +232,22 @@ gulp.task("rspack-prod-landing-page", () =>
     })
   )
 );
+
+gulp.task("rspack-dev-server-e2e-test-app", () =>
+  runDevServer({
+    compiler: rspack(
+      createE2eTestAppConfig({ isProdBuild: false, latestBuild: true })
+    ),
+    contentBase: paths.e2eTestApp_output_root,
+    port: 8095,
+  })
+);
+
+gulp.task("rspack-prod-e2e-test-app", () =>
+  prodBuild(
+    bothBuilds(createE2eTestAppConfig, {
+      isProdBuild: true,
+      isStatsBuild: env.isStatsBuild(),
+    })
+  )
+);

build-scripts/list-plugins-and-polyfills.js

@@ -48,6 +48,12 @@ for (const buildType of ["Modern", "Legacy"]) {
   const browserslistEnv = buildType.toLowerCase();
   const babelOpts = babelOptions({ latestBuild: browserslistEnv === "modern" });
   const presetEnvOpts = babelOpts.presets[0][1];
+  // Core-JS polyfills are injected by babel-plugin-polyfill-corejs3 (Babel 8
+  // removed preset-env's `useBuiltIns`), so read its options here.
+  const corejsOpts = babelOpts.plugins.find(
+    (plugin) =>
+      Array.isArray(plugin) && plugin[0] === "babel-plugin-polyfill-corejs3"
+  )?.[1];
 
   // Invoking preset-env in debug mode will log the included plugins
   console.log(detailsOpen(`${buildType} Build Babel Plugins`));
@@ -59,16 +65,16 @@ for (const buildType of ["Modern", "Legacy"]) {
   console.log(detailsClose);
 
   // Manually log the Core-JS polyfills using the same technique
-  if (presetEnvOpts.useBuiltIns) {
+  if (corejsOpts) {
     console.log(detailsOpen(`${buildType} Build Core-JS Polyfills`));
     const targets = compilationTargets.default(babelOpts?.targets, {
       browserslistEnv,
     });
     const polyfillList = coreJSCompat({ targets }).list.filter(
       polyfillFilter(
-        `${presetEnvOpts.useBuiltIns}-global`,
-        presetEnvOpts?.corejs?.proposals,
-        presetEnvOpts?.shippedProposals
+        corejsOpts.method,
+        corejsOpts.proposals,
+        corejsOpts.shippedProposals
       )
     );
     console.log(

build-scripts/lit-disable-dev-mode-loader.cjs

@@ -0,0 +1,8 @@
+/* global module */
+
+module.exports = function litDisableDevModeLoader(source) {
+  return source.replace(
+    /\b(const|let|var) DEV_MODE = true;/g,
+    "$1 DEV_MODE = false;"
+  );
+};

build-scripts/minify-template-literals-loader.cjs

@@ -0,0 +1,68 @@
+/* global module, require */
+// rspack/webpack loader that minifies the HTML, SVG, and CSS inside lit
+// tagged template literals using `minify-literals` (html-minifier-next +
+// lightningcss). Replaces the unmaintained babel-plugin-template-html-minifier.
+//
+// It runs between swc and babel: swc has already stripped TS types and
+// decorators (so minify-literals' acorn parser only sees plain ESM), but the
+// `html`/`css`/`svg` tagged templates are still intact at ES2021. Running after
+// babel instead would miss the legacy build, where babel lowers the templates
+// to `_taggedTemplateLiteral()` calls that no longer look like tagged templates.
+
+const remapping = require("@ampproject/remapping");
+
+// minify-literals is ESM-only, so load it via dynamic import from this CJS loader.
+let minifyPromise;
+const getMinifier = () => {
+  if (!minifyPromise) {
+    minifyPromise = import("minify-literals").then((m) => m.minifyHTMLLiterals);
+  }
+  return minifyPromise;
+};
+
+// HTML options mirror the previous babel-plugin-template-html-minifier config
+// (html-minifier-next is option-compatible with html-minifier-terser). CSS in
+// css`` templates and inline <style> is handled by minify-literals' lightningcss
+// default.
+//
+// `keepClosingSlash` is required for `svg`` templates: SVG elements such as
+// `<path />` and `<circle />` are not void elements in HTML, so dropping the
+// trailing slash would break the markup. It is harmless for HTML.
+const htmlOptions = {
+  caseSensitive: true,
+  collapseWhitespace: true,
+  conservativeCollapse: true,
+  decodeEntities: true,
+  keepClosingSlash: true,
+  removeComments: true,
+  removeRedundantAttributes: true,
+};
+
+module.exports = function minifyTemplateLiteralsLoader(source, map, meta) {
+  const callback = this.async();
+  getMinifier()
+    .then((minifyHTMLLiterals) =>
+      minifyHTMLLiterals(source, {
+        fileName: this.resourcePath,
+        html: htmlOptions,
+      })
+    )
+    .then((result) => {
+      if (!result) {
+        // No tagged templates changed; pass through untouched (incl. incoming map).
+        callback(null, source, map, meta);
+        return;
+      }
+      // minify-literals builds its map from `source` alone, so `result.map`
+      // describes minified output -> this loader's input (the swc output), not
+      // the original file. Compose it over the incoming map (swc output ->
+      // original source) so the map handed downstream still points at the
+      // original source; otherwise every minified file's source map is wrong.
+      const outMap =
+        map && result.map
+          ? remapping([result.map, map], () => null)
+          : (result.map ?? map);
+      callback(null, result.code, outMap, meta);
+    })
+    .catch(callback);
+};

build-scripts/paths.cjs

@@ -50,4 +50,15 @@ module.exports = {
   ),
 
   translations_src: path.resolve(__dirname, "../src/translations"),
+
+  e2eTestApp_dir: path.resolve(__dirname, "../test/e2e/app"),
+  e2eTestApp_output_root: path.resolve(__dirname, "../test/e2e/app/dist"),
+  e2eTestApp_output_static: path.resolve(
+    __dirname,
+    "../test/e2e/app/dist/static"
+  ),
+  e2eTestApp_output_latest: path.resolve(
+    __dirname,
+    "../test/e2e/app/dist/frontend_latest"
+  ),
 };

build-scripts/rspack.cjs

@@ -1,4 +1,3 @@
-/* global require, module, __dirname */
 const { existsSync } = require("fs");
 const path = require("path");
 const rspack = require("@rspack/core");
@@ -48,6 +47,12 @@ const createRspackConfig = ({
     dontHash = new Set();
   }
   const ignorePackages = bundle.ignorePackages({ latestBuild });
+  const litHtmlRoot = path.resolve(__dirname, "../node_modules/lit-html");
+  const litHtmlDevelopmentRoot = path.join(litHtmlRoot, "development");
+  const litDisableDevModeLoader = path.join(
+    __dirname,
+    "lit-disable-dev-mode-loader.cjs"
+  );
   return {
     name,
     mode: isProdBuild ? "production" : "development",
@@ -67,25 +72,42 @@ const createRspackConfig = ({
         {
           test: /\.m?js$|\.ts$/,
           exclude: /node_modules[\\/]core-js/,
-          use: (info) => [
-            {
-              loader: "babel-loader",
-              options: {
-                ...bundle.babelOptions({
-                  latestBuild,
-                  isProdBuild,
-                  isTestBuild,
-                  sw: info.issuerLayer === "sw",
-                }),
-                cacheDirectory: !isProdBuild,
-                cacheCompression: false,
+          use: (info) =>
+            [
+              {
+                loader: "babel-loader",
+                options: {
+                  ...bundle.babelOptions({
+                    latestBuild,
+                    isTestBuild,
+                    sw: info.issuerLayer === "sw",
+                  }),
+                  cacheDirectory: !isProdBuild,
+                  cacheCompression: false,
+                },
               },
-            },
-            {
-              loader: "builtin:swc-loader",
-              options: bundle.swcOptions(),
-            },
-          ],
+              // Minify lit html/svg/css tagged template literals for production.
+              // Must run after swc (TS/decorators stripped, but templates kept at
+              // ES2021) and before babel — otherwise the legacy build lowers
+              // html`` to _taggedTemplateLiteral() calls that can no longer be
+              // matched, leaving legacy templates unminified.
+              isProdBuild && {
+                loader: path.join(
+                  __dirname,
+                  "minify-template-literals-loader.cjs"
+                ),
+              },
+              !latestBuild &&
+                info.resource.startsWith(
+                  `${litHtmlDevelopmentRoot}${path.sep}`
+                ) && {
+                  loader: litDisableDevModeLoader,
+                },
+              {
+                loader: "builtin:swc-loader",
+                options: bundle.swcOptions(),
+              },
+            ].filter(Boolean),
           resolve: {
             fullySpecified: false,
           },
@@ -132,6 +154,47 @@ const createRspackConfig = ({
         // Only include the JS of entrypoints
         filter: (file) => file.isInitial && !file.name.endsWith(".map"),
       }),
+      // Babel can miscompile Lit's pre-minified runtime when downleveling to
+      // ES5. Compile lit-html from its development sources for legacy builds,
+      // then let the normal production minifier handle the final bundle.
+      !latestBuild &&
+        new rspack.NormalModuleReplacementPlugin(
+          /^(?:lit-html(?:\/.*)?|\.{1,2}\/.*\.js)$/,
+          (resource) => {
+            if (resource.request === "lit-html") {
+              resource.request = path.join(
+                litHtmlDevelopmentRoot,
+                "lit-html.js"
+              );
+              return;
+            }
+            if (resource.request.startsWith("lit-html/")) {
+              if (resource.request.startsWith("lit-html/development/")) {
+                return;
+              }
+              resource.request = path.join(
+                litHtmlDevelopmentRoot,
+                resource.request.slice("lit-html/".length)
+              );
+              return;
+            }
+            if (
+              resource.context.startsWith(`${litHtmlRoot}${path.sep}`) &&
+              resource.context !== litHtmlDevelopmentRoot &&
+              !resource.context.startsWith(
+                `${litHtmlDevelopmentRoot}${path.sep}`
+              )
+            ) {
+              resource.request = path.join(
+                litHtmlDevelopmentRoot,
+                path.relative(
+                  litHtmlRoot,
+                  path.resolve(resource.context, resource.request)
+                )
+              );
+            }
+          }
+        ),
       new rspack.DefinePlugin(
         bundle.definedVars({ isProdBuild, latestBuild, defineOverlay })
       ),
@@ -338,6 +401,11 @@ const createGalleryConfig = ({ isProdBuild, latestBuild }) =>
 const createLandingPageConfig = ({ isProdBuild, latestBuild }) =>
   createRspackConfig(bundle.config.landingPage({ isProdBuild, latestBuild }));
 
+const createE2eTestAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
+  createRspackConfig(
+    bundle.config.e2eTestApp({ isProdBuild, latestBuild, isStatsBuild })
+  );
+
 module.exports = {
   createAppConfig,
   createDemoConfig,
@@ -345,4 +413,5 @@ module.exports = {
   createGalleryConfig,
   createRspackConfig,
   createLandingPageConfig,
+  createE2eTestAppConfig,
 };

demo/src/ha-demo.ts

@@ -53,6 +53,7 @@ const CONFIG_PANEL_COMMANDS = [
   "config/scene/config",
   "search/related",
   "tag/list",
+  "assist_pipeline/",
 ];
 
 @customElement("ha-demo")

demo/src/stubs/assist.ts

@@ -0,0 +1,53 @@
+import type { AssistPipeline } from "../../../src/data/assist_pipeline";
+import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+
+const pipelines: AssistPipeline[] = [
+  {
+    id: "01home_assistant_cloud",
+    name: "Home Assistant Cloud",
+    language: "en",
+    conversation_engine: "conversation.home_assistant",
+    conversation_language: "en",
+    stt_engine: "cloud",
+    stt_language: "en-US",
+    tts_engine: "cloud",
+    tts_language: "en-US",
+    tts_voice: "JennyNeural",
+    wake_word_entity: null,
+    wake_word_id: null,
+  },
+  {
+    id: "01local",
+    name: "Local",
+    language: "en",
+    conversation_engine: "conversation.home_assistant",
+    conversation_language: "en",
+    stt_engine: "stt.faster_whisper",
+    stt_language: "en",
+    tts_engine: "tts.piper",
+    tts_language: "en",
+    tts_voice: null,
+    wake_word_entity: null,
+    wake_word_id: null,
+  },
+];
+
+export const mockAssist = (hass: MockHomeAssistant) => {
+  // Stub for assist pipeline list — returns a cloud and a local pipeline so the
+  // voice assistants config panel shows configured assistants.
+  hass.mockWS("assist_pipeline/pipeline/list", () => ({
+    pipelines,
+    preferred_pipeline: "01home_assistant_cloud",
+  }));
+
+  // Stub for assist pipeline run — immediately sends run-end event so
+  // the UI does not hang waiting for a response.
+  hass.mockWS("assist_pipeline/run", (_msg, _hass, onChange) => {
+    if (onChange) {
+      onChange({
+        type: "run-end",
+      });
+    }
+    return null;
+  });
+};

demo/src/stubs/config-panel.ts

@@ -1,5 +1,6 @@
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 import { mockApplicationCredentials } from "./application_credentials";
+import { mockAssist } from "./assist";
 import { mockAutomation } from "./automation";
 import { mockBackup } from "./backup";
 import { mockBlueprint } from "./blueprint";
@@ -37,4 +38,5 @@ export const mockConfigPanel = (hass: MockHomeAssistant) => {
   mockScene(hass);
   mockSearch(hass);
   mockTags(hass);
+  mockAssist(hass);
 };

demo/src/stubs/expose.ts

@@ -2,22 +2,27 @@ import type { ExposeEntitySettings } from "../../../src/data/expose";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 const exposedEntities: Record<string, ExposeEntitySettings> = {
-  "light.bed_light": {
+  "light.floor_lamp": {
     conversation: true,
     "cloud.alexa": true,
     "cloud.google_assistant": true,
   },
-  "light.ceiling_lights": {
+  "light.living_room_spotlights": {
     conversation: true,
     "cloud.alexa": true,
     "cloud.google_assistant": false,
   },
-  "switch.decorative_lights": {
+  "light.bar_lamp": {
     conversation: true,
     "cloud.alexa": false,
     "cloud.google_assistant": true,
   },
-  "climate.ecobee": {
+  "light.kitchen_spotlights": {
+    conversation: true,
+    "cloud.alexa": true,
+    "cloud.google_assistant": true,
+  },
+  "light.outdoor_light": {
     conversation: true,
     "cloud.alexa": true,
     "cloud.google_assistant": true,

demo/src/stubs/update.ts

@@ -0,0 +1,5 @@
+import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+
+export const mockUpdate = (hass: MockHomeAssistant) => {
+  hass.mockWS("update/list", () => []);
+};

eslint.config.mjs

@@ -234,6 +234,12 @@ export default tseslint.config(
       globals: globals.serviceworker,
     },
   },
+  {
+    files: ["test/e2e/*.mjs"],
+    languageOptions: {
+      globals: globals.node,
+    },
+  },
   {
     plugins: {
       html,

gallery/src/pages/lovelace/thermostat-card.ts

@@ -248,7 +248,7 @@ class DemoThermostatEntity extends LitElement {
 
   protected firstUpdated(changedProperties: PropertyValues<this>) {
     super.firstUpdated(changedProperties);
-    const hass = provideHass(this._demoRoot);
+    const hass = provideHass(this._demoRoot, {}, false, true);
     hass.updateTranslations(null, "en");
     hass.updateTranslations("lovelace", "en");
     hass.addEntities(ENTITIES);

gallery/src/pages/misc/box-shadow.ts

@@ -1,5 +1,6 @@
 import { css, html, LitElement } from "lit";
 import { customElement } from "lit/decorators";
+import { styleMap } from "lit/directives/style-map";
 import { THEME_COMPARISON_PANELS } from "../../components/demo-theme-comparison";
 
 const SHADOWS = ["s", "m", "l"] as const;
@@ -17,7 +18,9 @@ export class DemoMiscBoxShadow extends LitElement {
                   (size) => html`
                     <div
                       class="box"
-                      style="box-shadow: var(--ha-box-shadow-${size})"
+                      style=${styleMap({
+                        boxShadow: `var(--ha-box-shadow-${size})`,
+                      })}
                     >
                       ${size}
                     </div>

gallery/src/pages/more-info/climate.ts

@@ -151,7 +151,7 @@ class DemoMoreInfoClimate extends LitElement {
 
   protected firstUpdated(changedProperties: PropertyValues<this>) {
     super.firstUpdated(changedProperties);
-    const hass = provideHass(this._demoRoot);
+    const hass = provideHass(this._demoRoot, {}, false, true);
     hass.updateTranslations(null, "en");
     hass.addEntities(ENTITIES);
   }

gallery/src/pages/more-info/humidifier.ts

@@ -54,7 +54,7 @@ class DemoMoreInfoHumidifier extends LitElement {
 
   protected firstUpdated(changedProperties: PropertyValues<this>) {
     super.firstUpdated(changedProperties);
-    const hass = provideHass(this._demoRoot);
+    const hass = provideHass(this._demoRoot, {}, false, true);
     hass.updateTranslations(null, "en");
     hass.addEntities(ENTITIES);
   }

package.json

@@ -22,7 +22,12 @@
     "postpack": "pinst --enable",
     "test": "vitest run --config test/vitest.config.ts",
     "test:bench": "vitest bench --run --config test/vitest.bench.config.ts",
-    "test:coverage": "vitest run --config test/vitest.config.ts --coverage"
+    "test:coverage": "vitest run --config test/vitest.config.ts --coverage",
+    "test:e2e": "node test/e2e/run-suites.mjs demo app gallery",
+    "test:e2e:show-report": "yarn playwright show-report test/e2e/reports/combined",
+    "test:e2e:demo": "playwright test --config test/e2e/playwright.demo.config.ts",
+    "test:e2e:app": "playwright test --config test/e2e/playwright.app.config.ts",
+    "test:e2e:gallery": "playwright test --config test/e2e/playwright.gallery.config.ts"
   },
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "Apache-2.0",
@@ -127,10 +132,11 @@
     "xss": "1.0.15"
   },
   "devDependencies": {
-    "@babel/core": "8.0.0",
+    "@ampproject/remapping": "2.3.0",
+    "@babel/core": "8.0.1",
     "@babel/helper-define-polyfill-provider": "1.0.0",
-    "@babel/plugin-transform-runtime": "8.0.0",
-    "@babel/preset-env": "8.0.0",
+    "@babel/plugin-transform-runtime": "8.0.1",
+    "@babel/preset-env": "8.0.2",
     "@bundle-stats/plugin-webpack-filter": "4.22.2",
     "@eslint/js": "10.0.1",
     "@html-eslint/eslint-plugin": "0.62.0",
@@ -138,9 +144,11 @@
     "@octokit/auth-oauth-device": "8.0.3",
     "@octokit/plugin-retry": "8.1.0",
     "@octokit/rest": "22.0.1",
+    "@playwright/test": "1.60.0",
     "@rsdoctor/rspack-plugin": "1.5.15",
     "@rspack/core": "2.0.8",
     "@rspack/dev-server": "2.0.3",
+    "@types/babel__plugin-transform-runtime": "7.9.5",
     "@types/chromecast-caf-receiver": "6.0.26",
     "@types/chromecast-caf-sender": "1.0.11",
     "@types/color-name": "2.0.0",
@@ -157,7 +165,7 @@
     "@types/tar": "7.0.87",
     "@vitest/coverage-v8": "4.1.9",
     "babel-loader": "10.1.1",
-    "babel-plugin-template-html-minifier": "patch:babel-plugin-template-html-minifier@npm%3A4.1.0#~/.yarn/patches/babel-plugin-template-html-minifier-npm-4.1.0-9a3c00055a.patch",
+    "babel-plugin-polyfill-corejs3": "1.0.0",
     "browserslist-useragent-regexp": "4.1.4",
     "del": "8.0.1",
     "eslint": "10.5.0",
@@ -182,11 +190,12 @@
     "jsdom": "29.1.1",
     "jszip": "3.10.1",
     "license-checker-rseidelsohn": "5.0.1",
-    "lint-staged": "17.0.7",
+    "lint-staged": "17.0.8",
     "lit-analyzer": "2.0.3",
     "lodash.merge": "4.6.2",
     "lodash.template": "4.18.1",
     "map-stream": "0.0.7",
+    "minify-literals": "2.0.2",
     "pinst": "3.0.0",
     "prettier": "3.8.4",
     "rspack-manifest-plugin": "5.2.2",
@@ -216,6 +225,6 @@
   },
   "packageManager": "yarn@4.17.0",
   "volta": {
-    "node": "24.17.0"
+    "node": "24.18.0"
   }
 }

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20260527.0"
+version      = "20260624.1"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"

src/common/const.ts

@@ -111,7 +111,7 @@ export const DOMAINS_WITH_DYNAMIC_PICTURE = new Set([
 ]);
 
 /** Domains that use a timestamp for state. */
-export const TIMESTAMP_STATE_DOMAINS = new Set([
+const TIMESTAMP_STATE_DOMAINS_LIST = [
   "ai_task",
   "button",
   "conversation",
@@ -127,7 +127,14 @@ export const TIMESTAMP_STATE_DOMAINS = new Set([
   "tts",
   "wake_word",
   "datetime",
-]);
+] as const;
+
+export type TimestampStateDomain =
+  (typeof TIMESTAMP_STATE_DOMAINS_LIST)[number];
+
+export const TIMESTAMP_STATE_DOMAINS = new Set<string>(
+  TIMESTAMP_STATE_DOMAINS_LIST
+);
 
 /** Temperature units. */
 export const UNIT_C = "°C";

src/common/datetime/duration_to_seconds.ts

@@ -1,4 +1,13 @@
+import type { HaDurationData } from "../../components/ha-duration-input";
+
 export default function durationToSeconds(duration: string): number {
   const parts = duration.split(":").map(Number);
   return parts[0] * 3600 + parts[1] * 60 + parts[2];
 }
+
+export const durationDataToSeconds = (duration: HaDurationData): number =>
+  (duration.days || 0) * 86400 +
+  (duration.hours || 0) * 3600 +
+  (duration.minutes || 0) * 60 +
+  (duration.seconds || 0) +
+  (duration.milliseconds || 0) / 1000;

src/common/entity/compute_entity_name_display.ts

@@ -125,7 +125,15 @@ export interface EntityPickerDisplay {
 }
 
 export const computeEntityPickerDisplay = (
-  hass: HomeAssistant,
+  hass: Pick<
+    HomeAssistant,
+    | "entities"
+    | "devices"
+    | "areas"
+    | "floors"
+    | "language"
+    | "translationMetadata"
+  >,
   stateObj: HassEntity
 ): EntityPickerDisplay => {
   const [entityName, deviceName, areaName] = computeEntityNameList(

src/components/data-table/ha-data-table.ts

@@ -1463,6 +1463,12 @@ export class HaDataTable extends LitElement {
           flex: 1;
           padding: var(--ha-space-3);
         }
+        @media (min-width: 871px) {
+          ha-input-search {
+            --ha-input-search-height: 32px;
+            --ha-input-search-border-radius: 10px;
+          }
+        }
         slot[name="header"] {
           display: block;
         }

src/components/entity/ha-entities-picker.ts

@@ -9,15 +9,13 @@ import {
 } from "../../common/dom/fire_event";
 import { isValidEntityId } from "../../common/entity/valid_entity_id";
 import type { HaEntityPickerEntityFilterFunc } from "../../data/entity/entity";
-import type { HomeAssistant, ValueChangedEvent } from "../../types";
+import type { ValueChangedEvent } from "../../types";
 import "../ha-sortable";
 import "./ha-entity-picker";
 import type { HaEntityPicker } from "./ha-entity-picker";
 
 @customElement("ha-entities-picker")
 class HaEntitiesPicker extends LitElement {
-  @property({ attribute: false }) public hass?: HomeAssistant;
-
   @property({ type: Array }) public value?: string[];
 
   @property({ type: Boolean }) public disabled = false;
@@ -87,10 +85,6 @@ class HaEntitiesPicker extends LitElement {
   public reorder = false;
 
   protected render() {
-    if (!this.hass) {
-      return nothing;
-    }
-
     const currentEntities = this._currentEntities;
     return html`
       ${this.label ? html`<label>${this.label}</label>` : nothing}
@@ -105,7 +99,6 @@ class HaEntitiesPicker extends LitElement {
               <div class="entity">
                 <ha-entity-picker
                   .curValue=${entityId}
-                  .hass=${this.hass}
                   .includeDomains=${this.includeDomains}
                   .excludeDomains=${this.excludeDomains}
                   .includeEntities=${this.includeEntities}
@@ -133,7 +126,6 @@ class HaEntitiesPicker extends LitElement {
       </ha-sortable>
       <div>
         <ha-entity-picker
-          .hass=${this.hass}
           .includeDomains=${this.includeDomains}
           .excludeDomains=${this.excludeDomains}
           .includeEntities=${this.includeEntities}

src/components/entity/ha-entity-picker.ts

@@ -1,5 +1,5 @@
 import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
-import { consume } from "@lit/context";
+import { consume, type ContextType } from "@lit/context";
 import { mdiPlus, mdiShape } from "@mdi/js";
 import { html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
@@ -8,7 +8,14 @@ import { fireEvent } from "../../common/dom/fire_event";
 import { computeEntityPickerDisplay } from "../../common/entity/compute_entity_name_display";
 import { isValidEntityId } from "../../common/entity/valid_entity_id";
 import type { RelatedIdSets } from "../../common/search/related-context";
-import { relatedContext } from "../../data/context";
+import type { LocalizeFunc } from "../../common/translations/localize";
+import {
+  configContext,
+  internationalizationContext,
+  registriesContext,
+  relatedContext,
+  statesContext,
+} from "../../data/context";
 import type { HaEntityPickerEntityFilterFunc } from "../../data/entity/entity";
 import {
   entityComboBoxKeys,
@@ -38,7 +45,21 @@ const CREATE_ID = "___create-new-entity___";
 
 @customElement("ha-entity-picker")
 export class HaEntityPicker extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
+  @state()
+  @consume({ context: statesContext, subscribe: true })
+  private _states!: ContextType<typeof statesContext>;
+
+  @state()
+  @consume({ context: registriesContext, subscribe: true })
+  private _registries!: ContextType<typeof registriesContext>;
+
+  @state()
+  @consume({ context: internationalizationContext, subscribe: true })
+  private _i18n!: ContextType<typeof internationalizationContext>;
+
+  @state()
+  @consume({ context: configContext, subscribe: true })
+  private _config!: ContextType<typeof configContext>;
 
   // eslint-disable-next-line lit/no-native-attributes
   @property({ type: Boolean }) public autofocus = false;
@@ -150,12 +171,11 @@ export class HaEntityPicker extends LitElement {
     );
   }
 
-  protected willUpdate(changedProperties: PropertyValues<this>) {
+  protected willUpdate(changedProperties: PropertyValues) {
     if (
       this._pendingEntityId &&
-      changedProperties.has("hass") &&
-      this.hass.states !== changedProperties.get("hass")?.states &&
-      this.hass.states[this._pendingEntityId]
+      changedProperties.has("_states") &&
+      this._states[this._pendingEntityId]
     ) {
       this._setValue(this._pendingEntityId);
       this._pendingEntityId = undefined;
@@ -165,7 +185,7 @@ export class HaEntityPicker extends LitElement {
   protected firstUpdated(changedProperties: PropertyValues<this>): void {
     super.firstUpdated(changedProperties);
     // Load title translations so it is available when the combo-box opens
-    this.hass.loadBackendTranslation("title");
+    this._i18n.loadBackendTranslation("title");
   }
 
   private _findExtraOption(value: string | undefined) {
@@ -176,7 +196,7 @@ export class HaEntityPicker extends LitElement {
 
   private _renderExtraOptionStart(extraOption: EntitySelectorExtraOption) {
     const stateObj = extraOption.entity_id
-      ? this.hass.states[extraOption.entity_id]
+      ? this._states[extraOption.entity_id]
       : undefined;
     if (stateObj) {
       return html`
@@ -212,7 +232,7 @@ export class HaEntityPicker extends LitElement {
       `;
     }
 
-    const stateObj = this.hass.states[entityId];
+    const stateObj = this._states[entityId];
 
     if (!stateObj) {
       return html`
@@ -226,7 +246,11 @@ export class HaEntityPicker extends LitElement {
     }
 
     const { primary, secondary } = computeEntityPickerDisplay(
-      this.hass,
+      {
+        ...this._registries,
+        language: this._i18n.language,
+        translationMetadata: this._i18n.translationMetadata,
+      },
       stateObj
     );
 
@@ -238,7 +262,7 @@ export class HaEntityPicker extends LitElement {
   };
 
   private get _showEntityId() {
-    return this.showEntityId || this.hass.userData?.showEntityIdPicker;
+    return this.showEntityId || this._config.userData?.showEntityIdPicker;
   }
 
   private _rowRenderer: RenderItemFunction<EntityComboBoxItem> = (
@@ -286,17 +310,14 @@ export class HaEntityPicker extends LitElement {
   };
 
   private _getAdditionalItems = () =>
-    this._getCreateItems(this.hass.localize, this.createDomains);
+    this._getCreateItems(this._i18n.localize, this.createDomains);
 
   private _getCreateItems = memoizeOne(
-    (
-      localize: this["hass"]["localize"],
-      createDomains: this["createDomains"]
-    ) => {
+    (localize: LocalizeFunc, createDomains: this["createDomains"]) => {
       if (!createDomains?.length) {
         return [];
       }
-      this.hass.loadFragmentTranslation("config");
+      this._i18n.loadFragmentTranslation("config");
       return createDomains.map((domain) => {
         const primary = localize(
           "ui.components.entity.entity-picker.create_helper",
@@ -321,7 +342,9 @@ export class HaEntityPicker extends LitElement {
 
   private _getEntitiesMemoized = memoizeOne(
     (
-      hass: HomeAssistant,
+      states: ContextType<typeof statesContext>,
+      registries: ContextType<typeof registriesContext>,
+      i18n: ContextType<typeof internationalizationContext>,
       includeDomains?: string[],
       excludeDomains?: string[],
       entityFilter?: HaEntityPickerEntityFilterFunc,
@@ -331,16 +354,25 @@ export class HaEntityPicker extends LitElement {
       excludeEntities?: string[],
       value?: string
     ) =>
-      getEntities(hass, {
-        includeDomains,
-        excludeDomains,
-        entityFilter,
-        includeDeviceClasses,
-        includeUnitOfMeasurement,
-        includeEntities,
-        excludeEntities,
-        value,
-      })
+      getEntities(
+        {
+          states,
+          ...registries,
+          language: i18n.language,
+          translationMetadata: i18n.translationMetadata,
+          localize: i18n.localize,
+        },
+        {
+          includeDomains,
+          excludeDomains,
+          entityFilter,
+          includeDeviceClasses,
+          includeUnitOfMeasurement,
+          includeEntities,
+          excludeEntities,
+          value,
+        }
+      )
   );
 
   private _sortByRelatedContext = memoizeOne(
@@ -359,7 +391,9 @@ export class HaEntityPicker extends LitElement {
 
   private _getItems = () => {
     const entityItems = this._getEntitiesMemoized(
-      this.hass,
+      this._states,
+      this._registries,
+      this._i18n,
       this.includeDomains,
       this.excludeDomains,
       this.entityFilter,
@@ -373,15 +407,15 @@ export class HaEntityPicker extends LitElement {
       ? this._sortByRelatedContext(
           entityItems,
           this._relatedIdSets!,
-          this.hass.entities,
-          this.hass.devices,
-          this.hass.locale.language
+          this._registries.entities,
+          this._registries.devices,
+          this._i18n.locale.language
         )
       : entityItems;
     if (this.extraOptions?.length) {
       const resolvedExtras = this.extraOptions.map((opt) => ({
         ...opt,
-        stateObj: opt.entity_id ? this.hass.states[opt.entity_id] : undefined,
+        stateObj: opt.entity_id ? this._states[opt.entity_id] : undefined,
       }));
       return [...resolvedExtras, ...sortedItems];
     }
@@ -395,11 +429,10 @@ export class HaEntityPicker extends LitElement {
   protected render() {
     const placeholder =
       this.placeholder ??
-      this.hass.localize("ui.components.entity.entity-picker.placeholder");
+      this._i18n.localize("ui.components.entity.entity-picker.placeholder");
 
     return html`
       <ha-generic-picker
-        .hass=${this.hass}
         .disabled=${this.disabled}
         .autofocus=${this.autofocus}
         .allowCustomValue=${this.allowCustomEntity}
@@ -421,9 +454,9 @@ export class HaEntityPicker extends LitElement {
         use-top-label
         .addButtonLabel=${this.addButton
           ? (this.addButtonLabel ??
-            this.hass.localize("ui.components.entity.entity-picker.add"))
+            this._i18n.localize("ui.components.entity.entity-picker.add"))
           : undefined}
-        .unknownItemText=${this.hass.localize(
+        .unknownItemText=${this._i18n.localize(
           "ui.components.entity.entity-picker.unknown"
         )}
         @value-changed=${this._valueChanged}
@@ -476,7 +509,7 @@ export class HaEntityPicker extends LitElement {
         domain,
         dialogClosedCallback: (item) => {
           if (item.entityId) {
-            if (this.hass.states[item.entityId]) {
+            if (this._states[item.entityId]) {
               this._setValue(item.entityId);
             } else {
               this._pendingEntityId = item.entityId;
@@ -502,7 +535,7 @@ export class HaEntityPicker extends LitElement {
   }
 
   private _notFoundLabel = (search: string) =>
-    this.hass.localize("ui.components.entity.entity-picker.no_match", {
+    this._i18n.localize("ui.components.entity.entity-picker.no_match", {
       term: html`<b>‘${search}’</b>`,
     });
 }

src/components/ha-selector/ha-selector-entity.ts

@@ -63,7 +63,6 @@ export class HaEntitySelector extends LitElement {
 
     if (!this.selector.entity?.multiple) {
       return html`<ha-entity-picker
-        .hass=${this.hass}
         .value=${typeof this.value === "string" ? this.value : ""}
         .label=${this.label}
         .placeholder=${this.placeholder}
@@ -80,7 +79,6 @@ export class HaEntitySelector extends LitElement {
 
     return html`
       <ha-entities-picker
-        .hass=${this.hass}
         .value=${this.value}
         .label=${this.label}
         .placeholder=${this.placeholder}

src/components/ha-selector/ha-selector-media.ts

@@ -91,7 +91,6 @@ export class HaMediaSelector extends LitElement {
         ? nothing
         : html`
             <ha-entity-picker
-              .hass=${this.hass}
               .value=${entityId}
               .label=${this.label ||
               this.hass.localize(

src/components/ha-service-control.ts

@@ -558,7 +558,6 @@ export class HaServiceControl extends LitElement {
         ></ha-settings-row>`
       : entityId
         ? html`<ha-entity-picker
-            .hass=${this.hass}
             .disabled=${this.disabled}
             .value=${this._value?.data?.entity_id}
             .label=${this.hass.localize(

src/components/input/ha-input-search.ts

@@ -41,7 +41,11 @@ export class HaInputSearch extends HaInput {
     ...HaInput.styles,
     css`
       :host([appearance="outlined"]) wa-input.no-label::part(base) {
-        height: 40px;
+        height: var(--ha-input-search-height, 40px);
+        border-radius: var(
+          --ha-input-search-border-radius,
+          var(--ha-border-radius-md)
+        );
       }
     `,
   ];

src/data/alexa.ts

@@ -6,15 +6,11 @@ export interface AlexaEntity {
   interfaces: string[];
 }
 
-export interface AlexaEntityConfig {
-  name?: string | null;
-}
-
 export const fetchCloudAlexaEntities = (hass: HomeAssistant) =>
   hass.callWS<AlexaEntity[]>({ type: "cloud/alexa/entities" });
 
 export const fetchCloudAlexaEntity = (hass: HomeAssistant, entity_id: string) =>
-  hass.callWS<AlexaEntityConfig>({
+  hass.callWS<AlexaEntity>({
     type: "cloud/alexa/entities/get",
     entity_id,
   });

src/data/automation.ts

@@ -331,7 +331,14 @@ export interface AutomationElementGroupCollection {
 
 export type AutomationElementGroup = Record<
   string,
-  { icon?: string; members?: AutomationElementGroup }
+  {
+    icon?: string;
+    members?: AutomationElementGroup;
+    // Backend element domains (e.g. "calendar", "sun") whose triggers/conditions
+    // are bundled into this group instead of appearing as their own dynamic
+    // domain group.
+    domains?: string[];
+  }
 >;
 
 export type LegacyCondition =

src/data/cloud.ts

@@ -172,23 +172,12 @@ export const removeCloudData = (hass: HomeAssistant) =>
 export const updateCloudGoogleEntityConfig = (
   hass: HomeAssistant,
   entity_id: string,
-  values: { disable_2fa?: boolean; name?: string | null; aliases?: string[] }
+  disable_2fa: boolean
 ) =>
   hass.callWS({
     type: "cloud/google_assistant/entities/update",
     entity_id,
-    ...values,
-  });
-
-export const updateCloudAlexaEntityConfig = (
-  hass: HomeAssistant,
-  entity_id: string,
-  name: string | null
-) =>
-  hass.callWS({
-    type: "cloud/alexa/entities/update",
-    entity_id,
-    name,
+    disable_2fa,
   });
 
 export const cloudSyncGoogleAssistant = (hass: HomeAssistant) =>

src/data/condition.ts

@@ -1,7 +1,7 @@
-import { mdiMapClock, mdiShape } from "@mdi/js";
+import { mdiClockOutline, mdiShape, mdiWeatherSunny } from "@mdi/js";
+import type { Connection } from "home-assistant-js-websocket";
 import { computeDomain } from "../common/entity/compute_domain";
 import { computeObjectId } from "../common/entity/compute_object_id";
-import type { HomeAssistant } from "../types";
 import type { AutomationElementGroupCollection } from "./automation";
 import type { Selector, TargetSelector } from "./selector";
 
@@ -9,9 +9,14 @@ export const CONDITION_COLLECTIONS: AutomationElementGroupCollection[] = [
   {
     groups: {
       dynamicGroups: {},
-      time_location: {
-        icon: mdiMapClock,
-        members: { sun: {}, time: {}, zone: {} },
+      time: {
+        icon: mdiClockOutline,
+        members: { time: {} },
+        domains: ["calendar", "schedule"],
+      },
+      sun: {
+        icon: mdiWeatherSunny,
+        domains: ["sun"],
       },
       helpers: {},
       template: {},
@@ -68,10 +73,10 @@ export interface ConditionDescription {
 export type ConditionDescriptions = Record<string, ConditionDescription>;
 
 export const subscribeConditions = (
-  hass: HomeAssistant,
+  connection: Connection,
   callback: (conditions: ConditionDescriptions) => void
 ) =>
-  hass.connection.subscribeMessage<ConditionDescriptions>(callback, {
+  connection.subscribeMessage<ConditionDescriptions>(callback, {
     type: "condition_platforms/subscribe",
   });
 

src/data/context/index.ts

@@ -12,11 +12,13 @@ import type {
   HomeAssistantUI,
 } from "../../types";
 import type { RelatedIdSets } from "../../common/search/related-context";
+import type { ConditionDescriptions } from "../condition";
 import type { ConfigEntry } from "../config_entries";
 import type { EntityRegistryEntry } from "../entity/entity_registry";
 import type { DomainManifestLookup } from "../integration";
 import type { LabelRegistryEntry } from "../label/label_registry";
 import type { ItemType } from "../search";
+import type { TriggerDescriptions } from "../trigger";
 
 /**
  * Entity, device, area, and floor registries
@@ -131,6 +133,19 @@ export const configEntriesContext =
 export const manifestsContext =
   createContext<DomainManifestLookup>("manifests");
 
+/**
+ * Lazy loaded trigger platform descriptions, keyed by trigger key.
+ */
+export const triggerDescriptionsContext = createContext<TriggerDescriptions>(
+  "triggerDescriptions"
+);
+
+/**
+ * Lazy loaded condition platform descriptions, keyed by condition key.
+ */
+export const conditionDescriptionsContext =
+  createContext<ConditionDescriptions>("conditionDescriptions");
+
 // #endregion lazy-contexts
 
 // #region deprecated-contexts

src/data/energy.ts

@@ -42,6 +42,12 @@ import {
 
 export const ENERGY_COLLECTION_KEY_PREFIX = "energy_";
 
+// Collection key for the statistics-based energy dashboard views (Overview,
+// Electricity, Gas, Water).
+export const DEFAULT_ENERGY_COLLECTION_KEY = "energy_dashboard";
+// Collection key for the real-time "Now" view (live power + 5-minute stats).
+export const DEFAULT_POWER_COLLECTION_KEY = "energy_dashboard_now";
+
 // All collection keys created this session
 const energyCollectionKeys = new Set<string | undefined>();
 
@@ -787,9 +793,30 @@ const findEnergyDataCollection = (
   return (hass.connection as any)[key];
 };
 
+// When does the collection's day period need to roll over to the next day?
+// With `midnightRollover` (the real-time "Now" view) it rolls over right at
+// midnight. Otherwise it waits an hour, until the new day's first hourly
+// statistic exists — rolling over at midnight would show an empty graph.
+export const getNextEnergyPeriodStart = (
+  midnightRollover: boolean,
+  now: Date,
+  locale: HomeAssistant["locale"],
+  config: HomeAssistant["config"]
+): Date => {
+  const dayEnd = calcDate(now, endOfDay, locale, config);
+  return midnightRollover ? addMilliseconds(dayEnd, 1) : addHours(dayEnd, 1);
+};
+
 export const getEnergyDataCollection = (
   hass: HomeAssistant,
-  options: { prefs?: EnergyPreferences; key?: string } = {}
+  options: {
+    prefs?: EnergyPreferences;
+    key?: string;
+    // The real-time "Now" view opts in to rolling its day period over at
+    // midnight rather than an hour later (it shows live data, so it always
+    // tracks today and never falls back to yesterday in the first hour).
+    midnightRollover?: boolean;
+  } = {}
 ): EnergyCollection => {
   const [key, collectionKey] = convertCollectionKeyToConnection(
     hass,
@@ -799,6 +826,8 @@ export const getEnergyDataCollection = (
     return (hass.connection as any)[key];
   }
 
+  const midnightRollover = options.midnightRollover ?? false;
+
   energyCollectionKeys.add(collectionKey);
 
   const collection = getCollection<EnergyData>(
@@ -857,12 +886,16 @@ export const getEnergyDataCollection = (
 
   const now = new Date();
   const hour = formatTime24h(now, hass.locale, hass.config).split(":")[0];
-  // Set start to start of today if we have data for today, otherwise yesterday
+  // Set start to start of today if we have data for today, otherwise yesterday.
+  // The real-time "Now" view always tracks today; it shows live data even
+  // before today's first statistic exists, so it never falls back to yesterday.
   const preferredPeriod =
     (localStorage.getItem(`energy-default-period-${key}`) as DateRange) ||
     "today";
   const period =
-    preferredPeriod === "today" && hour === "0" ? "yesterday" : preferredPeriod;
+    preferredPeriod === "today" && hour === "0" && !midnightRollover
+      ? "yesterday"
+      : preferredPeriod;
 
   const [start, end] = calcDateRange(hass.locale, hass.config, period);
   collection.start = calcDate(start, startOfDay, hass.locale, hass.config);
@@ -886,10 +919,12 @@ export const getEnergyDataCollection = (
         collection.refresh();
         scheduleUpdatePeriod();
       },
-      addHours(
-        calcDate(new Date(), endOfDay, hass.locale, hass.config),
-        1
-      ).getTime() - Date.now() // Switch to next day an hour after the day changed
+      getNextEnergyPeriodStart(
+        midnightRollover,
+        new Date(),
+        hass.locale,
+        hass.config
+      ).getTime() - Date.now()
     );
   };
   scheduleUpdatePeriod();

src/data/entity/entity_picker.ts

@@ -58,7 +58,17 @@ export interface GetEntitiesOptions {
 }
 
 export const getEntities = (
-  hass: HomeAssistant,
+  hass: Pick<
+    HomeAssistant,
+    | "states"
+    | "entities"
+    | "devices"
+    | "areas"
+    | "floors"
+    | "language"
+    | "translationMetadata"
+    | "localize"
+  >,
   options?: GetEntitiesOptions
 ): EntityComboBoxItem[] => {
   const {

src/data/google_assistant.ts

@@ -5,8 +5,6 @@ export interface GoogleEntity {
   traits: string[];
   might_2fa: boolean;
   disable_2fa?: boolean;
-  name?: string | null;
-  aliases?: string[] | null;
 }
 
 export const fetchCloudGoogleEntities = (hass: HomeAssistant) =>

src/data/logbook.ts

@@ -1,5 +1,6 @@
 import type { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
 import { DOMAINS_WITH_DYNAMIC_PICTURE } from "../common/const";
+import type { TimestampStateDomain } from "../common/const";
 import { computeDomain } from "../common/entity/compute_domain";
 import { computeStateDomain } from "../common/entity/compute_state_domain";
 import type { LocalizeFunc } from "../common/translations/localize";
@@ -239,16 +240,53 @@ export const parseTriggerSource = (source: string): ParsedTriggerSource => {
   return {};
 };
 
+// Short label shown instead of the bare timestamp for each timestamp-state
+// domain. Typed to TIMESTAMP_STATE_DOMAINS minus datetime (a real value), so a
+// new timestamp domain won't compile until it gets a label here.
+type LogbookActionMessage =
+  | "pressed"
+  | "activated"
+  | "scanned"
+  | "detected_event_no_type"
+  | "updated"
+  | "sent"
+  | "detected"
+  | "transcribed"
+  | "spoke"
+  | "responded"
+  | "ran"
+  | "command_sent";
+
+const STATE_ACTION_MESSAGES: Record<
+  Exclude<TimestampStateDomain, "datetime">,
+  LogbookActionMessage
+> = {
+  button: "pressed",
+  input_button: "pressed",
+  scene: "activated",
+  tag: "scanned",
+  event: "detected_event_no_type",
+  image: "updated",
+  notify: "sent",
+  wake_word: "detected",
+  stt: "transcribed",
+  tts: "spoke",
+  conversation: "responded",
+  ai_task: "ran",
+  infrared: "command_sent",
+  radio_frequency: "command_sent",
+};
+
 export const localizeStateMessage = (
   hass: HomeAssistant,
   state: string,
   stateObj: HassEntity,
   domain: string
 ): string => {
-  // Events expose a timestamp as their state, which has no meaningful display
-  // value, so keep a dedicated phrase.
-  if (domain === "event") {
-    return hass.localize(`${LOGBOOK_LOCALIZE_PATH}.detected_event_no_type`);
+  const actionKey: LogbookActionMessage | undefined =
+    STATE_ACTION_MESSAGES[domain as keyof typeof STATE_ACTION_MESSAGES];
+  if (actionKey) {
+    return hass.localize(`${LOGBOOK_LOCALIZE_PATH}.${actionKey}`);
   }
   // Every other domain reuses the backend state translation, so the logbook
   // speaks the same vocabulary as the rest of the UI.

src/data/lovelace_custom_cards.ts

@@ -1,6 +1,7 @@
 import type { HassEntity } from "home-assistant-js-websocket";
 import type { HomeAssistant } from "../types";
 import type { LovelaceCardFeatureContext } from "../panels/lovelace/card-features/types";
+import type { LovelaceBadgeConfig } from "./lovelace/config/badge";
 import type { LovelaceCardConfig } from "./lovelace/config/card";
 
 export interface CustomCardSuggestion<
@@ -10,6 +11,13 @@ export interface CustomCardSuggestion<
   config: T;
 }
 
+export interface CustomBadgeSuggestion<
+  T extends LovelaceBadgeConfig = LovelaceBadgeConfig,
+> {
+  label?: string;
+  config: T;
+}
+
 export interface CustomCardEntry {
   type: string;
   name?: string;
@@ -28,6 +36,10 @@ export interface CustomBadgeEntry {
   description?: string;
   preview?: boolean;
   documentationURL?: string;
+  getEntitySuggestion?: (
+    hass: HomeAssistant,
+    entityId: string
+  ) => CustomBadgeSuggestion | CustomBadgeSuggestion[] | null;
 }
 
 export interface CustomCardFeatureEntry {

src/data/radio_frequency.ts

@@ -1,3 +1,5 @@
+import { formatNumber } from "../common/number/format_number";
+import type { FrontendLocaleData } from "./translation";
 import type { HomeAssistant } from "../types";
 
 export const DOMAIN = "radio_frequency";
@@ -20,3 +22,41 @@ export const fetchRadioFrequencyTransmitters = (
   hass.callWS({
     type: "radio_frequency/list",
   });
+
+const FREQUENCY_UNITS: [number, string][] = [
+  [1e9, "GHz"],
+  [1e6, "MHz"],
+  [1e3, "kHz"],
+  [1, "Hz"],
+];
+
+// Format a frequency in hertz using the largest unit that keeps the value >= 1.
+export const formatFrequency = (
+  hz: number,
+  locale: FrontendLocaleData
+): string => {
+  const [divisor, unit] = FREQUENCY_UNITS.find(
+    ([threshold]) => Math.abs(hz) >= threshold
+  ) ?? [1, "Hz"];
+  return `${formatNumber(hz / divisor, locale, {
+    maximumFractionDigits: 3,
+  })} ${unit}`;
+};
+
+// Format a single [min, max] range; collapses to a single value when min === max.
+export const formatFrequencyRange = (
+  range: readonly [number, number],
+  locale: FrontendLocaleData
+): string => {
+  const [min, max] = range;
+  return min === max
+    ? formatFrequency(min, locale)
+    : `${formatFrequency(min, locale)} – ${formatFrequency(max, locale)}`;
+};
+
+// Format a list of frequency ranges into a human-readable, comma-separated string.
+export const formatFrequencyRanges = (
+  ranges: readonly (readonly [number, number])[],
+  locale: FrontendLocaleData
+): string =>
+  ranges.map((range) => formatFrequencyRange(range, locale)).join(", ");

src/data/recorder.ts

@@ -153,6 +153,21 @@ export const getRecorderInfo = (conn: Connection) =>
     type: "recorder/info",
   });
 
+export type EntityRecordingDisabler = "user";
+
+export interface RecorderEntityOptions {
+  recording_disabled_by: EntityRecordingDisabler | null;
+}
+
+export const getRecorderEntityOptions = (
+  hass: Pick<HomeAssistant, "callWS">,
+  entity_id: string
+) =>
+  hass.callWS<RecorderEntityOptions>({
+    type: "recorder/entity_options/get",
+    entity_id,
+  });
+
 export const getStatisticIds = (
   hass: Pick<HomeAssistant, "callWS">,
   statistic_type?: "mean" | "sum"

src/data/trigger.ts

@@ -1,8 +1,8 @@
-import { mdiMapClock, mdiShape } from "@mdi/js";
+import { mdiClockOutline, mdiShape, mdiWeatherSunny } from "@mdi/js";
+import type { Connection } from "home-assistant-js-websocket";
 
 import { computeDomain } from "../common/entity/compute_domain";
 import { computeObjectId } from "../common/entity/compute_object_id";
-import type { HomeAssistant } from "../types";
 import type {
   AutomationElementGroupCollection,
   Trigger,
@@ -14,15 +14,17 @@ export const TRIGGER_COLLECTIONS: AutomationElementGroupCollection[] = [
   {
     groups: {
       dynamicGroups: {},
-      time_location: {
-        icon: mdiMapClock,
+      time: {
+        icon: mdiClockOutline,
         members: {
-          calendar: {},
-          sun: {},
           time: {},
           time_pattern: {},
-          zone: {},
         },
+        domains: ["calendar", "schedule"],
+      },
+      sun: {
+        icon: mdiWeatherSunny,
+        domains: ["sun"],
       },
       event: {},
       geo_location: {},
@@ -73,10 +75,10 @@ export interface TriggerDescription {
 export type TriggerDescriptions = Record<string, TriggerDescription>;
 
 export const subscribeTriggers = (
-  hass: HomeAssistant,
+  connection: Connection,
   callback: (triggers: TriggerDescriptions) => void
 ) =>
-  hass.connection.subscribeMessage<TriggerDescriptions>(callback, {
+  connection.subscribeMessage<TriggerDescriptions>(callback, {
     type: "trigger_platforms/subscribe",
   });
 

src/dialogs/more-info/components/voice/ha-more-info-view-voice-assistant-settings.ts

@@ -1,33 +0,0 @@
-import { html, LitElement, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
-import type { ExtEntityRegistryEntry } from "../../../../data/entity/entity_registry";
-import "../../../../panels/config/voice-assistants/voice-assistant-settings";
-import type { HomeAssistant } from "../../../../types";
-
-@customElement("ha-more-info-view-voice-assistant-settings")
-class MoreInfoViewVoiceAssistantSettings extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public entry!: ExtEntityRegistryEntry;
-
-  @property({ attribute: false }) public params?: { assistant: string };
-
-  protected render() {
-    if (!this.params || !this.entry) {
-      return nothing;
-    }
-
-    return html`<voice-assistant-settings
-      .hass=${this.hass}
-      .entityId=${this.entry.entity_id}
-      .assistant=${this.params.assistant}
-      .entry=${this.entry}
-    ></voice-assistant-settings>`;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-more-info-view-voice-assistant-settings": MoreInfoViewVoiceAssistantSettings;
-  }
-}

src/dialogs/more-info/components/voice/ha-more-info-view-voice-assistants.ts

@@ -7,7 +7,6 @@ import type { ExposeEntitySettings } from "../../../../data/expose";
 import { voiceAssistants } from "../../../../data/expose";
 import "../../../../panels/config/voice-assistants/entity-voice-settings";
 import type { HomeAssistant } from "../../../../types";
-import { showVoiceAssistantSettingsView } from "./show-view-voice-assistant-settings";
 
 @customElement("ha-more-info-view-voice-assistants")
 class MoreInfoViewVoiceAssistants extends LitElement {
@@ -34,19 +33,9 @@ class MoreInfoViewVoiceAssistants extends LitElement {
       .entityId=${this.entry.entity_id}
       .entry=${this.entry}
       .exposed=${this._calculateExposed(this.entry)}
-      @edit-assistant=${this._editAssistant}
     ></entity-voice-settings>`;
   }
 
-  private _editAssistant(ev: CustomEvent) {
-    const assistant = ev.detail.assistant;
-    showVoiceAssistantSettingsView(
-      this,
-      voiceAssistants[assistant].name,
-      assistant
-    );
-  }
-
   static get styles(): CSSResultGroup {
     return [
       css`

src/dialogs/more-info/components/voice/show-view-voice-assistant-settings.ts

@@ -1,17 +0,0 @@
-import { fireEvent } from "../../../../common/dom/fire_event";
-
-export const loadVoiceAssistantSettingsView = () =>
-  import("./ha-more-info-view-voice-assistant-settings");
-
-export const showVoiceAssistantSettingsView = (
-  element: HTMLElement,
-  title: string,
-  assistant: string
-): void => {
-  fireEvent(element, "show-child-view", {
-    viewTag: "ha-more-info-view-voice-assistant-settings",
-    viewImport: loadVoiceAssistantSettingsView,
-    viewTitle: title,
-    viewParams: { assistant },
-  });
-};

src/dialogs/more-info/ha-more-info-dialog.ts

@@ -59,14 +59,12 @@ import {
   getExtendedEntityRegistryEntry,
   updateEntityRegistryEntry,
 } from "../../data/entity/entity_registry";
-import { subscribeLabFeature } from "../../data/labs";
 import type { ItemType } from "../../data/search";
 import { SearchableDomains } from "../../data/search";
 import { DirtyStateProviderMixin } from "../../mixins/dirty-state-provider-mixin";
 import type { EntitySettingsState } from "../../panels/config/entities/entity-registry-settings-editor";
 import type { Helper } from "../../panels/config/helpers/const";
 import { ScrollableFadeMixin } from "../../mixins/scrollable-fade-mixin";
-import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import {
   haStyleDialog,
   haStyleDialogFixedTop,
@@ -126,7 +124,7 @@ const DEFAULT_VIEW: MoreInfoView = "info";
 export class MoreInfoDialog extends DirtyStateProviderMixin<
   EntitySettingsState | Helper | Record<string, string[]> | null,
   "entity-registry" | "helper" | "vacuum-segment-mapping"
->()(SubscribeMixin(ScrollableFadeMixin(LitElement))) {
+>()(ScrollableFadeMixin(LitElement)) {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ type: Boolean, reflect: true }) public large = false;
@@ -163,8 +161,6 @@ export class MoreInfoDialog extends DirtyStateProviderMixin<
 
   @state() private _isEscapeEnabled = true;
 
-  @state() private _newTriggersAndConditions = false;
-
   protected scrollFadeThreshold = 24;
 
   protected get scrollableElement(): HTMLElement | null {
@@ -260,24 +256,11 @@ export class MoreInfoDialog extends DirtyStateProviderMixin<
 
   private _shouldShowAddEntityTo(): boolean {
     return (
-      (this._newTriggersAndConditions && !!this.hass.user?.is_admin) ||
+      !!this.hass.user?.is_admin ||
       !!this.hass.auth.external?.config.hasEntityAddTo
     );
   }
 
-  protected hassSubscribe() {
-    return [
-      subscribeLabFeature(
-        this.hass.connection,
-        "automation",
-        "new_triggers_conditions",
-        (feature) => {
-          this._newTriggersAndConditions = feature.enabled;
-        }
-      ),
-    ];
-  }
-
   private _getDeviceId(): string | null {
     const entity = this.hass.entities[this._entityId!] as
       | EntityRegistryEntry
@@ -1061,8 +1044,7 @@ export class MoreInfoDialog extends DirtyStateProviderMixin<
         }
 
         ha-more-info-history-and-logbook {
-          padding: var(--ha-space-2) var(--ha-space-6) var(--ha-space-6)
-            var(--ha-space-6);
+          padding: var(--ha-space-2) 0 var(--ha-space-6) 0;
           display: block;
         }
 

src/dialogs/more-info/ha-more-info-history.ts

@@ -278,6 +278,7 @@ export class MoreInfoHistory extends LitElement {
         justify-content: space-between;
         align-items: center;
         margin-bottom: var(--ha-space-2);
+        padding-inline: var(--ha-space-6);
       }
       .header > a,
       a:visited {
@@ -290,6 +291,12 @@ export class MoreInfoHistory extends LitElement {
       h2 {
         margin: 0;
       }
+      ha-alert,
+      state-history-charts,
+      statistics-chart {
+        display: block;
+        padding-inline: var(--ha-space-6);
+      }
     `,
   ];
 }

src/dialogs/more-info/ha-more-info-logbook.ts

@@ -70,6 +70,7 @@ export class MoreInfoLogbook extends LitElement {
       css`
         ha-logbook {
           --logbook-max-height: 250px;
+          --logbook-horizontal-padding: var(--ha-space-6);
         }
         @media all and (max-width: 450px), all and (max-height: 500px) {
           ha-logbook {
@@ -82,6 +83,7 @@ export class MoreInfoLogbook extends LitElement {
           justify-content: space-between;
           align-items: center;
           margin-bottom: var(--ha-space-2);
+          padding-inline: var(--ha-space-6);
         }
         .header > a,
         a:visited {

src/dialogs/sidebar/dialog-edit-sidebar.ts

@@ -159,7 +159,7 @@ class DialogEditSidebar extends DirtyStateProviderMixin<SidebarState>()(
       value: panel.url_path,
       label:
         (getPanelTitle(this.hass, panel) || panel.url_path) +
-        `${defaultPanel === panel.url_path ? " (default)" : ""}`,
+        `${defaultPanel === panel.url_path ? ` (${this.hass.localize("ui.sidebar.default")})` : ""}`,
       icon: getPanelIcon(panel),
       iconPath: getPanelIconPath(panel),
       disableHiding: panel.url_path === defaultPanel,

src/fake_data/provide_hass.ts

@@ -1,3 +1,4 @@
+import { ContextProvider } from "@lit/context";
 import type { HassEntities, HassEntity } from "home-assistant-js-websocket";
 import {
   applyThemesOnElement,
@@ -6,6 +7,16 @@ import {
 import { fireEvent } from "../common/dom/fire_event";
 import { computeFormatFunctions } from "../common/translations/entity-state";
 import { computeLocalize } from "../common/translations/localize";
+import {
+  apiContext,
+  configContext,
+  connectionContext,
+  formattersContext,
+  internationalizationContext,
+  registriesContext,
+  uiContext,
+} from "../data/context";
+import { updateHassGroups } from "../data/context/updateContext";
 import type { IconCategory } from "../data/icons";
 import type { EntityRegistryDisplayEntry } from "../data/entity/entity_registry";
 import {
@@ -85,13 +96,55 @@ export interface MockHomeAssistant extends HomeAssistant {
 export const provideHass = (
   elements,
   overrideData: Partial<HomeAssistant> = {},
-  setHassProperty = false
+  setHassProperty = false,
+  // Opt-in to providing the grouped Lit contexts (config, formatters, api, …)
+  // that the real app's root element provides via `contextMixin`. Needed for
+  // gallery demos that render context-consuming components (e.g. the climate
+  // temperature control) without the full app shell.
+  provideContexts = false
 ): MockHomeAssistant => {
   elements = ensureArray(elements);
   // Can happen because we store sidebar, more info etc on hass.
   const baseEl = () => elements[0];
   const hass = (): MockHomeAssistant => baseEl().hass;
 
+  const contextProviders = provideContexts
+    ? {
+        registries: new ContextProvider(baseEl(), {
+          context: registriesContext,
+        }),
+        internationalization: new ContextProvider(baseEl(), {
+          context: internationalizationContext,
+        }),
+        api: new ContextProvider(baseEl(), { context: apiContext }),
+        connection: new ContextProvider(baseEl(), {
+          context: connectionContext,
+        }),
+        ui: new ContextProvider(baseEl(), { context: uiContext }),
+        config: new ContextProvider(baseEl(), { context: configContext }),
+        formatters: new ContextProvider(baseEl(), {
+          context: formattersContext,
+        }),
+      }
+    : undefined;
+
+  const updateContextProviders = (newHass: HomeAssistant) => {
+    if (!contextProviders) {
+      return;
+    }
+    (
+      Object.keys(contextProviders) as (keyof typeof contextProviders)[]
+    ).forEach((group) => {
+      const provider = contextProviders[group];
+      provider.setValue(
+        (updateHassGroups[group] as (h: HomeAssistant, v?: any) => any)(
+          newHass,
+          provider.value
+        )
+      );
+    });
+  };
+
   const wsCommands = {};
   const restResponses: [string | RegExp, MockRestCallback][] = [];
 
@@ -396,6 +449,7 @@ export const provideHass = (
       elements.forEach((el) => {
         el.hass = newHass;
       });
+      updateContextProviders(newHass);
     },
     updateStates,
     updateTranslations,
@@ -457,6 +511,10 @@ export const provideHass = (
         value: value !== null ? value : (stateObj.attributes[attribute] ?? ""),
       },
     ],
+    formatEntityName: (stateObj, type) =>
+      typeof type === "string"
+        ? type
+        : (stateObj.attributes.friendly_name ?? stateObj.entity_id),
     ...overrideData,
   };
 

src/layouts/hass-tabs-subpage-data-table.ts

@@ -793,6 +793,12 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) {
     ha-input-search {
       flex: 1;
     }
+    @media (min-width: 871px) {
+      ha-input-search {
+        --ha-input-search-height: 32px;
+        --ha-input-search-border-radius: 10px;
+      }
+    }
     .search-toolbar {
       display: flex;
       align-items: center;

src/panels/calendar/dialog-calendar-event-editor.ts

@@ -228,7 +228,6 @@ class DialogCalendarEventEditor extends DirtyStateProviderMixin<CalendarEventFor
           ></ha-textarea>
           <ha-entity-picker
             name="calendar"
-            .hass=${this.hass}
             .label=${this.hass.localize("ui.components.calendar.label")}
             .value=${this._calendarId!}
             .includeDomains=${CALENDAR_DOMAINS}

src/panels/config/areas/dialog-area-registry-detail.ts

@@ -251,7 +251,6 @@ class DialogAreaDetail
       >
         <div class="content">
           <ha-entity-picker
-            .hass=${this.hass}
             .label=${this.hass.localize(
               "ui.panel.config.areas.editor.temperature_entity"
             )}
@@ -266,7 +265,6 @@ class DialogAreaDetail
           ></ha-entity-picker>
 
           <ha-entity-picker
-            .hass=${this.hass}
             .label=${this.hass.localize(
               "ui.panel.config.areas.editor.humidity_entity"
             )}

src/panels/config/areas/ha-config-area-page.ts

@@ -14,10 +14,7 @@ import {
   mdiShape,
   mdiTools,
 } from "@mdi/js";
-import type {
-  HassEntity,
-  UnsubscribeFunc,
-} from "home-assistant-js-websocket/dist/types";
+import type { HassEntity } from "home-assistant-js-websocket/dist/types";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -59,7 +56,6 @@ import {
   computeEntityRegistryName,
   sortEntityRegistryByName,
 } from "../../../data/entity/entity_registry";
-import { subscribeLabFeature } from "../../../data/labs";
 import type { SceneEntity } from "../../../data/scene";
 import type { ScriptEntity } from "../../../data/script";
 import type { RelatedResult } from "../../../data/search";
@@ -69,7 +65,6 @@ import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box
 import { showMoreInfoDialog } from "../../../dialogs/more-info/show-ha-more-info-dialog";
 import "../../../layouts/hass-error-screen";
 import "../../../layouts/hass-subpage";
-import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { haStyle } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
 import { isHelperDomain } from "../helpers/const";
@@ -143,7 +138,7 @@ const NAVIGATION_ACTIONS: {
 const MAX_COLUMNS = 3;
 
 @customElement("ha-config-area-page")
-class HaConfigAreaPage extends SubscribeMixin(LitElement) {
+class HaConfigAreaPage extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ attribute: false }) public areaId!: string;
@@ -158,8 +153,6 @@ class HaConfigAreaPage extends SubscribeMixin(LitElement) {
 
   @state() private _related?: RelatedResult;
 
-  @state() private _newTriggersConditions = false;
-
   private _logbookTime = { recent: 86400 };
 
   private _columnsController = createColumnsController(this, MAX_COLUMNS);
@@ -255,23 +248,6 @@ class HaConfigAreaPage extends SubscribeMixin(LitElement) {
     }
   }
 
-  // When new_triggers_conditions labs feature is promoted, this whole method can be removed.
-  protected hassSubscribe(): (UnsubscribeFunc | Promise<UnsubscribeFunc>)[] {
-    if (!isComponentLoaded(this.hass!.config, "automation")) {
-      return [];
-    }
-    return [
-      subscribeLabFeature(
-        this.hass!.connection,
-        "automation",
-        "new_triggers_conditions",
-        (feature) => {
-          this._newTriggersConditions = feature.enabled;
-        }
-      ),
-    ];
-  }
-
   protected render() {
     if (!this.hass.areas || !this.hass.devices || !this.hass.entities) {
       return nothing;
@@ -377,32 +353,26 @@ class HaConfigAreaPage extends SubscribeMixin(LitElement) {
             ></ha-icon-button>
           </div>`
         : nothing}
-      ${area.picture && !this._newTriggersConditions
-        ? nothing
-        : html`<div class="action-buttons">
-            ${area.picture
-              ? nothing
-              : html`<ha-button
-                  appearance="filled"
-                  .entry=${area}
-                  @click=${this._showSettings}
-                >
-                  <ha-svg-icon .path=${mdiImagePlus} slot="start"></ha-svg-icon>
-                  ${this.hass.localize("ui.panel.config.areas.add_picture")}
-                </ha-button>`}
-            ${this._newTriggersConditions
-              ? html`<ha-button
-                  appearance="filled"
-                  variant="brand"
-                  @click=${this._showAddToDialog}
-                >
-                  <ha-svg-icon slot="start" .path=${mdiPlus}></ha-svg-icon>
-                  ${this.hass.localize(
-                    "ui.dialogs.more_info_control.add_to.item"
-                  )}
-                </ha-button>`
-              : nothing}
-          </div>`}
+      <div class="action-buttons">
+        ${area.picture
+          ? nothing
+          : html`<ha-button
+              appearance="filled"
+              .entry=${area}
+              @click=${this._showSettings}
+            >
+              <ha-svg-icon .path=${mdiImagePlus} slot="start"></ha-svg-icon>
+              ${this.hass.localize("ui.panel.config.areas.add_picture")}
+            </ha-button>`}
+        <ha-button
+          appearance="filled"
+          variant="brand"
+          @click=${this._showAddToDialog}
+        >
+          <ha-svg-icon slot="start" .path=${mdiPlus}></ha-svg-icon>
+          ${this.hass.localize("ui.dialogs.more_info_control.add_to.item")}
+        </ha-button>
+      </div>
       <ha-card
         outlined
         .header=${this.hass.localize("ui.panel.config.devices.caption")}

src/panels/config/automation/action/types/ha-automation-action-condition.ts

@@ -1,3 +1,4 @@
+import { consume } from "@lit/context";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -21,10 +22,9 @@ import {
   CONDITION_BUILDING_BLOCKS,
   getConditionDomain,
   getConditionObjectId,
-  subscribeConditions,
 } from "../../../../../data/condition";
+import { conditionDescriptionsContext } from "../../../../../data/context";
 import { domainToName } from "../../../../../data/integration";
-import { SubscribeMixin } from "../../../../../mixins/subscribe-mixin";
 import type { HomeAssistant, ValueChangedEvent } from "../../../../../types";
 import "../../condition/ha-automation-condition-editor";
 import type HaAutomationConditionEditor from "../../condition/ha-automation-condition-editor";
@@ -42,10 +42,7 @@ import "../../condition/types/ha-automation-condition-zone";
 import type { ActionElement } from "../ha-automation-action-row";
 
 @customElement("ha-automation-action-condition")
-export class HaConditionAction
-  extends SubscribeMixin(LitElement)
-  implements ActionElement
-{
+export class HaConditionAction extends LitElement implements ActionElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ type: Boolean }) public disabled = false;
@@ -58,7 +55,9 @@ export class HaConditionAction
 
   @property({ type: Boolean, attribute: "indent" }) public indent = false;
 
-  @state() private _conditionDescriptions: ConditionDescriptions = {};
+  @state()
+  @consume({ context: conditionDescriptionsContext, subscribe: true })
+  private _conditionDescriptions: ConditionDescriptions = {};
 
   @query("ha-automation-condition-editor")
   private _conditionEditor?: HaAutomationConditionEditor;
@@ -67,21 +66,6 @@ export class HaConditionAction
     return { condition: "state" };
   }
 
-  protected hassSubscribe() {
-    return [
-      subscribeConditions(this.hass, (conditions) =>
-        this._addConditions(conditions)
-      ),
-    ];
-  }
-
-  private _addConditions(conditions: ConditionDescriptions) {
-    this._conditionDescriptions = {
-      ...this._conditionDescriptions,
-      ...conditions,
-    };
-  }
-
   protected render() {
     const buildingBlock = CONDITION_BUILDING_BLOCKS.includes(
       this.action.condition

src/panels/config/automation/add-automation-element-dialog.ts

@@ -7,10 +7,7 @@ import {
   mdiHelpCircleOutline,
   mdiPlus,
 } from "@mdi/js";
-import type {
-  HassServiceTarget,
-  UnsubscribeFunc,
-} from "home-assistant-js-websocket";
+import type { HassServiceTarget } from "home-assistant-js-websocket";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
@@ -80,13 +77,16 @@ import {
   CONDITION_COLLECTIONS,
   getConditionDomain,
   getConditionObjectId,
-  subscribeConditions,
 } from "../../../data/condition";
 import {
   getConfigEntries,
   type ConfigEntry,
 } from "../../../data/config_entries";
-import { labelsContext } from "../../../data/context";
+import {
+  conditionDescriptionsContext,
+  labelsContext,
+  triggerDescriptionsContext,
+} from "../../../data/context";
 import { getDeviceEntityLookup } from "../../../data/device/device_registry";
 import type { EntityComboBoxItem } from "../../../data/entity/entity_picker";
 import { getFloorAreaLookup } from "../../../data/floor_registry";
@@ -101,7 +101,6 @@ import {
   fetchIntegrationManifests,
 } from "../../../data/integration";
 import type { LabelRegistryEntry } from "../../../data/label/label_registry";
-import { subscribeLabFeature } from "../../../data/labs";
 import { filterSelectorEntities } from "../../../data/selector";
 import {
   TARGET_SEPARATOR,
@@ -116,7 +115,6 @@ import {
   TRIGGER_COLLECTIONS,
   getTriggerDomain,
   getTriggerObjectId,
-  subscribeTriggers,
 } from "../../../data/trigger";
 import type { HassDialog } from "../../../dialogs/make-dialog-manager";
 import { KeyboardShortcutMixin } from "../../../mixins/keyboard-shortcut-mixin";
@@ -194,6 +192,11 @@ const DYNAMIC_KEYWORDS = [
 
 const DYNAMIC_TO_GENERIC = new Set([`${DYNAMIC_PREFIX}event`]);
 
+// Group keys surfaced as their own section in the "by target" tab because
+// their elements have no target (time/calendar/schedule, sun). Picking one
+// drills into its items, like selecting the matching group in the "by type" tab.
+const TIME_LOCATION_GROUPS = ["time", "sun"];
+
 type CollectionGroupType = "helper" | "other" | "dynamic" | "customDynamic";
 
 @customElement("add-automation-element-dialog")
@@ -227,7 +230,13 @@ class DialogAddAutomationElement
 
   @state() private _narrow = false;
 
-  @state() private _triggerDescriptions: TriggerDescriptions = {};
+  @state()
+  @consume({ context: triggerDescriptionsContext, subscribe: true })
+  private _triggerDescriptions: TriggerDescriptions = {};
+
+  @state()
+  @consume({ context: conditionDescriptionsContext, subscribe: true })
+  private _conditionDescriptions: ConditionDescriptions = {};
 
   @state() private _targetItems?: {
     title: string;
@@ -236,12 +245,8 @@ class DialogAddAutomationElement
 
   @state() private _loadItemsError = false;
 
-  @state() private _newTriggersAndConditions = false;
-
   @state() private _openedFromQuery = false;
 
-  @state() private _conditionDescriptions: ConditionDescriptions = {};
-
   @state()
   @consume({ context: labelsContext, subscribe: true })
   private _labelRegistry!: LabelRegistryEntry[];
@@ -259,10 +264,6 @@ class DialogAddAutomationElement
 
   // #region variables
 
-  private _unsub?: Promise<UnsubscribeFunc>;
-
-  private _unsubscribeLabFeatures?: Promise<UnsubscribeFunc>;
-
   private _configEntryLookup: Record<string, ConfigEntry> = {};
 
   private _closing = false;
@@ -278,31 +279,6 @@ class DialogAddAutomationElement
     ) {
       this._calculateUsedDomains();
     }
-
-    if (changedProps.has("_newTriggersAndConditions")) {
-      this._subscribeDescriptions();
-    }
-  }
-
-  private _subscribeDescriptions() {
-    this._unsubscribe();
-    if (this._params?.type === "trigger") {
-      this._triggerDescriptions = {};
-      this._unsub = subscribeTriggers(this.hass, (triggers) => {
-        this._triggerDescriptions = {
-          ...this._triggerDescriptions,
-          ...triggers,
-        };
-      });
-    } else if (this._params?.type === "condition") {
-      this._conditionDescriptions = {};
-      this._unsub = subscribeConditions(this.hass, (conditions) => {
-        this._conditionDescriptions = {
-          ...this._conditionDescriptions,
-          ...conditions,
-        };
-      });
-    }
   }
 
   public showDialog(params: AddAutomationElementDialogParams): void {
@@ -334,28 +310,9 @@ class DialogAddAutomationElement
 
     this._loadConfigEntries();
 
-    this._unsubscribe();
     this._fetchManifests();
     this._calculateUsedDomains();
 
-    this._unsubscribeLabFeatures = subscribeLabFeature(
-      this.hass.connection,
-      "automation",
-      "new_triggers_conditions",
-      (feature) => {
-        this._newTriggersAndConditions = feature.enabled;
-        this._tab = this._newTriggersAndConditions ? "targets" : "groups";
-        if (
-          queryTarget &&
-          this._newTriggersAndConditions &&
-          !this._selectedTarget
-        ) {
-          this._selectedTarget = queryTarget;
-          this._getItemsByTarget();
-        }
-      }
-    );
-
     if (!queryTarget) {
       // add initial dialog view state to history
       mainWindow.history.pushState(
@@ -372,11 +329,9 @@ class DialogAddAutomationElement
     } else if (this._params?.type === "trigger") {
       this.hass.loadBackendTranslation("triggers");
       getTriggerIcons(this.hass.connection, this.hass.config);
-      this._subscribeDescriptions();
     } else if (this._params?.type === "condition") {
       this.hass.loadBackendTranslation("conditions");
       getConditionIcons(this.hass.connection, this.hass.config);
-      this._subscribeDescriptions();
     }
 
     window.addEventListener("resize", this._updateNarrow);
@@ -385,11 +340,7 @@ class DialogAddAutomationElement
     // prevent view mode switch when resizing window
     this._bottomSheetMode = this._narrow;
 
-    if (
-      queryTarget &&
-      this._newTriggersAndConditions &&
-      !this._selectedTarget
-    ) {
+    if (queryTarget && !this._selectedTarget) {
       this._selectedTarget = queryTarget;
       this._tab = "targets";
       this._getItemsByTarget();
@@ -434,7 +385,6 @@ class DialogAddAutomationElement
     }
 
     this.removeKeyboardShortcuts();
-    this._unsubscribe();
     if (this._params) {
       fireEvent(this, "dialog-closed", { dialog: this.localName });
     }
@@ -450,7 +400,7 @@ class DialogAddAutomationElement
     this._selectedCollectionIndex = undefined;
     this._selectedGroup = undefined;
     this._selectedTarget = undefined;
-    this._tab = this._newTriggersAndConditions ? "targets" : "groups";
+    this._tab = "targets";
     this._filter = "";
     this._manifests = undefined;
     this._domains = undefined;
@@ -589,7 +539,6 @@ class DialogAddAutomationElement
   public disconnectedCallback(): void {
     super.disconnectedCallback();
     window.removeEventListener("resize", this._updateNarrow);
-    this._unsubscribe();
   }
 
   protected supportedShortcuts(): SupportedShortcuts {
@@ -598,39 +547,10 @@ class DialogAddAutomationElement
     };
   }
 
-  private _unsubscribe() {
-    if (this._unsub) {
-      this._unsub.then((unsub) => unsub());
-      this._unsub = undefined;
-    }
-    if (this._unsubscribeLabFeatures) {
-      this._unsubscribeLabFeatures.then((unsub) => unsub());
-      this._unsubscribeLabFeatures = undefined;
-    }
-  }
-
   // #endregion lifecycle
 
   // #region render
 
-  private _getEmptyNote(automationElementType: string) {
-    if (
-      automationElementType !== "trigger" &&
-      automationElementType !== "condition"
-    ) {
-      return undefined;
-    }
-
-    return this.hass.localize(
-      `ui.panel.config.automation.editor.${automationElementType}s.no_items_for_target_note`,
-      {
-        labs_link: html`<a href="/config/labs" @click=${this._close}
-          >${this.hass.localize("ui.panel.config.labs.caption")}</a
-        >`,
-      }
-    );
-  }
-
   protected render() {
     if (!this._params) {
       return nothing;
@@ -664,6 +584,12 @@ class DialogAddAutomationElement
     const automationElementType = this._params!.type;
 
     const tabButtons = [
+      {
+        label: this.hass.localize(
+          "ui.panel.config.automation.editor.tabs.target"
+        ),
+        value: "targets",
+      },
       {
         label: this.hass.localize(
           "ui.panel.config.automation.editor.tabs.type"
@@ -672,15 +598,6 @@ class DialogAddAutomationElement
       },
     ];
 
-    if (this._newTriggersAndConditions) {
-      tabButtons.unshift({
-        label: this.hass.localize(
-          "ui.panel.config.automation.editor.tabs.target"
-        ),
-        value: "targets",
-      });
-    }
-
     if (this._params?.type !== "trigger") {
       tabButtons.push({
         label: this.hass.localize("ui.panel.config.automation.editor.blocks"),
@@ -763,7 +680,6 @@ class DialogAddAutomationElement
                 this._manifests
               )}
               .convertToItem=${this._convertToItem}
-              .newTriggersAndConditions=${this._newTriggersAndConditions}
               @search-element-picked=${this._searchItemSelected}
             >
             </ha-automation-add-search>`
@@ -772,13 +688,28 @@ class DialogAddAutomationElement
                 .hass=${this.hass}
                 .value=${this._selectedTarget}
                 @value-changed=${this._handleTargetSelected}
+                @time-location-group-selected=${this
+                  ._handleTimeLocationGroupSelected}
                 .narrow=${this._narrow}
+                .timeLocationLabel=${this._getTimeLocationLabel(
+                  automationElementType
+                )}
+                .timeLocationGroups=${this._getTimeLocationGroups(
+                  automationElementType,
+                  this.hass.localize,
+                  automationElementType === "condition"
+                    ? this._conditionDescriptions
+                    : this._triggerDescriptions
+                )}
+                .selectedGroup=${this._selectedGroup}
                 class=${classMap({
                   "ha-scrollbar": true,
-                  hidden: !!this._getAddFromTargetHidden(
-                    this._narrow,
-                    this._selectedTarget
-                  ),
+                  hidden:
+                    !!this._getAddFromTargetHidden(
+                      this._narrow,
+                      this._selectedTarget
+                    ) ||
+                    (this._narrow && !!this._selectedGroup),
                 })}
                 .manifests=${this._manifests}
               ></ha-automation-add-from-target>`
@@ -884,13 +815,13 @@ class DialogAddAutomationElement
                     )
                   : undefined}
                 .selectLabel=${this.hass.localize(
-                  `ui.panel.config.automation.editor.${this._tab === "groups" ? `${automationElementType}s.select` : "select_target"}` as LocalizeKeys
+                  `ui.panel.config.automation.editor.${this._tab === "groups" || this._selectedGroup ? `${automationElementType}s.select` : "select_target"}` as LocalizeKeys
                 )}
                 .emptyLabel=${this.hass.localize(
                   `ui.panel.config.automation.editor.${automationElementType}s.no_items_for_target`
                 )}
-                .emptyNote=${this._getEmptyNote(automationElementType)}
-                .tooltipDescription=${this._tab === "targets"}
+                .tooltipDescription=${this._tab === "targets" &&
+                !this._selectedGroup}
                 .target=${(this._tab === "targets" &&
                   this._selectedTarget &&
                   ([
@@ -1050,7 +981,7 @@ class DialogAddAutomationElement
             items: this._getBlockItems(this._params!.type, this.hass.localize),
           },
         ]
-      : !this._filter && this._tab === "groups" && this._selectedGroup
+      : !this._filter && this._selectedGroup
         ? [
             {
               title: this.hass.localize(
@@ -1108,7 +1039,10 @@ class DialogAddAutomationElement
         Object.entries(grp).map(([key, options]) =>
           options.members
             ? flattenGroups(options.members)
-            : this._convertToItem(key, options, type, localize)
+            : options.domains
+              ? // domain elements are appended below from the backend descriptions
+                []
+              : this._convertToItem(key, options, type, localize)
         );
 
       const items = flattenGroups(groups).flat();
@@ -1149,6 +1083,8 @@ class DialogAddAutomationElement
       let genericCollectionIndex = -1;
       let dynamicCollectionIndex = -1;
 
+      const exclusiveDomains = this._getExclusiveDomains(type);
+
       collections.forEach((collection, index) => {
         let collectionGroups = Object.entries(collection.groups);
         const groups: AddAutomationElementListItem[] = [];
@@ -1179,7 +1115,8 @@ class DialogAddAutomationElement
               triggerDescriptions,
               manifests,
               domains,
-              types
+              types,
+              exclusiveDomains
             )
           );
 
@@ -1198,7 +1135,8 @@ class DialogAddAutomationElement
               conditionDescriptions,
               manifests,
               domains,
-              types
+              types,
+              exclusiveDomains
             )
           );
 
@@ -1231,9 +1169,19 @@ class DialogAddAutomationElement
         }
 
         groups.push(
-          ...collectionGroups.map(([key, options]) =>
-            this._convertToItem(key, options, type, localize)
-          )
+          ...collectionGroups
+            .filter(([, options]) =>
+              this._groupHasItems(
+                type,
+                options,
+                type === "condition"
+                  ? conditionDescriptions
+                  : triggerDescriptions
+              )
+            )
+            .map(([key, options]) =>
+              this._convertToItem(key, options, type, localize)
+            )
         );
 
         if (groups.length) {
@@ -1330,11 +1278,28 @@ class DialogAddAutomationElement
         return this._services(localize, services, manifests, group);
       }
 
-      const groups = this._getGroups(type, group, collectionIndex);
+      const groupDef =
+        TYPES[type].collections[collectionIndex]?.groups[group] ??
+        TYPES[type].collections.find((collection) => group in collection.groups)
+          ?.groups[group];
 
-      const result = Object.entries(groups).map(([key, options]) =>
-        this._convertToItem(key, options, type, localize)
-      );
+      let result: AddAutomationElementListItem[];
+
+      if (groupDef?.domains && !groupDef.members) {
+        // Curated group whose items come solely from backend domains (e.g. Sun).
+        result = this._getDomainElementItems(type, groupDef.domains, localize);
+      } else {
+        const groups = this._getGroups(type, group, collectionIndex);
+        result = Object.entries(groups).map(([key, options]) =>
+          this._convertToItem(key, options, type, localize)
+        );
+        if (groupDef?.domains) {
+          // Curated group with both static members and backend domains (Time).
+          result.push(
+            ...this._getDomainElementItems(type, groupDef.domains, localize)
+          );
+        }
+      }
 
       if (type === "action") {
         if (!this._selectedGroup) {
@@ -1454,7 +1419,8 @@ class DialogAddAutomationElement
     triggers: TriggerDescriptions,
     manifests: DomainManifestLookup | undefined,
     domains: Set<string> | undefined,
-    types: CollectionGroupType[]
+    types: CollectionGroupType[],
+    exclusiveDomains: Set<string>
   ): AddAutomationElementListItem[] => {
     if (!triggers || !manifests) {
       return [];
@@ -1464,7 +1430,7 @@ class DialogAddAutomationElement
     Object.keys(triggers).forEach((trigger) => {
       const domain = getTriggerDomain(trigger);
 
-      if (addedDomains.has(domain)) {
+      if (addedDomains.has(domain) || exclusiveDomains.has(domain)) {
         return;
       }
       addedDomains.add(domain);
@@ -1526,7 +1492,8 @@ class DialogAddAutomationElement
     conditions: ConditionDescriptions,
     manifests: DomainManifestLookup | undefined,
     domains: Set<string> | undefined,
-    types: CollectionGroupType[]
+    types: CollectionGroupType[],
+    exclusiveDomains: Set<string>
   ): AddAutomationElementListItem[] => {
     if (!conditions || !manifests) {
       return [];
@@ -1536,7 +1503,7 @@ class DialogAddAutomationElement
     Object.keys(conditions).forEach((condition) => {
       const domain = getConditionDomain(condition);
 
-      if (addedDomains.has(domain)) {
+      if (addedDomains.has(domain) || exclusiveDomains.has(domain)) {
         return;
       }
       addedDomains.add(domain);
@@ -1796,22 +1763,93 @@ class DialogAddAutomationElement
     options,
     type: AddAutomationElementDialogParams["type"],
     localize: LocalizeFunc
-  ): AddAutomationElementListItem => ({
-    key,
-    name: localize(
-      // @ts-ignore
-      `ui.panel.config.automation.editor.${type}s.${
-        options.members ? "groups" : "type"
-      }.${key}.label`
-    ),
-    description: localize(
-      // @ts-ignore
-      `ui.panel.config.automation.editor.${type}s.${
-        options.members ? "groups" : "type"
-      }.${key}.description${options.members ? "" : ".picker"}`
-    ),
-    iconPath: options.icon || TYPES[type].icons[key],
-  });
+  ): AddAutomationElementListItem => {
+    // A group either lists explicit members or bundles backend element domains.
+    const isGroup = !!(options.members || options.domains);
+    return {
+      key,
+      name: localize(
+        // @ts-ignore
+        `ui.panel.config.automation.editor.${type}s.${
+          isGroup ? "groups" : "type"
+        }.${key}.label`
+      ),
+      description: localize(
+        // @ts-ignore
+        `ui.panel.config.automation.editor.${type}s.${
+          isGroup ? "groups" : "type"
+        }.${key}.description${isGroup ? "" : ".picker"}`
+      ),
+      iconPath: options.icon || TYPES[type].icons[key],
+    };
+  };
+
+  // Domains owned exclusively by a curated group, i.e. a group that bundles
+  // only domains and no static members (e.g. "sun" under the Sun group). Those
+  // are hidden from the generic dynamic domain grouping so they don't appear
+  // both standalone and inside the curated group. Domains of a mixed group
+  // (static members + domains, e.g. "calendar"/"schedule" under Time) are NOT
+  // hidden — they still surface as their own domain group as well.
+  private _getExclusiveDomains = memoizeOne(
+    (type: AddAutomationElementDialogParams["type"]): Set<string> => {
+      const domains = new Set<string>();
+      TYPES[type].collections.forEach((collection) =>
+        Object.values(collection.groups).forEach((group) => {
+          if (group.domains && !group.members) {
+            group.domains.forEach((domain) => domains.add(domain));
+          }
+        })
+      );
+      return domains;
+    }
+  );
+
+  private _getDomainElementItems(
+    type: AddAutomationElementDialogParams["type"],
+    domains: string[],
+    localize: LocalizeFunc
+  ): AddAutomationElementListItem[] {
+    const domainSet = new Set(domains);
+    if (type === "trigger") {
+      return Object.keys(this._triggerDescriptions)
+        .filter((trigger) => domainSet.has(getTriggerDomain(trigger)))
+        .map((trigger) =>
+          this._getTriggerListItem(localize, getTriggerDomain(trigger), trigger)
+        );
+    }
+    if (type === "condition") {
+      return Object.keys(this._conditionDescriptions)
+        .filter((condition) => domainSet.has(getConditionDomain(condition)))
+        .map((condition) =>
+          this._getConditionListItem(
+            localize,
+            getConditionDomain(condition),
+            condition
+          )
+        );
+    }
+    return [];
+  }
+
+  private _groupHasItems(
+    type: AddAutomationElementDialogParams["type"],
+    options: { members?: object; domains?: string[] },
+    descriptions: TriggerDescriptions | ConditionDescriptions
+  ): boolean {
+    if (options.members && Object.keys(options.members).length) {
+      return true;
+    }
+    if (options.domains) {
+      const domainSet = new Set(options.domains);
+      const getDomain =
+        type === "condition" ? getConditionDomain : getTriggerDomain;
+      return Object.keys(descriptions).some((key) =>
+        domainSet.has(getDomain(key))
+      );
+    }
+    // plain single-element group
+    return true;
+  }
 
   private _getDomainGroupedListItems(
     localize: LocalizeFunc,
@@ -2055,6 +2093,8 @@ class DialogAddAutomationElement
   ) => {
     this._targetItems = undefined;
     this._loadItemsError = false;
+    this._selectedGroup = undefined;
+    this._selectedCollectionIndex = undefined;
     this._selectedTarget = ev.detail.value;
     mainWindow.history.pushState(
       {
@@ -2076,6 +2116,67 @@ class DialogAddAutomationElement
     this._getItemsByTarget();
   };
 
+  // Time & location groups have no target; picking one drills into its items
+  // (the same list as the matching group in the "by type" tab).
+  private _handleTimeLocationGroupSelected = (
+    ev: ValueChangedEvent<string>
+  ) => {
+    this._targetItems = undefined;
+    this._loadItemsError = false;
+    this._selectedTarget = undefined;
+    this._selectedGroup = ev.detail.value;
+    this._selectedCollectionIndex = 0;
+    mainWindow.history.pushState(
+      {
+        dialogData: {
+          group: this._selectedGroup,
+          collectionIndex: this._selectedCollectionIndex,
+        },
+      },
+      ""
+    );
+
+    requestAnimationFrame(() => {
+      if (this._narrow) {
+        this._contentElement?.scrollTo(0, 0);
+      } else {
+        this._itemsListElement?.scrollTo(0, 0);
+      }
+    });
+  };
+
+  private _getTimeLocationLabel(
+    type: AddAutomationElementDialogParams["type"]
+  ): string | undefined {
+    if (type !== "trigger" && type !== "condition") {
+      return undefined;
+    }
+    return this.hass.localize("ui.panel.config.automation.editor.time_sun");
+  }
+
+  private _getTimeLocationGroups = memoizeOne(
+    (
+      type: AddAutomationElementDialogParams["type"],
+      localize: LocalizeFunc,
+      descriptions: TriggerDescriptions | ConditionDescriptions
+    ): AddAutomationElementListItem[] => {
+      if (type !== "trigger" && type !== "condition") {
+        return [];
+      }
+      return TIME_LOCATION_GROUPS.map(
+        (group) => [group, TYPES[type].collections[0].groups[group]] as const
+      )
+        .filter(
+          ([, options]) =>
+            options && this._groupHasItems(type, options, descriptions)
+        )
+        .map(([group, options]) =>
+          this._convertToItem(group, options, type, localize)
+        )
+        .filter((item) => item.name);
+    }
+  );
+
   private _getDefaultStateItems(
     type: "trigger" | "condition"
   ): AddAutomationElementListItem[] {

src/panels/config/automation/add-automation-element/ha-automation-add-from-target.ts

@@ -63,6 +63,7 @@ import {
 } from "../../../../data/target";
 import type { HomeAssistant } from "../../../../types";
 import { brandsUrl } from "../../../../util/brands-url";
+import type { AddAutomationElementListItem } from "../add-automation-element-dialog";
 
 interface Level1Entries {
   open: boolean;
@@ -93,6 +94,16 @@ export default class HaAutomationAddFromTarget extends LitElement {
 
   @property({ attribute: false }) public manifests?: DomainManifestLookup;
 
+  // Section title + group rows (Time, Location) for the targetless element
+  // groups. Picking a row drills into that group's items, just like selecting
+  // the matching group in the "by type" tab.
+  @property({ attribute: false }) public timeLocationLabel?: string;
+
+  @property({ attribute: false })
+  public timeLocationGroups?: AddAutomationElementListItem[];
+
+  @property({ attribute: false }) public selectedGroup?: string;
+
   // #endregion properties
 
   // #region context
@@ -182,8 +193,20 @@ export default class HaAutomationAddFromTarget extends LitElement {
         ? this._renderNarrow(this._entries, this.value)
         : html`
             ${this._renderFloors(this.narrow, this._entries, this.value)}
+            ${this._renderTimeLocation(
+              this.narrow,
+              this.timeLocationLabel,
+              this.timeLocationGroups,
+              this.selectedGroup
+            )}
             ${this._renderUnassigned(this.narrow, this._entries, this.value)}
-            ${this._renderLabels(this.narrow, this.value)}
+            ${this._renderLabels(
+              this.narrow,
+              this.states,
+              this._registries,
+              this._labelRegistry,
+              this.value
+            )}
           `}
       ${this.narrow && this._showShowMoreButton && !this._fullHeight
         ? html`
@@ -343,14 +366,58 @@ export default class HaAutomationAddFromTarget extends LitElement {
     }
   );
 
+  private _renderTimeLocation = memoizeOne(
+    (
+      narrow: boolean,
+      label?: string,
+      groups?: AddAutomationElementListItem[],
+      selectedGroup?: string
+    ) => {
+      if (!label || !groups?.length) {
+        return nothing;
+      }
+
+      return html`<ha-section-title>${label}</ha-section-title>
+        <ha-list-base>
+          ${groups.map(
+            (group) =>
+              html`<ha-list-item-button
+                .value=${group.key}
+                @click=${this._selectTimeLocationGroup}
+                class=${group.key === selectedGroup ? "selected" : ""}
+              >
+                ${group.icon
+                  ? html`<span slot="start">${group.icon}</span>`
+                  : group.iconPath
+                    ? html`<ha-svg-icon
+                        slot="start"
+                        .path=${group.iconPath}
+                      ></ha-svg-icon>`
+                    : nothing}
+                <div slot="headline">${group.name}</div>
+                ${narrow
+                  ? html`<ha-icon-next slot="end"></ha-icon-next>`
+                  : nothing}
+              </ha-list-item-button>`
+          )}
+        </ha-list-base>`;
+    }
+  );
+
   private _renderLabels = memoizeOne(
-    (narrow: boolean, value?: SingleHassServiceTarget) => {
+    (
+      narrow: boolean,
+      states: ContextType<typeof statesContext>,
+      registries: ContextType<typeof registriesContext>,
+      labelRegistry: LabelRegistryEntry[],
+      value?: SingleHassServiceTarget
+    ) => {
       const labels = this._getLabelsMemoized(
-        this.states,
-        this._registries.areas,
-        this._registries.devices,
-        this._registries.entities,
-        this._labelRegistry,
+        states,
+        registries.areas,
+        registries.devices,
+        registries.entities,
+        labelRegistry,
         undefined,
         undefined,
         undefined,
@@ -1173,6 +1240,13 @@ export default class HaAutomationAddFromTarget extends LitElement {
     }
   }
 
+  private _selectTimeLocationGroup(ev: CustomEvent) {
+    const value = (ev.currentTarget as any).value;
+    if (value) {
+      fireEvent(this, "time-location-group-selected", { value });
+    }
+  }
+
   private async _valueChanged(itemId: string, expand = false) {
     const [type, id] = itemId.split(TARGET_SEPARATOR, 2);
 
@@ -1512,4 +1586,7 @@ declare global {
   interface HTMLElementTagNameMap {
     "ha-automation-add-from-target": HaAutomationAddFromTarget;
   }
+  interface HASSDomEvents {
+    "time-location-group-selected": { value: string };
+  }
 }

src/panels/config/automation/add-automation-element/ha-automation-add-items.ts

@@ -1,5 +1,5 @@
 import { mdiInformationOutline, mdiPlus } from "@mdi/js";
-import { LitElement, css, html, nothing, type TemplateResult } from "lit";
+import { LitElement, css, html, nothing } from "lit";
 import {
   customElement,
   eventOptions,
@@ -40,8 +40,6 @@ export class HaAutomationAddItems extends LitElement {
 
   @property({ attribute: "empty-label" }) public emptyLabel!: string;
 
-  @property({ attribute: false }) public emptyNote?: string | TemplateResult;
-
   @property({ attribute: false }) public target?: Target;
 
   @property({ attribute: false }) public getLabel!: (
@@ -83,9 +81,6 @@ export class HaAutomationAddItems extends LitElement {
             ? html`${this.emptyLabel}
               ${this.target
                 ? html`<div>${this._renderTarget(this.target)}</div>`
-                : nothing}
-              ${this.emptyNote
-                ? html`<div class="empty-note">${this.emptyNote}</div>`
                 : nothing}`
             : repeat(
                 this.items,
@@ -232,17 +227,6 @@ export class HaAutomationAddItems extends LitElement {
         justify-content: center;
       }
 
-      .empty-note {
-        color: var(--ha-color-text-secondary);
-        margin-top: var(--ha-space-2);
-        text-align: center;
-      }
-
-      .empty-note a {
-        color: currentColor;
-        text-decoration: underline;
-      }
-
       .items.error {
         background-color: var(--ha-color-fill-danger-quiet-resting);
         color: var(--ha-color-on-danger-normal);

src/panels/config/automation/add-automation-element/ha-automation-add-search.ts

@@ -117,9 +117,6 @@ export class HaAutomationAddSearch extends LitElement {
 
   @property({ type: Boolean }) public narrow = false;
 
-  @property({ type: Boolean, attribute: "new-triggers-and-conditions" })
-  public newTriggersAndConditions = false;
-
   @property({ attribute: false })
   public convertToItem!: (
     key: string,
@@ -209,7 +206,6 @@ export class HaAutomationAddSearch extends LitElement {
       this.filter,
       this.configEntryLookup,
       this.items,
-      this.newTriggersAndConditions,
       this._selectedSearchSection,
       this._relatedIdSets
     );
@@ -260,19 +256,13 @@ export class HaAutomationAddSearch extends LitElement {
   }
 
   private _renderSections() {
-    if (this.addElementType === "trigger" && !this.newTriggersAndConditions) {
-      return nothing;
-    }
-
     const searchSections: ("separator" | SearchSection)[] = ["item"];
 
     if (this.addElementType !== "trigger") {
       searchSections.push("block");
     }
 
-    if (this.newTriggersAndConditions) {
-      searchSections.push(...TARGET_SEARCH_SECTIONS);
-    }
+    searchSections.push(...TARGET_SEARCH_SECTIONS);
     return html`
       <ha-chip-set class="sections">
         ${searchSections.map((section) =>
@@ -502,7 +492,6 @@ export class HaAutomationAddSearch extends LitElement {
       searchTerm: string,
       configEntryLookup: Record<string, ConfigEntry>,
       automationItems: AddAutomationElementListItem[],
-      newTriggersAndConditions: boolean,
       selectedSection?: SearchSection,
       relatedIdSets?: RelatedIdSets
     ) => {
@@ -570,191 +559,185 @@ export class HaAutomationAddSearch extends LitElement {
         resultItems.push(...blocks);
       }
 
-      if (newTriggersAndConditions) {
-        if (!selectedSection || selectedSection === "entity") {
-          let entityItems = this._getEntitiesMemoized(
-            this.hass,
-            `entity${TARGET_SEPARATOR}`
-          );
+      if (!selectedSection || selectedSection === "entity") {
+        let entityItems = this._getEntitiesMemoized(
+          this.hass,
+          `entity${TARGET_SEPARATOR}`
+        );
 
-          if (relatedIdSets?.entities.size) {
-            entityItems = entityItems.map((item) => ({
-              ...item,
-              isRelated: relatedIdSets.entities.has(
-                (item as EntityComboBoxItem).stateObj?.entity_id || ""
-              ),
-            })) as EntityComboBoxItem[];
-          }
-
-          if (searchTerm) {
-            entityItems = sortRelatedFirst(
-              this._filterGroup(
-                "entity",
-                entityItems,
-                searchTerm,
-                entityComboBoxKeys
-              )
-            ) as EntityComboBoxItem[];
-          } else if (relatedIdSets?.entities.size) {
-            entityItems = sortRelatedFirst(entityItems) as EntityComboBoxItem[];
-          }
-
-          if (!selectedSection && entityItems.length) {
-            // show group title
-            resultItems.push(
-              localize("ui.components.target-picker.type.entities")
-            );
-          }
-
-          resultItems.push(...entityItems);
-        }
-
-        if (!selectedSection || selectedSection === "device") {
-          let deviceItems = this._getDevicesMemoized(
-            this.hass,
-            configEntryLookup,
-            `device${TARGET_SEPARATOR}`
-          );
-
-          if (relatedIdSets?.devices.size) {
-            deviceItems = deviceItems.map((item) => ({
-              ...item,
-              isRelated: relatedIdSets.devices.has(
-                item.id.split(TARGET_SEPARATOR)[1] || ""
-              ),
-            }));
-          }
-
-          if (searchTerm) {
-            deviceItems = sortRelatedFirst(
-              this._filterGroup(
-                "device",
-                deviceItems,
-                searchTerm,
-                deviceComboBoxKeys
-              )
-            );
-          } else if (relatedIdSets?.devices.size) {
-            deviceItems = sortRelatedFirst(deviceItems);
-          }
-
-          if (!selectedSection && deviceItems.length) {
-            // show group title
-            resultItems.push(
-              localize("ui.components.target-picker.type.devices")
-            );
-          }
-
-          resultItems.push(...deviceItems);
-        }
-
-        if (!selectedSection || selectedSection === "area") {
-          let areasAndFloors = this._getAreasAndFloorsMemoized(
-            this.hass.states,
-            this.hass.floors,
-            this.hass.areas,
-            this.hass.devices,
-            this.hass.entities,
-            memoizeOne((value: AreaFloorValue): string =>
-              [value.type, value.id].join(TARGET_SEPARATOR)
+        if (relatedIdSets?.entities.size) {
+          entityItems = entityItems.map((item) => ({
+            ...item,
+            isRelated: relatedIdSets.entities.has(
+              (item as EntityComboBoxItem).stateObj?.entity_id || ""
             ),
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined
-          );
-
-          if (relatedIdSets?.areas.size) {
-            areasAndFloors = areasAndFloors.map((item) => ({
-              ...item,
-              isRelated:
-                item.type === "area"
-                  ? relatedIdSets.areas.has(
-                      item.id.split(TARGET_SEPARATOR)[1] || ""
-                    )
-                  : false,
-            })) as FloorComboBoxItem[];
-          }
-
-          if (searchTerm) {
-            areasAndFloors = sortRelatedFirst(
-              this._filterGroup(
-                "area",
-                areasAndFloors,
-                searchTerm,
-                areaFloorComboBoxKeys,
-                false
-              )
-            ) as FloorComboBoxItem[];
-          } else if (relatedIdSets?.areas.size) {
-            areasAndFloors = sortRelatedFirst(
-              areasAndFloors
-            ) as FloorComboBoxItem[];
-          }
-
-          if (!selectedSection && areasAndFloors.length) {
-            // show group title
-            resultItems.push(
-              localize("ui.components.target-picker.type.areas")
-            );
-          }
-
-          resultItems.push(
-            ...areasAndFloors.map((item, index) => {
-              const nextItem = areasAndFloors[index + 1];
-
-              if (
-                !nextItem ||
-                (item.type === "area" && nextItem.type === "floor")
-              ) {
-                return {
-                  ...item,
-                  last: true,
-                };
-              }
-
-              return item;
-            })
-          );
+          })) as EntityComboBoxItem[];
         }
 
-        if (!selectedSection || selectedSection === "label") {
-          let labels = this._getLabelsMemoized(
-            this.hass.states,
-            this.hass.areas,
-            this.hass.devices,
-            this.hass.entities,
-            this._labelRegistry,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            `label${TARGET_SEPARATOR}`
-          );
-
-          if (searchTerm) {
-            labels = this._filterGroup(
-              "label",
-              labels,
+        if (searchTerm) {
+          entityItems = sortRelatedFirst(
+            this._filterGroup(
+              "entity",
+              entityItems,
               searchTerm,
-              labelComboBoxKeys
-            );
-          }
-
-          if (!selectedSection && labels.length) {
-            // show group title
-            resultItems.push(
-              localize("ui.components.target-picker.type.labels")
-            );
-          }
-
-          resultItems.push(...labels);
+              entityComboBoxKeys
+            )
+          ) as EntityComboBoxItem[];
+        } else if (relatedIdSets?.entities.size) {
+          entityItems = sortRelatedFirst(entityItems) as EntityComboBoxItem[];
         }
+
+        if (!selectedSection && entityItems.length) {
+          // show group title
+          resultItems.push(
+            localize("ui.components.target-picker.type.entities")
+          );
+        }
+
+        resultItems.push(...entityItems);
+      }
+
+      if (!selectedSection || selectedSection === "device") {
+        let deviceItems = this._getDevicesMemoized(
+          this.hass,
+          configEntryLookup,
+          `device${TARGET_SEPARATOR}`
+        );
+
+        if (relatedIdSets?.devices.size) {
+          deviceItems = deviceItems.map((item) => ({
+            ...item,
+            isRelated: relatedIdSets.devices.has(
+              item.id.split(TARGET_SEPARATOR)[1] || ""
+            ),
+          }));
+        }
+
+        if (searchTerm) {
+          deviceItems = sortRelatedFirst(
+            this._filterGroup(
+              "device",
+              deviceItems,
+              searchTerm,
+              deviceComboBoxKeys
+            )
+          );
+        } else if (relatedIdSets?.devices.size) {
+          deviceItems = sortRelatedFirst(deviceItems);
+        }
+
+        if (!selectedSection && deviceItems.length) {
+          // show group title
+          resultItems.push(
+            localize("ui.components.target-picker.type.devices")
+          );
+        }
+
+        resultItems.push(...deviceItems);
+      }
+
+      if (!selectedSection || selectedSection === "area") {
+        let areasAndFloors = this._getAreasAndFloorsMemoized(
+          this.hass.states,
+          this.hass.floors,
+          this.hass.areas,
+          this.hass.devices,
+          this.hass.entities,
+          memoizeOne((value: AreaFloorValue): string =>
+            [value.type, value.id].join(TARGET_SEPARATOR)
+          ),
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined
+        );
+
+        if (relatedIdSets?.areas.size) {
+          areasAndFloors = areasAndFloors.map((item) => ({
+            ...item,
+            isRelated:
+              item.type === "area"
+                ? relatedIdSets.areas.has(
+                    item.id.split(TARGET_SEPARATOR)[1] || ""
+                  )
+                : false,
+          })) as FloorComboBoxItem[];
+        }
+
+        if (searchTerm) {
+          areasAndFloors = sortRelatedFirst(
+            this._filterGroup(
+              "area",
+              areasAndFloors,
+              searchTerm,
+              areaFloorComboBoxKeys,
+              false
+            )
+          ) as FloorComboBoxItem[];
+        } else if (relatedIdSets?.areas.size) {
+          areasAndFloors = sortRelatedFirst(
+            areasAndFloors
+          ) as FloorComboBoxItem[];
+        }
+
+        if (!selectedSection && areasAndFloors.length) {
+          // show group title
+          resultItems.push(localize("ui.components.target-picker.type.areas"));
+        }
+
+        resultItems.push(
+          ...areasAndFloors.map((item, index) => {
+            const nextItem = areasAndFloors[index + 1];
+
+            if (
+              !nextItem ||
+              (item.type === "area" && nextItem.type === "floor")
+            ) {
+              return {
+                ...item,
+                last: true,
+              };
+            }
+
+            return item;
+          })
+        );
+      }
+
+      if (!selectedSection || selectedSection === "label") {
+        let labels = this._getLabelsMemoized(
+          this.hass.states,
+          this.hass.areas,
+          this.hass.devices,
+          this.hass.entities,
+          this._labelRegistry,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          undefined,
+          `label${TARGET_SEPARATOR}`
+        );
+
+        if (searchTerm) {
+          labels = this._filterGroup(
+            "label",
+            labels,
+            searchTerm,
+            labelComboBoxKeys
+          );
+        }
+
+        if (!selectedSection && labels.length) {
+          // show group title
+          resultItems.push(localize("ui.components.target-picker.type.labels"));
+        }
+
+        resultItems.push(...labels);
       }
 
       return resultItems;

src/panels/config/automation/condition/ha-automation-condition.ts

@@ -1,9 +1,7 @@
+import { consume } from "@lit/context";
 import { mdiDragHorizontalVariant, mdiPlus } from "@mdi/js";
 import deepClone from "deep-clone-simple";
-import type {
-  HassServiceTarget,
-  UnsubscribeFunc,
-} from "home-assistant-js-websocket";
+import type { HassServiceTarget } from "home-assistant-js-websocket";
 import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, queryAll, state } from "lit/decorators";
@@ -19,12 +17,8 @@ import {
   type Condition,
 } from "../../../../data/automation";
 import type { ConditionDescriptions } from "../../../../data/condition";
-import {
-  CONDITION_BUILDING_BLOCKS,
-  subscribeConditions,
-} from "../../../../data/condition";
-import { subscribeLabFeature } from "../../../../data/labs";
-import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
+import { CONDITION_BUILDING_BLOCKS } from "../../../../data/condition";
+import { conditionDescriptionsContext } from "../../../../data/context";
 import { EDITOR_SAVE_FAB_TOAST_BOTTOM_OFFSET } from "../editor-toast";
 import {
   getAddAutomationElementTargetFromQuery,
@@ -38,7 +32,7 @@ import type HaAutomationConditionRow from "./ha-automation-condition-row";
 
 @customElement("ha-automation-condition")
 export default class HaAutomationCondition extends AutomationSortableListMixin<Condition>(
-  SubscribeMixin(LitElement)
+  LitElement
 ) {
   @property({ attribute: false }) public conditions!: Condition[];
 
@@ -48,16 +42,13 @@ export default class HaAutomationCondition extends AutomationSortableListMixin<C
 
   @property({ type: Boolean, attribute: false }) public editorDirty = false;
 
-  @state() private _conditionDescriptions: ConditionDescriptions = {};
+  @state()
+  @consume({ context: conditionDescriptionsContext, subscribe: true })
+  private _conditionDescriptions: ConditionDescriptions = {};
 
   @queryAll("ha-automation-condition-row")
   private _conditionRowElements?: HaAutomationConditionRow[];
 
-  // @ts-ignore
-  @state() private _newTriggersAndConditions = false;
-
-  private _unsub?: Promise<UnsubscribeFunc>;
-
   private _openedAddDialogFromQuery = false;
 
   protected get items(): Condition[] {
@@ -72,49 +63,6 @@ export default class HaAutomationCondition extends AutomationSortableListMixin<C
     this.highlightedConditions = items;
   }
 
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    this._unsubscribe();
-  }
-
-  protected hassSubscribe() {
-    return [
-      subscribeLabFeature(
-        this.hass!.connection,
-        "automation",
-        "new_triggers_conditions",
-        (feature) => {
-          this._newTriggersAndConditions = feature.enabled;
-        }
-      ),
-    ];
-  }
-
-  private _subscribeDescriptions() {
-    this._unsubscribe();
-    this._conditionDescriptions = {};
-    this._unsub = subscribeConditions(this.hass, (descriptions) => {
-      this._conditionDescriptions = {
-        ...this._conditionDescriptions,
-        ...descriptions,
-      };
-    });
-  }
-
-  private _unsubscribe() {
-    if (this._unsub) {
-      this._unsub.then((unsub) => unsub());
-      this._unsub = undefined;
-    }
-  }
-
-  protected willUpdate(changedProperties: PropertyValues): void {
-    super.willUpdate(changedProperties);
-    if (changedProperties.has("_newTriggersAndConditions")) {
-      this._subscribeDescriptions();
-    }
-  }
-
   protected firstUpdated(changedProps: PropertyValues<this>) {
     super.firstUpdated(changedProps);
     this.hass.loadBackendTranslation("conditions");

src/panels/config/automation/condition/types/ha-automation-condition-platform.ts

@@ -1,13 +1,21 @@
-import { mdiHelpCircleOutline } from "@mdi/js";
+import { mdiAlertOutline, mdiHelpCircleOutline } from "@mdi/js";
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
+import { createDurationData } from "../../../../../common/datetime/create_duration_data";
+import { durationDataToSeconds } from "../../../../../common/datetime/duration_to_seconds";
 import { fireEvent } from "../../../../../common/dom/fire_event";
+import { stopPropagation } from "../../../../../common/dom/stop_propagation";
 import "../../../../../components/ha-checkbox";
 import "../../../../../components/ha-selector/ha-selector";
 import "../../../../../components/ha-settings-row";
-import type { PlatformCondition } from "../../../../../data/automation";
+import "../../../../../components/ha-svg-icon";
+import "../../../../../components/ha-tooltip";
+import type {
+  ForDict,
+  PlatformCondition,
+} from "../../../../../data/automation";
 import {
   getConditionDomain,
   getConditionObjectId,
@@ -15,11 +23,21 @@ import {
 } from "../../../../../data/condition";
 import type { IntegrationManifest } from "../../../../../data/integration";
 import { fetchIntegrationManifest } from "../../../../../data/integration";
+import { getRecorderEntityOptions } from "../../../../../data/recorder";
 import type { TargetSelector } from "../../../../../data/selector";
-import { getTargetEntityCount } from "../../../../../data/target";
+import {
+  extractFromTarget,
+  getTargetEntityCount,
+} from "../../../../../data/target";
 import type { HomeAssistant } from "../../../../../types";
 import { documentationUrl } from "../../../../../util/documentation-url";
 
+// Mirrors `MAX_HISTORY_PRIMING_LOOKBACK` in homeassistant/helpers/condition.py:
+// when a condition has a `for:` duration, the recorder is only queried this far
+// back to prime it at setup, so longer durations can't be fully satisfied from
+// history after a restart or reload.
+const MAX_HISTORY_PRIMING_LOOKBACK_HOURS = 6;
+
 const showOptionalToggle = (field: ConditionDescription["fields"][string]) =>
   field.selector &&
   !field.required &&
@@ -41,6 +59,11 @@ export class HaPlatformCondition extends LitElement {
 
   @state() private _resolvedTargetEntityCount?: number;
 
+  @state() private _targetHasUnrecordedEntity = false;
+
+  // Incremented on each recording check so stale async responses are ignored.
+  private _recordingCheckId = 0;
+
   public static get defaultConfig(): PlatformCondition {
     return { condition: "" };
   }
@@ -51,6 +74,26 @@ export class HaPlatformCondition extends LitElement {
       this.hass.loadBackendTranslation("conditions");
       this.hass.loadBackendTranslation("selector");
     }
+
+    // The `for:` priming info depends on both the condition (target + duration)
+    // and the description (whether the condition targets entities at all), which
+    // can arrive in separate updates.
+    if (
+      changedProperties.has("condition") ||
+      changedProperties.has("description")
+    ) {
+      const previousCondition = changedProperties.get("condition") as
+        | undefined
+        | this["condition"];
+      if (
+        changedProperties.has("description") ||
+        previousCondition?.target !== this.condition?.target ||
+        previousCondition?.options?.for !== this.condition?.options?.for
+      ) {
+        this._updateDurationPrimingInfo();
+      }
+    }
+
     if (!changedProperties.has("condition")) {
       return;
     }
@@ -263,7 +306,7 @@ export class HaPlatformCondition extends LitElement {
         @click=${showOptional ? this._toggleCheckbox : undefined}
         >${this.hass.localize(
           `component.${domain}.conditions.${conditionName}.fields.${fieldName}.name`
-        ) || fieldName}</span
+        ) || fieldName}${this._renderForPrimingInfo(fieldName)}</span
       >
       ${description
         ? html`<span
@@ -472,6 +515,118 @@ export class HaPlatformCondition extends LitElement {
     }
   }
 
+  // Shows a small info icon beside the `for` duration field's label, with a
+  // tooltip explaining when history priming can't fully cover the duration.
+  private _renderForPrimingInfo(fieldName: string) {
+    if (fieldName !== "for") {
+      return nothing;
+    }
+    const text = this._durationPrimingInfoText();
+    if (!text) {
+      return nothing;
+    }
+    return html`<ha-svg-icon
+        id="for-priming-info"
+        tabindex="0"
+        class="priming-info-icon"
+        .path=${mdiAlertOutline}
+        @click=${stopPropagation}
+      ></ha-svg-icon>
+      <ha-tooltip for="for-priming-info">${text}</ha-tooltip>`;
+  }
+
+  private _durationPrimingInfoText(): string | undefined {
+    const forValue = this.condition.options?.for;
+
+    // Priming only happens for entity conditions that have a `for:` duration.
+    if (
+      forValue === undefined ||
+      forValue === "" ||
+      !this.description?.target
+    ) {
+      return undefined;
+    }
+
+    if (this._targetHasUnrecordedEntity) {
+      return this.hass.localize(
+        "ui.panel.config.automation.editor.conditions.duration_priming.entity_not_recorded"
+      );
+    }
+
+    if (this._durationExceedsLookback(forValue)) {
+      return this.hass.localize(
+        "ui.panel.config.automation.editor.conditions.duration_priming.history_capped",
+        { hours: MAX_HISTORY_PRIMING_LOOKBACK_HOURS }
+      );
+    }
+
+    return undefined;
+  }
+
+  private _durationExceedsLookback(forValue: unknown): boolean {
+    const duration = createDurationData(
+      forValue as string | number | ForDict | undefined
+    );
+    if (!duration) {
+      return false;
+    }
+    return (
+      durationDataToSeconds(duration) >
+      MAX_HISTORY_PRIMING_LOOKBACK_HOURS * 3600
+    );
+  }
+
+  private async _updateDurationPrimingInfo(): Promise<void> {
+    const forValue = this.condition.options?.for;
+    const target = this.condition.target;
+
+    // Recording status only matters for an entity condition that has both a
+    // target and a `for:` duration.
+    const checkId = ++this._recordingCheckId;
+    if (
+      forValue === undefined ||
+      forValue === "" ||
+      !this.description?.target ||
+      !target ||
+      !this.hass.config.components.includes("recorder")
+    ) {
+      this._targetHasUnrecordedEntity = false;
+      return;
+    }
+
+    try {
+      const { referenced_entities } = await extractFromTarget(
+        this.hass.callWS,
+        target
+      );
+      // Ignore if a newer check superseded this one.
+      if (checkId !== this._recordingCheckId) {
+        return;
+      }
+      if (!referenced_entities.length) {
+        this._targetHasUnrecordedEntity = false;
+        return;
+      }
+      const recordingDisabled = await Promise.all(
+        referenced_entities.map((entityId) =>
+          getRecorderEntityOptions(this.hass, entityId)
+            .then((options) => options.recording_disabled_by !== null)
+            // Unknown entity or command unavailable on older cores: don't warn.
+            .catch(() => false)
+        )
+      );
+      if (checkId !== this._recordingCheckId) {
+        return;
+      }
+      this._targetHasUnrecordedEntity = recordingDisabled.some(Boolean);
+    } catch (_err) {
+      // Target resolution failed; fall back to no warning rather than guessing.
+      if (checkId === this._recordingCheckId) {
+        this._targetHasUnrecordedEntity = false;
+      }
+    }
+  }
+
   static styles = css`
     :host {
       display: block;
@@ -527,6 +682,15 @@ export class HaPlatformCondition extends LitElement {
     .clickable {
       cursor: pointer;
     }
+    .priming-info-icon {
+      --mdc-icon-size: 16px;
+      width: 16px;
+      height: 16px;
+      color: var(--warning-color);
+      margin-inline-start: var(--ha-space-1);
+      vertical-align: middle;
+      cursor: help;
+    }
   `;
 }
 

src/panels/config/automation/condition/types/ha-automation-condition-zone.ts

@@ -38,7 +38,6 @@ export class HaZoneCondition extends LitElement {
         )}
         .value=${entity_id}
         @value-changed=${this._entityPicked}
-        .hass=${this.hass}
         .disabled=${this.disabled}
         .entityFilter=${zoneAndLocationFilter}
       ></ha-entity-picker>
@@ -48,7 +47,6 @@ export class HaZoneCondition extends LitElement {
         )}
         .value=${zone}
         @value-changed=${this._zonePicked}
-        .hass=${this.hass}
         .disabled=${this.disabled}
         .includeDomains=${includeDomains}
       ></ha-entity-picker>

src/panels/config/automation/trigger/ha-automation-trigger.ts

@@ -1,9 +1,7 @@
+import { consume } from "@lit/context";
 import { mdiDragHorizontalVariant, mdiPlus } from "@mdi/js";
 import deepClone from "deep-clone-simple";
-import type {
-  HassServiceTarget,
-  UnsubscribeFunc,
-} from "home-assistant-js-websocket";
+import type { HassServiceTarget } from "home-assistant-js-websocket";
 import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -19,10 +17,9 @@ import {
   type Trigger,
   type TriggerList,
 } from "../../../../data/automation";
-import { subscribeLabFeature } from "../../../../data/labs";
+import { triggerDescriptionsContext } from "../../../../data/context";
 import type { TriggerDescriptions } from "../../../../data/trigger";
-import { isTriggerList, subscribeTriggers } from "../../../../data/trigger";
-import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
+import { isTriggerList } from "../../../../data/trigger";
 import { EDITOR_SAVE_FAB_TOAST_BOTTOM_OFFSET } from "../editor-toast";
 import {
   getAddAutomationElementTargetFromQuery,
@@ -36,7 +33,7 @@ import type HaAutomationTriggerRow from "./ha-automation-trigger-row";
 
 @customElement("ha-automation-trigger")
 export default class HaAutomationTrigger extends AutomationSortableListMixin<Trigger>(
-  SubscribeMixin(LitElement)
+  LitElement
 ) {
   @property({ attribute: false }) public triggers!: Trigger[];
 
@@ -46,12 +43,9 @@ export default class HaAutomationTrigger extends AutomationSortableListMixin<Tri
 
   @property({ type: Boolean, attribute: false }) public editorDirty = false;
 
-  @state() private _triggerDescriptions: TriggerDescriptions = {};
-
-  // @ts-ignore
-  @state() private _newTriggersAndConditions = false;
-
-  private _unsub?: Promise<UnsubscribeFunc>;
+  @state()
+  @consume({ context: triggerDescriptionsContext, subscribe: true })
+  private _triggerDescriptions: TriggerDescriptions = {};
 
   private _openedAddDialogFromQuery = false;
 
@@ -67,49 +61,6 @@ export default class HaAutomationTrigger extends AutomationSortableListMixin<Tri
     this.highlightedTriggers = items;
   }
 
-  public disconnectedCallback() {
-    super.disconnectedCallback();
-    this._unsubscribe();
-  }
-
-  protected hassSubscribe() {
-    return [
-      subscribeLabFeature(
-        this.hass!.connection,
-        "automation",
-        "new_triggers_conditions",
-        (feature) => {
-          this._newTriggersAndConditions = feature.enabled;
-        }
-      ),
-    ];
-  }
-
-  private _subscribeDescriptions() {
-    this._unsubscribe();
-    this._triggerDescriptions = {};
-    this._unsub = subscribeTriggers(this.hass, (descriptions) => {
-      this._triggerDescriptions = {
-        ...this._triggerDescriptions,
-        ...descriptions,
-      };
-    });
-  }
-
-  private _unsubscribe() {
-    if (this._unsub) {
-      this._unsub.then((unsub) => unsub());
-      this._unsub = undefined;
-    }
-  }
-
-  protected willUpdate(changedProperties: PropertyValues): void {
-    super.willUpdate(changedProperties);
-    if (changedProperties.has("_newTriggersAndConditions")) {
-      this._subscribeDescriptions();
-    }
-  }
-
   protected firstUpdated(changedProps: PropertyValues<this>) {
     super.firstUpdated(changedProps);
     this.hass.loadBackendTranslation("triggers");

src/panels/config/automation/trigger/types/ha-automation-trigger-numeric_state.ts

@@ -1,17 +1,189 @@
-import type { PropertyValues } from "lit";
 import { css, html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../../../../common/array/ensure-array";
 import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { hasTemplate } from "../../../../../common/string/has-template";
-import type { LocalizeFunc } from "../../../../../common/translations/localize";
 import "../../../../../components/ha-form/ha-form";
 import type { SchemaUnion } from "../../../../../components/ha-form/types";
 import type { NumericStateTrigger } from "../../../../../data/automation";
 import type { HomeAssistant } from "../../../../../types";
 
+const SCHEMA = [
+  {
+    name: "entity_id",
+    required: true,
+    selector: { entity: { multiple: true } },
+  },
+  {
+    name: "attribute",
+    context: { filter_entity: "entity_id" },
+    selector: {
+      attribute: {
+        hide_attributes: [
+          "access_token",
+          "auto_update",
+          "available_modes",
+          "away_mode",
+          "changed_by",
+          "code_arm_required",
+          "code_format",
+          "color_mode",
+          "color_modes",
+          "current_activity",
+          "device_class",
+          "editable",
+          "effect_list",
+          "effect",
+          "entity_id",
+          "entity_picture",
+          "event_type",
+          "event_types",
+          "fan_mode",
+          "fan_modes",
+          "fan_speed_list",
+          "forecast",
+          "friendly_name",
+          "frontend_stream_type",
+          "has_date",
+          "has_time",
+          "hs_color",
+          "hvac_mode",
+          "hvac_modes",
+          "icon",
+          "id",
+          "latest_version",
+          "max_color_temp_kelvin",
+          "max_mireds",
+          "max_temp",
+          "media_album_name",
+          "media_artist",
+          "media_content_type",
+          "media_position_updated_at",
+          "media_title",
+          "min_color_temp_kelvin",
+          "min_mireds",
+          "min_temp",
+          "mode",
+          "next_dawn",
+          "next_dusk",
+          "next_midnight",
+          "next_noon",
+          "next_rising",
+          "next_setting",
+          "operation_list",
+          "operation_mode",
+          "options",
+          "percentage_step",
+          "precipitation_unit",
+          "preset_mode",
+          "preset_modes",
+          "pressure_unit",
+          "release_notes",
+          "release_summary",
+          "release_url",
+          "restored",
+          "rgb_color",
+          "rgbw_color",
+          "shuffle",
+          "skipped_version",
+          "sound_mode_list",
+          "sound_mode",
+          "source_list",
+          "source_type",
+          "source",
+          "state_class",
+          "step",
+          "supported_color_modes",
+          "supported_features",
+          "swing_mode",
+          "swing_modes",
+          "target_temp_step",
+          "temperature_unit",
+          "title",
+          "token",
+          "unit_of_measurement",
+          "user_id",
+          "uuid",
+          "visibility_unit",
+          "wind_speed_unit",
+          "xy_color",
+        ],
+      },
+    },
+  },
+  {
+    name: "above",
+    selector: {
+      choose: {
+        translation_key:
+          "ui.panel.config.automation.editor.triggers.type.numeric_state.threshold_type",
+        choices: {
+          value: {
+            selector: {
+              number: {
+                mode: "box",
+                min: Number.MIN_SAFE_INTEGER,
+                max: Number.MAX_SAFE_INTEGER,
+                step: 0.1,
+              },
+            },
+          },
+          input: {
+            selector: {
+              entity: { domain: ["input_number", "number", "sensor"] },
+            },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "below",
+    selector: {
+      choose: {
+        translation_key:
+          "ui.panel.config.automation.editor.triggers.type.numeric_state.threshold_type",
+        choices: {
+          value: {
+            selector: {
+              number: {
+                mode: "box",
+                min: Number.MIN_SAFE_INTEGER,
+                max: Number.MAX_SAFE_INTEGER,
+                step: 0.1,
+              },
+            },
+          },
+          input: {
+            selector: {
+              entity: { domain: ["input_number", "number", "sensor"] },
+            },
+          },
+        },
+      },
+    },
+  },
+  {
+    name: "value_template",
+    selector: { template: {} },
+  },
+  {
+    name: "for",
+    selector: {
+      choose: {
+        translation_key:
+          "ui.panel.config.automation.editor.triggers.type.numeric_state.for_type",
+        choices: {
+          duration: { selector: { duration: {} } },
+          template: { selector: { template: {} } },
+        },
+      },
+    },
+  },
+] as const;
+
 @customElement("ha-automation-trigger-numeric_state")
 export class HaNumericStateTrigger extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -20,236 +192,6 @@ export class HaNumericStateTrigger extends LitElement {
 
   @property({ type: Boolean }) public disabled = false;
 
-  @state() private _inputAboveIsEntity?: boolean;
-
-  @state() private _inputBelowIsEntity?: boolean;
-
-  private _schema = memoizeOne(
-    (
-      localize: LocalizeFunc,
-      inputAboveIsEntity?: boolean,
-      inputBelowIsEntity?: boolean
-    ) =>
-      [
-        {
-          name: "entity_id",
-          required: true,
-          selector: { entity: { multiple: true } },
-        },
-        {
-          name: "attribute",
-          context: { filter_entity: "entity_id" },
-          selector: {
-            attribute: {
-              hide_attributes: [
-                "access_token",
-                "auto_update",
-                "available_modes",
-                "away_mode",
-                "changed_by",
-                "code_arm_required",
-                "code_format",
-                "color_mode",
-                "color_modes",
-                "current_activity",
-                "device_class",
-                "editable",
-                "effect_list",
-                "effect",
-                "entity_id",
-                "entity_picture",
-                "event_type",
-                "event_types",
-                "fan_mode",
-                "fan_modes",
-                "fan_speed_list",
-                "forecast",
-                "friendly_name",
-                "frontend_stream_type",
-                "has_date",
-                "has_time",
-                "hs_color",
-                "hvac_mode",
-                "hvac_modes",
-                "icon",
-                "id",
-                "latest_version",
-                "max_color_temp_kelvin",
-                "max_mireds",
-                "max_temp",
-                "media_album_name",
-                "media_artist",
-                "media_content_type",
-                "media_position_updated_at",
-                "media_title",
-                "min_color_temp_kelvin",
-                "min_mireds",
-                "min_temp",
-                "mode",
-                "next_dawn",
-                "next_dusk",
-                "next_midnight",
-                "next_noon",
-                "next_rising",
-                "next_setting",
-                "operation_list",
-                "operation_mode",
-                "options",
-                "percentage_step",
-                "precipitation_unit",
-                "preset_mode",
-                "preset_modes",
-                "pressure_unit",
-                "release_notes",
-                "release_summary",
-                "release_url",
-                "restored",
-                "rgb_color",
-                "rgbw_color",
-                "shuffle",
-                "skipped_version",
-                "sound_mode_list",
-                "sound_mode",
-                "source_list",
-                "source_type",
-                "source",
-                "state_class",
-                "step",
-                "supported_color_modes",
-                "supported_features",
-                "swing_mode",
-                "swing_modes",
-                "target_temp_step",
-                "temperature_unit",
-                "title",
-                "token",
-                "unit_of_measurement",
-                "user_id",
-                "uuid",
-                "visibility_unit",
-                "wind_speed_unit",
-                "xy_color",
-              ],
-            },
-          },
-        },
-        {
-          name: "lower_limit",
-          type: "select",
-          required: true,
-          options: [
-            [
-              "value",
-              localize(
-                "ui.panel.config.automation.editor.triggers.type.numeric_state.type_value"
-              ),
-            ],
-            [
-              "input",
-              localize(
-                "ui.panel.config.automation.editor.triggers.type.numeric_state.type_input"
-              ),
-            ],
-          ],
-        },
-        ...(inputAboveIsEntity
-          ? ([
-              {
-                name: "above",
-                selector: {
-                  entity: { domain: ["input_number", "number", "sensor"] },
-                },
-              },
-            ] as const)
-          : ([
-              {
-                name: "above",
-                selector: {
-                  number: {
-                    mode: "box",
-                    min: Number.MIN_SAFE_INTEGER,
-                    max: Number.MAX_SAFE_INTEGER,
-                    step: 0.1,
-                  },
-                },
-              },
-            ] as const)),
-        {
-          name: "upper_limit",
-          type: "select",
-          required: true,
-          options: [
-            [
-              "value",
-              localize(
-                "ui.panel.config.automation.editor.triggers.type.numeric_state.type_value"
-              ),
-            ],
-            [
-              "input",
-              localize(
-                "ui.panel.config.automation.editor.triggers.type.numeric_state.type_input"
-              ),
-            ],
-          ],
-        },
-        ...(inputBelowIsEntity
-          ? ([
-              {
-                name: "below",
-                selector: {
-                  entity: { domain: ["input_number", "number", "sensor"] },
-                },
-              },
-            ] as const)
-          : ([
-              {
-                name: "below",
-                selector: {
-                  number: {
-                    mode: "box",
-                    min: Number.MIN_SAFE_INTEGER,
-                    max: Number.MAX_SAFE_INTEGER,
-                    step: 0.1,
-                  },
-                },
-              },
-            ] as const)),
-        {
-          name: "value_template",
-          selector: { template: {} },
-        },
-        { name: "for", selector: { duration: {} } },
-      ] as const
-  );
-
-  public willUpdate(changedProperties: PropertyValues<this>) {
-    this._inputAboveIsEntity =
-      this._inputAboveIsEntity ??
-      (typeof this.trigger.above === "string" &&
-        ((this.trigger.above as string).startsWith("input_number.") ||
-          (this.trigger.above as string).startsWith("number.") ||
-          (this.trigger.above as string).startsWith("sensor.")));
-    this._inputBelowIsEntity =
-      this._inputBelowIsEntity ??
-      (typeof this.trigger.below === "string" &&
-        ((this.trigger.below as string).startsWith("input_number.") ||
-          (this.trigger.below as string).startsWith("number.") ||
-          (this.trigger.below as string).startsWith("sensor.")));
-
-    if (!changedProperties.has("trigger")) {
-      return;
-    }
-    // Check for templates in trigger. If found, revert to YAML mode.
-    if (this.trigger && hasTemplate(this.trigger.for)) {
-      fireEvent(
-        this,
-        "ui-mode-not-available",
-        Error(this.hass.localize("ui.errors.config.no_template_editor_support"))
-      );
-    }
-  }
-
   public static get defaultConfig(): NumericStateTrigger {
     return {
       trigger: "numeric_state",
@@ -257,39 +199,61 @@ export class HaNumericStateTrigger extends LitElement {
     };
   }
 
-  private _data = memoizeOne(
-    (
-      inputAboveIsEntity: boolean,
-      inputBelowIsEntity: boolean,
-      trigger: NumericStateTrigger
-    ) => ({
-      lower_limit: inputAboveIsEntity ? "input" : "value",
-      upper_limit: inputBelowIsEntity ? "input" : "value",
-      ...trigger,
-      entity_id: ensureArray(trigger.entity_id),
-      for: createDurationData(trigger.for),
-    })
-  );
+  private _wrapForValue(
+    forValue: NumericStateTrigger["for"]
+  ): Record<string, unknown> | undefined {
+    if (forValue === undefined) {
+      return undefined;
+    }
+    if (typeof forValue === "string" && hasTemplate(forValue)) {
+      return { active_choice: "template", template: forValue };
+    }
+    return {
+      active_choice: "duration",
+      duration: createDurationData(forValue),
+    };
+  }
+
+  private _unwrapForValue(
+    forValue: Record<string, unknown> | undefined
+  ): NumericStateTrigger["for"] {
+    if (!forValue || !forValue.active_choice) {
+      return forValue as NumericStateTrigger["for"];
+    }
+    if (forValue.active_choice === "template") {
+      return forValue.template as string;
+    }
+    return forValue.duration as NumericStateTrigger["for"];
+  }
+
+  private _unwrapThresholdValue(
+    value: Record<string, unknown> | number | string | undefined
+  ): number | string | undefined {
+    if (value === undefined || typeof value !== "object") {
+      return value as number | string | undefined;
+    }
+    if (!value.active_choice) {
+      return undefined;
+    }
+    return value[value.active_choice as string] as number | string | undefined;
+  }
+
+  private _data = memoizeOne((trigger: NumericStateTrigger) => ({
+    ...trigger,
+    entity_id: ensureArray(trigger.entity_id),
+    for: this._wrapForValue(trigger.for),
+  }));
 
   public render() {
-    const schema = this._schema(
-      this.hass.localize,
-      this._inputAboveIsEntity,
-      this._inputBelowIsEntity
-    );
-
-    const data = this._data(
-      this._inputAboveIsEntity!,
-      this._inputBelowIsEntity!,
-      this.trigger
-    );
+    const data = this._data(this.trigger);
 
     return html`
       <ha-form
         .hass=${this.hass}
         .data=${data}
-        .schema=${schema}
+        .schema=${SCHEMA}
         .disabled=${this.disabled}
+        .localizeValue=${this.hass.localize}
         @value-changed=${this._valueChanged}
         .computeLabel=${this._computeLabelCallback}
       ></ha-form>
@@ -300,11 +264,9 @@ export class HaNumericStateTrigger extends LitElement {
     ev.stopPropagation();
     const newTrigger = { ...ev.detail.value };
 
-    this._inputAboveIsEntity = newTrigger.lower_limit === "input";
-    this._inputBelowIsEntity = newTrigger.upper_limit === "input";
-
-    delete newTrigger.lower_limit;
-    delete newTrigger.upper_limit;
+    newTrigger.above = this._unwrapThresholdValue(newTrigger.above);
+    newTrigger.below = this._unwrapThresholdValue(newTrigger.below);
+    newTrigger.for = this._unwrapForValue(newTrigger.for);
 
     if (newTrigger.value_template === "") {
       delete newTrigger.value_template;
@@ -314,7 +276,7 @@ export class HaNumericStateTrigger extends LitElement {
   }
 
   private _computeLabelCallback = (
-    schema: SchemaUnion<ReturnType<typeof this._schema>>
+    schema: SchemaUnion<typeof SCHEMA>
   ): string => {
     switch (schema.name) {
       case "entity_id":

src/panels/config/automation/trigger/types/ha-automation-trigger-state.ts

@@ -174,7 +174,19 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
             },
           },
         },
-        { name: "for", selector: { duration: {} } },
+        {
+          name: "for",
+          selector: {
+            choose: {
+              translation_key:
+                "ui.panel.config.automation.editor.triggers.type.state.for_type",
+              choices: {
+                duration: { selector: { duration: {} } },
+                template: { selector: { template: {} } },
+              },
+            },
+          },
+        },
       ] as const satisfies HaFormSchema[]
   );
 
@@ -190,7 +202,9 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
       delete this.trigger.for.milliseconds;
     }
     // Check for templates in trigger. If found, revert to YAML mode.
-    if (this.trigger && hasTemplate(this.trigger)) {
+    // Exclude "for" since the UI now supports templates there via choose.
+    const { for: _for, ...triggerWithoutFor } = this.trigger;
+    if (triggerWithoutFor && hasTemplate(triggerWithoutFor)) {
       fireEvent(
         this,
         "ui-mode-not-available",
@@ -207,13 +221,38 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
     return true;
   }
 
-  protected render() {
-    const trgFor = createDurationData(this.trigger.for);
+  private _wrapForValue(
+    forValue: StateTrigger["for"]
+  ): Record<string, unknown> | undefined {
+    if (forValue === undefined) {
+      return undefined;
+    }
+    if (typeof forValue === "string" && hasTemplate(forValue)) {
+      return { active_choice: "template", template: forValue };
+    }
+    return {
+      active_choice: "duration",
+      duration: createDurationData(forValue),
+    };
+  }
 
+  private _unwrapForValue(
+    forValue: Record<string, unknown> | undefined
+  ): StateTrigger["for"] {
+    if (!forValue || !forValue.active_choice) {
+      return forValue as StateTrigger["for"];
+    }
+    if (forValue.active_choice === "template") {
+      return forValue.template as string;
+    }
+    return forValue.duration as StateTrigger["for"];
+  }
+
+  protected render() {
     const data = {
       ...this.trigger,
       entity_id: ensureArray(this.trigger.entity_id),
-      for: trgFor,
+      for: this._wrapForValue(this.trigger.for),
     };
 
     data.to = this._normalizeStates(this.trigger.to, data.attribute);
@@ -230,6 +269,7 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
         .hass=${this.hass}
         .data=${data}
         .schema=${schema}
+        .localizeValue=${this.hass.localize}
         @value-changed=${this._valueChanged}
         .computeLabel=${this._computeLabelCallback}
         .disabled=${this.disabled}
@@ -241,6 +281,8 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
     ev.stopPropagation();
     const newTrigger = ev.detail.value;
 
+    newTrigger.for = this._unwrapForValue(newTrigger.for);
+
     newTrigger.to = this._applyAnyStateExclusive(
       newTrigger.to,
       newTrigger.attribute

src/panels/config/automation/trigger/types/ha-automation-trigger-template.ts

@@ -1,4 +1,3 @@
-import type { PropertyValues } from "lit";
 import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { TemplateTrigger } from "../../../../../data/automation";
@@ -11,7 +10,19 @@ import type { SchemaUnion } from "../../../../../components/ha-form/types";
 
 const SCHEMA = [
   { name: "value_template", required: true, selector: { template: {} } },
-  { name: "for", selector: { duration: {} } },
+  {
+    name: "for",
+    selector: {
+      choose: {
+        translation_key:
+          "ui.panel.config.automation.editor.triggers.type.template.for_type",
+        choices: {
+          duration: { selector: { duration: {} } },
+          template: { selector: { template: {} } },
+        },
+      },
+    },
+  },
 ] as const;
 
 @customElement("ha-automation-trigger-template")
@@ -26,26 +37,37 @@ export class HaTemplateTrigger extends LitElement {
     return { trigger: "template", value_template: "" };
   }
 
-  public willUpdate(changedProperties: PropertyValues<this>) {
-    if (!changedProperties.has("trigger")) {
-      return;
+  private _wrapForValue(
+    forValue: TemplateTrigger["for"]
+  ): Record<string, unknown> | undefined {
+    if (forValue === undefined) {
+      return undefined;
     }
-    // Check for templates in trigger. If found, revert to YAML mode.
-    if (this.trigger && hasTemplate(this.trigger.for)) {
-      fireEvent(
-        this,
-        "ui-mode-not-available",
-        Error(this.hass.localize("ui.errors.config.no_template_editor_support"))
-      );
+    if (typeof forValue === "string" && hasTemplate(forValue)) {
+      return { active_choice: "template", template: forValue };
     }
+    return {
+      active_choice: "duration",
+      duration: createDurationData(forValue),
+    };
+  }
+
+  private _unwrapForValue(
+    forValue: Record<string, unknown> | undefined
+  ): TemplateTrigger["for"] {
+    if (!forValue || !forValue.active_choice) {
+      return forValue as TemplateTrigger["for"];
+    }
+    if (forValue.active_choice === "template") {
+      return forValue.template as string;
+    }
+    return forValue.duration as TemplateTrigger["for"];
   }
 
   protected render() {
-    const trgFor = createDurationData(this.trigger.for);
-
     const data = {
       ...this.trigger,
-      for: trgFor,
+      for: this._wrapForValue(this.trigger.for),
     };
 
     return html`
@@ -53,6 +75,7 @@ export class HaTemplateTrigger extends LitElement {
         .hass=${this.hass}
         .data=${data}
         .schema=${SCHEMA}
+        .localizeValue=${this.hass.localize}
         @value-changed=${this._valueChanged}
         .computeLabel=${this._computeLabelCallback}
         .disabled=${this.disabled}
@@ -64,8 +87,11 @@ export class HaTemplateTrigger extends LitElement {
     ev.stopPropagation();
     const newTrigger = ev.detail.value;
 
+    newTrigger.for = this._unwrapForValue(newTrigger.for);
+
     if (
       newTrigger.for &&
+      typeof newTrigger.for === "object" &&
       Object.values(newTrigger.for).every((value) => value === 0)
     ) {
       delete newTrigger.for;

src/panels/config/automation/trigger/types/ha-automation-trigger-zone.ts

@@ -45,7 +45,6 @@ export class HaZoneTrigger extends LitElement {
         .value=${entity_id ? ensureArray(entity_id) : []}
         .disabled=${this.disabled}
         @value-changed=${this._entityPicked}
-        .hass=${this.hass}
         .entityFilter=${zoneAndLocationFilter}
       ></ha-entities-picker>
       <ha-entity-picker
@@ -55,7 +54,6 @@ export class HaZoneTrigger extends LitElement {
         .value=${zone}
         .disabled=${this.disabled}
         @value-changed=${this._zonePicked}
-        .hass=${this.hass}
         .includeDomains=${includeDomains}
       ></ha-entity-picker>
 

src/panels/config/core/ai-task-pref.ts

@@ -99,7 +99,6 @@ export class AITaskPref extends LitElement {
             </span>
             <ha-entity-picker
               data-name="gen_data_entity_id"
-              .hass=${this.hass}
               .disabled=${this._prefs === undefined &&
               isComponentLoaded(this.hass.config, "ai_task")}
               .value=${this._gen_data_entity_id ||
@@ -119,7 +118,6 @@ export class AITaskPref extends LitElement {
             </span>
             <ha-entity-picker
               data-name="gen_image_entity_id"
-              .hass=${this.hass}
               .disabled=${this._prefs === undefined &&
               isComponentLoaded(this.hass.config, "ai_task")}
               .value=${this._gen_image_entity_id ||

src/panels/config/developer-tools/debug/developer-tools-debug.ts

@@ -50,7 +50,6 @@ class HaPanelDevDebug extends SubscribeMixin(LitElement) {
         >
           <div class="card-content">
             <ha-entity-picker
-              .hass=${this.hass}
               .helper=${this.hass.localize(
                 "ui.panel.config.developer-tools.tabs.debug.entity_diagnostic.description"
               )}

src/panels/config/developer-tools/state/developer-tools-state.ts

@@ -220,7 +220,6 @@ class HaPanelDevState extends LitElement {
           <div class="inputs">
             <ha-entity-picker
               autofocus
-              .hass=${this.hass}
               .value=${this._entityId}
               @value-changed=${this._entityIdChanged}
               show-entity-id

src/panels/config/devices/device-detail/ha-device-add-to-dialog.ts

@@ -1,5 +1,5 @@
 import { css, html, LitElement, nothing } from "lit";
-import type { CSSResultGroup, PropertyValues } from "lit";
+import type { CSSResultGroup } from "lit";
 import { consume, type ContextType } from "@lit/context";
 import { customElement, state } from "lit/decorators";
 import {
@@ -12,27 +12,10 @@ import {
 import { computeDeviceNameDisplay } from "../../../../common/entity/compute_device_name";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-adaptive-dialog";
-import "../../../../components/ha-spinner";
-import type { AutomationConfig } from "../../../../data/automation";
-import { showAutomationEditor } from "../../../../data/automation";
 import {
-  apiContext,
   internationalizationContext,
   statesContext,
 } from "../../../../data/context";
-import type {
-  DeviceAction,
-  DeviceCondition,
-  DeviceTrigger,
-} from "../../../../data/device/device_automation";
-import {
-  fetchDeviceActions,
-  fetchDeviceConditions,
-  fetchDeviceTriggers,
-  sortDeviceAutomations,
-} from "../../../../data/device/device_automation";
-import type { ScriptConfig } from "../../../../data/script";
-import { showScriptEditor } from "../../../../data/script";
 import { showSceneEditor } from "../../../../data/scene";
 import "../../../../dialogs/add-to/ha-add-to-action-list";
 import type {
@@ -48,21 +31,11 @@ import {
 import { haStyle, haStyleDialog } from "../../../../resources/styles";
 import type { DeviceAddToDialogParams } from "./show-dialog-device-add-to";
 
-type DeviceLegacyAddToActionType =
-  | "trigger"
-  | "condition"
-  | "automation_action"
-  | "script_action";
-
 type DeviceAddToAction =
   | (AddToActionListItem & {
       kind: "add-to";
       key: AddToAutomationScriptActionKey;
     })
-  | (AddToActionListItem & {
-      kind: "legacy";
-      legacyType: DeviceLegacyAddToActionType;
-    })
   | (AddToActionListItem & { kind: "scene" });
 
 @customElement("dialog-device-add-to")
@@ -75,76 +48,25 @@ export class DialogDeviceAddTo extends LitElement {
   @consume({ context: statesContext, subscribe: true })
   private _states!: ContextType<typeof statesContext>;
 
-  @state()
-  @consume({ context: apiContext, subscribe: true })
-  private _api!: ContextType<typeof apiContext>;
-
   @state() private _params?: DeviceAddToDialogParams;
 
   @state() private _open = false;
 
-  @state() private _triggers?: DeviceTrigger[];
-
-  @state() private _conditions?: DeviceCondition[];
-
-  @state() private _actions?: DeviceAction[];
-
   public showDialog(params: DeviceAddToDialogParams): void {
     this._params = params;
     this._open = true;
-
-    // When new_triggers_conditions labs feature is promoted, this whole check can be removed.
-    if (!params.newTriggersConditions && this._api) {
-      this._fetchDeviceAutomations(params);
-    }
   }
 
   public closeDialog(): void {
     this._open = false;
   }
 
-  protected willUpdate(changedProps: PropertyValues) {
-    super.willUpdate(changedProps);
-
-    // When new_triggers_conditions labs feature is promoted, this whole check can be removed.
-    if (
-      changedProps.has("_api") &&
-      this._api &&
-      this._params &&
-      !this._params.newTriggersConditions &&
-      !this._triggers
-    ) {
-      this._fetchDeviceAutomations(this._params);
-    }
-  }
-
-  protected firstUpdated(changedProps: PropertyValues<this>) {
-    super.firstUpdated(changedProps);
+  protected firstUpdated() {
     this._i18n.loadBackendTranslation("device_automation");
   }
 
-  // When new_triggers_conditions labs feature is promoted, this whole method can be removed.
-  private async _fetchDeviceAutomations(
-    params: DeviceAddToDialogParams
-  ): Promise<void> {
-    const deviceId = params.device.id;
-
-    const [triggers, conditions, actions] = await Promise.all([
-      fetchDeviceTriggers(this._api.callWS, deviceId),
-      fetchDeviceConditions(this._api.callWS, deviceId),
-      fetchDeviceActions(this._api.callWS, deviceId),
-    ]);
-
-    this._triggers = triggers.sort(sortDeviceAutomations);
-    this._conditions = conditions.sort(sortDeviceAutomations);
-    this._actions = actions.sort(sortDeviceAutomations);
-  }
-
   private _dialogClosed(): void {
     this._params = undefined;
-    this._triggers = undefined;
-    this._conditions = undefined;
-    this._actions = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
@@ -168,14 +90,12 @@ export class DialogDeviceAddTo extends LitElement {
         )}
         @closed=${this._dialogClosed}
       >
-        ${this._params.newTriggersConditions
-          ? this._renderNewOptions()
-          : this._renderLegacyOptions()}
+        ${this._renderOptions()}
       </ha-adaptive-dialog>
     `;
   }
 
-  private _renderNewOptions() {
+  private _renderOptions() {
     if (!this._params) {
       return nothing;
     }
@@ -238,112 +158,6 @@ export class DialogDeviceAddTo extends LitElement {
     `;
   }
 
-  // When new_triggers_conditions labs feature is promoted, this whole method can be removed.
-  private _renderLegacyOptions() {
-    if (!this._triggers && !this._conditions && !this._actions) {
-      return html`
-        <div class="loading">
-          <ha-spinner></ha-spinner>
-        </div>
-      `;
-    }
-
-    if (!this._params) {
-      return nothing;
-    }
-
-    const hasTriggers = Boolean(this._triggers?.length);
-    const hasConditions = Boolean(this._conditions?.length);
-    const hasActions = Boolean(this._actions?.length);
-    const hasScenes = Boolean(this._params.entityIds.length);
-
-    if (!hasTriggers && !hasConditions && !hasActions && !hasScenes) {
-      return html`
-        <div class="empty">
-          ${this._i18n.localize(
-            "ui.panel.config.devices.automation.no_device_automations"
-          )}
-        </div>
-      `;
-    }
-
-    const automationActions: DeviceAddToAction[] = [];
-    if (hasTriggers) {
-      automationActions.push({
-        kind: "legacy",
-        legacyType: "trigger",
-        iconPath: mdiRobotOutline,
-        name: this._i18n.localize(
-          "ui.dialogs.more_info_control.add_to.action_options.automation_trigger"
-        ),
-      });
-    }
-    if (hasConditions) {
-      automationActions.push({
-        kind: "legacy",
-        legacyType: "condition",
-        iconPath: mdiPlaylistCheck,
-        name: this._i18n.localize(
-          "ui.dialogs.more_info_control.add_to.action_options.automation_condition"
-        ),
-      });
-    }
-    if (hasActions) {
-      automationActions.push({
-        kind: "legacy",
-        legacyType: "automation_action",
-        iconPath: mdiPlayCircleOutline,
-        name: this._i18n.localize(
-          "ui.dialogs.more_info_control.add_to.action_options.automation_action"
-        ),
-      });
-    }
-
-    const scriptActions: DeviceAddToAction[] = hasActions
-      ? [
-          {
-            kind: "legacy",
-            legacyType: "script_action",
-            iconPath: mdiScriptTextOutline,
-            name: this._i18n.localize(
-              "ui.dialogs.more_info_control.add_to.action_options.script_action"
-            ),
-          },
-        ]
-      : [];
-
-    const sections: AddToActionListSection<DeviceAddToAction>[] = [
-      {
-        title: this._i18n.localize(
-          "ui.panel.config.devices.automation.automations_heading"
-        ),
-        actions: automationActions,
-        empty: automationActions.length
-          ? undefined
-          : this._i18n.localize(
-              "ui.panel.config.devices.automation.no_automations"
-            ),
-      },
-      {
-        title: this._i18n.localize(
-          "ui.panel.config.devices.script.scripts_heading"
-        ),
-        actions: scriptActions,
-        empty: scriptActions.length
-          ? undefined
-          : this._i18n.localize("ui.panel.config.devices.script.no_scripts"),
-      },
-    ];
-    this._addSceneSection(sections);
-
-    return html`
-      <ha-add-to-action-list
-        .sections=${sections}
-        @add-to-list-action-selected=${this._handleActionSelected}
-      ></ha-add-to-action-list>
-    `;
-  }
-
   private _addSceneSection(
     sections: AddToActionListSection<DeviceAddToAction>[]
   ): void {
@@ -380,12 +194,7 @@ export class DialogDeviceAddTo extends LitElement {
       return;
     }
 
-    if (action.kind === "add-to") {
-      this._handleAddToAction(action.key);
-      return;
-    }
-
-    this._handleLegacyAction(action.legacyType);
+    this._handleAddToAction(action.key);
   }
 
   private _handleAddToAction(key: AddToAutomationScriptActionKey) {
@@ -397,30 +206,6 @@ export class DialogDeviceAddTo extends LitElement {
     addToActionHandler(key, { device_id: this._params.device.id });
   }
 
-  // When new_triggers_conditions labs feature is promoted, this whole method can be removed.
-  private _handleLegacyAction(type: DeviceLegacyAddToActionType) {
-    this.closeDialog();
-
-    if (type === "script_action") {
-      const newScript = {} as ScriptConfig;
-      if (this._actions?.length) {
-        newScript.sequence = [this._actions[0]];
-      }
-      showScriptEditor(newScript, true);
-      return;
-    }
-
-    const newAutomation = {} as AutomationConfig;
-    if (type === "trigger" && this._triggers?.length) {
-      newAutomation.triggers = [this._triggers[0]];
-    } else if (type === "condition" && this._conditions?.length) {
-      newAutomation.conditions = [this._conditions[0]];
-    } else if (type === "automation_action" && this._actions?.length) {
-      newAutomation.actions = [this._actions[0]];
-    }
-    showAutomationEditor(newAutomation, true);
-  }
-
   private _handleCreateScene() {
     if (!this._params) {
       return;
@@ -439,12 +224,6 @@ export class DialogDeviceAddTo extends LitElement {
         ha-adaptive-dialog {
           --dialog-content-padding: 0;
         }
-
-        .loading,
-        .empty {
-          padding: var(--ha-space-4);
-          text-align: center;
-        }
       `,
     ];
   }

src/panels/config/devices/device-detail/show-dialog-device-add-to.ts

@@ -3,7 +3,6 @@ import type { DeviceRegistryEntry } from "../../../../data/device/device_registr
 
 export interface DeviceAddToDialogParams {
   device: DeviceRegistryEntry;
-  newTriggersConditions: boolean;
   entityIds: string[];
   canCreateScene: boolean;
 }

src/panels/config/devices/ha-config-device-page.ts

@@ -68,7 +68,6 @@ import {
   removeConfigEntryFromDevice,
   updateDeviceRegistryEntry,
 } from "../../../data/device/device_registry";
-import { subscribeLabFeature } from "../../../data/labs";
 import type { DiagnosticInfo } from "../../../data/diagnostics";
 import {
   fetchDiagnosticHandler,
@@ -204,10 +203,6 @@ export class HaConfigDevicePage extends LitElement {
 
   private _deviceAlertsActionsTimeout?: number;
 
-  @state() private _newTriggersConditions = false;
-
-  private _unsubLabFeature?: (() => void) | undefined;
-
   @state()
   @consume({ context: fullEntitiesContext, subscribe: true })
   _entityReg: EntityRegistryEntry[] = [];
@@ -377,7 +372,6 @@ export class HaConfigDevicePage extends LitElement {
   protected firstUpdated(changedProps: PropertyValues<this>) {
     super.firstUpdated(changedProps);
     loadDeviceRegistryDetailDialog();
-    this._subscribeLabFeature();
   }
 
   protected updated(changedProps: PropertyValues<this>) {
@@ -394,7 +388,6 @@ export class HaConfigDevicePage extends LitElement {
   public disconnectedCallback() {
     super.disconnectedCallback();
     clearTimeout(this._deviceAlertsActionsTimeout);
-    this._unsubLabFeature?.();
   }
 
   protected render() {
@@ -1404,7 +1397,6 @@ export class HaConfigDevicePage extends LitElement {
     );
     showDeviceAddToDialog(this, {
       device,
-      newTriggersConditions: this._newTriggersConditions,
       entityIds: sceneEntityIds,
       canCreateScene:
         isComponentLoaded(this.hass.config, "scene") &&
@@ -1412,23 +1404,6 @@ export class HaConfigDevicePage extends LitElement {
     });
   }
 
-  // When new_triggers_conditions labs feature is promoted, this whole method can be removed.
-  private _subscribeLabFeature() {
-    if (!isComponentLoaded(this.hass.config, "automation")) {
-      return;
-    }
-    subscribeLabFeature(
-      this.hass.connection,
-      "automation",
-      "new_triggers_conditions",
-      (feature) => {
-        this._newTriggersConditions = feature.enabled;
-      }
-    ).then((unsub) => {
-      this._unsubLabFeature = unsub;
-    });
-  }
-
   private _renderIntegrationInfo(
     device: DeviceRegistryEntry,
     integrations: ConfigEntry[],

src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts

@@ -269,7 +269,6 @@ export class DialogEnergyGasSettings
           : this._costs === "entity"
             ? html`<ha-entity-picker
                 class="price-options"
-                .hass=${this.hass}
                 include-domains='["sensor", "input_number"]'
                 .value=${this._source.entity_energy_price}
                 .label=${this.hass.localize(

src/panels/config/energy/dialogs/dialog-energy-grid-settings.ts

@@ -328,7 +328,6 @@ export class DialogEnergyGridSettings
         ${this._importCostType === "entity"
           ? html`
               <ha-entity-picker
-                .hass=${this.hass}
                 .value=${this._source.entity_energy_price}
                 .label=${this.hass.localize(
                   "ui.panel.config.energy.grid.dialog.cost_entity_label"
@@ -416,7 +415,6 @@ export class DialogEnergyGridSettings
               ${this._exportCostType === "entity"
                 ? html`
                     <ha-entity-picker
-                      .hass=${this.hass}
                       .value=${this._source.entity_energy_price_export}
                       .label=${this.hass.localize(
                         "ui.panel.config.energy.grid.dialog.compensation_entity_label"

src/panels/config/energy/dialogs/dialog-energy-water-settings.ts

@@ -230,7 +230,6 @@ export class DialogEnergyWaterSettings
           : this._costs === "entity"
             ? html`<ha-entity-picker
                 class="price-options"
-                .hass=${this.hass}
                 include-domains='["sensor", "input_number"]'
                 .value=${this._source.entity_energy_price}
                 .label=${this.hass.localize(

src/panels/config/entities/entity-registry-settings-editor.ts

@@ -747,7 +747,6 @@ export class EntityRegistrySettingsEditor extends LitElement {
       SCANNER_SOURCE_TYPES.includes(stateObj?.attributes?.source_type)
         ? html`
             <ha-entity-picker
-              .hass=${this.hass}
               .value=${this._associatedZone}
               .label=${this.hass.localize(
                 "ui.dialogs.entity_registry.editor.associated_zone"
@@ -1011,9 +1010,13 @@ export class EntityRegistrySettingsEditor extends LitElement {
           )}</span
         >
         <span slot="secondary">
-          ${this.hass.localize(
-            "ui.dialogs.entity_registry.editor.voice_assistants_description"
-          )}
+          ${this.entry.aliases.filter((a) => a !== null).length
+            ? this.entry.aliases
+                .filter((a): a is string => a !== null)
+                .join(", ")
+            : this.hass.localize(
+                "ui.dialogs.entity_registry.editor.no_aliases"
+              )}
         </span>
         <ha-icon-next slot="meta"></ha-icon-next>
       </ha-list-item>

src/panels/config/integrations/integration-panels/radio_frequency/radio-frequency-devices-page.ts

@@ -12,7 +12,10 @@ import type {
 } from "../../../../../components/data-table/ha-data-table";
 import "../../../../../components/ha-relative-time";
 import { UNAVAILABLE, UNKNOWN } from "../../../../../data/entity/entity";
-import type { RadioFrequencyTransmitter } from "../../../../../data/radio_frequency";
+import {
+  formatFrequencyRanges,
+  type RadioFrequencyTransmitter,
+} from "../../../../../data/radio_frequency";
 import "../../../../../layouts/hass-tabs-subpage-data-table";
 import type { PageNavigation } from "../../../../../layouts/hass-tabs-subpage";
 import { haStyle } from "../../../../../resources/styles";
@@ -22,6 +25,7 @@ interface RadioFrequencyTransmitterRow {
   id: string;
   name: string;
   type: string;
+  frequencies: string;
   last_used?: string;
   device_id: string | null;
 }
@@ -64,6 +68,13 @@ export class RadioFrequencyDevicesPage extends LitElement {
           filterable: true,
           groupable: true,
         },
+        frequencies: {
+          title: localize("ui.panel.config.radio_frequency.frequencies"),
+          sortable: true,
+          filterable: true,
+          flex: 2,
+          template: (transmitter) => transmitter.frequencies || "—",
+        },
         last_used: {
           title: localize("ui.panel.config.radio_frequency.last_used"),
           sortable: true,
@@ -86,7 +97,8 @@ export class RadioFrequencyDevicesPage extends LitElement {
     (
       transmitters: RadioFrequencyTransmitter[],
       states: HomeAssistant["states"],
-      localize: LocalizeFunc
+      localize: LocalizeFunc,
+      locale: HomeAssistant["locale"]
     ): RadioFrequencyTransmitterRow[] =>
       transmitters.map((transmitter) => {
         const stateObj = states[transmitter.entity_id];
@@ -104,6 +116,10 @@ export class RadioFrequencyDevicesPage extends LitElement {
           id: transmitter.entity_id,
           name: stateObj ? computeStateName(stateObj) : transmitter.entity_id,
           type: localize("component.radio_frequency.entity_component._.name"),
+          frequencies: formatFrequencyRanges(
+            transmitter.supported_frequency_ranges,
+            locale
+          ),
           last_used,
           device_id: transmitter.device_id,
         };
@@ -122,7 +138,8 @@ export class RadioFrequencyDevicesPage extends LitElement {
         .data=${this._data(
           this.transmitters,
           this.hass.states,
-          this.hass.localize
+          this.hass.localize,
+          this.hass.locale
         )}
         .noDataText=${this.hass.localize(
           "ui.panel.config.radio_frequency.no_devices"

src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts

@@ -13,6 +13,8 @@ import {
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { isComponentLoaded } from "../../../../../common/config/is_component_loaded";
+import { navigate } from "../../../../../common/navigate";
 import { animationStyles } from "../../../../../resources/theme/animations.globals";
 import "../../../../../components/ha-alert";
 import "../../../../../components/ha-button";
@@ -21,6 +23,7 @@ import "../../../../../components/ha-card";
 import "../../../../../components/ha-icon-next";
 import "../../../../../components/ha-md-list";
 import "../../../../../components/ha-md-list-item";
+import "../../../../../components/ha-spinner";
 import "../../../../../components/ha-svg-icon";
 import type { ConfigEntry } from "../../../../../data/config_entries";
 import { getConfigEntries } from "../../../../../data/config_entries";
@@ -66,20 +69,46 @@ class ZHAConfigDashboard extends LitElement {
 
   protected firstUpdated(changedProperties: PropertyValues<this>) {
     super.firstUpdated(changedProperties);
-    if (this.hass) {
-      this.hass.loadBackendTranslation("config_panel", "zha", false);
-      this._fetchConfigEntry();
-      this._fetchConfiguration();
-      this._fetchDevicesAndGroups();
+    if (!this.hass) {
+      return;
     }
+    if (!isComponentLoaded(this.hass.config, "zha")) {
+      navigate("/config/integrations", { replace: true });
+      return;
+    }
+    this.hass.loadBackendTranslation("config_panel", "zha", false);
+    this._load();
+  }
+
+  private async _load(): Promise<void> {
+    await this._fetchConfigEntry();
+    if (!this._configEntry) {
+      return;
+    }
+    this._fetchConfiguration();
+    this._fetchDevicesAndGroups();
   }
 
   protected render(): TemplateResult {
-    const devices = this._configEntry
-      ? Object.values(this.hass.devices).filter((device) =>
-          device.config_entries.includes(this._configEntry!.entry_id)
-        )
-      : [];
+    if (!this._configEntry) {
+      return html`
+        <hass-subpage
+          .hass=${this.hass}
+          .narrow=${this.narrow}
+          .header=${this.hass.localize("ui.panel.config.zha.network.caption")}
+          back-path="/config"
+        >
+          <div class="loading">
+            <ha-spinner></ha-spinner>
+          </div>
+        </hass-subpage>
+      `;
+    }
+
+    const configEntry = this._configEntry;
+    const devices = Object.values(this.hass.devices).filter((device) =>
+      device.config_entries.includes(configEntry.entry_id)
+    );
     const deviceCount = devices.length;
 
     let entityCount = 0;
@@ -463,6 +492,12 @@ class ZHAConfigDashboard extends LitElement {
           margin-top: var(--ha-space-6);
         }
 
+        .loading {
+          display: flex;
+          justify-content: center;
+          padding: var(--ha-space-12);
+        }
+
         ha-md-list {
           background: none;
           padding: 0;

src/panels/config/person/dialog-person-detail.ts

@@ -219,7 +219,6 @@ class DialogPersonDetail
                     )}
                   </p>
                   <ha-entities-picker
-                    .hass=${this.hass}
                     .value=${this._deviceTrackers}
                     .includeDomains=${includeDomains}
                     .pickedEntityLabel=${this.hass.localize(

src/panels/config/scene/ha-scene-editor.ts

@@ -584,7 +584,6 @@ export class HaSceneEditor extends DirtyStateProviderMixin<number>()(
                       <ha-entity-picker
                         @value-changed=${this._entityPicked}
                         .excludeDomains=${SCENE_IGNORED_DOMAINS}
-                        .hass=${this.hass}
                         label=${this.hass.localize(
                           "ui.panel.config.scene.editor.entities.add"
                         )}

src/panels/config/voice-assistants/alexa-entity-voice-settings.ts

@@ -1,95 +0,0 @@
-import type { CSSResultGroup, PropertyValues } from "lit";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { computeStateName } from "../../../common/entity/compute_state_name";
-import "../../../components/input/ha-input";
-import type { AlexaEntityConfig } from "../../../data/alexa";
-import { fetchCloudAlexaEntity } from "../../../data/alexa";
-import { updateCloudAlexaEntityConfig } from "../../../data/cloud";
-import { haStyle } from "../../../resources/styles";
-import type { HomeAssistant } from "../../../types";
-
-@customElement("alexa-entity-voice-settings")
-export class AlexaEntityVoiceSettings extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public entityId!: string;
-
-  @state() private _entity?: AlexaEntityConfig;
-
-  protected willUpdate(changedProps: PropertyValues<this>) {
-    if (changedProps.has("entityId") && this.entityId) {
-      this._fetchEntity();
-    }
-  }
-
-  private async _fetchEntity() {
-    try {
-      this._entity = await fetchCloudAlexaEntity(this.hass, this.entityId);
-    } catch (_err) {
-      this._entity = undefined;
-    }
-  }
-
-  protected render() {
-    if (!this._entity) {
-      return nothing;
-    }
-
-    const defaultName = this.hass.states[this.entityId]
-      ? computeStateName(this.hass.states[this.entityId])
-      : this.entityId;
-
-    return html`
-      <ha-input
-        .label=${this.hass.localize("ui.dialogs.voice-settings.name")}
-        .hint=${this.hass.localize(
-          "ui.dialogs.voice-settings.name_description"
-        )}
-        with-clear
-        .value=${this._entity.name ?? ""}
-        .placeholder=${defaultName}
-        @change=${this._nameChanged}
-      ></ha-input>
-    `;
-  }
-
-  private async _nameChanged(ev) {
-    if (!this._entity) {
-      return;
-    }
-    const value = ev.target.value?.trim() || null;
-    if ((this._entity.name ?? null) === value) {
-      return;
-    }
-    const previous = this._entity.name ?? null;
-    this._entity = { ...this._entity, name: value };
-    try {
-      await updateCloudAlexaEntityConfig(this.hass, this.entityId, value);
-    } catch (_err) {
-      this._entity = { ...this._entity, name: previous };
-    }
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      haStyle,
-      css`
-        :host {
-          display: block;
-          margin: 0 var(--ha-space-8) var(--ha-space-8);
-        }
-        ha-input {
-          display: block;
-          width: 100%;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "alexa-entity-voice-settings": AlexaEntityVoiceSettings;
-  }
-}

src/panels/config/voice-assistants/assist-entity-voice-settings.ts

@@ -1,146 +0,0 @@
-import type { CSSResultGroup } from "lit";
-import { css, html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { fireEvent } from "../../../common/dom/fire_event";
-import { computeStateName } from "../../../common/entity/compute_state_name";
-import "../../../components/ha-alert";
-import "../../../components/ha-aliases-editor";
-import "../../../components/ha-md-list-item";
-import "../../../components/ha-switch";
-import type { ExtEntityRegistryEntry } from "../../../data/entity/entity_registry";
-import { updateEntityRegistryEntry } from "../../../data/entity/entity_registry";
-import { haStyle } from "../../../resources/styles";
-import type { HomeAssistant } from "../../../types";
-import { documentationUrl } from "../../../util/documentation-url";
-
-@customElement("assist-entity-voice-settings")
-export class AssistEntityVoiceSettings extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public entityId!: string;
-
-  @property({ attribute: false }) public entry?: ExtEntityRegistryEntry;
-
-  @state() private _aliases?: (string | null)[];
-
-  protected render() {
-    if (!this.entry) {
-      return html`<ha-alert alert-type="warning">
-        ${this.hass.localize("ui.dialogs.voice-settings.aliases_no_unique_id", {
-          faq_link: html`<a
-            href=${documentationUrl(this.hass, "/faq/unique_id")}
-            target="_blank"
-            rel="noreferrer"
-            >${this.hass.localize("ui.dialogs.entity_registry.faq")}</a
-          >`,
-        })}
-      </ha-alert>`;
-    }
-
-    return html`
-      <ha-md-list-item>
-        <span slot="headline">
-          ${this.hass.states[this.entityId]
-            ? computeStateName(this.hass.states[this.entityId])
-            : this.entityId}
-        </span>
-        <span slot="supporting-text">
-          ${this.hass.localize(
-            "ui.dialogs.voice-settings.entity_name_alias_description"
-          )}
-        </span>
-        <ha-switch
-          slot="end"
-          .checked=${(this._aliases ?? this.entry.aliases).includes(null)}
-          @change=${this._toggleEntityNameAlias}
-        ></ha-switch>
-      </ha-md-list-item>
-      <h4 class="header">
-        ${this.hass.localize("ui.dialogs.voice-settings.aliases")}
-      </h4>
-      <ha-aliases-editor
-        .aliases=${(this._aliases ?? this.entry.aliases).filter(
-          (a): a is string => a !== null
-        )}
-        sortable
-        @value-changed=${this._aliasesChanged}
-      ></ha-aliases-editor>
-    `;
-  }
-
-  private async _toggleEntityNameAlias(ev) {
-    const previous = this._aliases;
-    const enabled = ev.target.checked;
-    const currentAliases = this._aliases ?? this.entry?.aliases ?? [];
-    if (enabled) {
-      this._aliases = [null, ...currentAliases.filter((a) => a !== null)];
-    } else {
-      this._aliases = currentAliases.filter((a): a is string => a !== null);
-    }
-    await this._saveAliases(previous);
-  }
-
-  private _aliasesChanged(ev) {
-    const previous = this._aliases;
-    const currentAliases = this._aliases ?? this.entry?.aliases ?? [];
-    const hasNull = currentAliases.includes(null);
-    const nullAliases: (string | null)[] = hasNull ? [null] : [];
-    const newStringAliases: string[] = ev.detail.value;
-
-    this._aliases = [...nullAliases, ...newStringAliases];
-    this._saveAliases(previous);
-  }
-
-  private async _saveAliases(previous?: (string | null)[]) {
-    if (!this._aliases) {
-      return;
-    }
-    const hasNull = this._aliases.includes(null);
-    const nullAliases: null[] = hasNull ? [null] : [];
-    const stringAliases = this._aliases
-      .filter((a): a is string => a !== null)
-      .map((alias) => alias.trim())
-      .filter((alias) => alias);
-    try {
-      const result = await updateEntityRegistryEntry(this.hass, this.entityId, {
-        aliases: [...nullAliases, ...stringAliases],
-      });
-      fireEvent(this, "entity-entry-updated", result.entity_entry);
-    } catch (_err) {
-      this._aliases = previous;
-    }
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      haStyle,
-      css`
-        :host {
-          display: block;
-          margin: 0 var(--ha-space-8) var(--ha-space-8);
-        }
-        ha-md-list-item {
-          --md-list-item-leading-space: 0;
-          --md-list-item-trailing-space: 0;
-          --md-item-overflow: visible;
-        }
-        ha-aliases-editor {
-          display: block;
-        }
-        .header {
-          margin-top: var(--ha-space-2);
-          margin-bottom: var(--ha-space-1);
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "assist-entity-voice-settings": AssistEntityVoiceSettings;
-  }
-  interface HASSDomEvents {
-    "entity-entry-updated": ExtEntityRegistryEntry;
-  }
-}

src/panels/config/voice-assistants/dialog-voice-settings.ts

@@ -1,4 +1,4 @@
-import { mdiChevronLeft, mdiTuneVertical } from "@mdi/js";
+import { mdiTuneVertical } from "@mdi/js";
 import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -6,17 +6,10 @@ import { fireEvent } from "../../../common/dom/fire_event";
 import { computeStateName } from "../../../common/entity/compute_state_name";
 import "../../../components/ha-icon-button";
 import "../../../components/ha-dialog";
-import type { ExposeEntitySettings } from "../../../data/expose";
-import { voiceAssistants } from "../../../data/expose";
 import { showMoreInfoDialog } from "../../../dialogs/more-info/show-ha-more-info-dialog";
-import {
-  haStyle,
-  haStyleDialog,
-  haStyleDialogFixedTop,
-} from "../../../resources/styles";
+import { haStyle, haStyleDialog } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
 import "./entity-voice-settings";
-import "./voice-assistant-settings";
 import type { VoiceSettingsDialogParams } from "./show-dialog-voice-settings";
 
 @customElement("dialog-voice-settings")
@@ -27,14 +20,8 @@ class DialogVoiceSettings extends LitElement {
 
   @state() private _open = false;
 
-  @state() private _editingAssistant?: string;
-
-  @state() private _exposed?: ExposeEntitySettings;
-
   public showDialog(params: VoiceSettingsDialogParams): void {
     this._params = params;
-    this._exposed = params.exposed;
-    this._editingAssistant = undefined;
     this._open = true;
   }
 
@@ -44,8 +31,6 @@ class DialogVoiceSettings extends LitElement {
 
   private _dialogClosed(): void {
     this._params = undefined;
-    this._exposed = undefined;
-    this._editingAssistant = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
@@ -56,23 +41,14 @@ class DialogVoiceSettings extends LitElement {
     this.closeDialog();
   }
 
-  private _editAssistant(ev: CustomEvent): void {
-    this._editingAssistant = ev.detail.assistant;
-  }
-
-  private _backToList(): void {
-    this._editingAssistant = undefined;
-  }
-
   protected render() {
     if (!this._params) {
       return nothing;
     }
 
-    const title = this._editingAssistant
-      ? voiceAssistants[this._editingAssistant].name
-      : computeStateName(this.hass.states[this._params.entityId]) ||
-        this.hass.localize("ui.panel.config.entities.picker.unnamed_entity");
+    const title =
+      computeStateName(this.hass.states[this._params.entityId]) ||
+      this.hass.localize("ui.panel.config.entities.picker.unnamed_entity");
 
     return html`
       <ha-dialog
@@ -80,58 +56,28 @@ class DialogVoiceSettings extends LitElement {
         header-title=${title}
         @closed=${this._dialogClosed}
       >
-        ${this._editingAssistant
-          ? html`<ha-icon-button
-              slot="headerNavigationIcon"
-              .label=${this.hass.localize("ui.common.back")}
-              .path=${mdiChevronLeft}
-              @click=${this._backToList}
-            ></ha-icon-button>`
-          : html`<ha-icon-button
-              slot="headerActionItems"
-              .label=${this.hass.localize(
-                "ui.dialogs.voice-settings.view_entity"
-              )}
-              .path=${mdiTuneVertical}
-              @click=${this._viewMoreInfo}
-            ></ha-icon-button>`}
-        <div>${this._renderContent()}</div>
+        <ha-icon-button
+          slot="headerActionItems"
+          .label=${this.hass.localize("ui.dialogs.voice-settings.view_entity")}
+          .path=${mdiTuneVertical}
+          @click=${this._viewMoreInfo}
+        ></ha-icon-button>
+        <div>
+          <entity-voice-settings
+            .hass=${this.hass}
+            .entityId=${this._params.entityId}
+            .entry=${this._params.extEntityReg}
+            .exposed=${this._params.exposed}
+            @entity-entry-updated=${this._entityEntryUpdated}
+            @exposed-entities-changed=${this._exposedEntitiesChanged}
+          ></entity-voice-settings>
+        </div>
       </ha-dialog>
     `;
   }
 
-  private _renderContent() {
-    const entityId = this._params!.entityId;
-
-    if (this._editingAssistant) {
-      return html`<voice-assistant-settings
-        .hass=${this.hass}
-        .entityId=${entityId}
-        .assistant=${this._editingAssistant}
-        .entry=${this._params!.extEntityReg}
-        @entity-entry-updated=${this._entityEntryUpdated}
-      ></voice-assistant-settings>`;
-    }
-
-    return html`<entity-voice-settings
-      .hass=${this.hass}
-      .entityId=${entityId}
-      .entry=${this._params!.extEntityReg}
-      .exposed=${this._exposed!}
-      @edit-assistant=${this._editAssistant}
-      @exposed-changed=${this._exposedChanged}
-      @entity-entry-updated=${this._entityEntryUpdated}
-      @exposed-entities-changed=${this._exposedEntitiesChanged}
-    ></entity-voice-settings>`;
-  }
-
-  private _exposedChanged(ev: CustomEvent): void {
-    this._exposed = ev.detail.value;
-  }
-
   private _entityEntryUpdated(ev: CustomEvent) {
     this._params!.extEntityReg = ev.detail;
-    this._params!.entityEntryUpdated?.(ev.detail);
   }
 
   private _exposedEntitiesChanged() {
@@ -142,7 +88,6 @@ class DialogVoiceSettings extends LitElement {
     return [
       haStyle,
       haStyleDialog,
-      haStyleDialogFixedTop,
       css`
         ha-dialog {
           --dialog-content-padding: 0;

src/panels/config/voice-assistants/entity-voice-settings.ts

@@ -1,10 +1,11 @@
-import { mdiAlertCircle, mdiCog } from "@mdi/js";
+import { mdiAlertCircle } from "@mdi/js";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { isComponentLoaded } from "../../../common/config/is_component_loaded";
 import { fireEvent } from "../../../common/dom/fire_event";
+import { computeStateName } from "../../../common/entity/compute_state_name";
 import type {
   EntityDomainFilter,
   EntityDomainFilterFunc,
@@ -13,24 +14,35 @@ import {
   generateEntityDomainFilter,
   isEmptyEntityDomainFilter,
 } from "../../../common/entity/entity_domain_filter";
-import "../../../components/ha-icon-button";
+import "../../../components/ha-alert";
+import "../../../components/ha-aliases-editor";
+import "../../../components/ha-checkbox";
 import "../../../components/ha-md-list-item";
 import "../../../components/ha-switch";
 import "../../../components/voice-assistant-brand-icon";
 import { fetchCloudAlexaEntity } from "../../../data/alexa";
 import type { CloudStatus, CloudStatusLoggedIn } from "../../../data/cloud";
-import { fetchCloudStatus } from "../../../data/cloud";
+import {
+  fetchCloudStatus,
+  updateCloudGoogleEntityConfig,
+} from "../../../data/cloud";
 import type { ExtEntityRegistryEntry } from "../../../data/entity/entity_registry";
-import { getExtendedEntityRegistryEntry } from "../../../data/entity/entity_registry";
+import {
+  getExtendedEntityRegistryEntry,
+  updateEntityRegistryEntry,
+} from "../../../data/entity/entity_registry";
 import type { ExposeEntitySettings } from "../../../data/expose";
 import { exposeEntities, voiceAssistants } from "../../../data/expose";
 import type { GoogleEntity } from "../../../data/google_assistant";
 import { fetchCloudGoogleEntity } from "../../../data/google_assistant";
+import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
 import { haStyle } from "../../../resources/styles";
 import type { HomeAssistant } from "../../../types";
+import { documentationUrl } from "../../../util/documentation-url";
+import type { EntityRegistrySettings } from "../entities/entity-registry-settings";
 
 @customElement("entity-voice-settings")
-export class EntityVoiceSettings extends LitElement {
+export class EntityVoiceSettings extends SubscribeMixin(LitElement) {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property({ attribute: false }) public entityId!: string;
@@ -41,6 +53,8 @@ export class EntityVoiceSettings extends LitElement {
 
   @state() private _cloudStatus?: CloudStatus;
 
+  @state() private _aliases?: (string | null)[];
+
   @state() private _googleEntity?: GoogleEntity;
 
   @state() private _unsupported: Partial<
@@ -63,16 +77,16 @@ export class EntityVoiceSettings extends LitElement {
 
   private async _fetchEntities() {
     try {
-      this._googleEntity = await fetchCloudGoogleEntity(
+      const googleEntity = await fetchCloudGoogleEntity(
         this.hass,
         this.entityId
       );
+      this._googleEntity = googleEntity;
+      this.requestUpdate("_googleEntity");
     } catch (err: any) {
       if (err.code === "not_supported") {
-        this._unsupported = {
-          ...this._unsupported,
-          "cloud.google_assistant": true,
-        };
+        this._unsupported["cloud.google_assistant"] = true;
+        this.requestUpdate("_unsupported");
       }
     }
 
@@ -80,7 +94,8 @@ export class EntityVoiceSettings extends LitElement {
       await fetchCloudAlexaEntity(this.hass, this.entityId);
     } catch (err: any) {
       if (err.code === "not_supported") {
-        this._unsupported = { ...this._unsupported, "cloud.alexa": true };
+        this._unsupported["cloud.alexa"] = true;
+        this.requestUpdate("_unsupported");
       }
     }
   }
@@ -112,6 +127,7 @@ export class EntityVoiceSettings extends LitElement {
       this._cloudStatus.prefs.alexa_enabled === true;
 
     const showAssistants = [...Object.keys(voiceAssistants)];
+    const uiAssistants = [...showAssistants];
 
     const alexaManual =
       alexaEnabled &&
@@ -129,12 +145,20 @@ export class EntityVoiceSettings extends LitElement {
         showAssistants.indexOf("cloud.google_assistant"),
         1
       );
+      uiAssistants.splice(showAssistants.indexOf("cloud.google_assistant"), 1);
+    } else if (googleManual) {
+      uiAssistants.splice(uiAssistants.indexOf("cloud.google_assistant"), 1);
     }
 
     if (!alexaEnabled) {
       showAssistants.splice(showAssistants.indexOf("cloud.alexa"), 1);
+      uiAssistants.splice(uiAssistants.indexOf("cloud.alexa"), 1);
+    } else if (alexaManual) {
+      uiAssistants.splice(uiAssistants.indexOf("cloud.alexa"), 1);
     }
 
+    const uiExposed = uiAssistants.some((key) => this.exposed[key]);
+
     let manFilterFuncs:
       | {
           google: EntityDomainFilterFunc;
@@ -153,97 +177,216 @@ export class EntityVoiceSettings extends LitElement {
     const manExposedGoogle =
       googleManual && manFilterFuncs!.google(this.entityId);
 
+    const anyExposed = uiExposed || manExposedAlexa || manExposedGoogle;
+
     return html`
-      ${showAssistants.map((key) => {
-        const supported = !this._unsupported[key];
+      <ha-md-list-item>
+        <h3 slot="headline">
+          ${this.hass.localize("ui.dialogs.voice-settings.expose_header")}
+        </h3>
+        <ha-switch
+          slot="end"
+          @change=${this._toggleAll}
+          .assistants=${uiAssistants}
+          .checked=${anyExposed}
+        ></ha-switch>
+      </ha-md-list-item>
+      ${anyExposed
+        ? showAssistants.map((key) => {
+            const supported = !this._unsupported[key];
 
-        const exposed =
-          alexaManual && key === "cloud.alexa"
-            ? manExposedAlexa
-            : googleManual && key === "cloud.google_assistant"
-              ? manExposedGoogle
-              : this.exposed[key];
+            const exposed =
+              alexaManual && key === "cloud.alexa"
+                ? manExposedAlexa
+                : googleManual && key === "cloud.google_assistant"
+                  ? manExposedGoogle
+                  : this.exposed[key];
 
-        const manualConfig =
-          (alexaManual && key === "cloud.alexa") ||
-          (googleManual && key === "cloud.google_assistant");
+            const manualConfig =
+              (alexaManual && key === "cloud.alexa") ||
+              (googleManual && key === "cloud.google_assistant");
 
-        const hasSettings = supported && !manualConfig;
+            const support2fa =
+              key === "cloud.google_assistant" &&
+              !googleManual &&
+              supported &&
+              this._googleEntity?.might_2fa;
 
-        const aliasCount =
-          key === "conversation"
-            ? this.entry
-              ? this.entry.aliases.filter(Boolean).length
-              : undefined
-            : key === "cloud.google_assistant"
-              ? (this._googleEntity?.aliases?.filter(Boolean).length ?? 0)
-              : undefined;
-
-        return html`
-          <ha-md-list-item>
-            <voice-assistant-brand-icon slot="start" .voiceAssistantId=${key}>
-            </voice-assistant-brand-icon>
-            <span slot="headline">${voiceAssistants[key].name}</span>
-            ${!supported
-              ? html`<div slot="supporting-text" class="unsupported">
-                  <ha-svg-icon .path=${mdiAlertCircle}></ha-svg-icon>
-                  ${this.hass.localize("ui.dialogs.voice-settings.unsupported")}
-                </div>`
-              : manualConfig
-                ? html`
-                    <div slot="supporting-text">
+            return html`
+              <ha-md-list-item>
+                <voice-assistant-brand-icon
+                  slot="start"
+                  .voiceAssistantId=${key}
+                >
+                </voice-assistant-brand-icon>
+                <span slot="headline">${voiceAssistants[key].name}</span>
+                ${!supported
+                  ? html`<div slot="supporting-text" class="unsupported">
+                      <ha-svg-icon .path=${mdiAlertCircle}></ha-svg-icon>
                       ${this.hass.localize(
-                        "ui.dialogs.voice-settings.manual_config"
-                      )}
-                    </div>
-                  `
-                : aliasCount
-                  ? html`<div slot="supporting-text">
-                      ${this.hass.localize(
-                        "ui.dialogs.voice-settings.aliases_count",
-                        { count: aliasCount }
+                        "ui.dialogs.voice-settings.unsupported"
                       )}
                     </div>`
                   : nothing}
-            <div slot="end" class="trailing">
-              ${hasSettings
-                ? html`<ha-icon-button
-                    .path=${mdiCog}
-                    .label=${this.hass.localize(
-                      "ui.dialogs.voice-settings.edit_settings",
-                      { assistant: voiceAssistants[key].name }
-                    )}
-                    .assistant=${key}
-                    @click=${this._editAssistant}
-                  ></ha-icon-button>`
-                : nothing}
+                ${manualConfig
+                  ? html`
+                      <div slot="supporting-text">
+                        ${this.hass.localize(
+                          "ui.dialogs.voice-settings.manual_config"
+                        )}
+                      </div>
+                    `
+                  : nothing}
+                ${support2fa
+                  ? html`
+                      <ha-checkbox
+                        slot="supporting-text"
+                        .checked=${!this._googleEntity!.disable_2fa}
+                        @change=${this._2faChanged}
+                      >
+                        ${this.hass.localize(
+                          "ui.dialogs.voice-settings.ask_pin"
+                        )}
+                      </ha-checkbox>
+                    `
+                  : nothing}
+                <ha-switch
+                  slot="end"
+                  .assistant=${key}
+                  @change=${this._toggleAssistant}
+                  .disabled=${manualConfig || (!exposed && !supported)}
+                  .checked=${exposed}
+                ></ha-switch>
+              </ha-md-list-item>
+            `;
+          })
+        : nothing}
+
+      <h3 class="header">
+        ${this.hass.localize("ui.dialogs.voice-settings.aliases_header")}
+      </h3>
+
+      <p class="description">
+        ${this.hass.localize("ui.dialogs.voice-settings.aliases_description")}
+      </p>
+
+      ${!this.entry
+        ? html`<ha-alert alert-type="warning">
+            ${this.hass.localize(
+              "ui.dialogs.voice-settings.aliases_no_unique_id",
+              {
+                faq_link: html`<a
+                  href=${documentationUrl(this.hass, "/faq/unique_id")}
+                  target="_blank"
+                  rel="noreferrer"
+                  >${this.hass.localize("ui.dialogs.entity_registry.faq")}</a
+                >`,
+              }
+            )}
+          </ha-alert>`
+        : html`
+            <ha-md-list-item>
+              <span slot="headline">
+                ${this.hass.states[this.entityId]
+                  ? computeStateName(this.hass.states[this.entityId])
+                  : this.entityId}
+              </span>
+              <span slot="supporting-text">
+                ${this.hass.localize(
+                  "ui.dialogs.voice-settings.entity_name_alias_description"
+                )}
+              </span>
               <ha-switch
-                .assistant=${key}
-                @change=${this._toggleAssistant}
-                .disabled=${manualConfig || (!exposed && !supported)}
-                .checked=${exposed}
+                slot="end"
+                .checked=${(this._aliases ?? this.entry.aliases).includes(null)}
+                @change=${this._toggleEntityNameAlias}
               ></ha-switch>
-            </div>
-          </ha-md-list-item>
-        `;
-      })}
+            </ha-md-list-item>
+            <ha-aliases-editor
+              .aliases=${(this._aliases ?? this.entry.aliases).filter(
+                (a): a is string => a !== null
+              )}
+              sortable
+              @value-changed=${this._aliasesChanged}
+            ></ha-aliases-editor>
+          `}
     `;
   }
 
-  private _editAssistant(ev) {
-    fireEvent(this, "edit-assistant", { assistant: ev.target.assistant });
+  private async _toggleEntityNameAlias(ev) {
+    const enabled = ev.target.checked;
+    const currentAliases = this._aliases ?? this.entry?.aliases ?? [];
+    if (enabled) {
+      this._aliases = [null, ...currentAliases.filter((a) => a !== null)];
+    } else {
+      this._aliases = currentAliases.filter((a): a is string => a !== null);
+    }
+    await this._saveAliases();
+  }
+
+  private _aliasesChanged(ev) {
+    const currentAliases = this._aliases ?? this.entry?.aliases ?? [];
+    const hasNull = currentAliases.includes(null);
+    const nullAliases: (string | null)[] = hasNull ? [null] : [];
+    const newStringAliases: string[] = ev.detail.value;
+
+    this._aliases = [...nullAliases, ...newStringAliases];
+    this._saveAliases();
+  }
+
+  private async _2faChanged(ev) {
+    try {
+      await updateCloudGoogleEntityConfig(
+        this.hass,
+        this.entityId,
+        !ev.target.checked
+      );
+    } catch (_err) {
+      ev.target.checked = !ev.target.checked;
+    }
+  }
+
+  private async _saveAliases() {
+    if (!this._aliases) {
+      return;
+    }
+    const hasNull = this._aliases.includes(null);
+    const nullAliases: null[] = hasNull ? [null] : [];
+    const stringAliases = this._aliases
+      .filter((a): a is string => a !== null)
+      .map((alias) => alias.trim())
+      .filter((alias) => alias);
+    const result = await updateEntityRegistryEntry(this.hass, this.entityId, {
+      aliases: [...nullAliases, ...stringAliases],
+    });
+    fireEvent(this, "entity-entry-updated", result.entity_entry);
   }
 
   private async _toggleAssistant(ev) {
-    ev.stopPropagation();
-    const assistant: string = ev.target.assistant;
-    const checked: boolean = ev.target.checked;
+    exposeEntities(
+      this.hass,
+      [ev.target.assistant],
+      [this.entityId],
+      ev.target.checked
+    );
+    if (this.entry) {
+      const entry = await getExtendedEntityRegistryEntry(
+        this.hass,
+        this.entityId
+      );
+      fireEvent(this, "entity-entry-updated", entry);
+    }
+    fireEvent(this, "exposed-entities-changed");
+  }
 
-    exposeEntities(this.hass, [assistant], [this.entityId], checked);
-    fireEvent(this, "exposed-changed", {
-      value: { ...this.exposed, [assistant]: checked },
-    });
+  private async _toggleAll(ev) {
+    const expose = ev.target.checked;
 
+    const assistants = expose
+      ? ev.target.assistants.filter((key) => !this._unsupported[key])
+      : ev.target.assistants;
+
+    exposeEntities(this.hass, assistants, [this.entityId], ev.target.checked);
     if (this.entry) {
       const entry = await getExtendedEntityRegistryEntry(
         this.hass,
@@ -260,7 +403,7 @@ export class EntityVoiceSettings extends LitElement {
       css`
         :host {
           display: block;
-          margin: var(--ha-space-8);
+          margin: 32px;
           margin-top: 0;
         }
         ha-md-list-item {
@@ -268,10 +411,19 @@ export class EntityVoiceSettings extends LitElement {
           --md-list-item-trailing-space: 0;
           --md-item-overflow: visible;
         }
-        .trailing {
-          display: flex;
-          align-items: center;
-          gap: var(--ha-space-2);
+        img {
+          height: 32px;
+          width: 32px;
+          margin-right: 16px;
+          margin-inline-end: 16px;
+          margin-inline-start: initial;
+        }
+        ha-aliases-editor {
+          display: block;
+        }
+        ha-alert {
+          display: block;
+          margin-top: 16px;
         }
         .unsupported {
           display: flex;
@@ -280,10 +432,21 @@ export class EntityVoiceSettings extends LitElement {
         .unsupported ha-svg-icon {
           color: var(--error-color);
           --mdc-icon-size: 16px;
-          margin-right: var(--ha-space-1);
-          margin-inline-end: var(--ha-space-1);
+          margin-right: 4px;
+          margin-inline-end: 4px;
           margin-inline-start: initial;
         }
+        .header {
+          margin-top: 8px;
+          margin-bottom: 4px;
+        }
+        .description {
+          color: var(--secondary-text-color);
+          font-size: var(--ha-font-size-m);
+          line-height: var(--ha-line-height-condensed);
+          margin-top: 0;
+          margin-bottom: 16px;
+        }
       `,
     ];
   }
@@ -291,11 +454,15 @@ export class EntityVoiceSettings extends LitElement {
 
 declare global {
   interface HTMLElementTagNameMap {
-    "entity-voice-settings": EntityVoiceSettings;
+    "entity-registry-settings": EntityRegistrySettings;
   }
   interface HASSDomEvents {
     "entity-entry-updated": ExtEntityRegistryEntry;
-    "edit-assistant": { assistant: string };
-    "exposed-changed": { value: ExposeEntitySettings };
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "entity-voice-settings": EntityVoiceSettings;
   }
 }

src/panels/config/voice-assistants/google-entity-voice-settings.ts

@@ -1,176 +0,0 @@
-import "@home-assistant/webawesome/dist/components/divider/divider";
-import type { CSSResultGroup, PropertyValues } from "lit";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { computeStateName } from "../../../common/entity/compute_state_name";
-import "../../../components/ha-aliases-editor";
-import "../../../components/ha-md-list-item";
-import "../../../components/ha-switch";
-import "../../../components/input/ha-input";
-import { updateCloudGoogleEntityConfig } from "../../../data/cloud";
-import type { GoogleEntity } from "../../../data/google_assistant";
-import { fetchCloudGoogleEntity } from "../../../data/google_assistant";
-import { haStyle } from "../../../resources/styles";
-import type { HomeAssistant } from "../../../types";
-
-@customElement("google-entity-voice-settings")
-export class GoogleEntityVoiceSettings extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
-  @property({ attribute: false }) public entityId!: string;
-
-  @state() private _entity?: GoogleEntity;
-
-  protected willUpdate(changedProps: PropertyValues<this>) {
-    if (changedProps.has("entityId") && this.entityId) {
-      this._fetchEntity();
-    }
-  }
-
-  private async _fetchEntity() {
-    try {
-      const entity = await fetchCloudGoogleEntity(this.hass, this.entityId);
-      if (entity.aliases) {
-        entity.aliases = entity.aliases.filter(Boolean);
-      }
-      this._entity = entity;
-    } catch (_err) {
-      this._entity = undefined;
-    }
-  }
-
-  protected render() {
-    if (!this._entity) {
-      return nothing;
-    }
-
-    const defaultName = this.hass.states[this.entityId]
-      ? computeStateName(this.hass.states[this.entityId])
-      : this.entityId;
-
-    return html`
-      <ha-input
-        .label=${this.hass.localize("ui.dialogs.voice-settings.name")}
-        .hint=${this.hass.localize(
-          "ui.dialogs.voice-settings.name_description"
-        )}
-        with-clear
-        .value=${this._entity.name ?? ""}
-        .placeholder=${defaultName}
-        @change=${this._nameChanged}
-      ></ha-input>
-      <h4 class="header">
-        ${this.hass.localize("ui.dialogs.voice-settings.aliases")}
-      </h4>
-      <ha-aliases-editor
-        .aliases=${this._entity.aliases ?? []}
-        @value-changed=${this._aliasesChanged}
-      ></ha-aliases-editor>
-      ${this._entity.might_2fa
-        ? html`
-            <wa-divider></wa-divider>
-            <ha-md-list-item>
-              <span slot="headline">
-                ${this.hass.localize("ui.dialogs.voice-settings.ask_pin")}
-              </span>
-              <ha-switch
-                slot="end"
-                .checked=${!this._entity.disable_2fa}
-                @change=${this._2faChanged}
-              ></ha-switch>
-            </ha-md-list-item>
-          `
-        : nothing}
-    `;
-  }
-
-  private async _nameChanged(ev) {
-    if (!this._entity) {
-      return;
-    }
-    const value = ev.target.value?.trim() || null;
-    if ((this._entity.name ?? null) === value) {
-      return;
-    }
-    const previous = this._entity.name ?? null;
-    this._entity = { ...this._entity, name: value };
-    try {
-      await updateCloudGoogleEntityConfig(this.hass, this.entityId, {
-        name: value,
-      });
-    } catch (_err) {
-      this._entity = { ...this._entity, name: previous };
-    }
-  }
-
-  private async _aliasesChanged(ev) {
-    if (!this._entity) {
-      return;
-    }
-    const aliases = ev.detail.value as string[];
-    const previous = this._entity.aliases ?? null;
-    this._entity = { ...this._entity, aliases };
-    const stringAliases = aliases
-      .map((alias) => alias.trim())
-      .filter((alias) => alias);
-    try {
-      await updateCloudGoogleEntityConfig(this.hass, this.entityId, {
-        aliases: stringAliases,
-      });
-    } catch (_err) {
-      this._entity = { ...this._entity, aliases: previous };
-    }
-  }
-
-  private async _2faChanged(ev) {
-    if (!this._entity) {
-      return;
-    }
-    const disable_2fa = !ev.target.checked;
-    this._entity = { ...this._entity, disable_2fa };
-    try {
-      await updateCloudGoogleEntityConfig(this.hass, this.entityId, {
-        disable_2fa,
-      });
-    } catch (_err) {
-      this._entity = { ...this._entity, disable_2fa: !disable_2fa };
-    }
-  }
-
-  static get styles(): CSSResultGroup {
-    return [
-      haStyle,
-      css`
-        :host {
-          display: block;
-          margin: 0 var(--ha-space-8) var(--ha-space-8);
-        }
-        ha-input {
-          display: block;
-          width: 100%;
-        }
-        ha-aliases-editor {
-          display: block;
-        }
-        .header {
-          margin-top: var(--ha-space-2);
-          margin-bottom: var(--ha-space-1);
-        }
-        ha-md-list-item {
-          --md-list-item-leading-space: 0;
-          --md-list-item-trailing-space: 0;
-          --md-item-overflow: visible;
-        }
-        wa-divider {
-          margin: var(--ha-space-2) 0;
-        }
-      `,
-    ];
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "google-entity-voice-settings": GoogleEntityVoiceSettings;
-  }
-}

src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts

@@ -104,8 +104,6 @@ export class VoiceAssistantsExpose extends LitElement {
     string[] | undefined
   >;
 
-  @state() private _googleAliases?: Record<string, string[]>;
-
   @storage({
     key: "voice-expose-table-sort",
     state: false,
@@ -160,8 +158,7 @@ export class VoiceAssistantsExpose extends LitElement {
         | undefined,
       _language: string,
       localize: LocalizeFunc,
-      entitiesToCheck?: any[],
-      googleAliases?: Record<string, string[]>
+      entitiesToCheck?: any[]
     ): DataTableColumnContainer => ({
       icon: {
         title: "",
@@ -202,15 +199,9 @@ export class VoiceAssistantsExpose extends LitElement {
         sortable: true,
         filterable: true,
         template: (entry) => {
-          const registryAliases = entry.aliases.filter(
+          const aliases = entry.aliases.filter(
             (a: string | null) => a !== null
           );
-          const aliases = [
-            ...new Set([
-              ...registryAliases,
-              ...(googleAliases?.[entry.entity_id] ?? []),
-            ]),
-          ];
           return aliases.length === 0
             ? "-"
             : aliases.length === 1
@@ -466,14 +457,6 @@ export class VoiceAssistantsExpose extends LitElement {
       // TODO add supported entity for assist
       conversation: undefined,
     };
-    this._googleAliases = googleEntities
-      ? Object.fromEntries(
-          googleEntities.map((entity) => [
-            entity.entity_id,
-            (entity.aliases ?? []).filter(Boolean),
-          ])
-        )
-      : undefined;
   }
 
   public willUpdate(changedProperties: PropertyValues): void {
@@ -520,8 +503,7 @@ export class VoiceAssistantsExpose extends LitElement {
           this._supportedEntities,
           this.hass.language,
           this.hass.localize,
-          filteredEntities,
-          this._googleAliases
+          filteredEntities
         )}
         .data=${filteredEntities}
         .searchLabel=${this.hass.localize(
@@ -726,9 +708,6 @@ export class VoiceAssistantsExpose extends LitElement {
       exposedEntitiesChanged: () => {
         fireEvent(this, "exposed-entities-changed");
       },
-      entityEntryUpdated: (entry) => {
-        this._extEntities = { ...this._extEntities, [entityId]: entry };
-      },
     });
   }
 

src/panels/config/voice-assistants/show-dialog-voice-settings.ts

@@ -7,7 +7,6 @@ export interface VoiceSettingsDialogParams {
   exposed: ExposeEntitySettings;
   extEntityReg?: ExtEntityRegistryEntry;
   exposedEntitiesChanged?: () => void;
-  entityEntryUpdated?: (entry: ExtEntityRegistryEntry) => void;
 }
 
 export const loadVoiceSettingsDialog = () => import("./dialog-voice-settings");