Add BrowserStack cross-browser/device e2e runs

Layers BrowserStack on top of the local Playwright e2e suites: - browserstack.yml (Windows Chrome, macOS Firefox, iPad/iPhone WebKit, Galaxy S23) driven by the BrowserStack Node SDK and Local tunnel - :browserstack package scripts and the gated E2E (BrowserStack) CI job (runs on manual dispatch or the e2e-browserstack PR label) - tunnel/iOS-WebKit resilience in the specs (bs-local.com host, single shared mobile context, dynamic-import + CDP "Internal error" skips) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Add Playwright e2e tests for demo, test app, and gallery
2026-07-27 06:46:27 +00:00 · 2026-06-17 10:50:27 +02:00 · 2026-06-17 10:49:08 +02:00
563 changed files with 11248 additions and 26814 deletions
@@ -1,38 +0,0 @@
-#!/usr/bin/env node
-// Fails the check when a pull request carries a label that blocks merging, and
-// writes the outcome to the job summary. Invoked from the `check` job in
-// .github/workflows/blocking-labels.yaml via actions/github-script:
-//
-//   const { default: checkBlockingLabels } =
-//     await import(`${process.env.GITHUB_WORKSPACE}/.github/scripts/check-blocking-labels.mjs`);
-//   await checkBlockingLabels({ github, context, core });
-
-export default async function checkBlockingLabels({ context, core }) {
-  const blockingLabels = [
-    "wait for backend",
-    "Needs UX",
-    "Do Not Review",
-    "Blocked",
-    "has-parent",
-  ];
-  const prLabels = context.payload.pull_request.labels.map((l) => l.name);
-  const found = blockingLabels.filter((bl) => prLabels.includes(bl));
-  if (found.length > 0) {
-    const message = `This Pull Request is blocked by label${found.length > 1 ? "s" : ""}: ${found.join(", ")}`;
-    await core.summary
-      .addHeading(":no_entry_sign: Pull Request is blocked", 2)
-      .addRaw(message)
-      .write();
-    core.setFailed(message);
-  } else {
-    await core.summary
-      .addHeading(
-        ":white_check_mark: Pull Request is clear to merge after review",
-        2
-      )
-      .addRaw(
-        "This Pull Request is not blocked by any labels which prevent it from being merged."
-      )
-      .write();
-  }
-}
@@ -1,195 +0,0 @@
-#!/usr/bin/env node
-// Checks that a pull request follows the contribution standards: it must use the
-// PR template, tick exactly one "Type of change" option, and describe the change.
-// Labels and comments the PR when it does not, and fails the check so it blocks
-// merging. Invoked from the `check` job in .github/workflows/pull-request-standards.yaml
-// via actions/github-script:
-//
-//   const { default: checkStandards } =
-//     await import(`${process.env.GITHUB_WORKSPACE}/.github/scripts/check-pull-request-standards.mjs`);
-//   await checkStandards({ github, context, core });
-
-export default async function checkPullRequestStandards({
-  github,
-  context,
-  core,
-}) {
-  const pr = context.payload.pull_request;
-
-  // Exempt bots (Copilot agent, dependabot), drafts, and maintainers.
-  if (pr.user.type === "Bot") {
-    core.info(`Skipping bot author: ${pr.user.login}`);
-    return;
-  }
-  if (pr.draft) {
-    core.info("Skipping draft pull request");
-    return;
-  }
-  try {
-    await github.rest.orgs.checkMembershipForUser({
-      org: "home-assistant",
-      username: pr.user.login,
-    });
-    core.info(`Skipping organization member: ${pr.user.login}`);
-    return;
-  } catch (_error) {
-    core.info(
-      `${pr.user.login} is not an organization member, checking standards`
-    );
-  }
-
-  const label = "Needs Template";
-  const marker = "<!-- pr-standards-check -->";
-  const { owner, repo } = context.repo;
-  const issue_number = pr.number;
-
-  let body = pr.body || "";
-  let previous;
-  do {
-    previous = body;
-    body = body.replace(/<!--[\s\S]*?-->/g, "");
-  } while (body !== previous);
-  const normalized = body.toLowerCase();
-
-  // Ignore 404s from mutations that race manual edits or cancelled runs.
-  const ignoreMissing = async (fn) => {
-    try {
-      await fn();
-    } catch (error) {
-      if (error.status === 404) {
-        core.info("Target already removed, nothing to do");
-        return;
-      }
-      throw error;
-    }
-  };
-
-  // Hide/restore our comment via GraphQL (REST cannot minimize).
-  const setMinimized = async (subjectId, minimized) => {
-    const mutation = minimized
-      ? `mutation($id: ID!) {
-           minimizeComment(input: { subjectId: $id, classifier: RESOLVED }) {
-             clientMutationId
-           }
-         }`
-      : `mutation($id: ID!) {
-           unminimizeComment(input: { subjectId: $id }) {
-             clientMutationId
-           }
-         }`;
-    try {
-      await github.graphql(mutation, { id: subjectId });
-    } catch (error) {
-      core.info(
-        `Could not ${minimized ? "minimize" : "restore"} comment: ${error.message}`
-      );
-    }
-  };
-
-  // Content of a "## <name>" section, or null when the heading is absent.
-  const section = (name) => {
-    const match = body.match(
-      new RegExp(`##\\s${name}([\\s\\S]*?)(?=\\n##\\s|$)`, "i")
-    );
-    return match ? match[1] : null;
-  };
-
-  const problems = [];
-
-  const requiredHeadings = [
-    "## proposed change",
-    "## type of change",
-    "## checklist",
-  ];
-  if (requiredHeadings.some((h) => !normalized.includes(h))) {
-    problems.push(
-      "Use the pull request template without removing its sections."
-    );
-  }
-
-  const typeOfChange = section("type of change");
-  if (typeOfChange !== null) {
-    const ticked = (typeOfChange.match(/-\s*\[[xX]\]/g) || []).length;
-    if (ticked !== 1) {
-      problems.push('Select exactly one option under "Type of change".');
-    }
-  }
-
-  const proposedChange = section("proposed change");
-  if (proposedChange !== null && proposedChange.trim().length === 0) {
-    problems.push('Describe your changes under "Proposed change".');
-  }
-
-  const isValid = problems.length === 0;
-
-  const comments = await github.paginate(github.rest.issues.listComments, {
-    owner,
-    repo,
-    issue_number,
-    per_page: 100,
-  });
-  const existing = comments.find((c) => c.body.includes(marker));
-  const hasLabel = pr.labels.some((l) => l.name === label);
-
-  if (isValid) {
-    core.info("Pull request standards met");
-
-    if (hasLabel) {
-      await ignoreMissing(() =>
-        github.rest.issues.removeLabel({
-          owner,
-          repo,
-          issue_number,
-          name: label,
-        })
-      );
-    }
-    if (existing) {
-      await setMinimized(existing.node_id, true);
-    }
-    return;
-  }
-
-  core.info(`Pull request standards not met:\n- ${problems.join("\n- ")}`);
-
-  if (!hasLabel) {
-    await github.rest.issues.addLabels({
-      owner,
-      repo,
-      issue_number,
-      labels: [label],
-    });
-  }
-
-  const message =
-    `${marker}\n` +
-    `Hey @${pr.user.login}!\n\n` +
-    `Thank you for your contribution! To help reviewers, please update ` +
-    `this pull request to follow our pull request standards:\n\n` +
-    problems.map((p) => `- ${p}`).join("\n") +
-    `\n\n` +
-    `Please complete the ` +
-    `[PR template](https://github.com/home-assistant/frontend/blob/dev/.github/PULL_REQUEST_TEMPLATE.md?plain=1) ` +
-    `and see the [developer docs](https://developers.home-assistant.io/docs/review-process) ` +
-    `for more on creating a great pull request (see point 6).`;
-
-  if (existing) {
-    await github.rest.issues.updateComment({
-      owner,
-      repo,
-      comment_id: existing.id,
-      body: message,
-    });
-    await setMinimized(existing.node_id, false);
-  } else {
-    await github.rest.issues.createComment({
-      owner,
-      repo,
-      issue_number,
-      body: message,
-    });
-  }
-
-  // Fail this check so it can block the PR from being merged
-  core.setFailed(`Pull request standards not met:\n- ${problems.join("\n- ")}`);
-}
@@ -1,58 +0,0 @@
-#!/usr/bin/env node
-// Restricts Task issues to organization members: closes and labels the issue with
-// an explanatory comment when the author is not an org member. Invoked from the
-// `check-authorization` job in .github/workflows/restrict-task-creation.yml via
-// actions/github-script:
-//
-//   const { default: checkTaskAuthorization } =
-//     await import(`${process.env.GITHUB_WORKSPACE}/.github/scripts/check-task-authorization.mjs`);
-//   await checkTaskAuthorization({ github, context, core });
-
-export default async function checkTaskAuthorization({
-  github,
-  context,
-  core,
-}) {
-  const issueAuthor = context.payload.issue.user.login;
-
-  // Check if user is an organization member
-  try {
-    await github.rest.orgs.checkMembershipForUser({
-      org: "home-assistant",
-      username: issueAuthor,
-    });
-    core.info(`✅ ${issueAuthor} is an organization member`);
-    return; // Authorized
-  } catch (_error) {
-    core.info(`❌ ${issueAuthor} is not authorized to create Task issues`);
-  }
-
-  // Close the issue with a comment
-  await github.rest.issues.createComment({
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    issue_number: context.issue.number,
-    body:
-      `Hi @${issueAuthor}, thank you for your contribution!\n\n` +
-      `Task issues are restricted to Open Home Foundation staff and authorized contributors.\n\n` +
-      `If you would like to:\n` +
-      `- Report a bug: Please use the [bug report form](https://github.com/home-assistant/frontend/issues/new?template=bug_report.yml)\n` +
-      `- Request a feature: Please submit to [Feature Requests](https://github.com/orgs/home-assistant/discussions)\n\n` +
-      `If you believe you should have access to create Task issues, please contact the maintainers.`,
-  });
-
-  await github.rest.issues.update({
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    issue_number: context.issue.number,
-    state: "closed",
-  });
-
-  // Add a label to indicate this was auto-closed
-  await github.rest.issues.addLabels({
-    owner: context.repo.owner,
-    repo: context.repo.repo,
-    issue_number: context.issue.number,
-    labels: ["auto-closed"],
-  });
-}
@@ -20,16 +20,31 @@ jobs:
    name: Check for labels which block the Pull Request from being merged
    runs-on: ubuntu-latest
    steps:
-      - name: Check out workflow scripts
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-          sparse-checkout: .github/scripts
      - name: Check for blocking labels
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          script: |
-            const { default: checkBlockingLabels } = await import(
-              `${process.env.GITHUB_WORKSPACE}/.github/scripts/check-blocking-labels.mjs`
+            const blockingLabels = [
+              "wait for backend",
+              "Needs UX",
+              "Do Not Review",
+              "Blocked",
+              "has-parent",
+            ];
+            const prLabels = context.payload.pull_request.labels.map(
+              (l) => l.name
            );
-            await checkBlockingLabels({ github, context, core });
+            const found = blockingLabels.filter((bl) => prLabels.includes(bl));
+            if (found.length > 0) {
+              const message = `This Pull Request is blocked by label${found.length > 1 ? "s" : ""}: ${found.join(", ")}`;
+              await core.summary
+                .addHeading(":no_entry_sign: Pull Request is blocked", 2)
+                .addRaw(message)
+                .write();
+              core.setFailed(message);
+            } else {
+              await core.summary
+                .addHeading(":white_check_mark: Pull Request is clear to merge after review", 2)
+                .addRaw("This Pull Request is not blocked by any labels which prevent it from being merged.")
+                .write();
+            }
@@ -24,7 +24,7 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          ref: dev
          persist-credentials: false
@@ -60,7 +60,7 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          ref: master
          persist-credentials: false
@@ -27,7 +27,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
      - name: Setup Node
@@ -65,7 +65,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
      - name: Setup Node
@@ -85,7 +85,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
      - name: Setup Node
@@ -105,8 +105,6 @@ jobs:
          name: frontend-bundle-stats
          path: build/stats/*.json
          if-no-files-found: error
-      - name: Check entrypoint bundle size budget
-        run: yarn run check-bundlesize
      - name: Upload frontend build
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
@@ -27,7 +27,7 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          # We must fetch at least the immediate parents so that if this is
          # a pull request then we can checkout the head.
@@ -25,7 +25,7 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          ref: dev
          persist-credentials: false
@@ -61,7 +61,7 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          ref: master
          persist-credentials: false
@@ -19,7 +19,7 @@ jobs:
      url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false

@@ -24,7 +24,7 @@ jobs:
    if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview')
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false

@@ -9,7 +9,14 @@ on:
    branches:
      - dev
      - master
+  # BrowserStack runs are gated by the `e2e-browserstack` label or manual
+  # dispatch — see the e2e-browserstack job below. Local Chromium always runs.
  workflow_dispatch:
+    inputs:
+      run-browserstack:
+        description: "Run BrowserStack suite"
+        type: boolean
+        default: true

 env:
  NODE_OPTIONS: --max_old_space_size=6144
@@ -28,7 +35,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false

@@ -60,7 +67,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false

@@ -92,7 +99,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false

@@ -129,7 +136,7 @@ jobs:
    timeout-minutes: 30
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false

@@ -155,19 +162,19 @@ jobs:
        timeout-minutes: 10

      - name: Download demo build
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        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@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        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@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
        with:
          name: gallery-dist
          path: gallery/dist/
@@ -184,18 +191,75 @@ jobs:
          path: test/e2e/reports/
          retention-days: 3

+  # ── Run Playwright tests on BrowserStack (real devices + browsers) ─────────
+  # The BrowserStack SDK manages the Local tunnel and uploads results to the
+  # BrowserStack Automate dashboard automatically — no tunnel action needed.
+  #
+  # Gated on:
+  #   - manual dispatch with the run-browserstack input enabled, OR
+  #   - a PR with the `e2e-browserstack` label applied.
+  # This keeps CI fast on normal PRs while still allowing on-demand runs.
+  e2e-browserstack:
+    name: E2E (BrowserStack)
+    needs: [build-demo, build-e2e-test-app, build-gallery]
+    runs-on: ubuntu-latest
+    if: |
+      (github.event_name == 'workflow_dispatch' && inputs.run-browserstack) ||
+      (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'e2e-browserstack'))
+    environment: browserstack
+    env:
+      BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
+      BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+    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 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 (BrowserStack)
+        run: yarn test:e2e:browserstack
+
  # ── Merge local blob reports and post PR comment ───────────────────────────
+  # Only depends on the local job — BrowserStack reports live on the
+  # BrowserStack Automate dashboard and don't feed into the local blob report.
  report:
    name: Report
    needs: [e2e-local]
    runs-on: ubuntu-latest
-    if: ${{ !cancelled() }}
+    if: always()
    permissions:
      contents: read
      pull-requests: write
    steps:
      - name: Check out files from GitHub
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
        with:
          persist-credentials: false

@@ -209,7 +273,7 @@ jobs:
        run: yarn install --immutable

      - name: Download blob report (local)
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
        continue-on-error: true
        with:
          name: blob-report-local
@@ -229,12 +293,16 @@ jobs:
          path: test/e2e/reports/combined/
          retention-days: 14

-      - name: Post report to PR
-        if: github.event_name == 'pull_request' && needs.e2e-local.result == 'failure'
-        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+      - name: Post report link to PR
+        if: github.event_name == 'pull_request'
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
        with:
          script: |
-            const { default: postReportComment } = await import(
-              `${process.env.GITHUB_WORKSPACE}/test/e2e/post-report-comment.mjs`
-            );
-            await postReportComment({ github, context, core });
+            const runUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
+            const body = `## Playwright E2E test report\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,
+            });
@@ -20,7 +20,7 @@ jobs:
      contents: write
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false

@@ -1,7 +1,7 @@
 name: Pull request standards

 on:
-  pull_request_target: # zizmor: ignore[dangerous-triggers] -- safe: reads PR metadata from event payload only, checks out base repo scripts only, never PR head code
+  pull_request_target: # zizmor: ignore[dangerous-triggers] -- safe: reads PR metadata from event payload only, no PR code checkout
    types:
      - opened
      - edited
@@ -23,16 +23,168 @@ jobs:
    permissions:
      pull-requests: write # To label and comment on pull requests
    steps:
-      - name: Check out workflow scripts
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-          sparse-checkout: .github/scripts
      - name: Check pull request standards
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          script: |
-            const { default: checkStandards } = await import(
-              `${process.env.GITHUB_WORKSPACE}/.github/scripts/check-pull-request-standards.mjs`
+            const pr = context.payload.pull_request;
+
+            // Exempt bots (Copilot agent, dependabot), drafts, and maintainers.
+            if (pr.user.type === "Bot") {
+              core.info(`Skipping bot author: ${pr.user.login}`);
+              return;
+            }
+            if (pr.draft) {
+              core.info("Skipping draft pull request");
+              return;
+            }
+            try {
+              await github.rest.orgs.checkMembershipForUser({
+                org: "home-assistant",
+                username: pr.user.login,
+              });
+              core.info(`Skipping organization member: ${pr.user.login}`);
+              return;
+            } catch (error) {
+              core.info(`${pr.user.login} is not an organization member, checking standards`);
+            }
+
+            const label = "Needs Template";
+            const marker = "<!-- pr-standards-check -->";
+            const { owner, repo } = context.repo;
+            const issue_number = pr.number;
+
+            const body = (pr.body || "").replace(/<!--[\s\S]*?-->/g, "");
+            const normalized = body.toLowerCase();
+
+            // Ignore 404s from mutations that race manual edits or cancelled runs.
+            const ignoreMissing = async (fn) => {
+              try {
+                await fn();
+              } catch (error) {
+                if (error.status === 404) {
+                  core.info("Target already removed, nothing to do");
+                  return;
+                }
+                throw error;
+              }
+            };
+
+            // Hide/restore our comment via GraphQL (REST cannot minimize).
+            const setMinimized = async (subjectId, minimized) => {
+              const mutation = minimized
+                ? `mutation($id: ID!) {
+                     minimizeComment(input: { subjectId: $id, classifier: RESOLVED }) {
+                       clientMutationId
+                     }
+                   }`
+                : `mutation($id: ID!) {
+                     unminimizeComment(input: { subjectId: $id }) {
+                       clientMutationId
+                     }
+                   }`;
+              try {
+                await github.graphql(mutation, { id: subjectId });
+              } catch (error) {
+                core.info(
+                  `Could not ${minimized ? "minimize" : "restore"} comment: ${error.message}`
+                );
+              }
+            };
+
+            // Content of a "## <name>" section, or null when the heading is absent.
+            const section = (name) => {
+              const match = body.match(
+                new RegExp(`##\\s${name}([\\s\\S]*?)(?=\\n##\\s|$)`, "i")
+              );
+              return match ? match[1] : null;
+            };
+
+            const problems = [];
+
+            const requiredHeadings = [
+              "## proposed change",
+              "## type of change",
+              "## checklist",
+            ];
+            if (requiredHeadings.some((h) => !normalized.includes(h))) {
+              problems.push(
+                "Use the pull request template without removing its sections."
+              );
+            }
+
+            const typeOfChange = section("type of change");
+            if (typeOfChange !== null) {
+              const ticked = (typeOfChange.match(/-\s*\[[xX]\]/g) || []).length;
+              if (ticked !== 1) {
+                problems.push(
+                  'Select exactly one option under "Type of change".'
+                );
+              }
+            }
+
+            const proposedChange = section("proposed change");
+            if (proposedChange !== null && proposedChange.trim().length === 0) {
+              problems.push('Describe your changes under "Proposed change".');
+            }
+
+            const isValid = problems.length === 0;
+
+            const comments = await github.paginate(
+              github.rest.issues.listComments,
+              { owner, repo, issue_number, per_page: 100 }
+            );
+            const existing = comments.find((c) => c.body.includes(marker));
+            const hasLabel = pr.labels.some((l) => l.name === label);
+
+            if (isValid) {
+              core.info("Pull request standards met");
+
+              if (hasLabel) {
+                await ignoreMissing(() =>
+                  github.rest.issues.removeLabel({
+                    owner, repo, issue_number, name: label,
+                  })
+                );
+              }
+              if (existing) {
+                await setMinimized(existing.node_id, true);
+              }
+              return;
+            }
+
+            core.info(`Pull request standards not met:\n- ${problems.join("\n- ")}`);
+
+            if (!hasLabel) {
+              await github.rest.issues.addLabels({
+                owner, repo, issue_number, labels: [label],
+              });
+            }
+
+            const message =
+              `${marker}\n` +
+              `Hey @${pr.user.login}!\n\n` +
+              `Thank you for your contribution! To help reviewers, please update ` +
+              `this pull request to follow our pull request standards:\n\n` +
+              problems.map((p) => `- ${p}`).join("\n") +
+              `\n\n` +
+              `Please complete the ` +
+              `[PR template](https://github.com/home-assistant/frontend/blob/dev/.github/PULL_REQUEST_TEMPLATE.md?plain=1) ` +
+              `and see the [developer docs](https://developers.home-assistant.io/docs/review-process) ` +
+              `for more on creating a great pull request (see point 6).`;
+
+            if (existing) {
+              await github.rest.issues.updateComment({
+                owner, repo, comment_id: existing.id, body: message,
+              });
+              await setMinimized(existing.node_id, false);
+            } else {
+              await github.rest.issues.createComment({
+                owner, repo, issue_number, body: message,
+              });
+            }
+
+            // Fail this check so it can block the PR from being merged
+            core.setFailed(
+              `Pull request standards not met:\n- ${problems.join("\n- ")}`
            );
-            await checkStandards({ github, context, core });
@@ -18,6 +18,6 @@ jobs:
      pull-requests: read
    runs-on: ubuntu-latest
    steps:
-      - uses: release-drafter/release-drafter@ed4bc48ec97379be2258e7b7ac2624a3e26ab809 # v7.4.0
+      - uses: release-drafter/release-drafter@693d20e7c1ce1a81d3a41962f85914253b518449 # v7.3.1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -26,7 +26,7 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false

@@ -36,7 +36,7 @@ jobs:
          python-version: ${{ env.PYTHON_VERSION }}

      - name: Verify version
-        uses: home-assistant/actions/helpers/verify-version@f4ca6f671bd429efb108c0f2fa0ae8af0215986c # master
+        uses: home-assistant/actions/helpers/verify-version@e91ad1948e57189485b9c1ad608af0c303946f89 # master

      - name: Setup Node
        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -113,7 +113,7 @@ jobs:
      contents: write # Required to upload release assets
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false
      - name: Setup Node
@@ -36,21 +36,52 @@ jobs:
    name: Check authorization
    runs-on: ubuntu-latest
    permissions:
-      contents: read # To check out workflow scripts
      issues: write # To comment on, label, and close issues
    # Only run if this is a Task issue type (from the issue form)
    if: github.event.issue.type.name == 'Task'
    steps:
-      - name: Check out workflow scripts
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-          sparse-checkout: .github/scripts
      - name: Check if user is authorized
        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
        with:
          script: |
-            const { default: checkTaskAuthorization } = await import(
-              `${process.env.GITHUB_WORKSPACE}/.github/scripts/check-task-authorization.mjs`
-            );
-            await checkTaskAuthorization({ github, context, core });
+            const issueAuthor = context.payload.issue.user.login;
+
+            // Check if user is an organization member
+            try {
+              await github.rest.orgs.checkMembershipForUser({
+                org: 'home-assistant',
+                username: issueAuthor
+              });
+              console.log(`✅ ${issueAuthor} is an organization member`);
+              return; // Authorized
+            } catch (error) {
+              console.log(`❌ ${issueAuthor} is not authorized to create Task issues`);
+            }
+
+            // Close the issue with a comment
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: `Hi @${issueAuthor}, thank you for your contribution!\n\n` +
+                    `Task issues are restricted to Open Home Foundation staff and authorized contributors.\n\n` +
+                    `If you would like to:\n` +
+                    `- Report a bug: Please use the [bug report form](https://github.com/home-assistant/frontend/issues/new?template=bug_report.yml)\n` +
+                    `- Request a feature: Please submit to [Feature Requests](https://github.com/orgs/home-assistant/discussions)\n\n` +
+                    `If you believe you should have access to create Task issues, please contact the maintainers.`
+            });
+
+            await github.rest.issues.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              state: 'closed'
+            });
+
+            // Add a label to indicate this was auto-closed
+            await github.rest.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              labels: ['auto-closed']
+            });
@@ -21,7 +21,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

      - name: Set up Node
        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
        with:
          persist-credentials: false

@@ -1 +1 @@
-24.18.0
+24.16.0
@@ -13,4 +13,4 @@ nodeLinker: node-modules

 npmMinimalAgeGate: 3d

-yarnPath: .yarn/releases/yarn-4.17.0.cjs
+yarnPath: .yarn/releases/yarn-4.16.0.cjs
@@ -0,0 +1,53 @@
+# BrowserStack Automate configuration for Home Assistant frontend e2e tests.
+# Credentials are read from BROWSERSTACK_USERNAME and BROWSERSTACK_ACCESS_KEY
+# environment variables set in GitHub Actions (or locally).
+# See: https://www.browserstack.com/docs/automate/playwright/getting-started/nodejs
+
+userName: ${BROWSERSTACK_USERNAME}
+accessKey: ${BROWSERSTACK_ACCESS_KEY}
+
+projectName: Home Assistant Frontend
+buildName: e2e tests
+buildIdentifier: "CI #${BUILD_NUMBER}"
+
+# ── Platforms ────────────────────────────────────────────────────────────────
+platforms:
+  - os: Windows
+    osVersion: 11
+    browserName: chrome
+    browserVersion: latest
+  - os: OS X
+    osVersion: Ventura
+    browserName: playwright-firefox
+    browserVersion: latest
+  - deviceName: iPad 6th
+    osVersion: 12
+    browserName: playwright-webkit
+  - deviceName: iPhone 12
+    osVersion: 14
+    browserName: playwright-webkit
+  - deviceName: Samsung Galaxy S23
+    osVersion: 13
+    browserName: chrome
+    realMobile: true
+
+parallelsPerPlatform: 1
+
+# ── Local tunnel ─────────────────────────────────────────────────────────────
+# The SDK manages the BrowserStack Local tunnel automatically.
+browserstackLocal: true
+
+framework: playwright
+
+# Pin to the latest Playwright version BrowserStack supports. Our local
+# @playwright/test is newer (1.59.x) which BrowserStack does not yet support,
+# causing a "Malformed endpoint" connection error if left unset.
+# Update this when BrowserStack adds support for a newer version.
+# Supported versions: https://www.browserstack.com/docs/automate/playwright/browsers-and-os
+playwrightVersion: 1.latest
+
+# ── Debugging ────────────────────────────────────────────────────────────────
+debug: false
+networkLogs: false
+consoleLogs: errors
+testObservability: true
@@ -1,15 +0,0 @@
-{
-  "_comment": "Initial JS budget (raw/uncompressed bytes) for the cold-load critical entrypoints. Enforced by build-scripts/check-bundle-size.cjs in CI. Re-seed after an intentional change with `--update --headroom=<percent>`.",
-  "frontend-modern": {
-    "app": 561513,
-    "core": 54473,
-    "authorize": 544272,
-    "onboarding": 647136
-  },
-  "frontend-legacy": {
-    "app": 790323,
-    "core": 237208,
-    "authorize": 765464,
-    "onboarding": 918679
-  }
-}
@@ -83,7 +83,12 @@ module.exports.swcOptions = () => ({
  },
 });

-module.exports.babelOptions = ({ latestBuild, isTestBuild, sw }) => ({
+module.exports.babelOptions = ({
+  latestBuild,
+  isProdBuild,
+  isTestBuild,
+  sw,
+}) => ({
  babelrc: false,
  compact: false,
  assumptions: {
@@ -96,22 +101,14 @@ module.exports.babelOptions = ({ latestBuild, isTestBuild, sw }) => ({
    [
      "@babel/preset-env",
      {
+        useBuiltIns: "usage",
+        corejs: dependencies["core-js"],
+        bugfixes: true,
        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"),
      {
@@ -119,14 +116,32 @@ module.exports.babelOptions = ({ latestBuild, isTestBuild, sw }) => ({
        ignoreModuleNotFound: true,
      },
    ],
-    // 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`.
+    // 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
    [
      "@babel/plugin-transform-runtime",
-      { version: dependencies["@babel/runtime"], moduleName: "@babel/runtime" },
+      { version: dependencies["@babel/runtime"] },
    ],
    "@babel/plugin-transform-class-properties",
    "@babel/plugin-transform-private-methods",
@@ -1,155 +0,0 @@
-/* global require, process, __dirname */
-// Enforce a strict size budget on the initial JS of the most critical
-// entrypoints (`app` and `core`). These two are downloaded on every cold load
-// before anything interactive can happen, so unintended growth here hurts
-// first-load performance directly.
-//
-// In production rspack does not split initial chunks (splitChunks only operates
-// on `!chunk.canBeInitial()`), so each entrypoint resolves to a single initial
-// JS asset. We read the per-build stats written by StatsWriterPlugin and compare
-// the entrypoint's initial JS size against a committed budget.
-//
-// Usage:
-//   node build-scripts/check-bundle-size.cjs            # enforce, exit 1 on regression
-//   node build-scripts/check-bundle-size.cjs --update    # rewrite budgets from current sizes
-//   node build-scripts/check-bundle-size.cjs --update --headroom=3   # current + 3% headroom
-
-const fs = require("fs");
-const path = require("path");
-const paths = require("./paths.cjs");
-
-// Entrypoints whose initial JS we hold to a strict budget. These are all
-// downloaded on a user-facing cold load before anything interactive can happen:
-// `app`/`core` for the main app, plus the standalone `authorize` and
-// `onboarding` pages. `custom-panel` is intentionally excluded (only loaded
-// when a custom panel is opened).
-const TRACKED_ENTRYPOINTS = ["app", "core", "authorize", "onboarding"];
-
-// App build stats files, as written by StatsWriterPlugin (`${name}.json`).
-const BUILDS = ["frontend-modern", "frontend-legacy"];
-
-const BUDGET_FILE = path.join(__dirname, "bundle-budget.json");
-const STATS_DIR = path.join(paths.build_dir, "stats");
-
-const readStats = (build) => {
-  const file = path.join(STATS_DIR, `${build}.json`);
-  if (!fs.existsSync(file)) {
-    throw new Error(
-      `Missing stats file: ${path.relative(process.cwd(), file)}.\n` +
-        `Run a production build first (e.g. \`gulp build-app\`), then re-run this check.`
-    );
-  }
-  return JSON.parse(fs.readFileSync(file, "utf8"));
-};
-
-// Initial JS bytes for an entrypoint = sum of the .js asset sizes of its initial
-// entry chunk(s). Sizes are raw (uncompressed) bytes, matching the stats output.
-const entrypointInitialJS = (stats, entrypoint) => {
-  const assetSize = new Map(stats.assets.map((a) => [a.name, a.size]));
-  let total = 0;
-  let found = false;
-  for (const chunk of stats.chunks) {
-    if (!chunk.entry || !chunk.initial) {
-      continue;
-    }
-    if (!(chunk.names || []).includes(entrypoint)) {
-      continue;
-    }
-    found = true;
-    for (const file of chunk.files || []) {
-      if (file.endsWith(".js") && assetSize.has(file)) {
-        total += assetSize.get(file);
-      }
-    }
-  }
-  if (!found) {
-    throw new Error(`Entrypoint "${entrypoint}" not found in bundle stats.`);
-  }
-  return total;
-};
-
-const kib = (bytes) => `${(bytes / 1024).toFixed(1)} KiB`;
-
-const main = () => {
-  const update = process.argv.includes("--update");
-  const headroomArg = process.argv.find((a) => a.startsWith("--headroom="));
-  const headroom = headroomArg ? Number(headroomArg.split("=")[1]) : 0;
-
-  const current = {};
-  for (const build of BUILDS) {
-    const stats = readStats(build);
-    current[build] = {};
-    for (const entrypoint of TRACKED_ENTRYPOINTS) {
-      current[build][entrypoint] = entrypointInitialJS(stats, entrypoint);
-    }
-  }
-
-  if (update) {
-    const budget = { _comment: BUDGET_COMMENT };
-    for (const build of BUILDS) {
-      budget[build] = {};
-      for (const entrypoint of TRACKED_ENTRYPOINTS) {
-        budget[build][entrypoint] = Math.ceil(
-          current[build][entrypoint] * (1 + headroom / 100)
-        );
-      }
-    }
-    fs.writeFileSync(BUDGET_FILE, `${JSON.stringify(budget, null, 2)}\n`);
-    console.log(
-      `Updated ${path.relative(process.cwd(), BUDGET_FILE)} from current sizes` +
-        (headroom ? ` (+${headroom}% headroom).` : ".")
-    );
-    return;
-  }
-
-  if (!fs.existsSync(BUDGET_FILE)) {
-    throw new Error(
-      `Missing budget file ${path.relative(process.cwd(), BUDGET_FILE)}.\n` +
-        `Seed it from a production build with: node build-scripts/check-bundle-size.cjs --update --headroom=3`
-    );
-  }
-  const budget = JSON.parse(fs.readFileSync(BUDGET_FILE, "utf8"));
-
-  let failed = false;
-  console.log("Initial JS budget (entry chunks, raw bytes):\n");
-  for (const build of BUILDS) {
-    for (const entrypoint of TRACKED_ENTRYPOINTS) {
-      const actual = current[build][entrypoint];
-      const limit = budget[build] && budget[build][entrypoint];
-      if (typeof limit !== "number") {
-        failed = true;
-        console.log(
-          `  ✗ ${build} / ${entrypoint}: no budget set (current ${kib(actual)})`
-        );
-        continue;
-      }
-      const ok = actual <= limit;
-      const delta = (((actual - limit) / limit) * 100).toFixed(1);
-      console.log(
-        `  ${ok ? "✓" : "✗"} ${build} / ${entrypoint}: ` +
-          `${kib(actual)} / ${kib(limit)}${ok ? "" : ` (+${delta}% over budget)`}`
-      );
-      if (!ok) {
-        failed = true;
-      }
-    }
-  }
-
-  if (failed) {
-    console.error(
-      "\nInitial JS budget exceeded for a critical entrypoint.\n" +
-        "Investigate what was pulled into the entry chunk (a static import that should be lazy?).\n" +
-        "If the growth is intentional, re-seed the budget:\n" +
-        "  node build-scripts/check-bundle-size.cjs --update --headroom=3"
-    );
-    process.exit(1);
-  }
-  console.log("\nAll tracked entrypoints within budget.");
-};
-
-const BUDGET_COMMENT =
-  "Initial JS budget (raw/uncompressed bytes) for the cold-load critical entrypoints. " +
-  "Enforced by build-scripts/check-bundle-size.cjs in CI. " +
-  "Re-seed after an intentional change with `--update --headroom=<percent>`.";
-
-main();
@@ -1,7 +1,7 @@
 import fs from "fs";
 import { glob } from "glob";
 import gulp from "gulp";
-import { load as loadYaml } from "js-yaml";
+import yaml from "js-yaml";
 import { marked } from "marked";
 import path from "path";
 import paths from "../paths.cjs";
@@ -47,7 +47,7 @@ gulp.task("gather-gallery-pages", async function gatherPages() {

      if (descriptionContent.startsWith("---")) {
        const metadataEnd = descriptionContent.indexOf("---", 3);
-        metadata = loadYaml(descriptionContent.substring(3, metadataEnd));
+        metadata = yaml.load(descriptionContent.substring(3, metadataEnd));
        descriptionContent = descriptionContent
          .substring(metadataEnd + 3)
          .trim();
@@ -240,7 +240,6 @@ gulp.task("rspack-dev-server-e2e-test-app", () =>
    ),
    contentBase: paths.e2eTestApp_output_root,
    port: 8095,
-    open: false,
  })
 );

@@ -48,12 +48,6 @@ 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`));
@@ -65,16 +59,16 @@ for (const buildType of ["Modern", "Legacy"]) {
  console.log(detailsClose);

  // Manually log the Core-JS polyfills using the same technique
-  if (corejsOpts) {
+  if (presetEnvOpts.useBuiltIns) {
    console.log(detailsOpen(`${buildType} Build Core-JS Polyfills`));
    const targets = compilationTargets.default(babelOpts?.targets, {
      browserslistEnv,
    });
    const polyfillList = coreJSCompat({ targets }).list.filter(
      polyfillFilter(
-        corejsOpts.method,
-        corejsOpts.proposals,
-        corejsOpts.shippedProposals
+        `${presetEnvOpts.useBuiltIns}-global`,
+        presetEnvOpts?.corejs?.proposals,
+        presetEnvOpts?.shippedProposals
      )
    );
    console.log(
@@ -1,8 +0,0 @@
-/* global module */
-
-module.exports = function litDisableDevModeLoader(source) {
-  return source.replace(
-    /\b(const|let|var) DEV_MODE = true;/g,
-    "$1 DEV_MODE = false;"
-  );
-};
@@ -1,68 +0,0 @@
-/* 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);
-};
@@ -47,12 +47,6 @@ 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",
@@ -72,42 +66,25 @@ const createRspackConfig = ({
        {
          test: /\.m?js$|\.ts$/,
          exclude: /node_modules[\\/]core-js/,
-          use: (info) =>
-            [
-              {
-                loader: "babel-loader",
-                options: {
-                  ...bundle.babelOptions({
-                    latestBuild,
-                    isTestBuild,
-                    sw: info.issuerLayer === "sw",
-                  }),
-                  cacheDirectory: !isProdBuild,
-                  cacheCompression: false,
-                },
+          use: (info) => [
+            {
+              loader: "babel-loader",
+              options: {
+                ...bundle.babelOptions({
+                  latestBuild,
+                  isProdBuild,
+                  isTestBuild,
+                  sw: info.issuerLayer === "sw",
+                }),
+                cacheDirectory: !isProdBuild,
+                cacheCompression: false,
              },
-              // 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),
+            },
+            {
+              loader: "builtin:swc-loader",
+              options: bundle.swcOptions(),
+            },
+          ],
          resolve: {
            fullySpecified: false,
          },
@@ -154,47 +131,6 @@ 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 })
      ),
@@ -53,7 +53,6 @@ const CONFIG_PANEL_COMMANDS = [
  "config/scene/config",
  "search/related",
  "tag/list",
-  "assist_pipeline/",
 ];

@customElement("ha-demo")
@@ -66,9 +65,7 @@ export class HaDemo extends HomeAssistantAppEl {
        this._updateHass(hassUpdate),
    };

-    // `false` for contexts: HomeAssistantAppEl already provides them via
-    // `contextMixin`, so let provideHass skip them to avoid duplicate providers.
-    const hass = provideHass(this, initial, true, false);
+    const hass = provideHass(this, initial, true);
    const localizePromise =
      // @ts-ignore
      this._loadFragmentTranslations(hass.language, "page-demo").then(
@@ -1,43 +1,11 @@
-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.
+  // Stub for assist pipeline list — returns empty so developer tools assist
+  // tab loads without errors.
  hass.mockWS("assist_pipeline/pipeline/list", () => ({
-    pipelines,
-    preferred_pipeline: "01home_assistant_cloud",
+    pipelines: [],
+    preferred_pipeline: null,
  }));

  // Stub for assist pipeline run — immediately sends run-end event so
@@ -1,6 +1,5 @@
 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";
@@ -38,5 +37,4 @@ export const mockConfigPanel = (hass: MockHomeAssistant) => {
  mockScene(hass);
  mockSearch(hass);
  mockTags(hass);
-  mockAssist(hass);
 };
@@ -2,27 +2,22 @@ import type { ExposeEntitySettings } from "../../../src/data/expose";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";

 const exposedEntities: Record<string, ExposeEntitySettings> = {
-  "light.floor_lamp": {
+  "light.bed_light": {
    conversation: true,
    "cloud.alexa": true,
    "cloud.google_assistant": true,
  },
-  "light.living_room_spotlights": {
+  "light.ceiling_lights": {
    conversation: true,
    "cloud.alexa": true,
    "cloud.google_assistant": false,
  },
-  "light.bar_lamp": {
+  "switch.decorative_lights": {
    conversation: true,
    "cloud.alexa": false,
    "cloud.google_assistant": true,
  },
-  "light.kitchen_spotlights": {
-    conversation: true,
-    "cloud.alexa": true,
-    "cloud.google_assistant": true,
-  },
-  "light.outdoor_light": {
+  "climate.ecobee": {
    conversation: true,
    "cloud.alexa": true,
    "cloud.google_assistant": true,
@@ -240,12 +240,6 @@ export default tseslint.config(
      globals: globals.node,
    },
  },
-  {
-    files: [".github/scripts/*.mjs"],
-    languageOptions: {
-      globals: globals.node,
-    },
-  },
  {
    plugins: {
      html,
@@ -1,75 +0,0 @@
-import type { DemoTrace } from "./types";
-
-export const notTriggeredTrace: DemoTrace = {
-  trace: {
-    last_step: "trigger/0",
-    run_id: "788767ce152d3d4475134bf1107986d4",
-    state: "stopped",
-    script_execution: "not_triggered",
-    not_triggered: true,
-    timestamp: {
-      start: "2021-03-25T04:36:51.223337+00:00",
-      finish: "2021-03-25T04:36:51.223341+00:00",
-    },
-    // Not-triggered traces have no trigger description.
-    trigger: null,
-    domain: "automation",
-    item_id: "1781703842452",
-    trace: {
-      "trigger/0": [
-        {
-          path: "trigger/0",
-          timestamp: "2021-03-25T04:36:51.223340+00:00",
-          changed_variables: {
-            trigger: {
-              id: "0",
-              idx: "0",
-              alias: null,
-              platform: "light.turned_on",
-            },
-          },
-          result: {
-            reason: "new_state_not_a_match",
-            data: {
-              entity_id: "light.bed_light",
-              to_state: "off",
-            },
-          },
-        },
-      ],
-    },
-    config: {
-      id: "1781703842452",
-      alias: "Light Turned On Notification",
-      description: "Send a notification when a specific light is turned on.",
-      triggers: [
-        {
-          trigger: "light.turned_on",
-          target: {
-            floor_id: "test",
-          },
-          options: {
-            for: "00:00:00",
-            behavior: "each",
-          },
-        },
-      ],
-      conditions: [],
-      actions: [
-        {
-          action: "notify.notify",
-          data: {
-            message: "A light was turned on.",
-          },
-        },
-      ],
-      mode: "single",
-    },
-    context: {
-      id: "01KVAX7CG7XBDYGJYAGA4XJHGX",
-      parent_id: "01KVAX7CG631JRX4H3JS5JJ11Q",
-      user_id: null,
-    },
-  },
-  logbookEntries: [],
-};
@@ -1,4 +1,3 @@
-import { ContextProvider } from "@lit/context";
 import { mdiCog, mdiMenu } from "@mdi/js";
 import type { Connection } from "home-assistant-js-websocket";
 import type { PropertyValues } from "lit";
@@ -20,22 +19,6 @@ import "../../src/components/ha-svg-icon";
 import "../../src/components/ha-top-app-bar-fixed";
 import "../../src/managers/notification-manager";
 import { haStyle } from "../../src/resources/styles";
-import {
-  apiContext,
-  areasContext,
-  configContext,
-  connectionContext,
-  devicesContext,
-  entitiesContext,
-  floorsContext,
-  formattersContext,
-  internationalizationContext,
-  registriesContext,
-  servicesContext,
-  statesContext,
-  uiContext,
-} from "../../src/data/context";
-import { updateHassGroups } from "../../src/data/context/updateContext";
 import type { HomeAssistant, ThemeSettings } from "../../src/types";
 import { PAGES, SIDEBAR } from "../build/import-pages";
 import {
@@ -130,65 +113,6 @@ class HaGallery extends LitElement {

  @state() private _drawerOpen = !this._narrow;

-  // Fallback Lit context providers for the whole gallery. The real app's root
-  // element provides these via `contextMixin`; here we mirror that so demos
-  // which render context-consuming components without setting up their own hass
-  // (e.g. bare component demos) still resolve `localize`, formatters, config,
-  // etc. instead of throwing during init. Demos that call `provideHass`
-  // register their own providers closer in the tree, which take precedence.
-  private _contextProviders = {
-    registries: new ContextProvider(this, { context: registriesContext }),
-    internationalization: new ContextProvider(this, {
-      context: internationalizationContext,
-    }),
-    api: new ContextProvider(this, { context: apiContext }),
-    connection: new ContextProvider(this, { context: connectionContext }),
-    ui: new ContextProvider(this, { context: uiContext }),
-    config: new ContextProvider(this, { context: configContext }),
-    formatters: new ContextProvider(this, { context: formattersContext }),
-  };
-
-  // The individual (non-grouped) contexts contextMixin also provides. Components
-  // such as ha-area-picker / ha-entity-picker consume these directly, so the
-  // fallback must cover them too.
-  private _singleContextProviders = {
-    states: new ContextProvider(this, { context: statesContext }),
-    services: new ContextProvider(this, { context: servicesContext }),
-    entities: new ContextProvider(this, { context: entitiesContext }),
-    devices: new ContextProvider(this, { context: devicesContext }),
-    areas: new ContextProvider(this, { context: areasContext }),
-    floors: new ContextProvider(this, { context: floorsContext }),
-  };
-
-  protected willUpdate(changedProps: PropertyValues<this>) {
-    super.willUpdate(changedProps);
-    // Refresh the fallback contexts before each render so theme/page changes in
-    // the gallery hass propagate to consuming components.
-    const hass = this._galleryHass;
-    (
-      Object.keys(
-        this._contextProviders
-      ) as (keyof typeof this._contextProviders)[]
-    ).forEach((group) => {
-      const provider = this._contextProviders[group];
-      provider.setValue(
-        (updateHassGroups[group] as (h: HomeAssistant, v?: any) => any)(
-          hass,
-          provider.value
-        )
-      );
-    });
-    (
-      Object.keys(
-        this._singleContextProviders
-      ) as (keyof typeof this._singleContextProviders)[]
-    ).forEach((key) => {
-      (this._singleContextProviders[key] as ContextProvider<any>).setValue(
-        hass[key]
-      );
-    });
-  }
-
  render() {
    const isSettingsPage = this._page === SETTINGS_PAGE;
    const page = isSettingsPage ? undefined : PAGES[this._page];
@@ -652,21 +576,6 @@ class HaGallery extends LitElement {
      callWS: async () => undefined,
      fetchWithAuth: async () => new Response(),
      sendWS: () => undefined,
-      formatEntityState: (stateObj, stateValue) =>
-        (stateValue != null ? stateValue : stateObj.state) ?? "",
-      formatEntityStateToParts: (stateObj, stateValue) => [
-        {
-          type: "value",
-          value: (stateValue != null ? stateValue : stateObj.state) ?? "",
-        },
-      ],
-      formatEntityAttributeName: (_stateObj, attribute) => attribute,
-      formatEntityAttributeValue: (stateObj, attribute, value) =>
-        value != null ? value : (stateObj.attributes[attribute] ?? ""),
-      formatEntityName: (stateObj, type) =>
-        typeof type === "string"
-          ? type
-          : (stateObj.attributes.friendly_name ?? stateObj.entity_id),
    } as unknown as HomeAssistant;
  }

@@ -24,33 +24,6 @@ const traces: DemoTrace[] = [
    error: 'Variable "beer" cannot be None',
  }),
  mockDemoTrace({ state: "stopped", script_execution: "cancelled" }),
-  mockDemoTrace({
-    state: "stopped",
-    script_execution: "not_triggered",
-    not_triggered: true,
-    // Not-triggered traces have no trigger description.
-    trigger: null,
-    trace: {
-      "trigger/0": [
-        {
-          path: "trigger/0",
-          changed_variables: {
-            trigger: {
-              id: "0",
-              idx: "0",
-              alias: null,
-              platform: "light.turned_on",
-            },
-          },
-          result: {
-            reason: "new_state_not_a_match",
-            data: { entity_id: "light.bed_light", to_state: "off" },
-          },
-          timestamp: "2021-03-25T04:36:51.223693+00:00",
-        },
-      ],
-    },
-  }),
 ];

@customElement("demo-automation-trace-timeline")
@@ -2,20 +2,17 @@

 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, queryAll, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import "../../../../src/components/ha-card";
-import "../../../../src/components/trace/ha-trace-path-details";
-import type { HatScriptGraph } from "../../../../src/components/trace/hat-script-graph";
 import "../../../../src/components/trace/hat-script-graph";
 import "../../../../src/components/trace/hat-trace-timeline";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import type { HomeAssistant } from "../../../../src/types";
 import { basicTrace } from "../../data/traces/basic_trace";
 import { motionLightTrace } from "../../data/traces/motion-light-trace";
-import { notTriggeredTrace } from "../../data/traces/not-triggered-trace";
 import type { DemoTrace } from "../../data/traces/types";

-const traces: DemoTrace[] = [basicTrace, motionLightTrace, notTriggeredTrace];
+const traces: DemoTrace[] = [basicTrace, motionLightTrace];

@customElement("demo-automation-trace")
 export class DemoAutomationTrace extends LitElement {
@@ -23,25 +20,18 @@ export class DemoAutomationTrace extends LitElement {

  @state() private _selected = {};

-  @queryAll("hat-script-graph") private _graphs!: NodeListOf<HatScriptGraph>;
-
  protected render() {
    if (!this.hass) {
      return nothing;
    }
    return html`
-      ${traces.map((trace, idx) => {
-        const graph = this._graphs?.[idx];
-        const selectedPath = this._selected[idx];
-        const selectedNode = selectedPath
-          ? graph?.renderedNodes[selectedPath]
-          : undefined;
-        return html`
+      ${traces.map(
+        (trace, idx) => html`
          <ha-card .header=${trace.trace.config.alias}>
            <div class="card-content">
              <hat-script-graph
                .trace=${trace.trace}
-                .selected=${selectedPath}
+                .selected=${this._selected[idx]}
                @graph-node-selected=${this._handleGraphNodeSelected}
                .sampleIdx=${idx}
              ></hat-script-graph>
@@ -50,25 +40,15 @@ export class DemoAutomationTrace extends LitElement {
                .hass=${this.hass}
                .trace=${trace.trace}
                .logbookEntries=${trace.logbookEntries}
-                .selectedPath=${selectedPath}
+                .selectedPath=${this._selected[idx]}
                @value-changed=${this._handleTimelineValueChanged}
                .sampleIdx=${idx}
              ></hat-trace-timeline>
-              ${selectedNode && graph
-                ? html`<ha-trace-path-details
-                    .hass=${this.hass}
-                    .trace=${trace.trace}
-                    .selected=${selectedNode}
-                    .logbookEntries=${trace.logbookEntries}
-                    .trackedNodes=${graph.trackedNodes}
-                    .renderedNodes=${graph.renderedNodes}
-                  ></ha-trace-path-details>`
-                : nothing}
              <button @click=${() => console.log(trace)}>Log trace</button>
            </div>
          </ha-card>
-        `;
-      })}
+        `
+      )}
    `;
  }

@@ -496,10 +496,6 @@ const SCHEMAS: {
                  },
                },
              },
-              password: {
-                label: "Password",
-                selector: { text: { type: "password" } },
-              },
            },
          },
        },
@@ -1,6 +1,5 @@
 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;
@@ -18,9 +17,7 @@ export class DemoMiscBoxShadow extends LitElement {
                  (size) => html`
                    <div
                      class="box"
-                      style=${styleMap({
-                        boxShadow: `var(--ha-box-shadow-${size})`,
-                      })}
+                      style="box-shadow: var(--ha-box-shadow-${size})"
                    >
                      ${size}
                    </div>
@@ -353,6 +353,7 @@ export class DemoEntityState extends LitElement {
          title: "Icon",
          template: (entry) => html`
            <state-badge
+              .hass=${hass}
              .stateObj=${entry.stateObj}
              .stateColor=${true}
            ></state-badge>
@@ -23,46 +23,48 @@
    "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",
-    "check-bundlesize": "node build-scripts/check-bundle-size.cjs",
    "test:e2e": "node test/e2e/run-suites.mjs demo app gallery",
+    "test:e2e:browserstack": "node test/e2e/run-suites.mjs demo:browserstack app:browserstack gallery:browserstack",
    "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:demo:browserstack": "browserstack-node-sdk playwright test --config test/e2e/playwright.demo.config.ts",
    "test:e2e:app": "playwright test --config test/e2e/playwright.app.config.ts",
-    "test:e2e:app:dev": "test/e2e/app/script/develop_app",
-    "test:e2e:gallery": "playwright test --config test/e2e/playwright.gallery.config.ts"
+    "test:e2e:app:browserstack": "browserstack-node-sdk playwright test --config test/e2e/playwright.app.config.ts",
+    "test:e2e:gallery": "playwright test --config test/e2e/playwright.gallery.config.ts",
+    "test:e2e:gallery:browserstack": "browserstack-node-sdk playwright test --config test/e2e/playwright.gallery.config.ts"
  },
  "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
  "license": "Apache-2.0",
  "type": "module",
  "dependencies": {
-    "@babel/runtime": "8.0.0",
+    "@babel/runtime": "7.29.7",
    "@braintree/sanitize-url": "7.1.2",
    "@codemirror/autocomplete": "6.20.3",
-    "@codemirror/commands": "6.10.4",
+    "@codemirror/commands": "6.10.3",
    "@codemirror/lang-jinja": "6.0.1",
    "@codemirror/lang-yaml": "6.1.3",
-    "@codemirror/language": "6.12.4",
+    "@codemirror/language": "6.12.3",
    "@codemirror/lint": "6.9.7",
-    "@codemirror/search": "6.7.1",
-    "@codemirror/state": "6.7.0",
-    "@codemirror/view": "6.43.3",
+    "@codemirror/search": "6.7.0",
+    "@codemirror/state": "6.6.0",
+    "@codemirror/view": "6.43.1",
    "@date-fns/tz": "1.5.0",
    "@egjs/hammerjs": "2.0.17",
    "@formatjs/intl-datetimeformat": "7.4.9",
    "@formatjs/intl-displaynames": "7.3.10",
-    "@formatjs/intl-durationformat": "0.10.15",
+    "@formatjs/intl-durationformat": "0.10.14",
    "@formatjs/intl-getcanonicallocales": "3.2.10",
    "@formatjs/intl-listformat": "8.3.10",
    "@formatjs/intl-locale": "5.3.9",
    "@formatjs/intl-numberformat": "9.3.11",
    "@formatjs/intl-pluralrules": "6.3.10",
    "@formatjs/intl-relativetimeformat": "12.3.10",
-    "@fullcalendar/core": "6.1.21",
-    "@fullcalendar/daygrid": "6.1.21",
-    "@fullcalendar/interaction": "6.1.21",
-    "@fullcalendar/list": "6.1.21",
-    "@fullcalendar/luxon3": "6.1.21",
-    "@fullcalendar/timegrid": "6.1.21",
+    "@fullcalendar/core": "6.1.20",
+    "@fullcalendar/daygrid": "6.1.20",
+    "@fullcalendar/interaction": "6.1.20",
+    "@fullcalendar/list": "6.1.20",
+    "@fullcalendar/luxon3": "6.1.20",
+    "@fullcalendar/timegrid": "6.1.20",
    "@home-assistant/webawesome": "3.7.0-ha.0",
    "@lezer/highlight": "1.2.3",
    "@lit-labs/motion": "1.1.0",
@@ -70,7 +72,6 @@
    "@lit-labs/virtualizer": "2.1.1",
    "@lit/context": "1.1.6",
    "@lit/reactive-element": "2.1.2",
-    "@lit/task": "1.0.3",
    "@material/mwc-formfield": "patch:@material/mwc-formfield@npm%3A0.27.0#~/.yarn/patches/@material-mwc-formfield-npm-0.27.0-9528cb60f6.patch",
    "@material/mwc-list": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch",
    "@material/web": "2.4.1",
@@ -79,10 +80,9 @@
    "@replit/codemirror-indentation-markers": "6.5.3",
    "@swc/helpers": "0.5.23",
    "@thomasloven/round-slider": "0.6.0",
-    "@tsparticles/engine": "4.2.1",
-    "@tsparticles/preset-links": "4.2.1",
+    "@tsparticles/engine": "4.1.3",
+    "@tsparticles/preset-links": "4.1.3",
    "@vibrant/color": "4.0.4",
-    "@vvo/tzdb": "6.198.0",
    "@webcomponents/scoped-custom-element-registry": "0.0.10",
    "@webcomponents/webcomponentsjs": "2.8.0",
    "barcode-detector": "3.2.0",
@@ -99,12 +99,13 @@
    "echarts": "6.1.0",
    "element-internals-polyfill": "3.0.2",
    "fuse.js": "7.4.2",
+    "google-timezones-json": "1.2.0",
    "gulp-zopfli-green": "7.0.0",
    "hls.js": "1.6.16",
    "home-assistant-js-websocket": "9.6.0",
    "idb-keyval": "6.2.5",
-    "intl-messageformat": "11.2.9",
-    "js-yaml": "5.1.0",
+    "intl-messageformat": "11.2.8",
+    "js-yaml": "4.2.0",
    "leaflet": "1.9.4",
    "leaflet-draw": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch",
    "leaflet.markercluster": "1.5.3",
@@ -134,11 +135,10 @@
    "xss": "1.0.15"
  },
  "devDependencies": {
-    "@ampproject/remapping": "2.3.0",
-    "@babel/core": "8.0.1",
-    "@babel/helper-define-polyfill-provider": "1.0.0",
-    "@babel/plugin-transform-runtime": "8.0.1",
-    "@babel/preset-env": "8.0.2",
+    "@babel/core": "7.29.7",
+    "@babel/helper-define-polyfill-provider": "0.6.8",
+    "@babel/plugin-transform-runtime": "7.29.7",
+    "@babel/preset-env": "7.29.7",
    "@bundle-stats/plugin-webpack-filter": "4.22.2",
    "@eslint/js": "10.0.1",
    "@html-eslint/eslint-plugin": "0.62.0",
@@ -146,33 +146,35 @@
    "@octokit/auth-oauth-device": "8.0.3",
    "@octokit/plugin-retry": "8.1.0",
    "@octokit/rest": "22.0.1",
-    "@playwright/test": "1.61.1",
-    "@rsdoctor/rspack-plugin": "1.5.16",
+    "@playwright/test": "1.60.0",
+    "@rsdoctor/rspack-plugin": "1.5.13",
    "@rspack/core": "2.0.8",
-    "@rspack/dev-server": "2.1.0",
+    "@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",
    "@types/culori": "4.0.1",
    "@types/html-minifier-terser": "7.0.2",
+    "@types/js-yaml": "4.0.9",
    "@types/leaflet": "1.9.21",
    "@types/leaflet-draw": "1.0.13",
    "@types/leaflet.markercluster": "1.5.6",
    "@types/lodash.merge": "4.6.9",
-    "@types/luxon": "3.7.2",
+    "@types/luxon": "3.7.1",
    "@types/qrcode": "1.5.6",
    "@types/sortablejs": "1.15.9",
    "@types/tar": "7.0.87",
-    "@vitest/coverage-v8": "4.1.9",
+    "@vitest/coverage-v8": "4.1.8",
    "babel-loader": "10.1.1",
-    "babel-plugin-polyfill-corejs3": "1.0.0",
+    "babel-plugin-template-html-minifier": "4.1.0",
    "browserslist-useragent-regexp": "4.1.4",
+    "browserstack-node-sdk": "1.53.2",
    "del": "8.0.1",
    "eslint": "10.5.0",
    "eslint-config-prettier": "10.1.8",
    "eslint-import-resolver-webpack": "0.13.11",
-    "eslint-plugin-import-x": "4.17.0",
+    "eslint-plugin-import-x": "4.16.2",
    "eslint-plugin-lit": "2.3.1",
    "eslint-plugin-lit-a11y": "5.1.1",
    "eslint-plugin-unused-imports": "4.4.1",
@@ -181,7 +183,7 @@
    "fs-extra": "11.3.5",
    "generate-license-file": "4.2.1",
    "glob": "13.0.6",
-    "globals": "17.7.0",
+    "globals": "17.6.0",
    "gulp": "5.0.1",
    "gulp-brotli": "3.0.0",
    "gulp-json-transform": "0.5.0",
@@ -191,24 +193,23 @@
    "jsdom": "29.1.1",
    "jszip": "3.10.1",
    "license-checker-rseidelsohn": "5.0.1",
-    "lint-staged": "17.0.8",
+    "lint-staged": "17.0.7",
    "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",
    "serve": "14.2.6",
    "sinon": "22.0.0",
-    "tar": "7.5.17",
+    "tar": "7.5.16",
    "terser-webpack-plugin": "5.6.1",
    "ts-lit-plugin": "2.0.2",
    "typescript": "6.0.3",
-    "typescript-eslint": "8.62.0",
+    "typescript-eslint": "8.61.0",
    "vite-tsconfig-paths": "6.1.1",
-    "vitest": "4.1.9",
+    "vitest": "4.1.8",
    "webpack-stats-plugin": "1.1.3",
    "webpackbar": "7.0.0",
    "workbox-build": "patch:workbox-build@npm%3A7.4.1#~/.yarn/patches/workbox-build-npm-7.4.1-c84561662c.patch"
@@ -218,14 +219,14 @@
    "lit-html": "3.3.3",
    "clean-css": "5.3.3",
    "@lit/reactive-element": "2.1.2",
-    "@fullcalendar/daygrid": "6.1.21",
-    "globals": "17.7.0",
+    "@fullcalendar/daygrid": "6.1.20",
+    "globals": "17.6.0",
    "tslib": "2.8.1",
    "@material/mwc-list@^0.27.0": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch",
    "glob@^10.2.2": "^10.5.0"
  },
-  "packageManager": "yarn@4.17.0",
+  "packageManager": "yarn@4.16.0",
  "volta": {
-    "node": "24.18.0"
+    "node": "24.16.0"
  }
 }
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name         = "home-assistant-frontend"
-version      = "20260624.0"
+version      = "20260527.0"
 license      = "Apache-2.0"
 license-files = ["LICENSE*"]
 description  = "The Home Assistant frontend"
@@ -1,24 +1,17 @@
 import type {
+  Condition,
  TimeCondition,
-  VisibilityCondition,
 } from "../../panels/lovelace/common/validate-condition";

 /**
 * Extract media queries from conditions recursively
 */
-export function extractMediaQueries(
-  conditions: VisibilityCondition[]
-): string[] {
+export function extractMediaQueries(conditions: Condition[]): string[] {
  return conditions.reduce<string[]>((array, c) => {
    if ("conditions" in c && c.conditions) {
      array.push(...extractMediaQueries(c.conditions));
    }
-    if (
-      "condition" in c &&
-      c.condition === "screen" &&
-      "media_query" in c &&
-      c.media_query
-    ) {
+    if (c.condition === "screen" && c.media_query) {
      array.push(c.media_query);
    }
    return array;
@@ -29,16 +22,14 @@ export function extractMediaQueries(
 * Extract time conditions from conditions recursively
 */
 export function extractTimeConditions(
-  conditions: VisibilityCondition[]
+  conditions: Condition[]
 ): TimeCondition[] {
  return conditions.reduce<TimeCondition[]>((array, c) => {
    if ("conditions" in c && c.conditions) {
      array.push(...extractTimeConditions(c.conditions));
    }
-    if ("condition" in c && c.condition === "time") {
-      // Dashboard `time` is always the client-side lovelace shape; core `time`
-      // is intentionally excluded from VisibilityCondition.
-      array.push(c as TimeCondition);
+    if (c.condition === "time") {
+      array.push(c);
    }
    return array;
  }, []);
@@ -1,9 +1,10 @@
 import { listenMediaQuery } from "../dom/media_query";
 import type { HomeAssistant } from "../../types";
 import type {
-  TimeCondition,
-  VisibilityCondition,
+  Condition,
+  ConditionContext,
 } from "../../panels/lovelace/common/validate-condition";
+import { checkConditionsMet } from "../../panels/lovelace/common/validate-condition";
 import { extractMediaQueries, extractTimeConditions } from "./extract";
 import { calculateNextTimeUpdate } from "./time-calculator";

@@ -15,68 +16,95 @@ import { calculateNextTimeUpdate } from "./time-calculator";
 const MAX_TIMEOUT_DELAY = 2147483647;

 /**
- * Schedule a callback to fire at the next boundary of a time condition,
- * rescheduling itself afterwards. Delays beyond the setTimeout maximum are
- * capped and re-scheduled without firing (so the boundary is only reported
- * once it is actually reached). Registers a single cleanup function that
- * clears the pending timeout.
+ * Helper to setup media query listeners for conditional visibility
 */
-function scheduleTimeBoundaryListener(
-  getHass: () => HomeAssistant,
-  timeCondition: Omit<TimeCondition, "condition">,
+export function setupMediaQueryListeners(
+  conditions: Condition[],
+  hass: HomeAssistant,
  addListener: (unsub: () => void) => void,
-  onBoundary: () => void
+  onUpdate: (conditionsMet: boolean) => void,
+  getContext?: () => ConditionContext
 ): void {
-  let timeoutId: ReturnType<typeof setTimeout> | undefined;
+  const mediaQueries = extractMediaQueries(conditions);

-  const scheduleUpdate = () => {
-    // Read hass lazily so timezone changes are picked up on the next boundary.
-    const delay = calculateNextTimeUpdate(getHass(), timeCondition);
+  if (mediaQueries.length === 0) return;

-    if (delay === undefined) return;
+  // Optimization for single media query
+  const hasOnlyMediaQuery =
+    conditions.length === 1 &&
+    conditions[0].condition === "screen" &&
+    !!conditions[0].media_query;

-    // Cap delay to prevent setTimeout overflow
-    const cappedDelay = Math.min(delay, MAX_TIMEOUT_DELAY);
-
-    timeoutId = setTimeout(() => {
-      if (delay <= MAX_TIMEOUT_DELAY) {
-        onBoundary();
+  mediaQueries.forEach((mediaQuery) => {
+    const unsub = listenMediaQuery(mediaQuery, (matches) => {
+      if (hasOnlyMediaQuery) {
+        onUpdate(matches);
+      } else {
+        const context = getContext?.() ?? {};
+        const conditionsMet = checkConditionsMet(conditions, hass, context);
+        onUpdate(conditionsMet);
      }
-      scheduleUpdate();
-    }, cappedDelay);
-  };
-
-  // Register cleanup function once, outside of scheduleUpdate
-  addListener(() => {
-    if (timeoutId !== undefined) {
-      clearTimeout(timeoutId);
-    }
+    });
+    addListener(unsub);
  });
-
-  scheduleUpdate();
 }

 /**
- * Observe the client-evaluated parts of a condition tree — `screen` media
- * queries and `time` boundaries — and invoke `onChange` whenever one of them
- * could have flipped.
- *
- * This does not evaluate the conditions itself: the caller recombines client
- * and server results on notification. Used by `ConditionEvaluatorController`,
- * which merges these client signals with the results of `subscribe_condition`
- * subscriptions.
+ * Helper to setup time-based listeners for conditional visibility
 */
-export function observeConditionChanges(
-  conditions: VisibilityCondition[],
-  getHass: () => HomeAssistant,
+export function setupTimeListeners(
+  conditions: Condition[],
+  hass: HomeAssistant,
  addListener: (unsub: () => void) => void,
-  onChange: () => void
+  onUpdate: (conditionsMet: boolean) => void,
+  getContext?: () => ConditionContext
 ): void {
-  extractMediaQueries(conditions).forEach((mediaQuery) => {
-    addListener(listenMediaQuery(mediaQuery, () => onChange()));
-  });
+  const timeConditions = extractTimeConditions(conditions);

-  extractTimeConditions(conditions).forEach((timeCondition) => {
-    scheduleTimeBoundaryListener(getHass, timeCondition, addListener, onChange);
+  if (timeConditions.length === 0) return;
+
+  timeConditions.forEach((timeCondition) => {
+    let timeoutId: ReturnType<typeof setTimeout> | undefined;
+
+    const scheduleUpdate = () => {
+      const delay = calculateNextTimeUpdate(hass, timeCondition);
+
+      if (delay === undefined) return;
+
+      // Cap delay to prevent setTimeout overflow
+      const cappedDelay = Math.min(delay, MAX_TIMEOUT_DELAY);
+
+      timeoutId = setTimeout(() => {
+        if (delay <= MAX_TIMEOUT_DELAY) {
+          const context = getContext?.() ?? {};
+          const conditionsMet = checkConditionsMet(conditions, hass, context);
+          onUpdate(conditionsMet);
+        }
+        scheduleUpdate();
+      }, cappedDelay);
+    };
+
+    // Register cleanup function once, outside of scheduleUpdate
+    addListener(() => {
+      if (timeoutId !== undefined) {
+        clearTimeout(timeoutId);
+      }
+    });
+
+    scheduleUpdate();
  });
 }
+
+/**
+ * Sets up all condition listeners (media query, time) for conditional visibility.
+ */
+export function setupConditionListeners(
+  conditions: Condition[],
+  hass: HomeAssistant,
+  addListener: (unsub: () => void) => void,
+  onUpdate: (conditionsMet: boolean) => void,
+  getContext?: () => ConditionContext
+): void {
+  setupMediaQueryListeners(conditions, hass, addListener, onUpdate, getContext);
+  setupTimeListeners(conditions, hass, addListener, onUpdate, getContext);
+}
@@ -1,176 +0,0 @@
-import type { Condition as CoreCondition } from "../../data/automation";
-import type { VisibilityCondition } from "../../panels/lovelace/common/validate-condition";
-import {
-  isLogicalCondition,
-  isServerCondition,
-  translateToCoreCondition,
-} from "./translate";
-
-/** A maximal server subtree, to be opened as one `subscribe_condition`. */
-export interface ServerSubtree {
-  id: string;
-  coreCondition: CoreCondition;
-}
-
-/**
- * Evaluate a single client-only condition leaf (`screen`, `user`,
- * `view_columns`, `location`, `time`). Returns `undefined` when the outcome is
- * not yet determinable (e.g. context not available).
- */
-export type ClientConditionEvaluator = (
-  condition: VisibilityCondition
-) => boolean | undefined;
-
-/** Server subtree results keyed by {@link ServerSubtree.id}; `undefined` = not yet reported. */
-export type ServerConditionResults = Record<string, boolean | undefined>;
-
-export interface SplitConditionTree {
-  /** Maximal server subtrees, each to be opened as one `subscribe_condition`. */
-  serverSubtrees: ServerSubtree[];
-  /**
-   * Combine client + server results into the overall visibility using
-   * three-valued (Kleene) logic. Returns `undefined` while the outcome still
-   * depends on a server subtree that has not reported yet.
-   */
-  evaluate: (
-    clientEvaluator: ClientConditionEvaluator,
-    serverResults: ServerConditionResults
-  ) => boolean | undefined;
-}
-
-type EvalNode = (
-  clientEvaluator: ClientConditionEvaluator,
-  serverResults: ServerConditionResults
-) => boolean | undefined;
-
-// Three-valued logic combinators (true / false / undefined = unknown). `false`
-// dominates AND and `true` dominates OR regardless of any unknown sibling.
-const andNode =
-  (children: EvalNode[]): EvalNode =>
-  (clientEvaluator, serverResults) => {
-    let unknown = false;
-    for (const child of children) {
-      const value = child(clientEvaluator, serverResults);
-      if (value === false) return false;
-      if (value === undefined) unknown = true;
-    }
-    return unknown ? undefined : true;
-  };
-
-const orNode =
-  (children: EvalNode[]): EvalNode =>
-  (clientEvaluator, serverResults) => {
-    let unknown = false;
-    for (const child of children) {
-      const value = child(clientEvaluator, serverResults);
-      if (value === true) return true;
-      if (value === undefined) unknown = true;
-    }
-    return unknown ? undefined : false;
-  };
-
-const notNode =
-  (child: EvalNode): EvalNode =>
-  (clientEvaluator, serverResults) => {
-    const value = child(clientEvaluator, serverResults);
-    return value === undefined ? undefined : !value;
-  };
-
-const serverLeaf =
-  (id: string): EvalNode =>
-  (_clientEvaluator, serverResults) =>
-    serverResults[id];
-
-const clientLeaf =
-  (condition: VisibilityCondition): EvalNode =>
-  (clientEvaluator) =>
-    clientEvaluator(condition);
-
-/**
- * Split a dashboard visibility condition tree into:
- *
- * - a flat list of **maximal server subtrees** (`serverSubtrees`), each
- *   translated to core format and meant to back one `subscribe_condition`; and
- * - an **`evaluate`** function that recombines those subtree results with
- *   locally-evaluated client leaves into the overall visibility.
- *
- * The top-level array is treated as an implicit `AND`. Sibling server
- * conditions sharing a logical parent (including that implicit top-level AND)
- * are grouped into a *single* subscription using the parent's operator, to
- * avoid subscription fan-out. A `not` combines its children with `AND` before
- * negating, matching lovelace `not` semantics (¬(AND of children)).
- */
-export const splitConditionTree = (
-  conditions: VisibilityCondition[]
-): SplitConditionTree => {
-  const serverSubtrees: ServerSubtree[] = [];
-  let nextId = 0;
-
-  const addSubtree = (coreCondition: CoreCondition): EvalNode => {
-    const id = String(nextId);
-    nextId += 1;
-    serverSubtrees.push({ id, coreCondition });
-    return serverLeaf(id);
-  };
-
-  // Partition children into client/server, group the server siblings into one
-  // subscription, and recurse into the client ones. `groupOperator` is the
-  // operator used to combine the grouped server siblings.
-  const buildSiblings = (
-    children: VisibilityCondition[],
-    groupOperator: "and" | "or"
-  ): EvalNode[] => {
-    const serverChildren: VisibilityCondition[] = [];
-    const clientChildren: VisibilityCondition[] = [];
-    for (const child of children) {
-      (isServerCondition(child) ? serverChildren : clientChildren).push(child);
-    }
-
-    const nodes: EvalNode[] = [];
-
-    if (serverChildren.length === 1) {
-      nodes.push(addSubtree(translateToCoreCondition(serverChildren[0])));
-    } else if (serverChildren.length > 1) {
-      nodes.push(
-        addSubtree({
-          condition: groupOperator,
-          conditions: serverChildren.map(translateToCoreCondition),
-        })
-      );
-    }
-
-    for (const child of clientChildren) {
-      nodes.push(build(child));
-    }
-
-    return nodes;
-  };
-
-  // Only ever reached for client-class nodes (server subtrees are grouped and
-  // translated whole by `buildSiblings`).
-  const build = (condition: VisibilityCondition): EvalNode => {
-    if (isLogicalCondition(condition)) {
-      const children = condition.conditions ?? [];
-      if (condition.condition === "or") {
-        return orNode(buildSiblings(children, "or"));
-      }
-      if (condition.condition === "not") {
-        return notNode(andNode(buildSiblings(children, "and")));
-      }
-      return andNode(buildSiblings(children, "and"));
-    }
-    // Defensive: a server leaf reaching here still becomes a subscription.
-    if (isServerCondition(condition)) {
-      return addSubtree(translateToCoreCondition(condition));
-    }
-    return clientLeaf(condition);
-  };
-
-  const root = andNode(buildSiblings(conditions, "and"));
-
-  return {
-    serverSubtrees,
-    evaluate: (clientEvaluator, serverResults) =>
-      root(clientEvaluator, serverResults),
-  };
-};
@@ -1,251 +0,0 @@
-import type {
-  Condition as CoreCondition,
-  NumericStateCondition as CoreNumericStateCondition,
-  StateCondition as CoreStateCondition,
-} from "../../data/automation";
-import type {
-  LegacyCondition,
-  NumericStateCondition as LovelaceNumericStateCondition,
-  StateCondition as LovelaceStateCondition,
-  VisibilityCondition,
-  VisibilityLogicalCondition,
-} from "../../panels/lovelace/common/validate-condition";
-import { isValidEntityId } from "../entity/valid_entity_id";
-
-/**
- * Lovelace condition types evaluated on the client; these have no usable core
- * equivalent for dashboards and are never sent to `subscribe_condition`.
- */
-const CLIENT_CONDITION_TYPES = new Set([
-  "screen",
-  "user",
-  "view_columns",
-  "location",
-  "time",
-]);
-
-const LOGICAL_CONDITION_TYPES = new Set(["and", "or", "not"]);
-
-/** Type guard for the `and` / `or` / `not` combinators. */
-export const isLogicalCondition = (
-  condition: VisibilityCondition
-): condition is VisibilityLogicalCondition =>
-  "condition" in condition && LOGICAL_CONDITION_TYPES.has(condition.condition);
-
-/**
- * Whether a condition must be evaluated server-side (via `subscribe_condition`).
- *
- * Leaves: everything except the client-only lovelace types is server-class,
- * including legacy `{ entity, state }` conditions (treated as `state`) and any
- * integration-provided condition.
- *
- * Compounds (`and` / `or` / `not`) are server-class only when *every*
- * descendant is, so a single client leaf anywhere forces the whole compound
- * client-side, where it becomes a combinator wrapping server subtrees (see
- * `splitConditionTree`). An empty compound is vacuously server-class.
- */
-export const isServerCondition = (condition: VisibilityCondition): boolean => {
-  if (isLogicalCondition(condition)) {
-    return (condition.conditions ?? []).every(isServerCondition);
-  }
-  // Legacy lovelace condition without a `condition` key → treated as `state`.
-  if (!("condition" in condition)) {
-    return true;
-  }
-  return !CLIENT_CONDITION_TYPES.has(condition.condition);
-};
-
-/** Inverse of {@link isServerCondition}. */
-export const isClientCondition = (condition: VisibilityCondition): boolean =>
-  !isServerCondition(condition);
-
-/**
- * Whether *every* leaf in the tree is a client-only condition, so the whole
- * tree can be evaluated and validated client-side without any
- * `subscribe_condition` round-trip. Distinct from {@link isClientCondition},
- * which is true when *any* leaf is client-side.
- */
-export const isPureClientCondition = (
-  condition: VisibilityCondition
-): boolean =>
-  isLogicalCondition(condition)
-    ? (condition.conditions ?? []).every(isPureClientCondition)
-    : isClientCondition(condition);
-
-/**
- * Translate a server-class lovelace condition into its core automation
- * equivalent. Core-format conditions (and condition types with no lovelace
- * counterpart, like `template` / `sun` / `zone` / `device` / integration
- * conditions) are passed through untouched.
- *
- * The caller is responsible for only translating server-class conditions
- * ({@link isServerCondition}); passing a client-only condition just returns it
- * unchanged.
- */
-export const translateToCoreCondition = (
-  condition: VisibilityCondition
-): CoreCondition => {
-  // Legacy lovelace condition: { entity, state, state_not } with no `condition`.
-  if (!("condition" in condition)) {
-    return translateStateCondition({ condition: "state", ...condition });
-  }
-
-  if (isLogicalCondition(condition)) {
-    return translateLogicalCondition(condition);
-  }
-
-  switch (condition.condition) {
-    case "state":
-      return translateStateCondition(condition as LovelaceStateCondition);
-    case "numeric_state":
-      return translateNumericStateCondition(
-        condition as LovelaceNumericStateCondition
-      );
-    default:
-      // Already core format (sun, zone, template, device, integration, or a
-      // core `state` / `numeric_state` carrying `entity_id`) → pass through.
-      return condition as CoreCondition;
-  }
-};
-
-// A core condition that always evaluates to false — ¬(AND of nothing) = ¬true.
-// Used where checkConditionsMet short-circuits to false (an incomplete config),
-// so we never emit a schema-invalid condition that would break a grouped
-// subscription.
-const alwaysFalseCondition = (): CoreCondition => ({
-  condition: "not",
-  conditions: [{ condition: "and", conditions: [] }],
-});
-
-const translateStateCondition = (
-  condition: LovelaceStateCondition | CoreStateCondition | LegacyCondition
-): CoreCondition => {
-  // Already core format — distinguished from lovelace by `entity_id`.
-  if ("entity_id" in condition) {
-    return condition as CoreStateCondition;
-  }
-
-  const lovelace = condition as LovelaceStateCondition;
-
-  // Incomplete config: no entity, or no comparison value. checkConditionsMet
-  // returns false for these (and a `state` condition with no `entity_id` /
-  // `state` is invalid for core), so resolve to a clean always-false.
-  if (
-    lovelace.entity === undefined ||
-    (lovelace.state === undefined && lovelace.state_not === undefined)
-  ) {
-    return alwaysFalseCondition();
-  }
-
-  const base = {
-    condition: "state" as const,
-    entity_id: lovelace.entity,
-    ...(lovelace.attribute !== undefined
-      ? { attribute: lovelace.attribute }
-      : {}),
-  };
-
-  // KNOWN LIMITATION: when the compared value is itself an entity id, lovelace
-  // (checkStateCondition -> getValueFromEntityId) resolves *any* entity to its
-  // live state, but core's `state` condition only dereferences `input_*`
-  // entities and compares everything else literally. A value referencing a
-  // non-`input_*` entity therefore changes meaning after delegation. This is
-  // niche (the visibility editor does not offer entity-as-value) and left as a
-  // future enhancement — a faithful, reactive fix would emit a `template`
-  // condition. See https://github.com/home-assistant/frontend/issues/52836.
-
-  // `state` wins over `state_not` when both are present, mirroring
-  // checkConditionsMet (`state ?? state_not`, positive branch when `state`).
-  if (lovelace.state !== undefined) {
-    return { ...base, state: lovelace.state } as CoreStateCondition;
-  }
-
-  // Core has no `state_not`; wrap a positive `state` in `not`.
-  return {
-    condition: "not",
-    conditions: [{ ...base, state: lovelace.state_not } as CoreStateCondition],
-  };
-};
-
-const translateNumericStateCondition = (
-  condition: LovelaceNumericStateCondition | CoreNumericStateCondition
-): CoreCondition => {
-  if ("entity_id" in condition) {
-    return condition as CoreNumericStateCondition;
-  }
-  const lovelace = condition as LovelaceNumericStateCondition;
-  const core: CoreNumericStateCondition = {
-    condition: "numeric_state",
-    entity_id: lovelace.entity as string,
-  };
-  if (lovelace.attribute !== undefined) {
-    core.attribute = lovelace.attribute;
-  }
-  const above = translateNumericBound(lovelace.above);
-  if (above !== undefined) {
-    core.above = above;
-  }
-  const below = translateNumericBound(lovelace.below);
-  if (below !== undefined) {
-    core.below = below;
-  }
-  return core;
-};
-
-/**
- * Reconcile a lovelace numeric bound with core's interpretation. Lovelace
- * resolves a string bound to an entity's state only when that entity exists,
- * otherwise falling back to `Number(...)` (which yields `NaN` for junk, leaving
- * the bound effectively ignored). Core instead treats *every* string bound as
- * an entity id and errors when it is not one. To preserve lovelace behavior:
- *
- * - a finite numeric string (`"5"`, `"10.5"`, even `""` → 0) coerces to a
- *   number (the entity-id regex matches `"10.5"`, so test `Number()` first);
- * - a genuine entity-id reference passes through for core to resolve;
- * - anything else (junk like `"foo"`, or non-finite like `"1e400"`) is dropped,
- *   matching lovelace's "NaN ⇒ ignored" and never emitting a non-finite number
- *   (which is not JSON-serializable).
- */
-const translateNumericBound = (
-  bound: string | number | undefined
-): string | number | undefined => {
-  if (typeof bound !== "string") {
-    return bound;
-  }
-  const numeric = Number(bound);
-  if (!isNaN(numeric) && isFinite(numeric)) {
-    return numeric;
-  }
-  if (isValidEntityId(bound)) {
-    return bound;
-  }
-  return undefined;
-};
-
-const translateLogicalCondition = (
-  condition: VisibilityLogicalCondition
-): CoreCondition => {
-  // Lovelace treats a logical condition with no `conditions` key as vacuously
-  // true (checkAnd/Or/NotCondition all early-return on a missing list).
-  if (condition.conditions === undefined) {
-    return { condition: "and", conditions: [] };
-  }
-
-  const conditions = condition.conditions.map(translateToCoreCondition);
-
-  if (condition.condition === "not") {
-    // Lovelace `not` means ¬(AND of children); core `not` means ¬(OR of
-    // children). Wrapping the children in an `and` preserves the lovelace
-    // meaning for any arity — including an empty `not`, which becomes ¬(AND of
-    // nothing) = ¬true = false, matching checkConditionsMet. A single child is
-    // unambiguous (¬(OR of one) = ¬(AND of one)) and left unwrapped for a
-    // tidier persisted form.
-    if (conditions.length === 1) {
-      return { condition: "not", conditions };
-    }
-    return { condition: "not", conditions: [{ condition: "and", conditions }] };
-  }
-
-  // Empty `and` (true) / `or` (false) already agree between lovelace and core.
-  return { condition: condition.condition, conditions };
-};
@@ -4,8 +4,7 @@ import { ensureArray } from "../array/ensure-array";
 import { isComponentLoaded } from "./is_component_loaded";

 export const canShowPage = (hass: HomeAssistant, page: PageNavigation) =>
-  (isCore(page) || isLoadedIntegration(hass, page)) &&
-  (!page.filter || page.filter(hass));
+  isCore(page) || isLoadedIntegration(hass, page);

 export const isLoadedIntegration = (
  hass: HomeAssistant,
@@ -110,32 +110,6 @@ export const DOMAINS_WITH_DYNAMIC_PICTURE = new Set([
  "media_player",
 ]);

-/** Domains that use a timestamp for state. */
-const TIMESTAMP_STATE_DOMAINS_LIST = [
-  "ai_task",
-  "button",
-  "conversation",
-  "event",
-  "image",
-  "infrared",
-  "input_button",
-  "notify",
-  "radio_frequency",
-  "scene",
-  "stt",
-  "tag",
-  "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";
 export const UNIT_F = "°F";
@@ -1,29 +0,0 @@
-import { Task, type TaskConfig } from "@lit/task";
-import type { ReactiveControllerHost } from "lit";
-
-/**
- * A `@lit/task` Task with a sticky `resolved` flag: false until the task has
- * completed once, then true. Lets callers tell "still loading" apart from
- * "resolved with an empty value" without a null sentinel, while keeping the
- * previous value during a re-run.
- */
-export class AsyncValueTask<T extends readonly unknown[], R> extends Task<
-  T,
-  R
-> {
-  private _resolved = false;
-
-  constructor(host: ReactiveControllerHost, config: TaskConfig<T, R>) {
-    super(host, {
-      ...config,
-      onComplete: (value) => {
-        this._resolved = true;
-        config.onComplete?.(value);
-      },
-    });
-  }
-
-  public get resolved(): boolean {
-    return this._resolved;
-  }
-}
@@ -1,329 +0,0 @@
-import type {
-  ReactiveController,
-  ReactiveControllerHost,
-} from "@lit/reactive-element/reactive-controller";
-import type { Connection, UnsubscribeFunc } from "home-assistant-js-websocket";
-import { subscribeCondition } from "../../data/automation";
-import type {
-  Condition,
-  ConditionContext,
-  VisibilityCondition,
-} from "../../panels/lovelace/common/validate-condition";
-import { checkConditionsMet } from "../../panels/lovelace/common/validate-condition";
-import type { HomeAssistant } from "../../types";
-import { observeConditionChanges } from "../condition/listeners";
-import type {
-  ClientConditionEvaluator,
-  ServerConditionResults,
-  SplitConditionTree,
-} from "../condition/split";
-import { splitConditionTree } from "../condition/split";
-
-/** Tri-state visibility outcome. `unknown` = a server subtree has not reported yet. */
-export type ConditionEvaluation = "visible" | "hidden" | "unknown";
-
-export interface ConditionEvaluatorOptions {
-  /** Called whenever the combined result or error changes. */
-  onResult: (result: ConditionEvaluation, error?: string) => void;
-  /** Debounce (ms) before (re)opening subscriptions when the tree changes. */
-  resubscribeDelay?: number;
-}
-
-const DEFAULT_RESUBSCRIBE_DELAY = 50;
-
-/**
- * Reactive controller that keeps a dashboard visibility condition tree
- * evaluated live by combining:
- *
- * - `subscribe_condition` subscriptions, one per maximal server subtree
- *   (`state`, `numeric_state`, `template`, `sun`, `zone`, `device`,
- *   integration conditions), and
- * - locally-evaluated client leaves (`screen`, `user`, `view_columns`,
- *   `location`, `time`), reacting to media-query / time-boundary / hass /
- *   context changes.
- *
- * The host calls {@link observe} whenever its inputs change; the controller
- * only (re)subscribes when the *condition tree* changes (debounced) and merely
- * recomputes for hass/context changes. Subscriptions are torn down on host
- * disconnect and re-opened on reconnect. The combined result uses three-valued
- * logic so the host can render an explicit `unknown` state without flashing
- * while server results are still pending.
- */
-export class ConditionEvaluatorController implements ReactiveController {
-  private _host: ReactiveControllerHost;
-
-  private readonly _onResult: ConditionEvaluatorOptions["onResult"];
-
-  private readonly _resubscribeDelay: number;
-
-  private _conditions?: VisibilityCondition[];
-
-  private _hass?: HomeAssistant;
-
-  private _getContext?: () => ConditionContext;
-
-  private _connected = false;
-
-  // Structural signature of the tree the live subscriptions/listeners are for,
-  // and of the tree a pending (debounced) re-subscribe will switch to. Compared
-  // by value (not array reference) so a host re-deriving the array each render
-  // does not starve the debounce or needlessly drop subscriptions.
-  private _subscribedSignature?: string;
-
-  private _pendingSignature?: string;
-
-  // Memoize the signature for a stable array reference to avoid re-stringifying
-  // on every host update.
-  private _lastConditionsRef?: VisibilityCondition[];
-
-  private _lastSignature?: string;
-
-  private _split?: SplitConditionTree;
-
-  private _serverResults: ServerConditionResults = {};
-
-  private _subtreeErrors: Record<string, string | undefined> = {};
-
-  private _subscriptions: Promise<UnsubscribeFunc>[] = [];
-
-  private _listeners: (() => void)[] = [];
-
-  // Bumped on every teardown so late-arriving async results are ignored.
-  private _generation = 0;
-
-  private _resubscribeTimeout?: ReturnType<typeof setTimeout>;
-
-  private _result: ConditionEvaluation = "unknown";
-
-  private _error?: string;
-
-  private _notifiedResult?: ConditionEvaluation;
-
-  private _notifiedError?: string;
-
-  constructor(
-    host: ReactiveControllerHost,
-    options: ConditionEvaluatorOptions
-  ) {
-    this._host = host;
-    this._onResult = options.onResult;
-    this._resubscribeDelay =
-      options.resubscribeDelay ?? DEFAULT_RESUBSCRIBE_DELAY;
-    host.addController(this);
-  }
-
-  public get result(): ConditionEvaluation {
-    return this._result;
-  }
-
-  public get error(): string | undefined {
-    return this._error;
-  }
-
-  /**
-   * Provide the latest inputs. Cheap to call on every host update: it only
-   * (re)subscribes when the condition tree reference changes, otherwise it just
-   * recomputes the client-dependent parts.
-   */
-  public observe(
-    conditions: VisibilityCondition[] | undefined,
-    hass: HomeAssistant | undefined,
-    getContext?: () => ConditionContext
-  ): void {
-    this._conditions = conditions;
-    this._hass = hass;
-    this._getContext = getContext;
-    this._sync();
-  }
-
-  public hostConnected(): void {
-    this._connected = true;
-    this._sync();
-  }
-
-  public hostDisconnected(): void {
-    this._connected = false;
-    this._teardown();
-    // Nothing backs the last result once subscriptions are closed; report
-    // `unknown` (and force the notification through) so a detached/reconnecting
-    // host never renders a stale, no-longer-live visibility.
-    this._notifiedResult = undefined;
-    this._notifiedError = undefined;
-    this._setResult("unknown", undefined);
-  }
-
-  private _signatureOf(
-    conditions: VisibilityCondition[] | undefined
-  ): string | undefined {
-    if (conditions === undefined) {
-      return undefined;
-    }
-    if (conditions === this._lastConditionsRef) {
-      return this._lastSignature;
-    }
-    this._lastConditionsRef = conditions;
-    this._lastSignature = JSON.stringify(conditions);
-    return this._lastSignature;
-  }
-
-  private _sync(): void {
-    if (!this._connected) {
-      return;
-    }
-    const signature = this._signatureOf(this._conditions);
-    // Re-subscribe only when the tree we are (or are about to be) subscribed to
-    // actually differs by value — not merely by array reference.
-    const targetSignature = this._pendingSignature ?? this._subscribedSignature;
-    if (signature !== targetSignature) {
-      this._pendingSignature = signature;
-      this._scheduleResubscribe();
-    }
-    // Always recompute so client leaves (and the current split) stay live, even
-    // while a re-subscribe is pending.
-    this._recompute();
-  }
-
-  private _scheduleResubscribe(): void {
-    if (this._resubscribeTimeout !== undefined) {
-      clearTimeout(this._resubscribeTimeout);
-    }
-    this._resubscribeTimeout = setTimeout(() => {
-      this._resubscribeTimeout = undefined;
-      this._subscribe();
-    }, this._resubscribeDelay);
-  }
-
-  private _subscribe(): void {
-    this._teardown();
-
-    const conditions = this._conditions;
-    const hass = this._hass;
-    this._subscribedSignature = this._signatureOf(conditions);
-    this._pendingSignature = undefined;
-
-    if (!conditions || !hass) {
-      this._setResult("unknown", undefined);
-      return;
-    }
-
-    const split = splitConditionTree(conditions);
-    this._split = split;
-
-    const generation = this._generation;
-    const connection: Connection = hass.connection;
-
-    for (const subtree of split.serverSubtrees) {
-      this._serverResults[subtree.id] = undefined;
-      const subscription = subscribeCondition(
-        connection,
-        (message) => {
-          if (generation !== this._generation) {
-            return;
-          }
-          if (message.error !== undefined) {
-            this._serverResults[subtree.id] = false;
-            this._subtreeErrors[subtree.id] =
-              typeof message.error === "string"
-                ? message.error
-                : message.error.message;
-          } else {
-            this._serverResults[subtree.id] = message.result;
-            this._subtreeErrors[subtree.id] = undefined;
-          }
-          this._recompute();
-        },
-        subtree.coreCondition
-      );
-      subscription.catch((err: unknown) => {
-        if (generation !== this._generation) {
-          return;
-        }
-        this._serverResults[subtree.id] = false;
-        this._subtreeErrors[subtree.id] =
-          err instanceof Error ? err.message : String(err);
-        this._recompute();
-      });
-      this._subscriptions.push(subscription);
-    }
-
-    observeConditionChanges(
-      conditions,
-      () => this._hass ?? hass,
-      (unsub) => this._listeners.push(unsub),
-      () => this._recompute()
-    );
-
-    this._recompute();
-  }
-
-  private _recompute(): void {
-    if (!this._split || !this._hass) {
-      this._setResult("unknown", undefined);
-      return;
-    }
-
-    const hass = this._hass;
-    const context = this._getContext?.() ?? {};
-    const clientEvaluator: ClientConditionEvaluator = (condition) => {
-      try {
-        // Only client-class leaves reach here, and those are all lovelace
-        // Condition members.
-        return checkConditionsMet([condition as Condition], hass, context);
-      } catch (_err) {
-        return false;
-      }
-    };
-
-    const value = this._split.evaluate(clientEvaluator, this._serverResults);
-    const result: ConditionEvaluation =
-      value === undefined ? "unknown" : value ? "visible" : "hidden";
-
-    this._setResult(result, this._combinedError());
-  }
-
-  private _combinedError(): string | undefined {
-    for (const error of Object.values(this._subtreeErrors)) {
-      if (error) {
-        return error;
-      }
-    }
-    return undefined;
-  }
-
-  private _setResult(
-    result: ConditionEvaluation,
-    error: string | undefined
-  ): void {
-    this._result = result;
-    this._error = error;
-    if (result === this._notifiedResult && error === this._notifiedError) {
-      return;
-    }
-    this._notifiedResult = result;
-    this._notifiedError = error;
-    this._onResult(result, error);
-    this._host.requestUpdate();
-  }
-
-  private _teardown(): void {
-    // Invalidate any in-flight subscription callbacks.
-    this._generation += 1;
-    if (this._resubscribeTimeout !== undefined) {
-      clearTimeout(this._resubscribeTimeout);
-      this._resubscribeTimeout = undefined;
-    }
-    for (const subscription of this._subscriptions) {
-      subscription.then((unsub) => unsub()).catch(() => undefined);
-    }
-    this._subscriptions = [];
-    for (const unsub of this._listeners) {
-      unsub();
-    }
-    this._listeners = [];
-    this._split = undefined;
-    this._serverResults = {};
-    this._subtreeErrors = {};
-    this._subscribedSignature = undefined;
-    this._pendingSignature = undefined;
-  }
-}
@@ -0,0 +1,59 @@
+import type {
+  ReactiveController,
+  ReactiveControllerHost,
+} from "@lit/reactive-element/reactive-controller";
+import type {
+  Condition,
+  ConditionContext,
+} from "../../panels/lovelace/common/validate-condition";
+import type { HomeAssistant } from "../../types";
+import { setupConditionListeners } from "../condition/listeners";
+
+/**
+ * Reactive controller that manages the media-query and time-based listeners
+ * needed to keep a set of lovelace visibility conditions evaluated live.
+ *
+ * The host is responsible for the actual evaluation (e.g. computing visible /
+ * hidden / invalid state); the controller only triggers it via the supplied
+ * `onUpdate` callback when something the conditions depend on changes. Call
+ * `setup()` whenever the conditions change; the controller clears previous
+ * listeners and re-subscribes. Listeners are automatically released when the
+ * host disconnects.
+ */
+export class ConditionListenersController implements ReactiveController {
+  private _unsubs: (() => void)[] = [];
+
+  constructor(host: ReactiveControllerHost) {
+    host.addController(this);
+  }
+
+  public hostDisconnected(): void {
+    this.clear();
+  }
+
+  public setup(
+    conditions: Condition[],
+    hass: HomeAssistant,
+    onUpdate: () => void,
+    getContext?: () => ConditionContext
+  ): void {
+    this.clear();
+    if (!conditions.length) {
+      return;
+    }
+    setupConditionListeners(
+      conditions,
+      hass,
+      (unsub) => this._unsubs.push(unsub),
+      () => onUpdate(),
+      getContext
+    );
+  }
+
+  public clear(): void {
+    for (const unsub of this._unsubs) {
+      unsub();
+    }
+    this._unsubs = [];
+  }
+}
@@ -1,13 +1,4 @@
-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;
@@ -3,24 +3,23 @@ import type { FrontendLocaleData } from "../../data/translation";
 import { selectUnit } from "../util/select-unit";

 const formatRelTimeMem = memoizeOne(
-  (locale: FrontendLocaleData, style: Intl.RelativeTimeFormatStyle) =>
-    new Intl.RelativeTimeFormat(locale.language, { numeric: "auto", style })
+  (locale: FrontendLocaleData) =>
+    new Intl.RelativeTimeFormat(locale.language, { numeric: "auto" })
 );

 export const relativeTime = (
  from: Date,
  locale: FrontendLocaleData,
  to?: Date,
-  includeTense = true,
-  style: Intl.RelativeTimeFormatStyle = "long"
+  includeTense = true
 ): string => {
  const diff = selectUnit(from, to, locale);
  if (includeTense) {
-    return formatRelTimeMem(locale, style).format(diff.value, diff.unit);
+    return formatRelTimeMem(locale).format(diff.value, diff.unit);
  }
  return Intl.NumberFormat(locale.language, {
    style: "unit",
    unit: diff.unit,
-    unitDisplay: style,
+    unitDisplay: "long",
  }).format(Math.abs(diff.value));
 };
@@ -1,4 +1,4 @@
-import { timeZonesNames } from "@vvo/tzdb";
+import timezones from "google-timezones-json";
 import { TimeZone } from "../../data/translation";

 const RESOLVED_RAW = Intl.DateTimeFormat?.().resolvedOptions?.().timeZone;
@@ -10,7 +10,7 @@ const RESOLVED_TIME_ZONE =
  RESOLVED_RAW &&
  (RESOLVED_RAW === "UTC" ||
    RESOLVED_RAW === "Etc/UTC" ||
-    timeZonesNames.includes(RESOLVED_RAW))
+    RESOLVED_RAW in timezones)
    ? RESOLVED_RAW
    : undefined;

@@ -60,17 +60,6 @@ export const computeAttributeValueToParts = (
    return [{ type: "value", value: localize("state.default.unknown") }];
  }

-  // Device class attribute, return the integration's translated name
-  if (attribute === "device_class" && typeof attributeValue === "string") {
-    const domain = computeStateDomain(stateObj);
-    const deviceClassName = localize(
-      `component.${domain}.entity_component.${attributeValue}.name`
-    );
-    if (deviceClassName) {
-      return [{ type: "value", value: deviceClassName }];
-    }
-  }
-
  // Number value, return formatted number
  if (typeof attributeValue === "number") {
    const domain = computeStateDomain(stateObj);
@@ -125,15 +125,7 @@ export interface EntityPickerDisplay {
 }

 export const computeEntityPickerDisplay = (
-  hass: Pick<
-    HomeAssistant,
-    | "entities"
-    | "devices"
-    | "areas"
-    | "floors"
-    | "language"
-    | "translationMetadata"
-  >,
+  hass: HomeAssistant,
  stateObj: HassEntity
 ): EntityPickerDisplay => {
  const [entityName, deviceName, areaName] = computeEntityNameList(
@@ -1,7 +1,6 @@
 import type { HassEntity } from "home-assistant-js-websocket";
 import { UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
 import type { HomeAssistant } from "../../types";
-import { unitFromParts } from "./value_parts";

 interface EntityUnitStubConfig {
  entity: string;
@@ -41,5 +40,5 @@ export const computeEntityUnitDisplay = (
    ? hass.formatEntityAttributeValueToParts(stateObj, config.attribute)
    : hass.formatEntityStateToParts(stateObj);

-  return unitFromParts(parts);
+  return parts.find((part) => part.type === "unit")?.value ?? "";
 };
@@ -21,11 +21,29 @@ import {
  isNumericSensorDeviceClass,
  SENSOR_TIMESTAMP_DEVICE_CLASSES,
 } from "../../data/sensor";
-import { TIMESTAMP_STATE_DOMAINS } from "../const";

 // Domains whose state is a timezone-agnostic date and/or time string.
 const DATE_TIME_DOMAINS = new Set(["date", "input_datetime", "time"]);

+// Domains whose state is a timestamp.
+const TIMESTAMP_DOMAINS = new Set([
+  "ai_task",
+  "button",
+  "conversation",
+  "event",
+  "image",
+  "infrared",
+  "input_button",
+  "notify",
+  "radio_frequency",
+  "scene",
+  "stt",
+  "tag",
+  "tts",
+  "wake_word",
+  "datetime",
+]);
+
 // Maps Intl.NumberFormat part types to ValuePart types for monetary states.
 const MONETARY_TYPE_MAP: Record<string, ValuePart["type"]> = {
  integer: "value",
@@ -160,8 +178,7 @@ const computeStateToPartsFromEntityAttributes = (
          const type = MONETARY_TYPE_MAP[part.type];
          if (!type) continue;
          const last = valueParts[valueParts.length - 1];
-          // Merge consecutive value parts so the number stays a single part
-          // (e.g. "-" + "12" + "." + "00" → "-12.00")
+          // Merge consecutive value parts (e.g. "-" + "12" + "." + "00" → "-12.00")
          if (type === "value" && last?.type === "value") {
            last.value += part.value;
          } else {
@@ -256,7 +273,7 @@ const computeStateToPartsFromEntityAttributes = (

  // state is a timestamp
  if (
-    TIMESTAMP_STATE_DOMAINS.has(domain) ||
+    TIMESTAMP_DOMAINS.has(domain) ||
    (domain === "sensor" &&
      SENSOR_TIMESTAMP_DEVICE_CLASSES.includes(attributes.device_class))
  ) {
@@ -0,0 +1,23 @@
+import type { HassEntity } from "home-assistant-js-websocket";
+import { supportsFeature } from "./supports-feature";
+
+export type FeatureClassNames<T extends number = number> = Partial<
+  Record<T, string>
+>;
+
+// Expects classNames to be an object mapping feature-bit -> className
+export const featureClassNames = (
+  stateObj: HassEntity,
+  classNames: FeatureClassNames
+) => {
+  if (!stateObj || !stateObj.attributes.supported_features) {
+    return "";
+  }
+
+  return Object.keys(classNames)
+    .map((feature) =>
+      supportsFeature(stateObj, Number(feature)) ? classNames[feature] : ""
+    )
+    .filter((attr) => attr !== "")
+    .join(" ");
+};
@@ -1,56 +0,0 @@
-import { AITaskEntityFeature } from "../../data/ai_task";
-import { AlarmControlPanelEntityFeature } from "../../data/alarm_control_panel";
-import { AssistSatelliteEntityFeature } from "../../data/assist_satellite";
-import { CalendarEntityFeature } from "../../data/calendar";
-import { CameraEntityFeature } from "../../data/camera";
-import { ClimateEntityFeature } from "../../data/climate";
-import { ConversationEntityFeature } from "../../data/conversation";
-import { CoverEntityFeature } from "../../data/cover";
-import { FanEntityFeature } from "../../data/fan";
-import { HumidifierEntityFeature } from "../../data/humidifier";
-import { LawnMowerEntityFeature } from "../../data/lawn_mower";
-import { LightEntityFeature } from "../../data/light";
-import { LockEntityFeature } from "../../data/lock";
-import { MediaPlayerEntityFeature } from "../../data/media-player";
-import { NotifyEntityFeature } from "../../data/notify";
-import { RemoteEntityFeature } from "../../data/remote";
-import { SirenEntityFeature } from "../../data/siren";
-import { TodoListEntityFeature } from "../../data/todo";
-import { UpdateEntityFeature } from "../../data/update";
-import { VacuumEntityFeature } from "../../data/vacuum";
-import { ValveEntityFeature } from "../../data/valve";
-import { WaterHeaterEntityFeature } from "../../data/water_heater";
-import { WeatherEntityFeature } from "../../data/weather";
-
-export type FeatureEnum = Record<string | number, string | number>;
-
-const DOMAIN_ENUMS = {
-  ai_task: AITaskEntityFeature,
-  alarm_control_panel: AlarmControlPanelEntityFeature,
-  assist_satellite: AssistSatelliteEntityFeature,
-  calendar: CalendarEntityFeature,
-  camera: CameraEntityFeature,
-  climate: ClimateEntityFeature,
-  conversation: ConversationEntityFeature,
-  cover: CoverEntityFeature,
-  fan: FanEntityFeature,
-  humidifier: HumidifierEntityFeature,
-  lawn_mower: LawnMowerEntityFeature,
-  light: LightEntityFeature,
-  lock: LockEntityFeature,
-  media_player: MediaPlayerEntityFeature,
-  notify: NotifyEntityFeature,
-  remote: RemoteEntityFeature,
-  siren: SirenEntityFeature,
-  todo: TodoListEntityFeature,
-  update: UpdateEntityFeature,
-  vacuum: VacuumEntityFeature,
-  valve: ValveEntityFeature,
-  water_heater: WaterHeaterEntityFeature,
-  weather: WeatherEntityFeature,
-};
-
-export function getFeatures(domain: string): FeatureEnum | undefined {
-  const enumObj = DOMAIN_ENUMS[domain] as FeatureEnum;
-  return enumObj;
-}
@@ -22,13 +22,16 @@ export const FIXED_DOMAIN_STATES = {
  assist_satellite: ["idle", "listening", "responding", "processing"],
  automation: ["on", "off"],
  binary_sensor: ["on", "off"],
+  button: [],
  calendar: ["on", "off"],
  camera: ["idle", "recording", "streaming"],
  cover: ["closed", "closing", "open", "opening"],
  device_tracker: ["home", "not_home"],
  fan: ["on", "off"],
  humidifier: ["on", "off"],
+  infrared: [],
  input_boolean: ["on", "off"],
+  input_button: [],
  lawn_mower: ["error", "paused", "mowing", "returning", "docked"],
  light: ["on", "off"],
  lock: [
@@ -53,6 +56,7 @@ export const FIXED_DOMAIN_STATES = {
  plant: ["ok", "problem"],
  radio_frequency: [],
  remote: ["on", "off"],
+  scene: [],
  schedule: ["on", "off"],
  script: ["on", "off"],
  siren: ["on", "off"],
@@ -286,81 +290,6 @@ export const getStatesDomain = (
  return result;
 };

-// Maps a value attribute (or the main state, keyed `_`) to the attribute listing
-// its options. Naming is irregular per domain, so it's mapped explicitly.
-export const DOMAIN_OPTIONS_ATTRIBUTES: Record<
-  string,
-  Record<string, string>
-> = {
-  climate: {
-    _: "hvac_modes",
-    fan_mode: "fan_modes",
-    preset_mode: "preset_modes",
-    swing_mode: "swing_modes",
-    swing_horizontal_mode: "swing_horizontal_modes",
-  },
-  event: {
-    event_type: "event_types",
-  },
-  fan: {
-    preset_mode: "preset_modes",
-  },
-  humidifier: {
-    mode: "available_modes",
-  },
-  input_select: {
-    _: "options",
-  },
-  select: {
-    _: "options",
-  },
-  light: {
-    effect: "effect_list",
-    color_mode: "supported_color_modes",
-  },
-  media_player: {
-    sound_mode: "sound_mode_list",
-    source: "source_list",
-  },
-  remote: {
-    current_activity: "activity_list",
-  },
-  sensor: {
-    _: "options",
-  },
-  vacuum: {
-    fan_speed: "fan_speed_list",
-  },
-  water_heater: {
-    _: "operation_list",
-    operation_mode: "operation_list",
-  },
-};
-
-const DOMAIN_VALUE_ATTRIBUTES: Record<
-  string,
-  Record<string, string>
-> = Object.fromEntries(
-  Object.entries(DOMAIN_OPTIONS_ATTRIBUTES).map(([domain, mapping]) => [
-    domain,
-    Object.fromEntries(
-      Object.entries(mapping).map(([value, list]) => [list, value])
-    ),
-  ])
-);
-
-// value attribute (or main state) → its options-list attribute
-export const getOptionsAttribute = (
-  domain: string,
-  attribute?: string
-): string | undefined => DOMAIN_OPTIONS_ATTRIBUTES[domain]?.[attribute ?? "_"];
-
-// options-list attribute → its value attribute (`_` = main state)
-export const getValueAttribute = (
-  domain: string,
-  optionsAttribute: string
-): string | undefined => DOMAIN_VALUE_ATTRIBUTES[domain]?.[optionsAttribute];
-
 export const getStates = (
  hass: HomeAssistant,
  state: HassEntity,
@@ -373,15 +302,78 @@ export const getStates = (
  result.push(...getStatesDomain(hass, domain, attribute));

  // Dynamic values based on the entities
-  const optionsAttribute = getOptionsAttribute(domain, attribute);
-  if (optionsAttribute) {
-    const options = state.attributes[optionsAttribute];
-    // Sensors only expose their options when their device class is `enum`.
-    const enumSensor =
-      domain !== "sensor" || state.attributes.device_class === "enum";
-    if (enumSensor && Array.isArray(options)) {
-      result.push(...options);
-    }
+  switch (domain) {
+    case "climate":
+      if (!attribute) {
+        result.push(...state.attributes.hvac_modes);
+      } else if (attribute === "fan_mode") {
+        result.push(...state.attributes.fan_modes);
+      } else if (attribute === "preset_mode") {
+        result.push(...state.attributes.preset_modes);
+      } else if (attribute === "swing_mode") {
+        result.push(...state.attributes.swing_modes);
+      } else if (attribute === "swing_horizontal_mode") {
+        result.push(...state.attributes.swing_horizontal_modes);
+      }
+      break;
+    case "event":
+      if (attribute === "event_type") {
+        result.push(...state.attributes.event_types);
+      }
+      break;
+    case "fan":
+      if (attribute === "preset_mode") {
+        result.push(...state.attributes.preset_modes);
+      }
+      break;
+    case "humidifier":
+      if (attribute === "mode") {
+        result.push(...state.attributes.available_modes);
+      }
+      break;
+    case "input_select":
+    case "select":
+      if (!attribute) {
+        result.push(...state.attributes.options);
+      }
+      break;
+    case "light":
+      if (attribute === "effect" && state.attributes.effect_list) {
+        result.push(...state.attributes.effect_list);
+      } else if (
+        attribute === "color_mode" &&
+        state.attributes.supported_color_modes
+      ) {
+        result.push(...state.attributes.supported_color_modes);
+      }
+      break;
+    case "media_player":
+      if (attribute === "sound_mode") {
+        result.push(...state.attributes.sound_mode_list);
+      } else if (attribute === "source") {
+        result.push(...state.attributes.source_list);
+      }
+      break;
+    case "remote":
+      if (attribute === "current_activity") {
+        result.push(...state.attributes.activity_list);
+      }
+      break;
+    case "sensor":
+      if (!attribute && state.attributes.device_class === "enum") {
+        result.push(...state.attributes.options);
+      }
+      break;
+    case "vacuum":
+      if (attribute === "fan_speed") {
+        result.push(...state.attributes.fan_speed_list);
+      }
+      break;
+    case "water_heater":
+      if (!attribute || attribute === "operation_mode") {
+        result.push(...state.attributes.operation_list);
+      }
+      break;
  }

  return [...new Set(result)];
@@ -1,13 +1,21 @@
 import type { HassEntity } from "home-assistant-js-websocket";
 import { OFF, UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
 import { computeDomain } from "./compute_domain";
-import { TIMESTAMP_STATE_DOMAINS } from "../const";

 export function stateActive(stateObj: HassEntity, state?: string): boolean {
  const domain = computeDomain(stateObj.entity_id);
  const compareState = state !== undefined ? state : stateObj?.state;

-  if (TIMESTAMP_STATE_DOMAINS.has(domain)) {
+  if (
+    [
+      "button",
+      "event",
+      "infrared",
+      "input_button",
+      "radio_frequency",
+      "scene",
+    ].includes(domain)
+  ) {
    return compareState !== UNAVAILABLE;
  }

@@ -1,29 +0,0 @@
-import type { ValuePart } from "../../types";
-
-// Joins every part except the unit, keeping native order so the sign and
-// grouping stay with the value (e.g. "-2,548.14").
-export const valueFromParts = (parts: ValuePart[]): string =>
-  parts
-    .filter((part) => part.type !== "unit")
-    .map((part) => part.value)
-    .join("")
-    .trim();
-
-export const unitFromParts = (parts: ValuePart[]): string =>
-  parts.find((part) => part.type === "unit")?.value ?? "";
-
-export type UnitPosition = "before" | "after";
-
-// Whether the unit sits before or after the value in the locale's native order
-// (e.g. "$5" / "€ 5" → "before", "5 €" / "5 %" → "after").
-export const unitPosition = (parts: ValuePart[]): UnitPosition => {
-  const unitIndex = parts.findIndex((part) => part.type === "unit");
-  if (unitIndex === -1) {
-    return "after";
-  }
-  const lastValueIndex = parts.reduceRight(
-    (acc, part, i) => (acc === -1 && part.type === "value" ? i : acc),
-    -1
-  );
-  return unitIndex < lastValueIndex ? "before" : "after";
-};
@@ -1,5 +1,5 @@
 import type { PickerComboBoxItem } from "../../components/ha-picker-combo-box";
-import type { ItemType, RelatedResult } from "../../data/search";
+import type { RelatedResult } from "../../data/search";

 export interface RelatedIdSets {
  areas: Set<string>;
@@ -8,30 +8,14 @@ export interface RelatedIdSets {
 }

 /**
- * Build a set of related IDs, merging in the current (queried) item.
- * `search/related` does not echo the queried item back, but it is the closest
- * related item (e.g. a card editor's own entity), so it is merged into the
- * matching group when it is an area, device, or entity.
+ * Build a set of related IDs for a given related result.
 * @param related - The related result to build the sets from.
- * @param current - The queried item to merge in.
- * @returns The related ID sets, including the current item.
+ * @returns The related ID sets.
 */
-export const buildRelatedIdSets = (
-  related?: RelatedResult,
-  current?: { itemType: ItemType; itemId: string }
-): RelatedIdSets => ({
-  areas: new Set([
-    ...(related?.area || []),
-    ...(current?.itemType === "area" ? [current.itemId] : []),
-  ]),
-  devices: new Set([
-    ...(related?.device || []),
-    ...(current?.itemType === "device" ? [current.itemId] : []),
-  ]),
-  entities: new Set([
-    ...(related?.entity || []),
-    ...(current?.itemType === "entity" ? [current.itemId] : []),
-  ]),
+export const buildRelatedIdSets = (related?: RelatedResult): RelatedIdSets => ({
+  areas: new Set(related?.area || []),
+  devices: new Set(related?.device || []),
+  entities: new Set(related?.entity || []),
 });

 /**
@@ -17,6 +17,8 @@ export type LocalizeKeys =
  | `ui.common.${string}`
  | `ui.components.calendar.event.rrule.${string}`
  | `ui.components.selectors.file.${string}`
+  | `ui.components.logbook.messages.detected_device_classes.${string}`
+  | `ui.components.logbook.messages.cleared_device_classes.${string}`
  | `ui.dialogs.entity_registry.editor.${string}`
  | `ui.dialogs.more_info_control.lawn_mower.${string}`
  | `ui.dialogs.more_info_control.vacuum.${string}`
@@ -1,26 +0,0 @@
-/**
- * Return a shallow copy of an object with every key removed whose value is
- * `undefined` or equals that key's default, so a key left at its default
- * (whether absent or explicit) does not count as a difference. A key's default
- * comes from `defaults` when present, otherwise `false`.
- *
- * Non-plain-object values are returned unchanged; only top-level keys are
- * compared.
- */
-export const stripDefaults = <T>(
-  value: T,
-  defaults?: Record<string, unknown>
-): T => {
-  if (value === null || typeof value !== "object" || Array.isArray(value)) {
-    return value;
-  }
-  const result: Record<string, unknown> = {};
-  for (const [key, val] of Object.entries(value)) {
-    const defaultValue = defaults && key in defaults ? defaults[key] : false;
-    if (val === undefined || val === defaultValue) {
-      continue;
-    }
-    result[key] = val;
-  }
-  return result as T;
-};
@@ -4,10 +4,10 @@ type ResultCache<T> = Record<string, Promise<T> | undefined>;

 /**
 * Call a function with result caching per entity.
- * @param cacheKey key to namespace the cache
+ * @param cacheKey key to store the cache on hass object
 * @param cacheTime time to cache the results
 * @param func function to fetch the data
- * @param hass Home Assistant object (or slice) the cache is keyed on
+ * @param hass Home Assistant object
 * @param entityId entity to fetch data for
 * @param args extra arguments to pass to the function to fetch the data
 * @returns
@@ -15,12 +15,8 @@ type ResultCache<T> = Record<string, Promise<T> | undefined>;
 export const timeCacheEntityPromiseFunc = async <T>(
  cacheKey: string,
  cacheTime: number,
-  func: (
-    hass: Pick<HomeAssistant, "callWS" | "hassUrl">,
-    entityId: string,
-    ...args: any[]
-  ) => Promise<T>,
-  hass: Pick<HomeAssistant, "callWS" | "hassUrl">,
+  func: (hass: HomeAssistant, entityId: string, ...args: any[]) => Promise<T>,
+  hass: HomeAssistant,
  entityId: string,
  ...args: any[]
 ): Promise<T> => {
@@ -43,11 +39,11 @@ export const timeCacheEntityPromiseFunc = async <T>(
    // When successful, set timer to clear cache
    () =>
      setTimeout(() => {
-        cache[entityId] = undefined;
+        cache![entityId] = undefined;
      }, cacheTime),
    // On failure, clear cache right away
    () => {
-      cache[entityId] = undefined;
+      cache![entityId] = undefined;
    }
  );

@@ -1,12 +1,5 @@
 import { LitElement, css, html } from "lit";
 import { customElement, property } from "lit/decorators";
-import "../ha-svg-icon";
-import {
-  mdiAlertCircle,
-  mdiCheckCircle,
-  mdiCloseCircle,
-  mdiHelpCircle,
-} from "@mdi/js";

 export type LiveTestState = "pass" | "fail" | "invalid" | "unknown";

@@ -26,59 +19,46 @@ export class HaAutomationRowLiveTest extends LitElement {

  @property() public label = "";

-  private get _iconPath() {
-    switch (this.state) {
-      case "pass":
-        return mdiCheckCircle;
-      case "fail":
-        return mdiCloseCircle;
-      case "invalid":
-        return mdiAlertCircle;
-      default:
-        return mdiHelpCircle;
-    }
-  }
-
  protected render() {
    return html`
-      <div id="indicator" role="status" tabindex="0" aria-label=${this.label}>
-        <ha-svg-icon .path=${this._iconPath}></ha-svg-icon>
-      </div>
+      <div
+        id="indicator"
+        role="status"
+        tabindex="0"
+        aria-label=${this.label}
+      ></div>
    `;
  }

  static styles = css`
    :host {
      position: absolute;
-      top: -8px;
-      inset-inline-end: -8px;
+      top: -5px;
+      inset-inline-end: -6px;
      display: inline-block;
    }
    #indicator {
-      width: 16px;
-      height: 16px;
-      display: grid;
-      place-items: center;
+      width: 10px;
+      height: 10px;
      border-radius: var(--ha-border-radius-circle);
+      border: var(--ha-border-width-md) solid;
+      box-sizing: border-box;
      background-color: var(--card-background-color);
+      box-shadow: 0 0 0 2px var(--card-background-color);
      transition: all var(--ha-animation-duration-normal) ease-in-out;
    }
-    #indicator ha-svg-icon {
-      width: 16px;
-      height: 16px;
-      --mdc-icon-size: 16px;
-    }
    :host([state="pass"]) #indicator {
-      color: var(--ha-color-green-60);
+      background-color: var(--ha-color-green-60);
+      border-color: var(--ha-color-green-60);
    }
    :host([state="fail"]) #indicator {
-      color: var(--ha-color-orange-60);
+      border-color: var(--ha-color-orange-60);
    }
    :host([state="invalid"]) #indicator {
-      color: var(--ha-color-red-60);
+      border-color: var(--ha-color-red-60);
    }
    :host([state="unknown"]) #indicator {
-      color: var(--ha-color-neutral-60);
+      border-color: var(--ha-color-neutral-60);
    }
  `;
 }
@@ -1,18 +1,16 @@
-import { consume, type ContextType } from "@lit/context";
 import type { TemplateResult } from "lit";
 import { LitElement, html } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { HassServiceTarget } from "home-assistant-js-websocket";
 import { showConfirmationDialog } from "../../dialogs/generic/show-dialog-box";
 import "./ha-progress-button";
-import { apiContext } from "../../data/context";
+import type { HomeAssistant } from "../../types";
 import { fireEvent } from "../../common/dom/fire_event";
 import type { Appearance } from "../ha-button";

@customElement("ha-call-service-button")
 class HaCallServiceButton extends LitElement {
-  @consume({ context: apiContext, subscribe: true })
-  private _api!: ContextType<typeof apiContext>;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ type: Boolean }) public disabled = false;

@@ -58,7 +56,7 @@ class HaCallServiceButton extends LitElement {
      this.shadowRoot!.querySelector("ha-progress-button")!;

    try {
-      await this._api.callService(
+      await this.hass.callService(
        this.domain,
        this.service,
        this.data,
@@ -445,7 +445,6 @@ export class StateHistoryChartLine extends LitElement {

  private _formatYAxisLabel = (value: number) => {
    const label = formatNumber(value, this.hass.locale, {
-      minimumFractionDigits: value === 0 ? 0 : this._yAxisFractionDigits,
      maximumFractionDigits: this._yAxisFractionDigits,
    });
    const width = measureTextWidth(label, 12) + 5;
@@ -552,7 +552,6 @@ export class StatisticsChart extends LitElement {

  private _formatYAxisLabel = (value: number) =>
    formatNumber(value, this.hass.locale, {
-      minimumFractionDigits: value === 0 ? 0 : this._yAxisFractionDigits,
      maximumFractionDigits: this._yAxisFractionDigits,
    });

@@ -79,11 +79,9 @@ function computeTimelineEnumColor(
  const domain = computeStateDomain(stateObj);
  const states =
    FIXED_DOMAIN_STATES[domain] ||
-    ((domain === "sensor" && stateObj.attributes.device_class === "enum") ||
-    domain === "select" ||
-    domain === "input_select"
-      ? stateObj.attributes.options
-      : undefined) ||
+    (domain === "sensor" &&
+      stateObj.attributes.device_class === "enum" &&
+      stateObj.attributes.options) ||
    [];
  const idx = states.indexOf(state);
  if (idx === -1) {
@@ -1463,12 +1463,6 @@ 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;
        }
@@ -9,13 +9,15 @@ import {
 } from "../../common/dom/fire_event";
 import { isValidEntityId } from "../../common/entity/valid_entity_id";
 import type { HaEntityPickerEntityFilterFunc } from "../../data/entity/entity";
-import type { ValueChangedEvent } from "../../types";
+import type { HomeAssistant, 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;
@@ -85,6 +87,10 @@ 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}
@@ -99,6 +105,7 @@ class HaEntitiesPicker extends LitElement {
              <div class="entity">
                <ha-entity-picker
                  .curValue=${entityId}
+                  .hass=${this.hass}
                  .includeDomains=${this.includeDomains}
                  .excludeDomains=${this.excludeDomains}
                  .includeEntities=${this.includeEntities}
@@ -126,6 +133,7 @@ class HaEntitiesPicker extends LitElement {
      </ha-sortable>
      <div>
        <ha-entity-picker
+          .hass=${this.hass}
          .includeDomains=${this.includeDomains}
          .excludeDomains=${this.excludeDomains}
          .includeEntities=${this.includeEntities}
@@ -1,5 +1,4 @@
 import type { RenderItemFunction } from "@lit-labs/virtualizer/virtualize";
-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";
@@ -7,21 +6,10 @@ import memoizeOne from "memoize-one";
 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 type { LocalizeFunc } from "../../common/translations/localize";
-import {
-  configContext,
-  internationalizationContext,
-  registriesContext,
-  relatedContext,
-  statesContext,
-} from "../../data/context";
 import type { HaEntityPickerEntityFilterFunc } from "../../data/entity/entity";
 import {
  entityComboBoxKeys,
  getEntities,
-  markEntitiesRelated,
-  sortEntitiesByRelatedRank,
  type EntityComboBoxItem,
 } from "../../data/entity/entity_picker";
 import { domainToName } from "../../data/integration";
@@ -45,21 +33,7 @@ const CREATE_ID = "___create-new-entity___";

@customElement("ha-entity-picker")
 export class HaEntityPicker extends LitElement {
-  @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>;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  // eslint-disable-next-line lit/no-native-attributes
  @property({ type: Boolean }) public autofocus = false;
@@ -157,25 +131,12 @@ export class HaEntityPicker extends LitElement {

  @state() private _pendingEntityId?: string;

-  @state()
-  @consume({ context: relatedContext, subscribe: true })
-  private _relatedIdSets?: RelatedIdSets;
-
-  private get _hasRelatedContext(): boolean {
-    const related = this._relatedIdSets;
-    return (
-      !!related &&
-      (related.entities.size > 0 ||
-        related.devices.size > 0 ||
-        related.areas.size > 0)
-    );
-  }
-
-  protected willUpdate(changedProperties: PropertyValues) {
+  protected willUpdate(changedProperties: PropertyValues<this>) {
    if (
      this._pendingEntityId &&
-      changedProperties.has("_states") &&
-      this._states[this._pendingEntityId]
+      changedProperties.has("hass") &&
+      this.hass.states !== changedProperties.get("hass")?.states &&
+      this.hass.states[this._pendingEntityId]
    ) {
      this._setValue(this._pendingEntityId);
      this._pendingEntityId = undefined;
@@ -185,7 +146,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._i18n.loadBackendTranslation("title");
+    this.hass.loadBackendTranslation("title");
  }

  private _findExtraOption(value: string | undefined) {
@@ -196,11 +157,15 @@ export class HaEntityPicker extends LitElement {

  private _renderExtraOptionStart(extraOption: EntitySelectorExtraOption) {
    const stateObj = extraOption.entity_id
-      ? this._states[extraOption.entity_id]
+      ? this.hass.states[extraOption.entity_id]
      : undefined;
    if (stateObj) {
      return html`
-        <state-badge slot="start" .stateObj=${stateObj}></state-badge>
+        <state-badge
+          slot="start"
+          .stateObj=${stateObj}
+          .hass=${this.hass}
+        ></state-badge>
      `;
    }
    if (extraOption.icon_path) {
@@ -232,7 +197,7 @@ export class HaEntityPicker extends LitElement {
      `;
    }

-    const stateObj = this._states[entityId];
+    const stateObj = this.hass.states[entityId];

    if (!stateObj) {
      return html`
@@ -246,23 +211,23 @@ export class HaEntityPicker extends LitElement {
    }

    const { primary, secondary } = computeEntityPickerDisplay(
-      {
-        ...this._registries,
-        language: this._i18n.language,
-        translationMetadata: this._i18n.translationMetadata,
-      },
+      this.hass,
      stateObj
    );

    return html`
-      <state-badge .stateObj=${stateObj} slot="start"></state-badge>
+      <state-badge
+        .hass=${this.hass}
+        .stateObj=${stateObj}
+        slot="start"
+      ></state-badge>
      <span slot="headline">${primary}</span>
      <span slot="supporting-text">${secondary}</span>
    `;
  };

  private get _showEntityId() {
-    return this.showEntityId || this._config.userData?.showEntityIdPicker;
+    return this.showEntityId || this.hass.userData?.showEntityIdPicker;
  }

  private _rowRenderer: RenderItemFunction<EntityComboBoxItem> = (
@@ -285,6 +250,7 @@ export class HaEntityPicker extends LitElement {
              <state-badge
                slot="start"
                .stateObj=${item.stateObj}
+                .hass=${this.hass}
              ></state-badge>
            `}
        <span slot="headline">${item.primary}</span>
@@ -310,14 +276,17 @@ export class HaEntityPicker extends LitElement {
  };

  private _getAdditionalItems = () =>
-    this._getCreateItems(this._i18n.localize, this.createDomains);
+    this._getCreateItems(this.hass.localize, this.createDomains);

  private _getCreateItems = memoizeOne(
-    (localize: LocalizeFunc, createDomains: this["createDomains"]) => {
+    (
+      localize: this["hass"]["localize"],
+      createDomains: this["createDomains"]
+    ) => {
      if (!createDomains?.length) {
        return [];
      }
-      this._i18n.loadFragmentTranslation("config");
+      this.hass.loadFragmentTranslation("config");
      return createDomains.map((domain) => {
        const primary = localize(
          "ui.components.entity.entity-picker.create_helper",
@@ -342,9 +311,7 @@ export class HaEntityPicker extends LitElement {

  private _getEntitiesMemoized = memoizeOne(
    (
-      states: ContextType<typeof statesContext>,
-      registries: ContextType<typeof registriesContext>,
-      i18n: ContextType<typeof internationalizationContext>,
+      hass: HomeAssistant,
      includeDomains?: string[],
      excludeDomains?: string[],
      entityFilter?: HaEntityPickerEntityFilterFunc,
@@ -354,46 +321,21 @@ export class HaEntityPicker extends LitElement {
      excludeEntities?: string[],
      value?: string
    ) =>
-      getEntities(
-        {
-          states,
-          ...registries,
-          language: i18n.language,
-          translationMetadata: i18n.translationMetadata,
-          localize: i18n.localize,
-        },
-        {
-          includeDomains,
-          excludeDomains,
-          entityFilter,
-          includeDeviceClasses,
-          includeUnitOfMeasurement,
-          includeEntities,
-          excludeEntities,
-          value,
-        }
-      )
-  );
-
-  private _sortByRelatedContext = memoizeOne(
-    (
-      items: EntityComboBoxItem[],
-      related: RelatedIdSets,
-      entities: HomeAssistant["entities"],
-      devices: HomeAssistant["devices"],
-      language: string
-    ): EntityComboBoxItem[] =>
-      sortEntitiesByRelatedRank(
-        markEntitiesRelated(items, related, entities, devices),
-        language
-      )
+      getEntities(hass, {
+        includeDomains,
+        excludeDomains,
+        entityFilter,
+        includeDeviceClasses,
+        includeUnitOfMeasurement,
+        includeEntities,
+        excludeEntities,
+        value,
+      })
  );

  private _getItems = () => {
-    const entityItems = this._getEntitiesMemoized(
-      this._states,
-      this._registries,
-      this._i18n,
+    const items = this._getEntitiesMemoized(
+      this.hass,
      this.includeDomains,
      this.excludeDomains,
      this.entityFilter,
@@ -403,23 +345,14 @@ export class HaEntityPicker extends LitElement {
      this.excludeEntities,
      this.value
    );
-    const sortedItems = this._hasRelatedContext
-      ? this._sortByRelatedContext(
-          entityItems,
-          this._relatedIdSets!,
-          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._states[opt.entity_id] : undefined,
+        stateObj: opt.entity_id ? this.hass.states[opt.entity_id] : undefined,
      }));
-      return [...resolvedExtras, ...sortedItems];
+      return [...resolvedExtras, ...items];
    }
-    return sortedItems;
+    return items;
  };

  private _shouldHideClearIcon() {
@@ -429,10 +362,11 @@ export class HaEntityPicker extends LitElement {
  protected render() {
    const placeholder =
      this.placeholder ??
-      this._i18n.localize("ui.components.entity.entity-picker.placeholder");
+      this.hass.localize("ui.components.entity.entity-picker.placeholder");

    return html`
      <ha-generic-picker
+        .hass=${this.hass}
        .disabled=${this.disabled}
        .autofocus=${this.autofocus}
        .allowCustomValue=${this.allowCustomEntity}
@@ -450,13 +384,12 @@ export class HaEntityPicker extends LitElement {
        .searchFn=${this._searchFn}
        .valueRenderer=${this._valueRenderer}
        .searchKeys=${entityComboBoxKeys}
-        .noSort=${this._hasRelatedContext}
        use-top-label
        .addButtonLabel=${this.addButton
          ? (this.addButtonLabel ??
-            this._i18n.localize("ui.components.entity.entity-picker.add"))
+            this.hass.localize("ui.components.entity.entity-picker.add"))
          : undefined}
-        .unknownItemText=${this._i18n.localize(
+        .unknownItemText=${this.hass.localize(
          "ui.components.entity.entity-picker.unknown"
        )}
        @value-changed=${this._valueChanged}
@@ -469,23 +402,17 @@ export class HaEntityPicker extends LitElement {
    search,
    filteredItems
  ) => {
-    // Float related items to the top by closeness, keeping search relevance
-    // order within each tier.
-    const items = this._hasRelatedContext
-      ? sortEntitiesByRelatedRank(filteredItems)
-      : filteredItems;
-
    // If there is exact match for entity id, put it first
-    const index = items.findIndex(
+    const index = filteredItems.findIndex(
      (item) => item.stateObj?.entity_id === search
    );
    if (index === -1) {
-      return items;
+      return filteredItems;
    }

-    const [exactMatch] = items.splice(index, 1);
-    items.unshift(exactMatch);
-    return items;
+    const [exactMatch] = filteredItems.splice(index, 1);
+    filteredItems.unshift(exactMatch);
+    return filteredItems;
  };

  public async open() {
@@ -509,7 +436,7 @@ export class HaEntityPicker extends LitElement {
        domain,
        dialogClosedCallback: (item) => {
          if (item.entityId) {
-            if (this._states[item.entityId]) {
+            if (this.hass.states[item.entityId]) {
              this._setValue(item.entityId);
            } else {
              this._pendingEntityId = item.entityId;
@@ -535,7 +462,7 @@ export class HaEntityPicker extends LitElement {
  }

  private _notFoundLabel = (search: string) =>
-    this._i18n.localize("ui.components.entity.entity-picker.no_match", {
+    this.hass.localize("ui.components.entity.entity-picker.no_match", {
      term: html`<b>‘${search}’</b>`,
    });
 }
@@ -1,4 +1,3 @@
-import { consume, type ContextType } from "@lit/context";
 import { mdiFlash, mdiFlashOff } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
 import type { PropertyValues, TemplateResult } from "lit";
@@ -7,9 +6,9 @@ import { customElement, property, state } from "lit/decorators";
 import { STATES_OFF } from "../../common/const";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
-import { apiContext } from "../../data/context";
 import { UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
 import { forwardHaptic } from "../../data/haptics";
+import type { HomeAssistant } from "../../types";
 import "../ha-formfield";
 import "../ha-icon-button";
 import "../ha-switch";
@@ -30,8 +29,8 @@ const isOn = (stateObj?: HassEntity) =>

@customElement("ha-entity-toggle")
 export class HaEntityToggle extends LitElement {
-  @consume({ context: apiContext, subscribe: true })
-  private _api?: ContextType<typeof apiContext>;
+  // hass is not a property so that we only re-render on stateObj changes
+  public hass?: HomeAssistant;

  @property({ attribute: false }) public stateObj?: HassEntity;

@@ -119,7 +118,7 @@ export class HaEntityToggle extends LitElement {
  // result in the entity to be turned on. Since the state is not changing,
  // the resync is not called automatic.
  private async _callService(turnOn): Promise<void> {
-    if (!this._api || !this.stateObj) {
+    if (!this.hass || !this.stateObj) {
      return;
    }
    forwardHaptic(this, "light");
@@ -150,7 +149,7 @@ export class HaEntityToggle extends LitElement {
    this._isOn = turnOn;

    try {
-      await this._api.callService(serviceDomain, service, {
+      await this.hass.callService(serviceDomain, service, {
        entity_id: this.stateObj.entity_id,
      });
    } finally {
@@ -1,5 +1,3 @@
-import { consume } from "@lit/context";
-import type { ContextType } from "@lit/context";
 import { mdiAlert } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
 import type { PropertyValues, TemplateResult } from "lit";
@@ -8,19 +6,13 @@ import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { arrayLiteralIncludes } from "../../common/array/literal-includes";
 import secondsToDuration from "../../common/datetime/seconds_to_duration";
-import {
-  consumeEntityRegistryEntry,
-  consumeLocalize,
-} from "../../common/decorators/consume-context-entry";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
 import { computeStateName } from "../../common/entity/compute_state_name";
-import { unitFromParts, valueFromParts } from "../../common/entity/value_parts";
 import { FIXED_DOMAIN_STATES } from "../../common/entity/get_states";
-import type { LocalizeFunc } from "../../common/translations/localize";
-import { formattersContext } from "../../data/context";
 import { UNAVAILABLE, UNKNOWN } from "../../data/entity/entity";
 import type { EntityRegistryDisplayEntry } from "../../data/entity/entity_registry";
 import { timerTimeRemaining } from "../../data/timer";
+import type { HomeAssistant } from "../../types";
 import "../ha-label-badge";
 import "../ha-state-icon";

@@ -48,15 +40,7 @@ const getTruncatedKey = (domainKey: string, stateKey: string) => {

@customElement("ha-state-label-badge")
 export class HaStateLabelBadge extends LitElement {
-  @state()
-  @consume({ context: formattersContext, subscribe: true })
-  private _formatters?: ContextType<typeof formattersContext>;
-
-  @state() @consumeLocalize() private _localize!: LocalizeFunc;
-
-  @state()
-  @consumeEntityRegistryEntry({ entityIdPath: ["state", "entity_id"] })
-  private _entry?: EntityRegistryDisplayEntry;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property({ attribute: false }) public state?: HassEntity;

@@ -93,8 +77,10 @@ export class HaStateLabelBadge extends LitElement {
      return html`
        <ha-label-badge
          class="warning"
-          label=${this._localize("state_badge.default.error")}
-          description=${this._localize("state_badge.default.entity_not_found")}
+          label=${this.hass!.localize("state_badge.default.error")}
+          description=${this.hass!.localize(
+            "state_badge.default.entity_not_found"
+          )}
        >
          <ha-svg-icon .path=${mdiAlert}></ha-svg-icon>
        </ha-label-badge>
@@ -108,7 +94,7 @@ export class HaStateLabelBadge extends LitElement {
    // 4. Icon determined via entity state
    // 5. Value string as fallback
    const domain = computeStateDomain(entityState);
-    const entry = this._entry;
+    const entry = this.hass?.entities[entityState.entity_id];

    const showIcon =
      this.icon || this._computeShowIcon(domain, entityState, entry);
@@ -177,23 +163,20 @@ export class HaStateLabelBadge extends LitElement {
      case "sun":
      case "timer":
        return null;
+      // @ts-expect-error we don't break and go to default
      case "sensor":
        if (entry?.platform === "moon") {
          return null;
        }
-        break;
+      // eslint-disable-next-line: disable=no-fallthrough
      default:
-        break;
+        return entityState.state === UNAVAILABLE ||
+          entityState.state === UNKNOWN
+          ? "—"
+          : this.hass!.formatEntityStateToParts(entityState).find(
+              (part) => part.type === "value"
+            )?.value;
    }
-    if (entityState.state === UNAVAILABLE || entityState.state === UNKNOWN) {
-      return "—";
-    }
-    if (!this._formatters) {
-      return null;
-    }
-    return valueFromParts(
-      this._formatters.formatEntityStateToParts(entityState)
-    );
  }

  private _computeShowIcon(
@@ -228,11 +211,11 @@ export class HaStateLabelBadge extends LitElement {
  ) {
    // For unavailable states or certain domains, use a special translation that is truncated to fit within the badge label
    if (entityState.state === UNAVAILABLE || entityState.state === UNKNOWN) {
-      return this._localize(`state_badge.default.${entityState.state}`);
+      return this.hass!.localize(`state_badge.default.${entityState.state}`);
    }
    const domainStateKey = getTruncatedKey(domain, entityState.state);
    if (domainStateKey) {
-      return this._localize(`state_badge.${domainStateKey}`);
+      return this.hass!.localize(`state_badge.${domainStateKey}`);
    }
    // Person and device tracker state can be zone name
    if (domain === "person" || domain === "device_tracker") {
@@ -241,12 +224,10 @@ export class HaStateLabelBadge extends LitElement {
    if (domain === "timer") {
      return secondsToDuration(_timerTimeRemaining);
    }
-    if (!this._formatters) {
-      return null;
-    }
    return (
-      unitFromParts(this._formatters.formatEntityStateToParts(entityState)) ||
-      null
+      this.hass!.formatEntityStateToParts(entityState).find(
+        (part) => part.type === "unit"
+      )?.value || null
    );
  }

@@ -343,7 +343,11 @@ export class HaStatisticPicker extends LitElement {
    return html`
      ${item.stateObj
        ? html`
-            <state-badge .stateObj=${item.stateObj} slot="start"></state-badge>
+            <state-badge
+              .hass=${this.hass}
+              .stateObj=${item.stateObj}
+              slot="start"
+            ></state-badge>
          `
        : item.icon_path
          ? html`
@@ -484,6 +488,7 @@ export class HaStatisticPicker extends LitElement {
                <state-badge
                  slot="start"
                  .stateObj=${item.stateObj}
+                  .hass=${this.hass}
                ></state-badge>
              `
            : nothing}
@@ -1,4 +1,3 @@
-import { consume, type ContextType } from "@lit/context";
 import { mdiAlert } from "@mdi/js";
 import type { HassEntity } from "home-assistant-js-websocket";
 import type { CSSResultGroup, PropertyValues } from "lit";
@@ -15,12 +14,13 @@ import {
 import { iconColorCSS } from "../../common/style/icon_color_css";
 import { cameraUrlWithWidthHeight } from "../../data/camera";
 import { CLIMATE_HVAC_ACTION_TO_MODE } from "../../data/climate";
-import { connectionContext } from "../../data/context";
-import { isBrandUrl } from "../../util/brands-url";
+import type { HomeAssistant } from "../../types";
 import "../ha-state-icon";

@customElement("state-badge")
 export class StateBadge extends LitElement {
+  public hass?: HomeAssistant;
+
  @property({ attribute: false }) public stateObj?: HassEntity;

  @property({ attribute: false }) public overrideIcon?: string;
@@ -36,10 +36,6 @@ export class StateBadge extends LitElement {
  // @todo Consider reworking to eliminate need for attribute since it is manipulated internally
  @property({ type: Boolean, reflect: true }) public icon = true;

-  @state()
-  @consume({ context: connectionContext, subscribe: true })
-  private _connection?: ContextType<typeof connectionContext>;
-
  @state() private _iconStyle: Record<string, string | undefined> = {};

  connectedCallback(): void {
@@ -110,15 +106,14 @@ export class StateBadge extends LitElement {
    ></ha-state-icon>`;
  }

-  public willUpdate(changedProps: PropertyValues) {
+  public willUpdate(changedProps: PropertyValues<this>) {
    super.willUpdate(changedProps);
    if (
      !changedProps.has("stateObj") &&
      !changedProps.has("overrideImage") &&
      !changedProps.has("overrideIcon") &&
      !changedProps.has("stateColor") &&
-      !changedProps.has("color") &&
-      !changedProps.has("_connection")
+      !changedProps.has("color")
    ) {
      return;
    }
@@ -138,10 +133,12 @@ export class StateBadge extends LitElement {
            stateObj.attributes.entity_picture) &&
          !this.overrideIcon
        ) {
-          let imageUrl = this._resolveImageUrl(
+          let imageUrl =
            stateObj.attributes.entity_picture_local ||
-              stateObj.attributes.entity_picture
-          );
+            stateObj.attributes.entity_picture;
+          if (this.hass) {
+            imageUrl = this.hass.hassUrl(imageUrl);
+          }
          if (domain === "camera") {
            imageUrl = cameraUrlWithWidthHeight(imageUrl, 80, 80);
          }
@@ -182,7 +179,11 @@ export class StateBadge extends LitElement {
          }
        }
      } else if (this.overrideImage) {
-        backgroundImage = `url(${this._resolveImageUrl(this.overrideImage)})`;
+        let imageUrl = this.overrideImage;
+        if (this.hass) {
+          imageUrl = this.hass.hassUrl(imageUrl);
+        }
+        backgroundImage = `url(${imageUrl})`;
        this.icon = false;
      }
    }
@@ -191,20 +192,6 @@ export class StateBadge extends LitElement {
    this.style.backgroundImage = backgroundImage;
  }

-  // Sign the image URL via the connection context so brand images
-  // (/api/brands/...) get their access token. Without a way to sign, a brands
-  // request would be rejected (and logged/blocked by core), so skip it until
-  // we can sign.
-  private _resolveImageUrl(url: string | undefined): string {
-    if (!url) {
-      return "";
-    }
-    if (this._connection) {
-      return this._connection.hassUrl(url);
-    }
-    return isBrandUrl(url) ? "" : url;
-  }
-
  protected getClass() {
    const cls = new Map(
      ["has-no-radius", "has-media-image", "has-image"].map((_cls) => [
@@ -24,6 +24,7 @@ class StateInfo extends LitElement {
    const name = this.hass.formatEntityName(this.stateObj, { type: "entity" });

    return html`<state-badge
+        .hass=${this.hass}
        .stateObj=${this.stateObj}
        .stateColor=${true}
        .color=${this.color}
@@ -173,6 +173,7 @@ export class HaAreaControlsPicker extends LitElement {
            domainItems = multiTermSortedSearch(
              domainItems,
              searchString,
+              this._domainSearchKeys,
              (item) => item.id,
              fuseIndex
            );
@@ -225,6 +226,7 @@ export class HaAreaControlsPicker extends LitElement {
            entityItems = multiTermSortedSearch(
              entityItems,
              searchString,
+              this._entitySearchKeys,
              (item) => item.id,
              fuseIndex
            );
@@ -1,11 +1,10 @@
-import { consume, type ContextType } from "@lit/context";
 import { mdiTextureBox } from "@mdi/js";
 import type { TemplateResult } from "lit";
 import { LitElement, html } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { getAreaContext } from "../common/entity/context/get_area_context";
-import { areasContext, floorsContext } from "../data/context";
+import type { HomeAssistant } from "../types";
 import "./ha-expansion-panel";
 import "./ha-items-display-editor";
 import type { DisplayItem, DisplayValue } from "./ha-items-display-editor";
@@ -18,13 +17,7 @@ export interface AreasDisplayValue {

@customElement("ha-areas-display-editor")
 export class HaAreasDisplayEditor extends LitElement {
-  @consume({ context: areasContext, subscribe: true })
-  @state()
-  private _areas!: ContextType<typeof areasContext>;
-
-  @consume({ context: floorsContext, subscribe: true })
-  @state()
-  private _floors!: ContextType<typeof floorsContext>;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public label?: string;

@@ -42,10 +35,10 @@ export class HaAreasDisplayEditor extends LitElement {
  public showNavigationButton = false;

  protected render(): TemplateResult {
-    const areas = Object.values(this._areas);
+    const areas = Object.values(this.hass.areas);

    const items: DisplayItem[] = areas.map((area) => {
-      const { floor } = getAreaContext(area, this._floors);
+      const { floor } = getAreaContext(area, this.hass.floors);
      return {
        value: area.area_id,
        label: area.name,
@@ -1,19 +1,15 @@
-import { consume, type ContextType } from "@lit/context";
 import { mdiDragHorizontalVariant, mdiTextureBox } from "@mdi/js";
 import type { TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeFloorName } from "../common/entity/compute_floor_name";
 import { getAreaContext } from "../common/entity/context/get_area_context";
-import type { LocalizeFunc } from "../common/translations/localize";
-import { areasContext, floorsContext } from "../data/context";
 import type { FloorRegistryEntry } from "../data/floor_registry";
 import { getFloors } from "../panels/lovelace/strategies/areas/helpers/areas-strategy-helper";
-import type { ValueChangedEvent } from "../types";
+import type { HomeAssistant, ValueChangedEvent } from "../types";
 import "./ha-expansion-panel";
 import "./ha-floor-icon";
 import "./ha-items-display-editor";
@@ -34,17 +30,7 @@ const UNASSIGNED_FLOOR = "__unassigned__";

@customElement("ha-areas-floors-display-editor")
 export class HaAreasFloorsDisplayEditor extends LitElement {
-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
-
-  @consume({ context: areasContext, subscribe: true })
-  @state()
-  private _areas!: ContextType<typeof areasContext>;
-
-  @consume({ context: floorsContext, subscribe: true })
-  @state()
-  private _floors!: ContextType<typeof floorsContext>;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public label?: string;

@@ -65,14 +51,13 @@ export class HaAreasFloorsDisplayEditor extends LitElement {

  protected render(): TemplateResult {
    const groupedAreasItems = this._groupedAreasItems(
-      this._areas,
-      this._floors
+      this.hass.areas,
+      this.hass.floors
    );

    const filteredFloors = this._sortedFloors(
-      this._floors,
-      this.value?.floors_display?.order,
-      this._localize
+      this.hass.floors,
+      this.value?.floors_display?.order
    ).filter(
      (floor) =>
        // Only include floors that have areas assigned to them
@@ -139,14 +124,15 @@ export class HaAreasFloorsDisplayEditor extends LitElement {

  private _groupedAreasItems = memoizeOne(
    (
-      areas: ContextType<typeof areasContext>,
-      floors: ContextType<typeof floorsContext>
+      hassAreas: HomeAssistant["areas"],
+      // update items if floors change
+      _hassFloors: HomeAssistant["floors"]
    ): Record<string, DisplayItem[]> => {
-      const areaList = Object.values(areas);
+      const areas = Object.values(hassAreas);

-      const groupedItems: Record<string, DisplayItem[]> = areaList.reduce(
+      const groupedItems: Record<string, DisplayItem[]> = areas.reduce(
        (acc, area) => {
-          const { floor } = getAreaContext(area, floors);
+          const { floor } = getAreaContext(area, this.hass.floors);
          const floorId = floor?.floor_id ?? UNASSIGNED_FLOOR;

          if (!acc[floorId]) {
@@ -169,24 +155,23 @@ export class HaAreasFloorsDisplayEditor extends LitElement {

  private _sortedFloors = memoizeOne(
    (
-      floors: ContextType<typeof floorsContext>,
-      order: string[] | undefined,
-      localize: LocalizeFunc
+      hassFloors: HomeAssistant["floors"],
+      order: string[] | undefined
    ): FloorRegistryEntry[] => {
-      const sortedFloors = getFloors(floors, order);
-      const noFloors = sortedFloors.length === 0;
-      sortedFloors.push({
+      const floors = getFloors(hassFloors, order);
+      const noFloors = floors.length === 0;
+      floors.push({
        floor_id: UNASSIGNED_FLOOR,
        name: noFloors
-          ? localize("ui.panel.lovelace.strategy.areas.areas")
-          : localize("ui.panel.lovelace.strategy.areas.other_areas"),
+          ? this.hass.localize("ui.panel.lovelace.strategy.areas.areas")
+          : this.hass.localize("ui.panel.lovelace.strategy.areas.other_areas"),
        icon: null,
        level: null,
        aliases: [],
        created_at: 0,
        modified_at: 0,
      });
-      return sortedFloors;
+      return floors;
    }
  );

@@ -195,9 +180,8 @@ export class HaAreasFloorsDisplayEditor extends LitElement {
    const newIndex = ev.detail.newIndex;
    const oldIndex = ev.detail.oldIndex;
    const floorIds = this._sortedFloors(
-      this._floors,
-      this.value?.floors_display?.order,
-      this._localize
+      this.hass.floors,
+      this.value?.floors_display?.order
    ).map((floor) => floor.floor_id);
    const newOrder = [...floorIds];
    const movedFloorId = newOrder.splice(oldIndex, 1)[0];
@@ -220,9 +204,8 @@ export class HaAreasFloorsDisplayEditor extends LitElement {
    const currentFloorId = (ev.currentTarget as any).floorId;

    const floorIds = this._sortedFloors(
-      this._floors,
-      this.value?.floors_display?.order,
-      this._localize
+      this.hass.floors,
+      this.value?.floors_display?.order
    ).map((floor) => floor.floor_id);

    const oldAreaDisplay = this.value?.areas_display ?? {};
@@ -240,14 +223,14 @@ export class HaAreasFloorsDisplayEditor extends LitElement {
        continue;
      }
      const hidden = oldHidden.filter((areaId) => {
-        const id = this._areas[areaId]?.floor_id ?? UNASSIGNED_FLOOR;
+        const id = this.hass.areas[areaId]?.floor_id ?? UNASSIGNED_FLOOR;
        return id === floorId;
      });
      if (hidden?.length) {
        newHidden.push(...hidden);
      }
      const order = oldOrder.filter((areaId) => {
-        const id = this._areas[areaId]?.floor_id ?? UNASSIGNED_FLOOR;
+        const id = this.hass.areas[areaId]?.floor_id ?? UNASSIGNED_FLOOR;
        return id === floorId;
      });
      if (order?.length) {
@@ -1,4 +1,3 @@
-import { consume } from "@lit/context";
 import {
  mdiAlertCircle,
  mdiChevronDown,
@@ -11,9 +10,7 @@ import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
 import { supportsFeature } from "../common/entity/supports-feature";
-import type { LocalizeFunc } from "../common/translations/localize";
 import {
  runAssistPipeline,
  type AssistPipeline,
@@ -21,19 +18,10 @@ import {
  type ConversationChatLogToolResultDelta,
  type PipelineRunEvent,
 } from "../data/assist_pipeline";
-import {
-  configContext,
-  connectionContext,
-  statesContext,
-} from "../data/context";
 import { ConversationEntityFeature } from "../data/conversation";
 import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
 import { haStyleScrollbar } from "../resources/styles";
-import type {
-  HomeAssistant,
-  HomeAssistantConfig,
-  HomeAssistantConnection,
-} from "../types";
+import type { HomeAssistant } from "../types";
 import { AudioRecorder } from "../util/audio-recorder";
 import { documentationUrl } from "../util/documentation-url";
 import "./ha-alert";
@@ -59,6 +47,8 @@ interface AssistMessage {

@customElement("ha-assist-chat")
 export class HaAssistChat extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
  @property({ attribute: false }) public pipeline?: AssistPipeline;

  @property({ type: Boolean, attribute: "disable-speech" })
@@ -81,22 +71,6 @@ export class HaAssistChat extends LitElement {

  @state() private _processing = false;

-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
-
-  @state()
-  @consume({ context: statesContext, subscribe: true })
-  private _states!: HomeAssistant["states"];
-
-  @state()
-  @consume({ context: configContext, subscribe: true })
-  private _config!: HomeAssistantConfig;
-
-  @state()
-  @consume({ context: connectionContext, subscribe: true })
-  private _connection!: HomeAssistantConnection;
-
  private _conversationId: string | null = null;

  private _audioRecorder?: AudioRecorder;
@@ -112,7 +86,7 @@ export class HaAssistChat extends LitElement {
      this._conversation = [
        {
          who: "hass",
-          text: this._localize("ui.dialogs.voice_command.how_can_i_help"),
+          text: this.hass.localize("ui.dialogs.voice_command.how_can_i_help"),
          thinking: "",
          tool_calls: {},
        },
@@ -150,9 +124,9 @@ export class HaAssistChat extends LitElement {
    const controlHA = !this.pipeline
      ? false
      : this.pipeline.prefer_local_intents ||
-        (this._states[this.pipeline.conversation_engine]
+        (this.hass.states[this.pipeline.conversation_engine]
          ? supportsFeature(
-              this._states[this.pipeline.conversation_engine],
+              this.hass.states[this.pipeline.conversation_engine],
              ConversationEntityFeature.CONTROL
            )
          : true);
@@ -165,7 +139,7 @@ export class HaAssistChat extends LitElement {
          ? nothing
          : html`
              <ha-alert>
-                ${this._localize(
+                ${this.hass.localize(
                  "ui.dialogs.voice_command.conversation_no_control"
                )}
              </ha-alert>
@@ -206,7 +180,7 @@ export class HaAssistChat extends LitElement {
                                  .path=${mdiCommentProcessingOutline}
                                ></ha-svg-icon>
                                <span class="thinking-label">
-                                  ${this._localize(
+                                  ${this.hass.localize(
                                    "ui.dialogs.voice_command.show_details"
                                  )}
                                </span>
@@ -277,7 +251,7 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre
          id="message-input"
          @keyup=${this._handleKeyUp}
          @input=${this._handleInput}
-          .label=${this._localize(`ui.dialogs.voice_command.input_label`)}
+          .label=${this.hass.localize(`ui.dialogs.voice_command.input_label`)}
        >
          <div slot="end">
            ${this._showSendButton || !supportsSTT
@@ -287,7 +261,7 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre
                    .path=${mdiSend}
                    @click=${this._handleSendMessage}
                    .disabled=${this._processing}
-                    .label=${this._localize(
+                    .label=${this.hass.localize(
                      "ui.dialogs.voice_command.send_text"
                    )}
                  >
@@ -308,7 +282,7 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre
                      .path=${mdiMicrophone}
                      @click=${this._handleListeningButton}
                      .disabled=${this._processing}
-                      .label=${this._localize(
+                      .label=${this.hass.localize(
                        "ui.dialogs.voice_command.start_listening"
                      )}
                    >
@@ -400,12 +374,10 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre

  private _handleToggleThinking(ev: Event) {
    const index = (ev.currentTarget as any).index;
-    // Mutate the message in place rather than replacing it. The streaming
-    // processor keeps a reference to this same object and mutates it as deltas
-    // arrive; swapping in a new object would detach the in-flight message from
-    // the processor and freeze the chat (see #52501).
-    const message = this._conversation[index];
-    message.thinking_expanded = !message.thinking_expanded;
+    this._conversation[index] = {
+      ...this._conversation[index],
+      thinking_expanded: !this._conversation[index].thinking_expanded,
+    };
    this.requestUpdate("_conversation");
  }

@@ -419,21 +391,21 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre
      text:
        // New lines matter for messages
        // prettier-ignore
-        html`${this._localize(
+        html`${this.hass.localize(
          "ui.dialogs.voice_command.not_supported_microphone_browser"
        )}

-        ${this._localize(
+        ${this.hass.localize(
          "ui.dialogs.voice_command.not_supported_microphone_documentation",
          {
            documentation_link: html`<a
                target="_blank"
                rel="noopener noreferrer"
                href=${documentationUrl(
-                  this._config,
+                  this.hass,
                  "/docs/configuration/securing/#remote-access"
                )}
-              >${this._localize(
+              >${this.hass.localize(
                  "ui.dialogs.voice_command.not_supported_microphone_documentation_link"
                )}</a>`,
          }
@@ -471,7 +443,7 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre

    try {
      const unsub = await runAssistPipeline(
-        this._connection,
+        this.hass,
        (event: PipelineRunEvent) => {
          if (event.type === "run-start") {
            this._stt_binary_handler_id =
@@ -567,7 +539,7 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre
  }

  private _sendAudioChunk(chunk: Int16Array) {
-    this._connection.connection.socket!.binaryType = "arraybuffer";
+    this.hass.connection.socket!.binaryType = "arraybuffer";

    // eslint-disable-next-line eqeqeq
    if (this._stt_binary_handler_id == undefined) {
@@ -578,7 +550,7 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre
    data[0] = this._stt_binary_handler_id;
    data.set(new Uint8Array(chunk.buffer), 1);

-    this._connection.connection.socket!.send(data);
+    this.hass.connection.socket!.send(data);
  }

  private _unloadAudio = () => {
@@ -598,7 +570,7 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre
    hassMessageProcesser.addMessage();
    try {
      const unsub = await runAssistPipeline(
-        this._connection,
+        this.hass,
        (event) => {
          if (event.type.startsWith("intent-")) {
            hassMessageProcesser.processEvent(event);
@@ -621,7 +593,7 @@ ${JSON.stringify(toolCall.result, null, 2)}</pre
      );
    } catch {
      hassMessageProcesser.setError(
-        this._localize("ui.dialogs.voice_command.error")
+        this.hass.localize("ui.dialogs.voice_command.error")
      );
    } finally {
      this._processing = false;
@@ -1,21 +1,16 @@
-import { consume } from "@lit/context";
-import type { ContextType } from "@lit/context";
-import { initialState } from "@lit/task";
 import type { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { AsyncValueTask } from "../common/controllers/async-value-task";
-import {
-  configContext,
-  connectionContext,
-  entitiesContext,
-} from "../data/context";
+import { customElement, property } from "lit/decorators";
+import { until } from "lit/directives/until";
 import { attributeIcon } from "../data/icons";
+import type { HomeAssistant } from "../types";
 import "./ha-icon";
 import "./ha-svg-icon";

@customElement("ha-attribute-icon")
 export class HaAttributeIcon extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
  @property({ attribute: false }) public stateObj?: HassEntity;

  @property() public attribute?: string;
@@ -24,59 +19,6 @@ export class HaAttributeIcon extends LitElement {

  @property() public icon?: string;

-  @state()
-  @consume({ context: configContext, subscribe: true })
-  private _config?: ContextType<typeof configContext>;
-
-  @state()
-  @consume({ context: connectionContext, subscribe: true })
-  private _connection?: ContextType<typeof connectionContext>;
-
-  @state()
-  @consume({ context: entitiesContext, subscribe: true })
-  private _entities?: ContextType<typeof entitiesContext>;
-
-  private _iconTask = new AsyncValueTask(this, {
-    task: ([
-      icon,
-      config,
-      connection,
-      entities,
-      stateObj,
-      attribute,
-      attributeValue,
-    ]) => {
-      if (
-        icon ||
-        !config ||
-        !connection ||
-        !entities ||
-        !stateObj ||
-        !attribute
-      ) {
-        return initialState;
-      }
-      return attributeIcon(
-        config.config,
-        connection.connection,
-        entities,
-        stateObj,
-        attribute,
-        attributeValue
-      );
-    },
-    args: () =>
-      [
-        this.icon,
-        this._config,
-        this._connection,
-        this._entities,
-        this.stateObj,
-        this.attribute,
-        this.attributeValue,
-      ] as const,
-  });
-
  protected render() {
    if (this.icon) {
      return html`<ha-icon .icon=${this.icon}></ha-icon>`;
@@ -86,13 +28,23 @@ export class HaAttributeIcon extends LitElement {
      return nothing;
    }

-    if (!this._config || !this._connection || !this._entities) {
+    if (!this.hass) {
      return nothing;
    }

-    return this._iconTask.value
-      ? html`<ha-icon .icon=${this._iconTask.value}></ha-icon>`
-      : nothing;
+    const icon = attributeIcon(
+      this.hass,
+      this.stateObj,
+      this.attribute,
+      this.attributeValue
+    ).then((icn) => {
+      if (icn) {
+        return html`<ha-icon .icon=${icn}></ha-icon>`;
+      }
+      return nothing;
+    });
+
+    return html`${until(icon)}`;
  }
 }

@@ -1,19 +1,11 @@
 import { consume } from "@lit/context";
 import type { ContextType } from "@lit/context";
-import { initialState } from "@lit/task";
 import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { AsyncValueTask } from "../common/controllers/async-value-task";
-import { computeStateDomain } from "../common/entity/compute_state_domain";
-import { getValueAttribute } from "../common/entity/get_states";
-import { valueFromParts } from "../common/entity/value_parts";
+import { until } from "lit/directives/until";
 import { formattersContext } from "../data/context";

-const isObjectValue = (value: unknown): boolean =>
-  (Array.isArray(value) && value.some((val) => val instanceof Object)) ||
-  (!Array.isArray(value) && value instanceof Object);
-
@customElement("ha-attribute-value")
 class HaAttributeValue extends LitElement {
  @state()
@@ -26,17 +18,6 @@ class HaAttributeValue extends LitElement {

  @property({ type: Boolean, attribute: "hide-unit" }) public hideUnit = false;

-  private _yamlTask = new AsyncValueTask(this, {
-    task: async ([attributeValue]) => {
-      if (!isObjectValue(attributeValue)) {
-        return initialState;
-      }
-      const { dump } = await import("js-yaml");
-      return dump(attributeValue);
-    },
-    args: () => [this.stateObj?.attributes[this.attribute]] as const,
-  });
-
  protected render() {
    if (!this.stateObj) {
      return nothing;
@@ -66,28 +47,13 @@ class HaAttributeValue extends LitElement {
      }
    }

-    if (isObjectValue(attributeValue)) {
-      return html`<pre>${this._yamlTask.value ?? ""}</pre>`;
-    }
-
-    // Options-list attributes (effect_list, preset_modes, …) translated through
-    // their value attribute, or the main state for lists like hvac_modes.
-    if (Array.isArray(attributeValue)) {
-      const domain = computeStateDomain(this.stateObj);
-      const valueAttribute = getValueAttribute(domain, this.attribute);
-      if (valueAttribute) {
-        return attributeValue
-          .map((item) =>
-            valueAttribute === "_"
-              ? this._formatters!.formatEntityState(this.stateObj!, item)
-              : this._formatters!.formatEntityAttributeValue(
-                  this.stateObj!,
-                  valueAttribute,
-                  item
-                )
-          )
-          .join(", ");
-      }
+    if (
+      (Array.isArray(attributeValue) &&
+        attributeValue.some((val) => val instanceof Object)) ||
+      (!Array.isArray(attributeValue) && attributeValue instanceof Object)
+    ) {
+      const yaml = import("js-yaml").then(({ dump }) => dump(attributeValue));
+      return html`<pre>${until(yaml, "")}</pre>`;
    }

    if (this.hideUnit) {
@@ -95,7 +61,10 @@ class HaAttributeValue extends LitElement {
        this.stateObj!,
        this.attribute
      );
-      return valueFromParts(parts);
+      return parts
+        .filter((part) => part.type === "value")
+        .map((part) => part.value)
+        .join("");
    }

    return this._formatters!.formatEntityAttributeValue(
@@ -153,16 +153,10 @@ export class HaBaseTimeInput extends LitElement {
  protected render(): TemplateResult {
    return html`
      ${this.label
-        ? html`<label id="label"
-            >${this.label}${this.required ? " *" : ""}</label
-          >`
+        ? html`<label>${this.label}${this.required ? " *" : ""}</label>`
        : nothing}
      <div class="time-input-wrap-wrap">
-        <div
-          class="time-input-wrap"
-          role="group"
-          aria-labelledby=${ifDefined(this.label ? "label" : undefined)}
-        >
+        <div class="time-input-wrap">
          ${this.enableDay
            ? html`
                <ha-input
@@ -1,12 +1,10 @@
-import { consume } from "@lit/context";
-import type { ContextType } from "@lit/context";
 import type { CSSResultGroup } from "lit";
 import { LitElement, css, html } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { formatNumber } from "../common/number/format_number";
 import { blankBeforeUnit } from "../common/translations/blank_before_unit";
-import { internationalizationContext } from "../data/context";
+import type { HomeAssistant } from "../types";

@customElement("ha-big-number")
 export class HaBigNumber extends LitElement {
@@ -17,16 +15,17 @@ export class HaBigNumber extends LitElement {
  @property({ attribute: "unit-position" })
  public unitPosition: "top" | "bottom" = "top";

+  @property({ attribute: false }) public hass?: HomeAssistant;
+
  @property({ attribute: false })
  public formatOptions: Intl.NumberFormatOptions = {};

-  @state()
-  @consume({ context: internationalizationContext, subscribe: true })
-  private _i18n?: ContextType<typeof internationalizationContext>;
-
  protected render() {
-    const locale = this._i18n!.locale;
-    const formatted = formatNumber(this.value, locale, this.formatOptions);
+    const formatted = formatNumber(
+      this.value,
+      this.hass?.locale,
+      this.formatOptions
+    );
    const [integer] = formatted.includes(".")
      ? formatted.split(".")
      : formatted.split(",");
@@ -34,7 +33,9 @@ export class HaBigNumber extends LitElement {
    const temperatureDecimal = formatted.replace(integer, "");

    const formattedValue = `${this.value}${
-      this.unit ? `${blankBeforeUnit(this.unit, locale)}${this.unit}` : ""
+      this.unit
+        ? `${blankBeforeUnit(this.unit, this.hass?.locale)}${this.unit}`
+        : ""
    }`;

    const unitBottom = this.unitPosition === "bottom";
@@ -1,4 +1,3 @@
-import { consume, type ContextType } from "@lit/context";
 import { css, html, LitElement, nothing, type PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
@@ -8,7 +7,7 @@ import memoizeOne from "memoize-one";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { supportsFeature } from "../common/entity/supports-feature";
 import {
-  CameraEntityFeature,
+  CAMERA_SUPPORT_STREAM,
  type CameraCapabilities,
  type CameraEntity,
  computeMJPEGStreamUrl,
@@ -18,7 +17,7 @@ import {
  STREAM_TYPE_WEB_RTC,
  type StreamType,
 } from "../data/camera";
-import { apiContext, configContext, connectionContext } from "../data/context";
+import type { HomeAssistant } from "../types";
 import "./ha-hls-player";
 import "./ha-web-rtc-player";

@@ -31,17 +30,7 @@ interface Stream {

@customElement("ha-camera-stream")
 export class HaCameraStream extends LitElement {
-  @state()
-  @consume({ context: configContext, subscribe: true })
-  private _config!: ContextType<typeof configContext>;
-
-  @state()
-  @consume({ context: apiContext, subscribe: true })
-  private _api!: ContextType<typeof apiContext>;
-
-  @state()
-  @consume({ context: connectionContext, subscribe: true })
-  private _connection!: ContextType<typeof connectionContext>;
+  @property({ attribute: false }) public hass?: HomeAssistant;

  @property({ attribute: false }) public stateObj?: CameraEntity;

@@ -69,33 +58,21 @@ export class HaCameraStream extends LitElement {

  @state() private _webRtcStreams?: { hasAudio: boolean; hasVideo: boolean };

-  private _thumbnailApi = memoizeOne(
-    (
-      api: ContextType<typeof apiContext>,
-      connection: ContextType<typeof connectionContext>
-    ) => ({
-      callWS: api.callWS,
-      hassUrl: connection.hassUrl,
-    })
-  );
-
-  public willUpdate(changedProps: PropertyValues): void {
+  public willUpdate(changedProps: PropertyValues<this>): void {
    const entityChanged =
      changedProps.has("stateObj") &&
      this.stateObj &&
      (changedProps.get("stateObj") as CameraEntity | undefined)?.entity_id !==
        this.stateObj.entity_id;

-    const oldConfig = changedProps.get("_config") as
-      | ContextType<typeof configContext>
-      | undefined;
+    const oldHass = changedProps.get("hass") as HomeAssistant | undefined;
    const backendStarted =
-      changedProps.has("_config") &&
-      this._config &&
+      changedProps.has("hass") &&
+      this.hass &&
      this.stateObj &&
-      oldConfig &&
-      this._config.config.state === STATE_RUNNING &&
-      oldConfig.config?.state !== STATE_RUNNING;
+      oldHass &&
+      this.hass.config.state === STATE_RUNNING &&
+      oldHass.config?.state !== STATE_RUNNING;

    if (entityChanged || backendStarted) {
      this._getCapabilities();
@@ -160,6 +137,7 @@ export class HaCameraStream extends LitElement {
        .allowExoPlayer=${this.allowExoPlayer}
        .muted=${this.muted}
        .controls=${this.controls}
+        .hass=${this.hass}
        .entityid=${this.stateObj.entity_id}
        .posterUrl=${this._posterUrl}
        @streams=${this._handleHlsStreams}
@@ -175,6 +153,7 @@ export class HaCameraStream extends LitElement {
        playsinline
        .muted=${this.muted}
        .controls=${this.controls}
+        .hass=${this.hass}
        .entityid=${this.stateObj.entity_id}
        .posterUrl=${this._posterUrl}
        @streams=${this._handleWebRtcStreams}
@@ -191,12 +170,12 @@ export class HaCameraStream extends LitElement {
    this._capabilities = undefined;
    this._hlsStreams = undefined;
    this._webRtcStreams = undefined;
-    if (!supportsFeature(this.stateObj!, CameraEntityFeature.STREAM)) {
+    if (!supportsFeature(this.stateObj!, CAMERA_SUPPORT_STREAM)) {
      this._capabilities = { frontend_stream_types: [] };
      return;
    }
    this._capabilities = await fetchCameraCapabilities(
-      this._api,
+      this.hass!,
      this.stateObj!.entity_id
    );
  }
@@ -204,7 +183,7 @@ export class HaCameraStream extends LitElement {
  private async _getPosterUrl(): Promise<void> {
    try {
      this._posterUrl = await fetchThumbnailUrlWithCache(
-        this._thumbnailApi(this._api, this._connection),
+        this.hass!,
        this.stateObj!.entity_id,
        this.clientWidth,
        this.clientHeight
@@ -12,11 +12,10 @@ import {
  mdiWeatherSunny,
 } from "@mdi/js";
 import { consume } from "@lit/context";
-import { initialState } from "@lit/task";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
+import { until } from "lit/directives/until";
 import type { HassConfig, Connection } from "home-assistant-js-websocket";
-import { AsyncValueTask } from "../common/controllers/async-value-task";
 import { computeDomain } from "../common/entity/compute_domain";
 import { transform } from "../common/decorators/transform";
 import { configContext, connectionContext } from "../data/context";
@@ -58,17 +57,6 @@ export class HaConditionIcon extends LitElement {
  })
  private _connection?: Connection;

-  private _iconTask = new AsyncValueTask(this, {
-    task: ([icon, connection, config, condition]) => {
-      if (icon || !connection || !config || !condition) {
-        return initialState;
-      }
-      return conditionIcon(connection, config, condition);
-    },
-    args: () =>
-      [this.icon, this._connection, this._config, this.condition] as const,
-  });
-
  protected render() {
    if (this.icon) {
      return html`<ha-icon .icon=${this.icon}></ha-icon>`;
@@ -82,12 +70,18 @@ export class HaConditionIcon extends LitElement {
      return this._renderFallback();
    }

-    if (!this._iconTask.resolved) {
-      return nothing;
-    }
-    return this._iconTask.value
-      ? html`<ha-icon .icon=${this._iconTask.value}></ha-icon>`
-      : this._renderFallback();
+    const icon = conditionIcon(
+      this._connection,
+      this._config,
+      this.condition
+    ).then((icn) => {
+      if (icn) {
+        return html`<ha-icon .icon=${icn}></ha-icon>`;
+      }
+      return this._renderFallback();
+    });
+
+    return html`${until(icon)}`;
  }

  private _renderFallback() {
@@ -388,10 +388,7 @@ export class HaControlSlider extends LitElement {
  private _isVisuallyInverted() {
    let inverted = this.inverted;

-    // RTL only mirrors the horizontal axis. A vertical slider always fills
-    // bottom-to-top regardless of text direction, so it must not be flipped,
-    // otherwise its value mapping ends up upside down in RTL languages.
-    if (!this.vertical && mainWindow.document.dir === "rtl") {
+    if (mainWindow.document.dir === "rtl") {
      inverted = !inverted;
    }

@@ -1,8 +1,7 @@
 import { consume, type ContextType } from "@lit/context";
-import { initialState } from "@lit/task";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { AsyncValueTask } from "../common/controllers/async-value-task";
+import { until } from "lit/directives/until";
 import { configContext, connectionContext, uiContext } from "../data/context";
 import {
  DEFAULT_DOMAIN_ICON,
@@ -37,30 +36,6 @@ export class HaDomainIcon extends LitElement {
  @consume({ context: uiContext, subscribe: true })
  private _hassUi?: ContextType<typeof uiContext>;

-  private _iconTask = new AsyncValueTask(this, {
-    task: ([icon, connection, config, domain, deviceClass, domainState]) => {
-      if (icon || !connection || !config || !domain) {
-        return initialState;
-      }
-      return domainIcon(
-        connection.connection,
-        config.config,
-        domain,
-        deviceClass,
-        domainState
-      );
-    },
-    args: () =>
-      [
-        this.icon,
-        this._connection,
-        this._hassConfig,
-        this.domain,
-        this.deviceClass,
-        this.state,
-      ] as const,
-  });
-
  protected render() {
    if (this.icon) {
      return html`<ha-icon .icon=${this.icon}></ha-icon>`;
@@ -74,12 +49,21 @@ export class HaDomainIcon extends LitElement {
      return this._renderFallback();
    }

-    if (!this._iconTask.resolved) {
-      return nothing;
-    }
-    return this._iconTask.value
-      ? html`<ha-icon .icon=${this._iconTask.value}></ha-icon>`
-      : this._renderFallback();
+    const icon = domainIcon(
+      this._connection.connection,
+      this._hassConfig.config,
+      this.domain,
+      this.deviceClass,
+      this.state
+    ).then((icn) => {
+      if (icn) {
+        return html`<ha-icon .icon=${icn}></ha-icon>`;
+      }
+
+      return this._renderFallback();
+    });
+
+    return html`${until(icon)}`;
  }

  private _renderFallback() {
@@ -1,18 +1,10 @@
-import { consume, type ContextType } from "@lit/context";
-import type { HassEntity } from "home-assistant-js-websocket";
 import type { TemplateResult } from "lit";
 import { LitElement, html } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import memoizeOne from "memoize-one";
-import { consumeEntityStates } from "../common/decorators/consume-context-entry";
+import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeStateName } from "../common/entity/compute_state_name";
-import {
-  configContext,
-  connectionContext,
-  entitiesContext,
-} from "../data/context";
 import { entityIcon } from "../data/icons";
+import type { HomeAssistant } from "../types";
 import "./ha-items-display-editor";
 import type { DisplayItem, DisplayValue } from "./ha-items-display-editor";

@@ -23,21 +15,7 @@ export interface EntitiesDisplayValue {

@customElement("ha-entities-display-editor")
 export class HaEntitiesDisplayEditor extends LitElement {
-  @state()
-  @consumeEntityStates({ entityIdPath: ["entitiesIds"] })
-  private _entityStates?: Record<string, HassEntity>;
-
-  @consume({ context: entitiesContext, subscribe: true })
-  @state()
-  private _entitiesReg!: ContextType<typeof entitiesContext>;
-
-  @consume({ context: configContext, subscribe: true })
-  @state()
-  private _config!: ContextType<typeof configContext>;
-
-  @consume({ context: connectionContext, subscribe: true })
-  @state()
-  private _connection!: ContextType<typeof connectionContext>;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property() public label?: string;

@@ -54,13 +32,20 @@ export class HaEntitiesDisplayEditor extends LitElement {
  @property({ type: Boolean }) public required = false;

  protected render(): TemplateResult {
-    const items = this._items(
-      this.entitiesIds,
-      this._entityStates,
-      this._entitiesReg,
-      this._config,
-      this._connection
-    );
+    const entities = this.entitiesIds
+      .map((entityId) => this.hass.states[entityId])
+      .filter(Boolean);
+
+    const items: DisplayItem[] = entities.map((entity) => ({
+      value: entity.entity_id,
+      label: computeStateName(entity),
+      icon: entityIcon(
+        this.hass.entities,
+        this.hass.config,
+        this.hass.connection,
+        entity
+      ),
+    }));

    const value: DisplayValue = {
      order: this.value?.order ?? [],
@@ -76,31 +61,6 @@ export class HaEntitiesDisplayEditor extends LitElement {
    `;
  }

-  private _items = memoizeOne(
-    (
-      entitiesIds: string[],
-      entityStates: Record<string, HassEntity> | undefined,
-      entitiesReg: ContextType<typeof entitiesContext>,
-      config: ContextType<typeof configContext>,
-      connection: ContextType<typeof connectionContext>
-    ): DisplayItem[] => {
-      const entities = entitiesIds
-        .map((entityId) => entityStates?.[entityId])
-        .filter((stateObj): stateObj is HassEntity => Boolean(stateObj));
-
-      return entities.map((entity) => ({
-        value: entity.entity_id,
-        label: computeStateName(entity),
-        icon: entityIcon(
-          entitiesReg,
-          config.config,
-          connection.connection,
-          entity
-        ),
-      }));
-    }
-  );
-
  private _itemDisplayChanged(ev) {
    ev.stopPropagation();
    const value = ev.detail.value as DisplayValue;
@@ -1,18 +1,13 @@
-import { consume } from "@lit/context";
 import { mdiDelete, mdiFileUpload } from "@mdi/js";
 import type { PropertyValues, TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { ensureArray } from "../common/array/ensure-array";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
-import { transform } from "../common/decorators/transform";
 import { fireEvent } from "../common/dom/fire_event";
 import { blankBeforePercent } from "../common/translations/blank_before_percent";
 import type { LocalizeFunc } from "../common/translations/localize";
-import { internationalizationContext } from "../data/context";
-import type { FrontendLocaleData } from "../data/translation";
-import type { HomeAssistantInternationalization } from "../types";
+import type { HomeAssistant } from "../types";
 import { bytesToString } from "../util/bytes-to-string";
 import "./ha-button";
 import "./ha-icon-button";
@@ -27,17 +22,10 @@ declare global {

@customElement("ha-file-upload")
 export class HaFileUpload extends LitElement {
+  @property({ attribute: false }) public hass?: HomeAssistant;
+
  @property({ attribute: false }) public localize?: LocalizeFunc;

-  @state() @consumeLocalize() private _localize?: LocalizeFunc;
-
-  @state()
-  @consume({ context: internationalizationContext, subscribe: true })
-  @transform<HomeAssistantInternationalization, FrontendLocaleData>({
-    transformer: ({ locale }) => locale,
-  })
-  private _locale?: FrontendLocaleData;
-
  @property() public accept!: string;

  @property() public icon?: string;
@@ -92,7 +80,7 @@ export class HaFileUpload extends LitElement {
  }

  public render(): TemplateResult {
-    const localize = this.localize || this._localize!;
+    const localize = this.localize || this.hass!.localize;
    return html`
      ${this.uploading
        ? html`<div class="container">
@@ -107,8 +95,8 @@ export class HaFileUpload extends LitElement {
              >
              ${this.progress
                ? html`<div class="progress">
-                    ${this.progress}${this._locale &&
-                    blankBeforePercent(this._locale)}%
+                    ${this.progress}${this.hass &&
+                    blankBeforePercent(this.hass!.locale)}%
                  </div>`
                : nothing}
            </div>
@@ -1,23 +1,15 @@
-import { consume, type ContextType } from "@lit/context";
 import { mdiFilterVariantRemove } from "@mdi/js";
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeDeviceNameDisplay } from "../common/entity/compute_device_name";
 import { stringCompare } from "../common/string/compare";
-import type { LocalizeFunc } from "../common/translations/localize";
 import { deepEqual } from "../common/util/deep-equal";
-import {
-  apiContext,
-  devicesContext,
-  internationalizationContext,
-  statesContext,
-} from "../data/context";
 import type { RelatedResult } from "../data/search";
 import { findRelated } from "../data/search";
+import type { HomeAssistant } from "../types";
 import "./ha-expansion-panel";
 import "./input/ha-input-search";
 import type { HaInputSearch } from "./input/ha-input-search";
@@ -32,24 +24,7 @@ interface HaFilterDevicesItem extends HaListVirtualizedItem {

@customElement("ha-filter-devices")
 export class HaFilterDevices extends LitElement {
-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
-
-  @consume({ context: statesContext, subscribe: true })
-  @state()
-  private _states!: ContextType<typeof statesContext>;
-
-  @consume({ context: devicesContext, subscribe: true })
-  @state()
-  private _devicesReg!: ContextType<typeof devicesContext>;
-
-  @consume({ context: internationalizationContext, subscribe: true })
-  @state()
-  private _i18n!: ContextType<typeof internationalizationContext>;
-
-  @consume({ context: apiContext, subscribe: true })
-  private _api!: ContextType<typeof apiContext>;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ attribute: false }) public value?: string[];

@@ -100,7 +75,7 @@ export class HaFilterDevices extends LitElement {
        @expanded-changed=${this._expandedChanged}
      >
        <div slot="header" class="header">
-          ${this._localize("ui.panel.config.devices.caption")}
+          ${this.hass.localize("ui.panel.config.devices.caption")}
          ${this.value?.length
            ? html`<div class="badge">${this.value?.length}</div>
                <ha-icon-button
@@ -120,13 +95,7 @@ export class HaFilterDevices extends LitElement {
              </ha-input-search>
              <ha-list-selectable-virtualized
                multi
-                .rows=${this._devices(
-                  this._devicesReg,
-                  this._filter || "",
-                  this._localize,
-                  this._states,
-                  this._i18n.locale.language
-                )}
+                .rows=${this._devices(this.hass.devices, this._filter || "")}
                .rowRenderer=${this._renderItem}
                @ha-list-item-selected=${this._handleAdded}
                @ha-list-item-deselected=${this._handleRemoved}
@@ -152,24 +121,13 @@ export class HaFilterDevices extends LitElement {
  private _handleAdded(ev: CustomEvent<number>) {
    this.value = [
      ...(this.value ?? []),
-      this._devices(
-        this._devicesReg,
-        this._filter || "",
-        this._localize,
-        this._states,
-        this._i18n.locale.language
-      )[ev.detail].id,
+      this._devices(this.hass.devices, this._filter || "")[ev.detail].id,
    ];
  }

  private _handleRemoved(ev: CustomEvent<number>) {
-    const id = this._devices(
-      this._devicesReg,
-      this._filter || "",
-      this._localize,
-      this._states,
-      this._i18n.locale.language
-    )[ev.detail].id;
+    const id = this._devices(this.hass.devices, this._filter || "")[ev.detail]
+      .id;
    this.value = (this.value ?? []).filter((deviceId) => deviceId !== id);
  }

@@ -195,24 +153,27 @@ export class HaFilterDevices extends LitElement {

  private _devices = memoizeOne(
    (
-      devices: ContextType<typeof devicesContext>,
-      filter: string,
-      localize: LocalizeFunc,
-      states: ContextType<typeof statesContext>,
-      language: string | undefined
+      devices: HomeAssistant["devices"],
+      filter: string
    ): HaFilterDevicesItem[] => {
      const values = Object.values(devices);
      return values
        .map((device) => ({
          id: device.id,
          interactive: true,
-          name: computeDeviceNameDisplay(device, localize, states),
+          name: computeDeviceNameDisplay(
+            device,
+            this.hass.localize,
+            this.hass.states
+          ),
        }))
        .filter(
          ({ name }) =>
            !filter || name.toLowerCase().includes(filter.toLowerCase())
        )
-        .sort((a, b) => stringCompare(a.name, b.name, language));
+        .sort((a, b) =>
+          stringCompare(a.name, b.name, this.hass.locale.language)
+        );
    }
  );

@@ -233,7 +194,7 @@ export class HaFilterDevices extends LitElement {
    for (const deviceId of this.value) {
      value.push(deviceId);
      if (this.type) {
-        relatedPromises.push(findRelated(this._api, "device", deviceId));
+        relatedPromises.push(findRelated(this.hass, "device", deviceId));
      }
    }
    const results = await Promise.all(relatedPromises);
@@ -1,4 +1,3 @@
-import { consume, type ContextType } from "@lit/context";
 import type { SelectedDetail } from "@material/mwc-list";
 import { mdiFilterVariantRemove } from "@mdi/js";
 import type { CSSResultGroup, PropertyValues } from "lit";
@@ -6,14 +5,12 @@ import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import memoizeOne from "memoize-one";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeDomain } from "../common/entity/compute_domain";
 import { stringCompare } from "../common/string/compare";
-import type { LocalizeFunc } from "../common/translations/localize";
-import { internationalizationContext, statesContext } from "../data/context";
 import { domainToName } from "../data/integration";
 import { haStyleScrollbar } from "../resources/styles";
+import type { HomeAssistant } from "../types";
 import "./ha-check-list-item";
 import "./ha-domain-icon";
 import "./ha-expansion-panel";
@@ -23,17 +20,7 @@ import type { HaInputSearch } from "./input/ha-input-search";

@customElement("ha-filter-domains")
 export class HaFilterDomains extends LitElement {
-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
-
-  @consume({ context: statesContext, subscribe: true })
-  @state()
-  private _states!: ContextType<typeof statesContext>;
-
-  @consume({ context: internationalizationContext, subscribe: true })
-  @state()
-  private _i18n!: ContextType<typeof internationalizationContext>;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ attribute: false }) public value?: string[];

@@ -56,7 +43,7 @@ export class HaFilterDomains extends LitElement {
        @expanded-changed=${this._expandedChanged}
      >
        <div slot="header" class="header">
-          ${this._localize("ui.panel.config.domains.caption")}
+          ${this.hass.localize("ui.panel.config.domains.caption")}
          ${this.value?.length
            ? html`<div class="badge">${this.value?.length}</div>
                <ha-icon-button
@@ -78,13 +65,7 @@ export class HaFilterDomains extends LitElement {
                multi
              >
                ${repeat(
-                  this._domains(
-                    this._states,
-                    this._localize,
-                    this._i18n.locale.language,
-                    this._filter,
-                    this.value
-                  ),
+                  this._domains(this.hass.states, this._filter, this.value),
                  (i) => i,
                  (domain) =>
                    html`<ha-check-list-item
@@ -97,7 +78,7 @@ export class HaFilterDomains extends LitElement {
                        .domain=${domain}
                        brand-fallback
                      ></ha-domain-icon>
-                      ${domainToName(this._localize, domain)}
+                      ${domainToName(this.hass.localize, domain)}
                    </ha-check-list-item>`
                )}
              </ha-list> `
@@ -106,34 +87,26 @@ export class HaFilterDomains extends LitElement {
    `;
  }

-  private _domains = memoizeOne(
-    (
-      states: ContextType<typeof statesContext>,
-      localize: LocalizeFunc,
-      language: string | undefined,
-      filter: string | undefined,
-      _value
-    ) => {
-      const domains = new Set<string>();
-      Object.keys(states).forEach((entityId) => {
-        domains.add(computeDomain(entityId));
-      });
+  private _domains = memoizeOne((states, filter, _value) => {
+    const domains = new Set<string>();
+    Object.keys(states).forEach((entityId) => {
+      domains.add(computeDomain(entityId));
+    });

-      return Array.from(domains.values())
-        .map((domain) => ({
-          domain,
-          name: domainToName(localize, domain),
-        }))
-        .filter(
-          (entry) =>
-            !filter ||
-            entry.domain.toLowerCase().includes(filter) ||
-            entry.name.toLowerCase().includes(filter)
-        )
-        .sort((a, b) => stringCompare(a.name, b.name, language))
-        .map((entry) => entry.domain);
-    }
-  );
+    return Array.from(domains.values())
+      .map((domain) => ({
+        domain,
+        name: domainToName(this.hass.localize, domain),
+      }))
+      .filter(
+        (entry) =>
+          !filter ||
+          entry.domain.toLowerCase().includes(filter) ||
+          entry.name.toLowerCase().includes(filter)
+      )
+      .sort((a, b) => stringCompare(a.name, b.name, this.hass.locale.language))
+      .map((entry) => entry.domain);
+  });

  protected updated(changed: PropertyValues<this>) {
    if (changed.has("expanded") && this.expanded) {
@@ -156,13 +129,7 @@ export class HaFilterDomains extends LitElement {
  }

  private _handleItemSelected(ev: CustomEvent<SelectedDetail<Set<number>>>) {
-    const domains = this._domains(
-      this._states,
-      this._localize,
-      this._i18n.locale.language,
-      this._filter,
-      this.value
-    );
+    const domains = this._domains(this.hass.states, this._filter, this.value);

    const visibleDomains = new Set(domains);
    const preserved = (this.value || []).filter((d) => !visibleDomains.has(d));
@@ -1,25 +1,18 @@
-import { consume, type ContextType } from "@lit/context";
 import { mdiFilterVariantRemove } from "@mdi/js";
 import type { CSSResultGroup, PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { consumeLocalize } from "../common/decorators/consume-context-entry";
 import { fireEvent } from "../common/dom/fire_event";
 import { computeStateDomain } from "../common/entity/compute_state_domain";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { stringCompare } from "../common/string/compare";
-import type { LocalizeFunc } from "../common/translations/localize";
 import { deepEqual } from "../common/util/deep-equal";
-import {
-  apiContext,
-  internationalizationContext,
-  statesContext,
-} from "../data/context";
 import type { RelatedResult } from "../data/search";
 import { findRelated } from "../data/search";
 import { haStyleScrollbar } from "../resources/styles";
 import { loadVirtualizer } from "../resources/virtualizer";
+import type { HomeAssistant } from "../types";
 import "./ha-check-list-item";
 import "./ha-expansion-panel";
 import "./ha-list";
@@ -29,20 +22,7 @@ import type { HaInputSearch } from "./input/ha-input-search";

@customElement("ha-filter-entities")
 export class HaFilterEntities extends LitElement {
-  @state()
-  @consumeLocalize()
-  private _localize!: LocalizeFunc;
-
-  @consume({ context: statesContext, subscribe: true })
-  @state()
-  private _states!: ContextType<typeof statesContext>;
-
-  @consume({ context: internationalizationContext, subscribe: true })
-  @state()
-  private _i18n!: ContextType<typeof internationalizationContext>;
-
-  @consume({ context: apiContext, subscribe: true })
-  private _api!: ContextType<typeof apiContext>;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ attribute: false }) public value?: string[];

@@ -82,7 +62,7 @@ export class HaFilterEntities extends LitElement {
        @expanded-changed=${this._expandedChanged}
      >
        <div slot="header" class="header">
-          ${this._localize("ui.panel.config.entities.caption")}
+          ${this.hass.localize("ui.panel.config.entities.caption")}
          ${this.value?.length
            ? html`<div class="badge">${this.value?.length}</div>
                <ha-icon-button
@@ -102,10 +82,9 @@ export class HaFilterEntities extends LitElement {
              <ha-list class="ha-scrollbar" multi>
                <lit-virtualizer
                  .items=${this._entities(
-                    this._states,
+                    this.hass.states,
                    this.type,
                    this._filter || "",
-                    this._i18n.locale.language,
                    this.value
                  )}
                  .keyFunction=${this._keyFunction}
@@ -184,10 +163,9 @@ export class HaFilterEntities extends LitElement {

  private _entities = memoizeOne(
    (
-      states: ContextType<typeof statesContext>,
+      states: HomeAssistant["states"],
      type: this["type"],
      filter: string,
-      language: string | undefined,
      _value
    ) => {
      const values = Object.values(states);
@@ -202,7 +180,11 @@ export class HaFilterEntities extends LitElement {
                .includes(filter))
        )
        .sort((a, b) =>
-          stringCompare(computeStateName(a), computeStateName(b), language)
+          stringCompare(
+            computeStateName(a),
+            computeStateName(b),
+            this.hass.locale.language
+          )
        );
    }
  );
@@ -221,7 +203,7 @@ export class HaFilterEntities extends LitElement {

    for (const entityId of this.value) {
      if (this.type) {
-        relatedPromises.push(findRelated(this._api, "entity", entityId));
+        relatedPromises.push(findRelated(this.hass, "entity", entityId));
      }
    }

--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .18.0
 .16.0