Show diagnostic moisture binary sensors on security dashboard

2026-05-19 15:47:05 +00:00 · 2026-05-19 10:27:23 +03:00
53 changed files with 1404 additions and 1827 deletions
@@ -187,6 +187,7 @@ export class HaAutomationRow extends LitElement {
      flex: 1;
      min-width: 0;
      overflow-wrap: anywhere;
+      margin: 0 var(--ha-space-3);
    }
    ::slotted([slot="header"]) {
      overflow-wrap: anywhere;
@@ -116,7 +116,7 @@ export class HaProgressButton extends LitElement {
      visibility: hidden;
    }

-    :host([appearance="brand"]) ha-svg-icon {
+    ha-svg-icon {
      color: var(--white-color);
    }
  `;
@@ -30,7 +30,6 @@ export class HaSettingsRow extends LitElement {
        <slot name="prefix"></slot>
        <div
          class="body"
-          part="heading"
          ?two-line=${!this.threeLine && hasDescription}
          ?three-line=${this.threeLine}
        >
@@ -1,13 +1,12 @@
 import "@home-assistant/webawesome/dist/components/textarea/textarea";
 import type WaTextarea from "@home-assistant/webawesome/dist/components/textarea/textarea";
 import { HasSlotController } from "@home-assistant/webawesome/dist/internal/slot";
-import type { PropertyValues } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
-import { stopPropagation } from "../common/dom/stop_propagation";
 import { WaInputMixin, waInputStyles } from "./input/wa-input-mixin";
+import { stopPropagation } from "../common/dom/stop_propagation";

 /**
 * Home Assistant textarea component
@@ -85,20 +84,6 @@ export class HaTextArea extends WaInputMixin(LitElement) {
    this.removeEventListener("keydown", stopPropagation);
  }

-  protected override async firstUpdated(
-    changedProperties: PropertyValues<this>
-  ): Promise<void> {
-    super.firstUpdated(changedProperties);
-    if (this.autofocus) {
-      await this._textarea?.updateComplete;
-      this._textarea?.focus();
-    }
-  }
-
-  public override focus(options?: FocusOptions): void {
-    this._textarea?.focus(options);
-  }
-
  protected render() {
    const hasLabelSlot = this.label
      ? false
@@ -95,7 +95,6 @@ export interface TriggerList {

 export interface BaseTrigger {
  alias?: string;
-  comment?: string;
  /** @deprecated Use `trigger` instead */
  platform?: string;
  trigger: string;
@@ -241,7 +240,6 @@ export type Trigger = LegacyTrigger | TriggerList | PlatformTrigger;
 interface BaseCondition {
  condition: string;
  alias?: string;
-  comment?: string;
  enabled?: boolean;
  options?: Record<string, unknown>;
 }
@@ -609,7 +607,6 @@ export interface AutomationClipboard {
 export interface BaseSidebarConfig {
  delete: () => void;
  close: (focus?: boolean) => void;
-  editComment: () => void;
 }

 export interface TriggerSidebarConfig extends BaseSidebarConfig {
@@ -671,7 +668,6 @@ export interface OptionSidebarConfig extends BaseSidebarConfig {
  rename: () => void;
  duplicate: () => void;
  defaultOption?: boolean;
-  comment?: string;
 }

 export interface ScriptFieldSidebarConfig extends BaseSidebarConfig {
@@ -12,7 +12,6 @@ import {

 export interface DeviceAutomation {
  alias?: string;
-  comment?: string;
  device_id: string;
  domain: string;
  entity_id?: string;
@@ -1,15 +1,11 @@
+import { atLeastVersion } from "../../common/config/version";
 import type { HaFormSchema } from "../../components/ha-form/types";
-import type {
-  CallWS,
-  HomeAssistant,
-  HomeAssistantApi,
-  TranslationDict,
-} from "../../types";
+import type { HomeAssistant, TranslationDict } from "../../types";
 import { supervisorApiCall } from "../supervisor/common";
 import type { StoreAddonDetails } from "../supervisor/store";
 import type { Supervisor, SupervisorArch } from "../supervisor/supervisor";
 import type { HassioResponse } from "./common";
-import { extractApiErrorMessage } from "./common";
+import { extractApiErrorMessage, hassioApiResultExtractor } from "./common";

 export type AddonCapability = Exclude<
  keyof TranslationDict["ui"]["panel"]["config"]["apps"]["dashboard"]["capability"],
@@ -147,38 +143,57 @@ export interface HassioAddonSetOptionParams {
 }

 export const reloadHassioAddons = async (hass: HomeAssistant) => {
-  await hass.callWS({
-    type: "supervisor/api",
-    endpoint: "/addons/reload",
-    method: "post",
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: "/addons/reload",
+      method: "post",
+    });
+    return;
+  }
+  await hass.callApi<HassioResponse<void>>("POST", `hassio/addons/reload`);
 };

 export const fetchHassioAddonsInfo = async (
  hass: HomeAssistant
 ): Promise<HassioAddonsInfo> => {
-  return hass.callWS({
-    type: "supervisor/api",
-    endpoint: "/addons",
-    method: "get",
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    return hass.callWS({
+      type: "supervisor/api",
+      endpoint: "/addons",
+      method: "get",
+    });
+  }
+
+  return hassioApiResultExtractor(
+    await hass.callApi<HassioResponse<HassioAddonsInfo>>("GET", `hassio/addons`)
+  );
 };

 export const fetchHassioAddonInfo = async (
-  callWS: CallWS,
+  hass: HomeAssistant,
  slug: string
 ): Promise<HassioAddonDetails> => {
-  return callWS({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/info`,
-    method: "get",
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    return hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/info`,
+      method: "get",
+    });
+  }
+
+  return hassioApiResultExtractor(
+    await hass.callApi<HassioResponse<HassioAddonDetails>>(
+      "GET",
+      `hassio/addons/${slug}/info`
+    )
+  );
 };

 export const fetchHassioAddonChangelog = async (
-  api: HomeAssistantApi,
+  hass: HomeAssistant,
  slug: string
-) => api.callApi<string>("GET", `hassio/addons/${slug}/changelog`);
+) => hass.callApi<string>("GET", `hassio/addons/${slug}/changelog`);

 export const fetchHassioAddonLogs = async (hass: HomeAssistant, slug: string) =>
  hass.callApi<string>("GET", `hassio/addons/${slug}/logs`);
@@ -189,77 +204,119 @@ export const fetchHassioAddonDocumentation = async (
 ) => hass.callApi<string>("GET", `hassio/addons/${slug}/documentation`);

 export const setHassioAddonOption = async (
-  callWS: CallWS,
+  hass: HomeAssistant,
  slug: string,
  data: HassioAddonSetOptionParams
 ) => {
-  const response = await callWS<HassioResponse<any>>({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/options`,
-    method: "post",
-    data,
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    const response = await hass.callWS<HassioResponse<any>>({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/options`,
+      method: "post",
+      data,
+    });

-  if (response.result === "error") {
-    throw Error(extractApiErrorMessage(response));
+    if (response.result === "error") {
+      throw Error(extractApiErrorMessage(response));
+    }
+    return response;
  }
-  return response;
+
+  return hass.callApi<HassioResponse<any>>(
+    "POST",
+    `hassio/addons/${slug}/options`,
+    data
+  );
 };

 export const validateHassioAddonOption = async (
-  callWS: CallWS,
+  hass: HomeAssistant,
  slug: string,
  data?: any
 ): Promise<{ message: string; valid: boolean }> => {
-  return callWS({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/options/validate`,
-    method: "post",
-    data,
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    return hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/options/validate`,
+      method: "post",
+      data,
+    });
+  }
+
+  return (
+    await hass.callApi<HassioResponse<{ message: string; valid: boolean }>>(
+      "POST",
+      `hassio/addons/${slug}/options/validate`
+    )
+  ).data;
 };

-export const startHassioAddon = async (callWS: CallWS, slug: string) => {
-  return callWS({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/start`,
-    method: "post",
-    timeout: null,
-  });
+export const startHassioAddon = async (hass: HomeAssistant, slug: string) => {
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    return hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/start`,
+      method: "post",
+      timeout: null,
+    });
+  }
+
+  return hass.callApi<string>("POST", `hassio/addons/${slug}/start`);
 };

-export const stopHassioAddon = async (callWS: CallWS, slug: string) => {
-  return callWS({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/stop`,
-    method: "post",
-    timeout: null,
-  });
+export const stopHassioAddon = async (hass: HomeAssistant, slug: string) => {
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    return hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/stop`,
+      method: "post",
+      timeout: null,
+    });
+  }
+
+  return hass.callApi<string>("POST", `hassio/addons/${slug}/stop`);
 };

 export const setHassioAddonSecurity = async (
-  callWS: CallWS,
+  hass: HomeAssistant,
  slug: string,
  data: HassioAddonSetSecurityParams
 ) => {
-  await callWS({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/security`,
-    method: "post",
-    data,
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/security`,
+      method: "post",
+      data,
+    });
+    return;
+  }
+
+  await hass.callApi<HassioResponse<void>>(
+    "POST",
+    `hassio/addons/${slug}/security`,
+    data
+  );
 };

 export const installHassioAddon = async (
-  callWS: CallWS,
+  hass: HomeAssistant,
  slug: string
 ): Promise<void> => {
-  await callWS({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/install`,
-    method: "post",
-    timeout: null,
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/install`,
+      method: "post",
+      timeout: null,
+    });
+    return;
+  }
+
+  await hass.callApi<HassioResponse<void>>(
+    "POST",
+    `hassio/addons/${slug}/install`
+  );
 };

 export const updateHassioAddon = async (
@@ -267,37 +324,74 @@ export const updateHassioAddon = async (
  slug: string,
  backup: boolean
 ): Promise<void> => {
-  await hass.callWS({
-    type: "hassio/update/addon",
-    addon: slug,
-    backup: backup,
-  });
+  if (atLeastVersion(hass.config.version, 2025, 2, 0)) {
+    await hass.callWS({
+      type: "hassio/update/addon",
+      addon: slug,
+      backup: backup,
+    });
+    return;
+  }
+
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/store/addons/${slug}/update`,
+      method: "post",
+      timeout: null,
+      data: { backup },
+    });
+    return;
+  }
+
+  await hass.callApi<HassioResponse<void>>(
+    "POST",
+    `hassio/addons/${slug}/update`,
+    { backup }
+  );
 };

 export const restartHassioAddon = async (
-  callWS: CallWS,
+  hass: HomeAssistant,
  slug: string
 ): Promise<void> => {
-  await callWS({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/restart`,
-    method: "post",
-    timeout: null,
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/restart`,
+      method: "post",
+      timeout: null,
+    });
+    return;
+  }
+
+  await hass.callApi<HassioResponse<void>>(
+    "POST",
+    `hassio/addons/${slug}/restart`
+  );
 };

 export const uninstallHassioAddon = async (
-  callWS: CallWS,
+  hass: HomeAssistant,
  slug: string,
  removeData: boolean
 ): Promise<void> => {
-  await callWS({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/uninstall`,
-    method: "post",
-    timeout: null,
-    data: { remove_config: removeData },
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    await hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/uninstall`,
+      method: "post",
+      timeout: null,
+      data: { remove_config: removeData },
+    });
+    return;
+  }
+
+  await hass.callApi<HassioResponse<void>>(
+    "POST",
+    `hassio/addons/${slug}/uninstall`,
+    { remove_config: removeData }
+  );
 };

 export const fetchAddonInfo = (
@@ -313,13 +407,21 @@ export const fetchAddonInfo = (
  );

 export const rebuildLocalAddon = async (
-  callWS: CallWS,
+  hass: HomeAssistant,
  slug: string
 ): Promise<void> => {
-  return callWS<undefined>({
-    type: "supervisor/api",
-    endpoint: `/addons/${slug}/rebuild`,
-    method: "post",
-    timeout: null,
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    return hass.callWS<undefined>({
+      type: "supervisor/api",
+      endpoint: `/addons/${slug}/rebuild`,
+      method: "post",
+      timeout: null,
+    });
+  }
+  return (
+    await hass.callApi<HassioResponse<void>>(
+      "POST",
+      `hassio/addons/${slug}rebuild`
+    )
+  ).data;
 };
@@ -1,4 +1,5 @@
-import type { CallWS } from "../../types";
+import { atLeastVersion } from "../../common/config/version";
+import type { HomeAssistant } from "../../types";

 export interface HassioResponse<T> {
  data: T;
@@ -45,12 +46,21 @@ export const ignoreSupervisorError = (error): boolean => {
 };

 export const fetchHassioStats = async (
-  callWS: CallWS,
+  hass: HomeAssistant,
  container: string
 ): Promise<HassioStats> => {
-  return callWS({
-    type: "supervisor/api",
-    endpoint: `/${container}/stats`,
-    method: "get",
-  });
+  if (atLeastVersion(hass.config.version, 2021, 2, 4)) {
+    return hass.callWS({
+      type: "supervisor/api",
+      endpoint: `/${container}/stats`,
+      method: "get",
+    });
+  }
+
+  return hassioApiResultExtractor(
+    await hass.callApi<HassioResponse<HassioStats>>(
+      "GET",
+      `hassio/${container}/stats`
+    )
+  );
 };
@@ -36,7 +36,6 @@ export const isMaxMode = arrayLiteralIncludes(MODES_MAX);

 export const baseActionStruct = object({
  alias: optional(string()),
-  comment: optional(string()),
  continue_on_error: optional(boolean()),
  enabled: optional(boolean()),
 });
@@ -106,7 +105,6 @@ export interface Field {

 interface BaseAction {
  alias?: string;
-  comment?: string;
  continue_on_error?: boolean;
  enabled?: boolean;
 }
@@ -197,7 +195,6 @@ export interface ForEachRepeat extends BaseRepeat {

 export interface Option {
  alias?: string;
-  comment?: string;
  conditions: string | Condition[];
  sequence: Action | Action[];
 }
@@ -9,7 +9,6 @@ import "../../components/ha-dialog";
 import "../../components/ha-dialog-footer";
 import "../../components/ha-dialog-header";
 import "../../components/ha-svg-icon";
-import "../../components/ha-textarea";
 import "../../components/input/ha-input";
 import type { HaInput } from "../../components/input/ha-input";
 import type { HomeAssistant } from "../../types";
@@ -29,7 +28,7 @@ class DialogBox extends LitElement {

  @state() private _validInput = true;

-  @query("ha-input, ha-textarea") private _textField?: HaInput;
+  @query("ha-input") private _textField?: HaInput;

  private _closePromise?: Promise<void>;

@@ -110,7 +109,7 @@ class DialogBox extends LitElement {
        </ha-dialog-header>
        <div id="dialog-box-description">
          ${this._params.text ? html` <p>${this._params.text}</p> ` : ""}
-          ${this._params.prompt && !this._params.multiline
+          ${this._params.prompt
            ? html`
                <ha-input
                  autofocus
@@ -132,19 +131,7 @@ class DialogBox extends LitElement {
                    : nothing}
                </ha-input>
              `
-            : this._params.prompt && this._params.multiline
-              ? html`
-                  <ha-textarea
-                    resize="auto"
-                    autofocus
-                    .value=${this._params.defaultValue}
-                    .placeholder=${this._params.placeholder}
-                    .label=${this._params.inputLabel}
-                    .disabled=${this._loading}
-                    @input=${this._validateInput}
-                  ></ha-textarea>
-                `
-              : nothing}
+            : nothing}
        </div>
        <ha-dialog-footer slot="footer">
          ${confirmPrompt
@@ -33,7 +33,6 @@ export interface PromptDialogParams extends BaseDialogBoxParams {
  inputMin?: number | string;
  inputMax?: number | string;
  action?: (value?: string) => Promise<void>;
-  multiline?: boolean;
 }

 export interface DialogBoxParams
@@ -199,13 +199,13 @@ export class HaVoiceAssistantSetupStepLocal extends LitElement {
          this._detailState = this.hass.localize(
            `ui.panel.config.voice_assistants.satellite_wizard.local.state.installing_${this._ttsProviderName}`
          );
-          await installHassioAddon(this.hass.callWS, this._ttsAddonName);
+          await installHassioAddon(this.hass, this._ttsAddonName);
        }
        if (!ttsAddon || ttsAddon.state !== "started") {
          this._detailState = this.hass.localize(
            `ui.panel.config.voice_assistants.satellite_wizard.local.state.starting_${this._ttsProviderName}`
          );
-          await startHassioAddon(this.hass.callWS, this._ttsAddonName);
+          await startHassioAddon(this.hass, this._ttsAddonName);
        }
        this._detailState = this.hass.localize(
          `ui.panel.config.voice_assistants.satellite_wizard.local.state.setup_${this._ttsProviderName}`
@@ -217,13 +217,13 @@ export class HaVoiceAssistantSetupStepLocal extends LitElement {
          this._detailState = this.hass.localize(
            `ui.panel.config.voice_assistants.satellite_wizard.local.state.installing_${this._sttProviderName}`
          );
-          await installHassioAddon(this.hass.callWS, this._sttAddonName);
+          await installHassioAddon(this.hass, this._sttAddonName);
        }
        if (!sttAddon || sttAddon.state !== "started") {
          this._detailState = this.hass.localize(
            `ui.panel.config.voice_assistants.satellite_wizard.local.state.starting_${this._sttProviderName}`
          );
-          await startHassioAddon(this.hass.callWS, this._sttAddonName);
+          await startHassioAddon(this.hass, this._sttAddonName);
        }
        this._detailState = this.hass.localize(
          `ui.panel.config.voice_assistants.satellite_wizard.local.state.setup_${this._sttProviderName}`
@@ -213,7 +213,7 @@ class HaPanelApp extends LitElement {
    let addon: HassioAddonDetails;

    try {
-      addon = await fetchHassioAddonInfo(this.hass.callWS, addonSlug);
+      addon = await fetchHassioAddonInfo(this.hass, addonSlug);
    } catch (err: any) {
      await this._showErrorAndNavigateHome(
        addonSlug,
@@ -253,7 +253,7 @@ class HaPanelApp extends LitElement {
          );
          // Set auto-retry window for after starting the app
          this._autoRetryUntil = Date.now() + START_WAIT_TIME;
-          await startHassioAddon(this.hass.callWS, addonSlug);
+          await startHassioAddon(this.hass, addonSlug);
          this._fetchData(addonSlug);
          return;
        } catch (_err) {
@@ -3,7 +3,7 @@ import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import "../../../../../components/ha-bar";
-import "../../../../../components/item/ha-row-item";
+import "../../../../../components/ha-settings-row";
 import { roundWithOneDecimal } from "../../../../../util/calculate";

@customElement("supervisor-app-metric")
@@ -16,9 +16,9 @@ class SupervisorAppMetric extends LitElement {

  protected render(): TemplateResult {
    const roundedValue = roundWithOneDecimal(this.value);
-    return html`<ha-row-item empty>
-      <span slot="headline"> ${this.description} </span>
-      <div slot="supporting-text" .title=${this.tooltip ?? ""}>
+    return html`<ha-settings-row empty>
+      <span slot="heading"> ${this.description} </span>
+      <div slot="description" .title=${this.tooltip ?? ""}>
        <span class="value"> ${roundedValue} % </span>
        <ha-bar
          class=${classMap({
@@ -28,14 +28,16 @@ class SupervisorAppMetric extends LitElement {
          .value=${this.value}
        ></ha-bar>
      </div>
-    </ha-row-item>`;
+    </ha-settings-row>`;
  }

  static styles = css`
-    ha-row-item {
+    ha-settings-row {
+      padding: 0;
+      height: 54px;
      width: 100%;
    }
-    ha-row-item > div[slot="supporting-text"] {
+    ha-settings-row > div[slot="description"] {
      white-space: normal;
      color: var(--secondary-text-color);
      display: flex;
@@ -0,0 +1,283 @@
+import {
+  css,
+  type CSSResultGroup,
+  html,
+  LitElement,
+  nothing,
+  type PropertyValues,
+} from "lit";
+import { customElement, property, state } from "lit/decorators";
+import { atLeastVersion } from "../../../../../common/config/version";
+import { fireEvent } from "../../../../../common/dom/fire_event";
+import "../../../../../components/buttons/ha-progress-button";
+import "../../../../../components/ha-alert";
+import "../../../../../components/ha-button";
+import "../../../../../components/ha-card";
+import "../../../../../components/ha-faded";
+import "../../../../../components/ha-markdown";
+import "../../../../../components/ha-spinner";
+import "../../../../../components/ha-switch";
+import type { HaSwitch } from "../../../../../components/ha-switch";
+import "../../../../../components/item/ha-row-item";
+import type { HassioAddonDetails } from "../../../../../data/hassio/addon";
+import {
+  fetchHassioAddonChangelog,
+  updateHassioAddon,
+} from "../../../../../data/hassio/addon";
+import {
+  extractApiErrorMessage,
+  ignoreSupervisorError,
+} from "../../../../../data/hassio/common";
+import { haStyle } from "../../../../../resources/styles";
+import type { HomeAssistant } from "../../../../../types";
+import { extractChangelog } from "../util/supervisor-app";
+
+declare global {
+  interface HASSDomEvents {
+    "update-complete": undefined;
+  }
+}
+
+@customElement("supervisor-app-update-available-card")
+class SupervisorAppUpdateAvailableCard extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property({ type: Boolean }) public narrow = false;
+
+  @property({ attribute: false }) public addon!: HassioAddonDetails;
+
+  @state() private _changelogContent?: string;
+
+  @state() private _updating = false;
+
+  @state() private _error?: string;
+
+  protected render() {
+    if (!this.addon) {
+      return nothing;
+    }
+
+    const createBackupTexts = this._computeCreateBackupTexts();
+
+    return html`
+      <ha-card
+        outlined
+        .header=${this.hass.localize(
+          "ui.panel.config.apps.dashboard.update_available.update_name",
+          {
+            name: this.addon.name,
+          }
+        )}
+      >
+        <div class="card-content">
+          ${this._error
+            ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+            : ""}
+          ${this.addon.version === this.addon.version_latest
+            ? html`<p>
+                ${this.hass.localize(
+                  "ui.panel.config.apps.dashboard.update_available.no_update",
+                  {
+                    name: this.addon.name,
+                  }
+                )}
+              </p>`
+            : !this._updating
+              ? html`
+                  ${this._changelogContent
+                    ? html`
+                        <ha-faded>
+                          <ha-markdown .content=${this._changelogContent}>
+                          </ha-markdown>
+                        </ha-faded>
+                      `
+                    : nothing}
+                  <div class="versions">
+                    <p>
+                      ${this.hass.localize(
+                        "ui.panel.config.apps.dashboard.update_available.description",
+                        {
+                          name: this.addon.name,
+                          version: this.addon.version,
+                          newest_version: this.addon.version_latest,
+                        }
+                      )}
+                    </p>
+                  </div>
+                  ${createBackupTexts
+                    ? html`
+                        <hr />
+                        <ha-row-item>
+                          <span slot="headline">
+                            ${createBackupTexts.title}
+                          </span>
+
+                          ${createBackupTexts.description
+                            ? html`
+                                <span slot="supporting-text">
+                                  ${createBackupTexts.description}
+                                </span>
+                              `
+                            : nothing}
+                          <ha-switch slot="end" id="create-backup"></ha-switch>
+                        </ha-row-item>
+                      `
+                    : nothing}
+                `
+              : html`<ha-spinner
+                    aria-label="Updating"
+                    size="large"
+                  ></ha-spinner>
+                  <p class="progress-text">
+                    ${this.hass.localize(
+                      "ui.panel.config.apps.dashboard.update_available.updating",
+                      {
+                        name: this.addon.name,
+                        version: this.addon.version_latest,
+                      }
+                    )}
+                  </p>`}
+        </div>
+        ${this.addon.version !== this.addon.version_latest && !this._updating
+          ? html`
+              <div class="card-actions">
+                <span></span>
+                <ha-progress-button @click=${this._update}>
+                  ${this.hass.localize("ui.common.update")}
+                </ha-progress-button>
+              </div>
+            `
+          : nothing}
+      </ha-card>
+    `;
+  }
+
+  protected firstUpdated(changedProps: PropertyValues<this>) {
+    super.firstUpdated(changedProps);
+    this._loadAddonData();
+  }
+
+  private _computeCreateBackupTexts():
+    | { title: string; description?: string }
+    | undefined {
+    if (atLeastVersion(this.hass.config.version, 2025, 2, 0)) {
+      const version = this.addon.version;
+      return {
+        title: this.hass.localize(
+          "ui.panel.config.apps.dashboard.update_available.create_backup.app"
+        ),
+        description: this.hass.localize(
+          "ui.panel.config.apps.dashboard.update_available.create_backup.app_description",
+          { version: version }
+        ),
+      };
+    }
+
+    return {
+      title: this.hass.localize(
+        "ui.panel.config.apps.dashboard.update_available.create_backup.generic"
+      ),
+    };
+  }
+
+  get _shouldCreateBackup(): boolean {
+    const createBackupSwitch = this.shadowRoot?.getElementById(
+      "create-backup"
+    ) as HaSwitch;
+    if (createBackupSwitch) {
+      return createBackupSwitch.checked;
+    }
+    return true;
+  }
+
+  private async _loadAddonData() {
+    if (this.addon.changelog) {
+      try {
+        const content = await fetchHassioAddonChangelog(
+          this.hass,
+          this.addon.slug
+        );
+        this._changelogContent = extractChangelog(
+          this.addon as HassioAddonDetails,
+          content
+        );
+      } catch (err) {
+        this._error = extractApiErrorMessage(err);
+      }
+    }
+  }
+
+  private async _update() {
+    this._error = undefined;
+    this._updating = true;
+
+    try {
+      await updateHassioAddon(
+        this.hass,
+        this.addon.slug,
+        this._shouldCreateBackup
+      );
+    } catch (err: any) {
+      if (this.hass.connection.connected && !ignoreSupervisorError(err)) {
+        this._error = extractApiErrorMessage(err);
+        this._updating = false;
+        return;
+      }
+    }
+    fireEvent(this, "update-complete");
+    this._updating = false;
+  }
+
+  static get styles(): CSSResultGroup {
+    return [
+      haStyle,
+      css`
+        :host {
+          display: block;
+        }
+        ha-card {
+          margin: auto;
+        }
+        a {
+          text-decoration: none;
+          color: var(--primary-text-color);
+        }
+        .card-actions {
+          display: flex;
+          justify-content: space-between;
+        }
+
+        ha-spinner {
+          display: block;
+          margin: 32px;
+          text-align: center;
+        }
+
+        .progress-text {
+          text-align: center;
+        }
+
+        ha-markdown {
+          padding-bottom: var(--ha-space-2);
+        }
+
+        hr {
+          border-color: var(--divider-color);
+          border-bottom: none;
+          margin: var(--ha-space-4) 0 0 0;
+        }
+
+        ha-row-item {
+          --ha-row-item-padding-inline: 0;
+          margin-bottom: calc(-1 * var(--ha-space-4));
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "supervisor-app-update-available-card": SupervisorAppUpdateAvailableCard;
+  }
+}
@@ -183,7 +183,7 @@ class SupervisorAppAudio extends LitElement {
        this._selectedOutput === "default" ? null : this._selectedOutput,
    };
    try {
-      await setHassioAddonOption(this.hass.callWS, this.addon.slug, data);
+      await setHassioAddonOption(this.hass, this.addon.slug, data);
      if (this.addon?.state === "started") {
        await suggestSupervisorAppRestart(this, this.hass, this.addon);
      }
@@ -449,7 +449,7 @@ class SupervisorAppConfig extends LitElement {
      options: null,
    };
    try {
-      await setHassioAddonOption(this.hass.callWS, this.addon.slug, data);
+      await setHassioAddonOption(this.hass, this.addon.slug, data);
      this._configHasChanged = false;
      const eventdata = {
        success: true,
@@ -488,14 +488,14 @@ class SupervisorAppConfig extends LitElement {

    try {
      const validation = await validateHassioAddonOption(
-        this.hass.callWS,
+        this.hass,
        this.addon.slug,
        options
      );
      if (!validation.valid) {
        throw Error(validation.message);
      }
-      await setHassioAddonOption(this.hass.callWS, this.addon.slug, {
+      await setHassioAddonOption(this.hass, this.addon.slug, {
        options,
      });

@@ -6,9 +6,9 @@ import { fireEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/buttons/ha-progress-button";
 import "../../../../../components/ha-alert";
 import "../../../../../components/ha-card";
+import "../../../../../components/ha-formfield";
 import "../../../../../components/ha-form/ha-form";
 import type { HaFormSchema } from "../../../../../components/ha-form/types";
-import "../../../../../components/ha-formfield";
 import type {
  HassioAddonDetails,
  HassioAddonSetOptionParams,
@@ -17,8 +17,8 @@ import { setHassioAddonOption } from "../../../../../data/hassio/addon";
 import { extractApiErrorMessage } from "../../../../../data/hassio/common";
 import { haStyle } from "../../../../../resources/styles";
 import type { HomeAssistant } from "../../../../../types";
-import { supervisorAppsStyle } from "../../resources/supervisor-apps-style";
 import { suggestSupervisorAppRestart } from "../dialogs/suggestSupervisorAppRestart";
+import { supervisorAppsStyle } from "../../resources/supervisor-apps-style";

@customElement("supervisor-app-network")
 class SupervisorAppNetwork extends LitElement {
@@ -160,7 +160,7 @@ class SupervisorAppNetwork extends LitElement {
    };

    try {
-      await setHassioAddonOption(this.hass.callWS, this.addon.slug, data);
+      await setHassioAddonOption(this.hass, this.addon.slug, data);
      this._configHasChanged = false;
      const eventdata = {
        success: true,
@@ -205,7 +205,7 @@ class SupervisorAppNetwork extends LitElement {
    };

    try {
-      await setHassioAddonOption(this.hass.callWS, this.addon.slug, data);
+      await setHassioAddonOption(this.hass, this.addon.slug, data);
      this._configHasChanged = false;
      const eventdata = {
        success: true,
@@ -28,7 +28,7 @@ export const suggestSupervisorAppRestart = async (
  });
  if (confirmed) {
    try {
-      await restartHassioAddon(hass.callWS, addon.slug);
+      await restartHassioAddon(hass, addon.slug);
    } catch (err: any) {
      showAlertDialog(element, {
        title: hass.localize(
@@ -46,8 +46,8 @@ class SupervisorAppInfoDashboard extends LitElement {
      css`
        .content {
          margin: auto;
-          padding: var(--ha-space-4);
-          max-width: 1200px;
+          padding: var(--ha-space-2);
+          max-width: 1024px;
        }
      `,
    ];
@@ -1,19 +1,16 @@
-import { consume, type ContextType } from "@lit/context";
 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 { fireEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-alert";
 import "../../../../../components/ha-button";
-import { internationalizationContext } from "../../../../../data/context";
+import type { HomeAssistant } from "../../../../../types";

@customElement("supervisor-app-system-managed")
 class SupervisorAppSystemManaged extends LitElement {
  @property({ type: Boolean }) public narrow = false;

-  @state()
-  @consume({ context: internationalizationContext, subscribe: true })
-  private i18n!: ContextType<typeof internationalizationContext>;
+  @property({ attribute: false }) public hass!: HomeAssistant;

  @property({ type: Boolean, attribute: "hide-button" }) public hideButton =
    false;
@@ -22,18 +19,18 @@ class SupervisorAppSystemManaged extends LitElement {
    return html`
      <ha-alert
        alert-type="warning"
-        .title=${this.i18n.localize(
+        .title=${this.hass.localize(
          "ui.panel.config.apps.dashboard.system_managed.title"
        )}
        .narrow=${this.narrow}
      >
-        ${this.i18n.localize(
+        ${this.hass.localize(
          "ui.panel.config.apps.dashboard.system_managed.description"
        )}
        ${!this.hideButton
          ? html`
              <ha-button slot="action" @click=${this._takeControl}>
-                ${this.i18n.localize(
+                ${this.hass.localize(
                  "ui.panel.config.apps.dashboard.system_managed.take_control"
                )}
              </ha-button>
@@ -161,7 +161,7 @@ class HaConfigAppDashboard extends LitElement {
    }

    try {
-      this._addon = await fetchHassioAddonInfo(this.hass.callWS, slug);
+      this._addon = await fetchHassioAddonInfo(this.hass, slug);
    } catch (err: any) {
      if (repositoryUrl) {
        try {
@@ -210,7 +210,7 @@ class HaConfigAppDashboard extends LitElement {
    }

    await addStoreRepository(this.hass, repositoryUrl);
-    this._addon = await fetchHassioAddonInfo(this.hass.callWS, slug);
+    this._addon = await fetchHassioAddonInfo(this.hass, slug);
  }

  private async _apiCalled(ev): Promise<void> {
@@ -107,7 +107,6 @@ export default class HaAutomationActionEditor extends LitElement {
    ev.stopPropagation();
    const value = {
      ...(this.action.alias ? { alias: this.action.alias } : {}),
-      ...(this.action.comment ? { comment: this.action.comment } : {}),
      ...ev.detail.value,
    };
    fireEvent(this, "value-changed", { value });
@@ -7,8 +7,6 @@ import {
  mdiArrowUp,
  mdiCheckboxBlankOutline,
  mdiCheckboxOutline,
-  mdiCommentEditOutline,
-  mdiCommentTextOutline,
  mdiContentCopy,
  mdiContentCut,
  mdiContentPaste,
@@ -296,13 +294,6 @@ export default class HaAutomationActionRow extends LitElement {
            ?.target
        : undefined;

-    const trimmedComment = this.action.comment?.trim() || "";
-    const commentTooltipText = !trimmedComment
-      ? ""
-      : trimmedComment.length > 250
-        ? `${trimmedComment.substring(0, 250)}...`
-        : trimmedComment;
-
    return html`
      ${type === "service" && "action" in this.action && this.action.action
        ? html`
@@ -338,21 +329,6 @@ export default class HaAutomationActionRow extends LitElement {
              serviceTargetSpec
            )
          : nothing}
-        ${commentTooltipText
-          ? html`
-              <ha-svg-icon
-                id="comment-icon"
-                .path=${mdiCommentTextOutline}
-                .label=${this.hass.localize(
-                  "ui.panel.config.automation.editor.comment.label"
-                )}
-                class="comment-indicator"
-              ></ha-svg-icon
-              ><ha-tooltip for="comment-icon"
-                ><p>${commentTooltipText}</p></ha-tooltip
-              >
-            `
-          : nothing}
        ${type !== "condition" &&
        (this.action as NonConditionAction).continue_on_error === true
          ? html`<ha-svg-icon
@@ -408,14 +384,6 @@ export default class HaAutomationActionRow extends LitElement {
            )
          )}
        </ha-dropdown-item>
-        <ha-dropdown-item value="edit_comment">
-          <ha-svg-icon slot="icon" .path=${mdiCommentEditOutline}></ha-svg-icon>
-          ${this._renderOverflowLabel(
-            this.hass.localize(
-              `ui.panel.config.automation.editor.comment.${this.action.comment ? "edit" : "add"}`
-            )
-          )}
-        </ha-dropdown-item>
        <wa-divider></wa-divider>
        <ha-dropdown-item value="duplicate" .disabled=${this.disabled}>
          <ha-svg-icon
@@ -942,38 +910,6 @@ export default class HaAutomationActionRow extends LitElement {
    }
  };

-  private _editCommentAction = async (): Promise<void> => {
-    const comment = await showPromptDialog(this, {
-      title: this.hass.localize(
-        `ui.panel.config.automation.editor.comment.${this.action.comment ? "edit" : "add"}`
-      ),
-      inputLabel: this.hass.localize(
-        "ui.panel.config.automation.editor.comment.label"
-      ),
-      inputType: "string",
-      defaultValue: this.action.comment,
-      confirmText: this.hass.localize("ui.common.submit"),
-      multiline: true,
-    });
-    if (comment !== null) {
-      const value = { ...this.action };
-      if (comment === "") {
-        delete value.comment;
-      } else {
-        value.comment = comment;
-      }
-      fireEvent(this, "value-changed", {
-        value,
-      });
-
-      if (this._selected && this.optionsInSidebar) {
-        this.openSidebar(value); // refresh sidebar
-      } else if (this._yamlMode) {
-        this._actionEditor?.yamlEditor?.setValue(value);
-      }
-    }
-  };
-
  private _duplicateAction = () => {
    fireEvent(this, "duplicate");
  };
@@ -1090,7 +1026,6 @@ export default class HaAutomationActionRow extends LitElement {
      rename: () => {
        this._renameAction();
      },
-      editComment: this._editCommentAction,
      toggleYamlMode: () => {
        this._toggleYamlMode();
        this.openSidebar();
@@ -1186,9 +1121,6 @@ export default class HaAutomationActionRow extends LitElement {
      case "rename":
        this._renameAction();
        break;
-      case "edit_comment":
-        this._editCommentAction();
-        break;
      case "duplicate":
        this._duplicateAction();
        break;
@@ -186,10 +186,6 @@ export class HaDeviceAction extends LitElement {
  }

  static styles = css`
-    :host {
-      display: block;
-      margin-bottom: var(--ha-space-3);
-    }
    ha-device-picker {
      display: block;
      margin-bottom: 24px;
@@ -123,7 +123,6 @@ export default class HaAutomationConditionEditor extends LitElement {
    ev.stopPropagation();
    const value = {
      ...(this.condition.alias ? { alias: this.condition.alias } : {}),
-      ...(this.condition.comment ? { comment: this.condition.comment } : {}),
      ...ev.detail.value,
    };
    fireEvent(this, "value-changed", { value });
@@ -4,8 +4,6 @@ import {
  mdiAppleKeyboardCommand,
  mdiArrowDown,
  mdiArrowUp,
-  mdiCommentEditOutline,
-  mdiCommentTextOutline,
  mdiContentCopy,
  mdiContentCut,
  mdiContentPaste,
@@ -202,13 +200,6 @@ export default class HaAutomationConditionRow extends LitElement {
    const conditionTargetSpec =
      this.conditionDescriptions[this.condition.condition]?.target;

-    const trimmedComment = this.condition.comment?.trim() || "";
-    const commentTooltipText = !trimmedComment
-      ? ""
-      : trimmedComment.length > 250
-        ? `${trimmedComment.substring(0, 250)}...`
-        : trimmedComment;
-
    return html`
      <ha-condition-icon
        slot="leading-icon"
@@ -226,21 +217,6 @@ export default class HaAutomationConditionRow extends LitElement {
              conditionTargetSpec
            )
          : nothing}
-        ${this.condition.comment?.trim()
-          ? html`
-              <ha-svg-icon
-                id="comment-icon"
-                .path=${mdiCommentTextOutline}
-                .label=${this.hass.localize(
-                  "ui.panel.config.automation.editor.comment.label"
-                )}
-                class="comment-indicator"
-              ></ha-svg-icon>
-              <ha-tooltip for="comment-icon"
-                ><p>${commentTooltipText}</p></ha-tooltip
-              >
-            `
-          : nothing}
      </h3>
      <ha-automation-row-event-chip
        .show=${this._testing}
@@ -288,14 +264,6 @@ export default class HaAutomationConditionRow extends LitElement {
            )
          )}
        </ha-dropdown-item>
-        <ha-dropdown-item value="edit_comment">
-          <ha-svg-icon slot="icon" .path=${mdiCommentEditOutline}></ha-svg-icon>
-          ${this._renderOverflowLabel(
-            this.hass.localize(
-              `ui.panel.config.automation.editor.comment.${this.condition.comment ? "edit" : "add"}`
-            )
-          )}
-        </ha-dropdown-item>

        <wa-divider></wa-divider>

@@ -845,38 +813,6 @@ export default class HaAutomationConditionRow extends LitElement {
    }
  };

-  private _editCommentCondition = async (): Promise<void> => {
-    const comment = await showPromptDialog(this, {
-      title: this.hass.localize(
-        `ui.panel.config.automation.editor.comment.${this.condition.comment ? "edit" : "add"}`
-      ),
-      inputLabel: this.hass.localize(
-        "ui.panel.config.automation.editor.comment.label"
-      ),
-      inputType: "string",
-      defaultValue: this.condition.comment,
-      confirmText: this.hass.localize("ui.common.submit"),
-      multiline: true,
-    });
-    if (comment !== null) {
-      const value = { ...this.condition };
-      if (comment === "") {
-        delete value.comment;
-      } else {
-        value.comment = comment;
-      }
-      fireEvent(this, "value-changed", {
-        value,
-      });
-
-      if (this._selected && this.optionsInSidebar) {
-        this.openSidebar(value); // refresh sidebar
-      } else if (this._yamlMode) {
-        this.conditionEditor?.yamlEditor?.setValue(value);
-      }
-    }
-  };
-
  private _duplicateCondition = () => {
    fireEvent(this, "duplicate");
  };
@@ -1018,7 +954,6 @@ export default class HaAutomationConditionRow extends LitElement {
      rename: () => {
        this._renameCondition();
      },
-      editComment: this._editCommentCondition,
      toggleYamlMode: () => {
        this._toggleYamlMode();
        this.openSidebar();
@@ -1090,9 +1025,6 @@ export default class HaAutomationConditionRow extends LitElement {
      case "rename":
        this._renameCondition();
        break;
-      case "edit_comment":
-        this._editCommentCondition();
-        break;
      case "duplicate":
        this._duplicateCondition();
        break;
@@ -188,10 +188,6 @@ export class HaDeviceCondition extends LitElement {
  }

  static styles = css`
-    :host {
-      display: block;
-      margin-bottom: var(--ha-space-3);
-    }
    ha-device-picker {
      display: block;
      margin-bottom: 24px;
@@ -1,5 +1,5 @@
 import type { PropertyValues } from "lit";
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import {
@@ -22,7 +22,6 @@ import type { HomeAssistant } from "../../../../../types";

 const numericStateConditionStruct = object({
  alias: optional(string()),
-  comment: optional(string()),
  condition: literal("numeric_state"),
  entity_id: optional(string()),
  attribute: optional(string()),
@@ -256,13 +255,6 @@ export default class HaNumericStateCondition extends LitElement {
        );
    }
  };
-
-  static styles = css`
-    :host {
-      display: block;
-      margin-bottom: var(--ha-space-3);
-    }
-  `;
 }

 declare global {
@@ -1,8 +1,7 @@
 import type { PropertyValues } from "lit";
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import {
-  array,
  assert,
  boolean,
  literal,
@@ -11,9 +10,10 @@ import {
  optional,
  string,
  union,
+  array,
 } from "superstruct";
-import { ensureArray } from "../../../../../common/array/ensure-array";
 import { createDurationData } from "../../../../../common/datetime/create_duration_data";
+import { ensureArray } from "../../../../../common/array/ensure-array";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import "../../../../../components/ha-form/ha-form";
 import type { SchemaUnion } from "../../../../../components/ha-form/types";
@@ -25,7 +25,6 @@ import type { ConditionElement } from "../ha-automation-condition-row";

 const stateConditionStruct = object({
  alias: optional(string()),
-  comment: optional(string()),
  condition: literal("state"),
  entity_id: optional(string()),
  attribute: optional(string()),
@@ -143,13 +142,6 @@ export class HaStateCondition extends LitElement implements ConditionElement {
        );
    }
  };
-
-  static styles = css`
-    :host {
-      display: block;
-      margin-bottom: var(--ha-space-3);
-    }
-  `;
 }

 declare global {
@@ -1,80 +0,0 @@
-import "@home-assistant/webawesome/dist/components/divider/divider";
-import { consume, type ContextType } from "@lit/context";
-import { css, html, LitElement } from "lit";
-import { customElement, property, state } from "lit/decorators";
-import { fireEvent } from "../../../common/dom/fire_event";
-import "../../../components/ha-button";
-import "../../../components/ha-settings-row";
-import { internationalizationContext } from "../../../data/context";
-
-@customElement("ha-automation-comment")
-export class HaAutomationComment extends LitElement {
-  @property() public comment!: string;
-
-  @state()
-  @consume({ context: internationalizationContext, subscribe: true })
-  private _i18n!: ContextType<typeof internationalizationContext>;
-
-  protected render() {
-    return html`
-      <ha-settings-row narrow>
-        <div class="heading" slot="heading">
-          <span class="title" id="comment-label">
-            ${this._i18n.localize(
-              "ui.panel.config.automation.editor.comment.label"
-            )}
-          </span>
-          <ha-button
-            @click=${this._handleClick}
-            size="small"
-            appearance="plain"
-          >
-            ${this._i18n.localize("ui.common.edit")}
-          </ha-button>
-        </div>
-        <p aria-labelledby="comment-label">${this.comment}</p>
-      </ha-settings-row>
-    `;
-  }
-
-  private _handleClick() {
-    fireEvent(this, "edit-comment");
-  }
-
-  static styles = css`
-    ha-settings-row {
-      margin-inline: calc(-1 * var(--ha-space-4));
-    }
-    ha-settings-row::part(heading) {
-      padding-inline-end: 0;
-      overflow: visible;
-    }
-    .heading {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-    }
-    p {
-      margin: var(--ha-space-2) 0 0;
-      border: var(--ha-border-width-sm) solid
-        var(--ha-color-border-neutral-quiet);
-      padding: var(--ha-space-1) var(--ha-space-3);
-      border-radius: var(--ha-border-radius-lg);
-      background-color: var(--ha-color-fill-neutral-quiet-resting);
-      white-space: pre;
-    }
-    ha-button {
-      margin-inline-end: calc(-1 * var(--ha-space-3));
-    }
-  `;
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-automation-comment": HaAutomationComment;
-  }
-
-  interface HASSDomEvents {
-    "edit-comment": undefined;
-  }
-}
@@ -3,8 +3,6 @@ import {
  mdiAppleKeyboardCommand,
  mdiArrowDown,
  mdiArrowUp,
-  mdiCommentEditOutline,
-  mdiCommentTextOutline,
  mdiDelete,
  mdiDotsVertical,
  mdiPlusCircleMultipleOutline,
@@ -39,11 +37,11 @@ import type { Action, Option } from "../../../../data/script";
 import { showPromptDialog } from "../../../../dialogs/generic/show-dialog-box";
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
+import { showEditorToast } from "../editor-toast";
 import "../action/ha-automation-action";
 import type HaAutomationAction from "../action/ha-automation-action";
 import "../condition/ha-automation-condition";
 import type HaAutomationCondition from "../condition/ha-automation-condition";
-import { showEditorToast } from "../editor-toast";
 import {
  editorStyles,
  indentStyle,
@@ -140,14 +138,8 @@ export default class HaAutomationOptionRow extends LitElement {
      </div>
    `;
  }
-  private _renderRow() {
-    const trimmedComment = this.option?.comment?.trim() || "";
-    const commentTooltipText = !trimmedComment
-      ? ""
-      : trimmedComment.length > 250
-        ? `${trimmedComment.substring(0, 250)}...`
-        : trimmedComment;

+  private _renderRow() {
    return html`
      <h3 slot="header">
        ${this.option
@@ -158,21 +150,6 @@ export default class HaAutomationOptionRow extends LitElement {
          : this.hass.localize(
              "ui.panel.config.automation.editor.actions.type.choose.default"
            )}
-        ${this.option?.comment?.trim()
-          ? html`
-              <ha-svg-icon
-                id="comment-icon"
-                .path=${mdiCommentTextOutline}
-                .label=${this.hass.localize(
-                  "ui.panel.config.automation.editor.comment.label"
-                )}
-                class="comment-indicator"
-              ></ha-svg-icon>
-              <ha-tooltip for="comment-icon"
-                ><p>${commentTooltipText}</p></ha-tooltip
-              >
-            `
-          : nothing}
      </h3>

      <slot name="icons" slot="icons"></slot>
@@ -200,17 +177,6 @@ export default class HaAutomationOptionRow extends LitElement {
                  )
                )}
              </ha-dropdown-item>
-              <ha-dropdown-item value="edit_comment">
-                <ha-svg-icon
-                  slot="icon"
-                  .path=${mdiCommentEditOutline}
-                ></ha-svg-icon>
-                ${this._renderOverflowLabel(
-                  this.hass.localize(
-                    `ui.panel.config.automation.editor.comment.${this.option?.comment ? "edit" : "add"}`
-                  )
-                )}
-              </ha-dropdown-item>

              <ha-dropdown-item value="duplicate" .disabled=${this.disabled}>
                <ha-svg-icon
@@ -395,9 +361,6 @@ export default class HaAutomationOptionRow extends LitElement {
      case "rename":
        this._renameOption();
        break;
-      case "edit_comment":
-        this._editCommentOption();
-        break;
      case "delete":
        this._removeOption();
        break;
@@ -461,39 +424,6 @@ export default class HaAutomationOptionRow extends LitElement {
    }
  };

-  private _editCommentOption = async (): Promise<void> => {
-    if (!this.option) {
-      return;
-    }
-    const comment = await showPromptDialog(this, {
-      title: this.hass.localize(
-        `ui.panel.config.automation.editor.comment.${this.option.comment ? "edit" : "add"}`
-      ),
-      inputLabel: this.hass.localize(
-        "ui.panel.config.automation.editor.comment.label"
-      ),
-      inputType: "string",
-      defaultValue: this.option.comment,
-      confirmText: this.hass.localize("ui.common.submit"),
-      multiline: true,
-    });
-    if (comment !== null) {
-      const value: Option = { ...this.option };
-      if (comment === "") {
-        delete value.comment;
-      } else {
-        value.comment = comment;
-      }
-      fireEvent(this, "value-changed", {
-        value,
-      });
-
-      if (this._selected) {
-        this.openSidebar(value); // refresh sidebar
-      }
-    }
-  };
-
  private _conditionChanged(ev: CustomEvent) {
    ev.stopPropagation();
    const conditions = ev.detail.value as Condition[];
@@ -525,8 +455,7 @@ export default class HaAutomationOptionRow extends LitElement {
    this.openSidebar();
  }

-  public openSidebar(option?: Option): void {
-    const sidebarOption = option ?? this.option;
+  public openSidebar(): void {
    fireEvent(this, "open-sidebar", {
      close: (focus?: boolean) => {
        this._selected = false;
@@ -538,11 +467,9 @@ export default class HaAutomationOptionRow extends LitElement {
      rename: () => {
        this._renameOption();
      },
-      editComment: this._editCommentOption,
      delete: this._removeOption,
      duplicate: this._duplicateOption,
      defaultOption: !!this.defaultActions,
-      comment: sidebarOption?.comment,
    } satisfies OptionSidebarConfig);
    this._selected = true;
    this._collapsed = false;
@@ -3,7 +3,6 @@ import {
  mdiAppleKeyboardCommand,
  mdiCheckboxBlankOutline,
  mdiCheckboxOutline,
-  mdiCommentEditOutline,
  mdiContentCopy,
  mdiContentCut,
  mdiContentPaste,
@@ -27,8 +26,8 @@ import type { HaDropdownSelectEvent } from "../../../../components/ha-dropdown";
 import "../../../../components/ha-dropdown-item";
 import { ACTION_BUILDING_BLOCKS } from "../../../../data/action";
 import type { ActionSidebarConfig } from "../../../../data/automation";
-import type { DomainManifestLookup } from "../../../../data/integration";
 import { domainToName } from "../../../../data/integration";
+import type { DomainManifestLookup } from "../../../../data/integration";
 import type {
  NonConditionAction,
  RepeatAction,
@@ -39,7 +38,6 @@ import { isMac } from "../../../../util/is_mac";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
 import { getAutomationActionType } from "../action/ha-automation-action-row";
 import { getRepeatType } from "../action/types/ha-automation-action-repeat";
-import "../ha-automation-comment";
 import { overflowStyles, sidebarEditorStyles } from "../styles";
 import "./ha-automation-sidebar-card";

@@ -177,15 +175,6 @@ export default class HaAutomationSidebarAction extends LitElement {
          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
        </div>
      </ha-dropdown-item>
-      <ha-dropdown-item slot="menu-items" value="edit_comment">
-        <ha-svg-icon slot="icon" .path=${mdiCommentEditOutline}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.comment.${this.config.config.action.comment ? "edit" : "add"}`
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
-      </ha-dropdown-item>

      <wa-divider slot="menu-items"></wa-divider>
      <ha-dropdown-item
@@ -388,12 +377,6 @@ export default class HaAutomationSidebarAction extends LitElement {
              @ui-mode-not-available=${this._handleUiModeNotAvailable}
            ></ha-automation-action-editor>`
          )}
-      ${this.config.config.action.comment?.trim() && !this.yamlMode
-        ? html`<ha-automation-comment
-            @edit-comment=${this.config.editComment}
-            .comment=${this.config.config.action.comment}
-          ></ha-automation-comment>`
-        : nothing}
    </ha-automation-sidebar-card>`;
  }

@@ -442,9 +425,6 @@ export default class HaAutomationSidebarAction extends LitElement {
      case "rename":
        this.config.rename();
        break;
-      case "edit_comment":
-        this.config.editComment();
-        break;
      case "run":
        this.config.run();
        break;
@@ -1,7 +1,6 @@
 import "@home-assistant/webawesome/dist/components/divider/divider";
 import {
  mdiAppleKeyboardCommand,
-  mdiCommentEditOutline,
  mdiContentCopy,
  mdiContentCut,
  mdiContentPaste,
@@ -35,7 +34,6 @@ import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import "../condition/ha-automation-condition-editor";
 import type HaAutomationConditionEditor from "../condition/ha-automation-condition-editor";
-import "../ha-automation-comment";
 import { overflowStyles, sidebarEditorStyles } from "../styles";
 import "./ha-automation-sidebar-card";

@@ -151,19 +149,6 @@ export default class HaAutomationSidebarCondition extends LitElement {
          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
        </div>
      </ha-dropdown-item>
-      <ha-dropdown-item
-        slot="menu-items"
-        value="edit_comment"
-        .disabled=${this.disabled}
-      >
-        <ha-svg-icon slot="icon" .path=${mdiCommentEditOutline}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.comment.${this.config.config.comment ? "edit" : "add"}`
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
-      </ha-dropdown-item>

      <wa-divider slot="menu-items"></wa-divider>

@@ -347,12 +332,6 @@ export default class HaAutomationSidebarCondition extends LitElement {
              sidebar
            ></ha-automation-condition-editor>`
          )}
-      ${this.config.config.comment?.trim() && !this.yamlMode
-        ? html`<ha-automation-comment
-            @edit-comment=${this.config.editComment}
-            .comment=${this.config.config.comment}
-          ></ha-automation-comment>`
-        : nothing}
      <div class="testing-wrapper">
        <div
          class="testing ${classMap({
@@ -417,9 +396,6 @@ export default class HaAutomationSidebarCondition extends LitElement {
      case "rename":
        this.config.rename();
        break;
-      case "edit_comment":
-        this.config.editComment();
-        break;
      case "test":
        this.config.test();
        break;
@@ -1,7 +1,6 @@
 import "@home-assistant/webawesome/dist/components/divider/divider";
 import {
  mdiAppleKeyboardCommand,
-  mdiCommentEditOutline,
  mdiDelete,
  mdiPlusCircleMultipleOutline,
  mdiRenameBox,
@@ -15,7 +14,6 @@ import type { OptionSidebarConfig } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
-import "../ha-automation-comment";
 import { overflowStyles, sidebarEditorStyles } from "../styles";
 import "./ha-automation-sidebar-card";
 import type { HaDropdownSelectEvent } from "../../../../components/ha-dropdown";
@@ -74,22 +72,6 @@ export default class HaAutomationSidebarOption extends LitElement {
                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
              </div>
            </ha-dropdown-item>
-            <ha-dropdown-item
-              slot="menu-items"
-              value="edit_comment"
-              .disabled=${!!disabled}
-            >
-              <ha-svg-icon
-                slot="icon"
-                .path=${mdiCommentEditOutline}
-              ></ha-svg-icon>
-              <div class="overflow-label">
-                ${this.hass.localize(
-                  `ui.panel.config.automation.editor.comment.${this.config.comment ? "edit" : "add"}`
-                )}
-                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-              </div>
-            </ha-dropdown-item>

            <ha-dropdown-item
              slot="menu-items"
@@ -144,12 +126,6 @@ export default class HaAutomationSidebarOption extends LitElement {
          `}

      <div class="description">${description}</div>
-      ${!this.config.defaultOption && this.config.comment?.trim()
-        ? html`<ha-automation-comment
-            @edit-comment=${this.config.editComment}
-            .comment=${this.config.comment}
-          ></ha-automation-comment>`
-        : nothing}
    </ha-automation-sidebar-card>`;
  }

@@ -164,9 +140,6 @@ export default class HaAutomationSidebarOption extends LitElement {
      case "rename":
        this.config.rename();
        break;
-      case "edit_comment":
-        this.config.editComment();
-        break;
      case "duplicate":
        this.config.duplicate();
        break;
@@ -1,24 +1,18 @@
-import {
-  mdiAppleKeyboardCommand,
-  mdiCommentEditOutline,
-  mdiDelete,
-  mdiPlaylistEdit,
-} from "@mdi/js";
+import { mdiAppleKeyboardCommand, mdiDelete, mdiPlaylistEdit } from "@mdi/js";
 import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
-import type { HaDropdownSelectEvent } from "../../../../components/ha-dropdown";
 import "../../../../components/ha-dropdown-item";
 import type { ScriptFieldSidebarConfig } from "../../../../data/automation";
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import "../../script/ha-script-field-editor";
 import type HaAutomationConditionEditor from "../action/ha-automation-action-editor";
-import "../ha-automation-comment";
 import { overflowStyles, sidebarEditorStyles } from "../styles";
 import "./ha-automation-sidebar-card";
+import type { HaDropdownSelectEvent } from "../../../../components/ha-dropdown";

@customElement("ha-automation-sidebar-script-field")
 export default class HaAutomationSidebarScriptField extends LitElement {
@@ -68,15 +62,6 @@ export default class HaAutomationSidebarScriptField extends LitElement {
      @wa-select=${this._handleDropdownSelect}
    >
      <span slot="title">${title}</span>
-      <ha-dropdown-item slot="menu-items" value="edit_comment">
-        <ha-svg-icon slot="icon" .path=${mdiCommentEditOutline}></ha-svg-icon>
-        <div class="overflow-label">
-          ${this.hass.localize(
-            `ui.panel.config.automation.editor.comment.${this.config.config.field.description ? "edit" : "add"}`
-          )}
-          <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-        </div>
-      </ha-dropdown-item>
      <ha-dropdown-item
        slot="menu-items"
        value="toggle_yaml_mode"
@@ -136,12 +121,6 @@ export default class HaAutomationSidebarScriptField extends LitElement {
          @yaml-changed=${this._yamlChangedSidebar}
        ></ha-script-field-editor>`
      )}
-      ${this.config.config.field.description?.trim() && !this.yamlMode
-        ? html`<ha-automation-comment
-            @edit-comment=${this.config.editComment}
-            .comment=${this.config.config.field.description}
-          ></ha-automation-comment>`
-        : nothing}
    </ha-automation-sidebar-card>`;
  }

@@ -189,9 +168,6 @@ export default class HaAutomationSidebarScriptField extends LitElement {
      case "toggle_yaml_mode":
        this._toggleYamlMode();
        break;
-      case "edit_comment":
-        this.config.editComment();
-        break;
      case "delete":
        this.config.delete();
        break;
@@ -1,7 +1,6 @@
 import "@home-assistant/webawesome/dist/components/divider/divider";
 import {
  mdiAppleKeyboardCommand,
-  mdiCommentEditOutline,
  mdiContentCopy,
  mdiContentCut,
  mdiContentPaste,
@@ -19,12 +18,9 @@ import { customElement, property, query, state } from "lit/decorators";
 import { keyed } from "lit/directives/keyed";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { handleStructError } from "../../../../common/structs/handle-errors";
-import type { HaDropdownSelectEvent } from "../../../../components/ha-dropdown";
 import "../../../../components/ha-dropdown-item";
 import type {
  LegacyTrigger,
-  Trigger,
-  TriggerList,
  TriggerSidebarConfig,
 } from "../../../../data/automation";
 import {
@@ -34,11 +30,11 @@ import {
 } from "../../../../data/trigger";
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
-import "../ha-automation-comment";
 import { overflowStyles, sidebarEditorStyles } from "../styles";
 import "../trigger/ha-automation-trigger-editor";
 import type HaAutomationTriggerEditor from "../trigger/ha-automation-trigger-editor";
 import "./ha-automation-sidebar-card";
+import type { HaDropdownSelectEvent } from "../../../../components/ha-dropdown";

@customElement("ha-automation-sidebar-trigger")
 export default class HaAutomationSidebarTrigger extends LitElement {
@@ -129,24 +125,7 @@ export default class HaAutomationSidebarTrigger extends LitElement {
            <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
          </div>
        </ha-dropdown-item>
-        ${type !== "list"
-          ? html`<ha-dropdown-item
-              slot="menu-items"
-              value="edit_comment"
-              .disabled=${this.disabled}
-            >
-              <ha-svg-icon
-                slot="icon"
-                .path=${mdiCommentEditOutline}
-              ></ha-svg-icon>
-              <div class="overflow-label">
-                ${this.hass.localize(
-                  `ui.panel.config.automation.editor.comment.${(this.config.config as Exclude<Trigger, TriggerList>).comment ? "edit" : "add"}`
-                )}
-                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
-              </div>
-            </ha-dropdown-item>`
-          : nothing}
+
        ${!this.yamlMode &&
        !("id" in this.config.config) &&
        !this._requestShowId
@@ -342,14 +321,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
            sidebar
          ></ha-automation-trigger-editor>`
        )}
-        ${!isTriggerList(this.config.config) &&
-        this.config.config.comment?.trim() &&
-        !this.yamlMode
-          ? html`<ha-automation-comment
-              @edit-comment=${this.config.editComment}
-              .comment=${this.config.config.comment}
-            ></ha-automation-comment>`
-          : nothing}
      </ha-automation-sidebar-card>
    `;
  }
@@ -401,9 +372,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
      case "rename":
        this.config.rename();
        break;
-      case "edit_comment":
-        this.config.editComment();
-        break;
      case "show_id":
        this._showTriggerId();
        break;
@@ -4,7 +4,6 @@ export const baseTriggerStruct = object({
  trigger: string(),
  id: optional(string()),
  enabled: optional(boolean()),
-  comment: optional(string()),
 });

 export const forDictStruct = object({
@@ -52,18 +52,6 @@ export const rowStyles = css`
  ha-automation-row-event-chip.event-chip {
    position: absolute;
  }
-
-  .comment-indicator {
-    color: var(--ha-color-on-neutral-normal);
-  }
-  .comment-indicator + ha-tooltip::part(body) {
-    cursor: default;
-    max-width: 300px;
-  }
-  .comment-indicator + ha-tooltip p {
-    white-space: pre;
-    margin: 0;
-  }
 `;

 export const editorStyles = css`
@@ -141,7 +141,6 @@ export default class HaAutomationTriggerEditor extends LitElement {
    ev.stopPropagation();
    const value = {
      ...(this.trigger.alias ? { alias: this.trigger.alias } : {}),
-      ...(this.trigger.comment ? { comment: this.trigger.comment } : {}),
      ...ev.detail.value,
    };
    fireEvent(this, "value-changed", { value });
@@ -4,8 +4,6 @@ import {
  mdiAppleKeyboardCommand,
  mdiArrowDown,
  mdiArrowUp,
-  mdiCommentEditOutline,
-  mdiCommentTextOutline,
  mdiContentCopy,
  mdiContentCut,
  mdiContentPaste,
@@ -223,16 +221,6 @@ export default class HaAutomationTriggerRow extends LitElement {
            ?.target
        : undefined;

-    const trimmedComment =
-      (type !== "list" &&
-        (this.trigger as Exclude<Trigger, TriggerList>).comment?.trim()) ||
-      "";
-    const commentTooltipText = !trimmedComment
-      ? ""
-      : trimmedComment.length > 250
-        ? `${trimmedComment.substring(0, 250)}...`
-        : trimmedComment;
-
    return html`
      ${type === "list"
        ? html`<ha-svg-icon
@@ -254,22 +242,6 @@ export default class HaAutomationTriggerRow extends LitElement {
              triggerTargetSpec
            )
          : nothing}
-        ${type !== "list" &&
-        (this.trigger as Exclude<Trigger, TriggerList>).comment?.trim()
-          ? html`
-              <ha-svg-icon
-                id="comment-icon"
-                .path=${mdiCommentTextOutline}
-                .label=${this.hass.localize(
-                  "ui.panel.config.automation.editor.comment.label"
-                )}
-                class="comment-indicator"
-              ></ha-svg-icon>
-              <ha-tooltip for="comment-icon"
-                ><p>${commentTooltipText}</p></ha-tooltip
-              >
-            `
-          : nothing}
      </h3>
      <ha-automation-row-event-chip
        .show=${this._triggered}
@@ -310,19 +282,7 @@ export default class HaAutomationTriggerRow extends LitElement {
            )
          )}
        </ha-dropdown-item>
-        ${type !== "list"
-          ? html`<ha-dropdown-item value="edit_comment">
-              <ha-svg-icon
-                slot="icon"
-                .path=${mdiCommentEditOutline}
-              ></ha-svg-icon>
-              ${this._renderOverflowLabel(
-                this.hass.localize(
-                  `ui.panel.config.automation.editor.comment.${(this.trigger as Exclude<Trigger, TriggerList>).comment ? "edit" : "add"}`
-                )
-              )}
-            </ha-dropdown-item>`
-          : nothing}
+
        <wa-divider></wa-divider>

        <ha-dropdown-item value="duplicate" .disabled=${this.disabled}>
@@ -699,7 +659,6 @@ export default class HaAutomationTriggerRow extends LitElement {
      rename: () => {
        this._renameTrigger();
      },
-      editComment: this._editCommentTrigger,
      toggleYamlMode: () => {
        this._toggleYamlMode();
        this.openSidebar();
@@ -843,40 +802,6 @@ export default class HaAutomationTriggerRow extends LitElement {
    }
  };

-  private _editCommentTrigger = async (): Promise<void> => {
-    if (isTriggerList(this.trigger)) return;
-    const trigger = this.trigger;
-    const comment = await showPromptDialog(this, {
-      title: this.hass.localize(
-        `ui.panel.config.automation.editor.comment.${trigger.comment ? "edit" : "add"}`
-      ),
-      inputLabel: this.hass.localize(
-        "ui.panel.config.automation.editor.comment.label"
-      ),
-      inputType: "string",
-      defaultValue: trigger.comment,
-      confirmText: this.hass.localize("ui.common.submit"),
-      multiline: true,
-    });
-    if (comment !== null) {
-      const value = { ...trigger };
-      if (comment === "") {
-        delete value.comment;
-      } else {
-        value.comment = comment;
-      }
-      fireEvent(this, "value-changed", {
-        value,
-      });
-
-      if (this._selected && this.optionsInSidebar) {
-        this.openSidebar(value); // refresh sidebar
-      } else if (this._yamlMode) {
-        this.triggerEditor?.yamlEditor?.setValue(value);
-      }
-    }
-  };
-
  private _duplicateTrigger = () => {
    fireEvent(this, "duplicate");
  };
@@ -988,9 +913,6 @@ export default class HaAutomationTriggerRow extends LitElement {
      case "rename":
        this._renameTrigger();
        break;
-      case "edit_comment":
-        this._editCommentTrigger();
-        break;
      case "duplicate":
        this._duplicateTrigger();
        break;
@@ -212,10 +212,6 @@ export class HaDeviceTrigger extends LitElement {
  }

  static styles = css`
-    :host {
-      display: block;
-      margin-bottom: var(--ha-space-3);
-    }
    ha-device-picker {
      display: block;
      margin-bottom: 24px;
@@ -1,8 +1,7 @@
 import type { PropertyValues } from "lit";
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { ensureArray } from "../../../../../common/array/ensure-array";
 import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { hasTemplate } from "../../../../../common/string/has-template";
@@ -11,6 +10,7 @@ import "../../../../../components/ha-form/ha-form";
 import type { SchemaUnion } from "../../../../../components/ha-form/types";
 import type { NumericStateTrigger } from "../../../../../data/automation";
 import type { HomeAssistant } from "../../../../../types";
+import { ensureArray } from "../../../../../common/array/ensure-array";

@customElement("ha-automation-trigger-numeric_state")
 export class HaNumericStateTrigger extends LitElement {
@@ -333,13 +333,6 @@ export class HaNumericStateTrigger extends LitElement {
        );
    }
  };
-
-  static styles = css`
-    :host {
-      display: block;
-      margin-bottom: var(--ha-space-3);
-    }
-  `;
 }

 declare global {
@@ -29,7 +29,6 @@ const DEFAULT_KEYS: (keyof PlatformTrigger)[] = [
  "trigger",
  "target",
  "alias",
-  "comment",
  "id",
  "variables",
  "enabled",
@@ -1,7 +1,6 @@
 import type { PropertyValues } from "lit";
-import { css, html, LitElement } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import {
  array,
  assert,
@@ -14,21 +13,22 @@ import {
  string,
  union,
 } from "superstruct";
+import memoizeOne from "memoize-one";
+import type { LocalizeFunc } from "../../../../../common/translations/localize";
 import { ensureArray } from "../../../../../common/array/ensure-array";
-import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 import { fireEvent } from "../../../../../common/dom/fire_event";
 import { hasTemplate } from "../../../../../common/string/has-template";
-import type { LocalizeFunc } from "../../../../../common/translations/localize";
+import type { StateTrigger } from "../../../../../data/automation";
 import { ANY_STATE_VALUE } from "../../../../../components/entity/const";
+import type { HomeAssistant } from "../../../../../types";
+import { baseTriggerStruct, forDictStruct } from "../../structs";
+import type { TriggerElement } from "../ha-automation-trigger-row";
 import "../../../../../components/ha-form/ha-form";
+import { createDurationData } from "../../../../../common/datetime/create_duration_data";
 import type {
  HaFormSchema,
  SchemaUnion,
 } from "../../../../../components/ha-form/types";
-import type { StateTrigger } from "../../../../../data/automation";
-import type { HomeAssistant } from "../../../../../types";
-import { baseTriggerStruct, forDictStruct } from "../../structs";
-import type { TriggerElement } from "../ha-automation-trigger-row";

 const stateTriggerStruct = assign(
  baseTriggerStruct,
@@ -303,13 +303,6 @@ export class HaStateTrigger extends LitElement implements TriggerElement {
        ? "ui.components.entity.entity-picker.entity"
        : `ui.panel.config.automation.editor.triggers.type.state.${schema.name}`
    );
-
-  static styles = css`
-    :host {
-      display: block;
-      margin-bottom: var(--ha-space-3);
-    }
-  `;
 }

 declare global {
@@ -9,8 +9,8 @@ import { copyToClipboard } from "../../../common/util/copy-clipboard";
 import { subscribePollingCollection } from "../../../common/util/subscribe-polling";
 import "../../../components/ha-alert";
 import "../../../components/ha-button";
-import "../../../components/ha-dialog";
 import "../../../components/ha-dialog-footer";
+import "../../../components/ha-dialog";
 import "../../../components/ha-metric";
 import "../../../components/ha-spinner";
 import type { HassioStats } from "../../../data/hassio/common";
@@ -103,10 +103,10 @@ class DialogSystemInformation extends LitElement {
        this.hass,
        async () => {
          this._supervisorStats = await fetchHassioStats(
-            this.hass.callWS,
+            this.hass,
            "supervisor"
          );
-          this._coreStats = await fetchHassioStats(this.hass.callWS, "core");
+          this._coreStats = await fetchHassioStats(this.hass, "core");
        },
        10000
      );
@@ -42,6 +42,10 @@ export default class HaScriptFieldEditor extends LitElement {
          name: "key",
          selector: { text: {} },
        },
+        {
+          name: "description",
+          selector: { text: {} },
+        },
        {
          name: "required",
          selector: { boolean: {} },
@@ -1,7 +1,5 @@
 import {
  mdiAppleKeyboardCommand,
-  mdiCommentEditOutline,
-  mdiCommentTextOutline,
  mdiDelete,
  mdiDotsVertical,
  mdiPlaylistEdit,
@@ -23,7 +21,6 @@ import "../../../components/ha-dropdown-item";
 import type { ScriptFieldSidebarConfig } from "../../../data/automation";
 import type { Field } from "../../../data/script";
 import { SELECTOR_SELECTOR_BUILDING_BLOCKS } from "../../../data/selector/selector_selector";
-import { showPromptDialog } from "../../../dialogs/generic/show-dialog-box";
 import type { HomeAssistant } from "../../../types";
 import { isMac } from "../../../util/is_mac";
 import { showEditorToast } from "../automation/editor-toast";
@@ -69,14 +66,6 @@ export default class HaScriptFieldRow extends LitElement {
  protected render() {
    const hasSelector =
      this.field.selector && typeof this.field.selector === "object";
-
-    const trimmedComment = this.field.description?.trim() || "";
-    const commentTooltipText = !trimmedComment
-      ? ""
-      : trimmedComment.length > 250
-        ? `${trimmedComment.substring(0, 250)}...`
-        : trimmedComment;
-
    return html`
      <ha-card outlined>
        <ha-automation-row
@@ -101,16 +90,6 @@ export default class HaScriptFieldRow extends LitElement {
              .label=${this.hass.localize("ui.common.menu")}
              .path=${mdiDotsVertical}
            ></ha-icon-button>
-
-            <ha-dropdown-item value="edit_comment">
-              <ha-svg-icon
-                slot="icon"
-                .path=${mdiCommentEditOutline}
-              ></ha-svg-icon>
-              ${this.hass.localize(
-                `ui.panel.config.automation.editor.comment.${this.field.description ? "edit" : "add"}`
-              )}
-            </ha-dropdown-item>
            <ha-dropdown-item value="toggle_yaml_mode">
              <ha-svg-icon slot="icon" .path=${mdiPlaylistEdit}></ha-svg-icon>
              <div class="overflow-label">
@@ -153,24 +132,7 @@ export default class HaScriptFieldRow extends LitElement {
            </ha-dropdown-item>
          </ha-dropdown>

-          <h3 slot="header">
-            ${this.field.name ?? this.key}
-            ${this.field.description?.trim()
-              ? html`
-                  <ha-svg-icon
-                    id="comment-icon"
-                    .path=${mdiCommentTextOutline}
-                    .label=${this.hass.localize(
-                      "ui.panel.config.automation.editor.comment.label"
-                    )}
-                    class="comment-indicator"
-                  ></ha-svg-icon>
-                  <ha-tooltip for="comment-icon"
-                    ><p>${commentTooltipText}</p></ha-tooltip
-                  >
-                `
-              : nothing}
-          </h3>
+          <h3 slot="header">${this.field.name ?? this.key}</h3>

          <slot name="icons" slot="icons"></slot>
        </ha-automation-row>
@@ -362,46 +324,11 @@ export default class HaScriptFieldRow extends LitElement {
    });
  }

-  private _editComment = async (): Promise<void> => {
-    const comment = await showPromptDialog(this, {
-      title: this.hass.localize(
-        `ui.panel.config.automation.editor.comment.${this.field.description ? "edit" : "add"}`
-      ),
-      inputLabel: this.hass.localize(
-        "ui.panel.config.automation.editor.comment.label"
-      ),
-      inputType: "string",
-      defaultValue: this.field.description,
-      confirmText: this.hass.localize("ui.common.submit"),
-      multiline: true,
-    });
-    if (comment !== null) {
-      const value = { ...this.field };
-      if (comment === "") {
-        delete value.description;
-      } else {
-        value.description = comment;
-      }
-      fireEvent(this, "value-changed", {
-        value,
-      });
-
-      if (this._selected) {
-        this.openSidebar(false, value); // refresh sidebar
-      }
-    }
-  };
-
-  public openSidebar(
-    selectorEditor = false,
-    fieldValue?: HaScriptFieldRow["field"]
-  ): void {
+  public openSidebar(selectorEditor = false): void {
    if (!selectorEditor) {
      this._selected = true;
    }

-    const field = fieldValue ?? this.field;
-
    fireEvent(this, "open-sidebar", {
      save: (value) => {
        fireEvent(this, "value-changed", { value });
@@ -426,13 +353,12 @@ export default class HaScriptFieldRow extends LitElement {
      },
      delete: this._onDelete,
      config: {
-        field,
+        field: this.field,
        selector: selectorEditor,
        key: this.key,
        excludeKeys: this.excludeKeys,
      },
      yamlMode: this._yamlMode,
-      editComment: this._editComment,
    } satisfies ScriptFieldSidebarConfig);

    if (this.narrow) {
@@ -493,9 +419,6 @@ export default class HaScriptFieldRow extends LitElement {
      case "delete":
        this._onDelete();
        break;
-      case "edit_comment":
-        this._editComment();
-        break;
    }
  }

@@ -61,10 +61,11 @@ export const securityEntityFilters: EntityFilter[] = [
    ],
    entity_category: "none",
  },
-  // We also want the tamper sensors when they are diagnostic
+  // We also want the tamper and moisture sensors when they are diagnostic
+  // (some integrations, e.g. homee, mark water leak alarms as diagnostic)
  {
    domain: "binary_sensor",
-    device_class: ["tamper"],
+    device_class: ["moisture", "tamper"],
    entity_category: "diagnostic",
  },
 ];
@@ -332,7 +332,7 @@ export default <T extends Constructor<HassElement>>(superClass: T) =>
            import("../data/supervisor/store"),
          ]);
        const [info, repos] = await Promise.all([
-          fetchHassioAddonInfo(this.hass!.callWS, myParams.get("app")!),
+          fetchHassioAddonInfo(this.hass!, myParams.get("app")!),
          fetchStoreRepositories(this.hass!),
        ]);
        const repo = repos.find((r) => r.slug === info.repository);
@@ -2818,7 +2818,6 @@
          },
          "state": {
            "update_available": "Update available",
-            "updating": "Updating...",
            "installed": "Installed",
            "not_installed": "Not installed",
            "not_available": "Not available"
@@ -2874,7 +2873,6 @@
          "dashboard": {
            "cpu_usage": "CPU usage",
            "ram_usage": "RAM usage",
-            "controls": "Controls",
            "app_running": "App is running",
            "app_stopped": "App is stopped",
            "current_version": "Current version: {version}",
@@ -2891,7 +2889,6 @@
            "failed_to_save": "Failed to save: {error}",
            "failed_to_reset": "Failed to reset: {error}",
            "failed_to_restart": "Failed to restart {name}",
-            "uninstalling": "Uninstalling...",
            "protection_mode": {
              "title": "Protection mode disabled!",
              "content": "Protection mode on this app is disabled! This gives the app full access to the entire system, which is more risky for your system if the app is compromised. Only disable protection mode if you know what you are doing.",
@@ -5049,11 +5046,6 @@
              "placeholder": "Optional description",
              "add": "Add description"
            },
-            "comment": {
-              "label": "Comment",
-              "edit": "Edit comment",
-              "add": "Add comment"
-            },
            "leave": {
              "unsaved_new_title": "Save new automation?",
              "unsaved_new_text": "You can save your changes, or delete this automation. You can't undo this action.",
@@ -253,8 +253,6 @@ export interface HomeAssistantInternationalization {
  loadFragmentTranslation(fragment: string): Promise<LocalizeFunc | undefined>;
 }

-export type CallWS = <T>(msg: MessageBase) => Promise<T>;
-
 export interface HomeAssistantApi {
  callService<T = any>(
    domain: ServiceCallRequest["domain"],
@@ -279,7 +277,7 @@ export interface HomeAssistantApi {
  ): Promise<Response>;
  fetchWithAuth(path: string, init?: Record<string, any>): Promise<Response>;
  sendWS(msg: MessageBase): void;
-  callWS: CallWS;
+  callWS<T>(msg: MessageBase): Promise<T>;
 }

 export interface HomeAssistantFormatters {