Fix types

Clean up
Add trigger position reference warning
2026-09-01 22:58:40 +00:00 · 2026-05-27 08:24:02 +02:00 · 2026-05-26 16:01:36 +02:00 · 2026-05-22 12:25:50 +02:00 · 2026-05-21 17:09:52 +02:00 · 2026-05-21 16:01:43 +02:00
20 changed files with 746 additions and 256 deletions
@@ -86,7 +86,7 @@
    "core-js": "3.49.0",
    "cropperjs": "1.6.2",
    "culori": "4.0.2",
-    "date-fns": "4.2.0",
+    "date-fns": "4.2.1",
    "deep-clone-simple": "1.1.1",
    "deep-freeze": "0.0.1",
    "dialog-polyfill": "0.5.6",
@@ -1,3 +1,4 @@
+import { createContext } from "@lit/context";
 import type {
  Connection,
  HassEntityAttributeBase,
@@ -490,12 +491,12 @@ export const migrateAutomationTrigger = (

 export const flattenTriggers = (
  triggers: undefined | Trigger | Trigger[]
-): Trigger[] => {
+): Exclude<Trigger, TriggerList>[] => {
  if (!triggers) {
    return [];
  }

-  const flatTriggers: Trigger[] = [];
+  const flatTriggers: Exclude<Trigger, TriggerList>[] = [];

  ensureArray(triggers).forEach((t) => {
    if ("triggers" in t) {
@@ -614,6 +615,7 @@ export interface BaseSidebarConfig {

 export interface TriggerSidebarConfig extends BaseSidebarConfig {
  save: (value: Trigger) => void;
+  editId: () => void;
  rename: () => void;
  disable: () => void;
  duplicate: () => void;
@@ -697,3 +699,7 @@ export interface ShowAutomationEditorParams {
  data?: Partial<AutomationConfig>;
  expanded?: boolean;
 }
+
+export const automationConfigContext = createContext<
+  AutomationConfig | undefined
+>("automationConfig");
@@ -27,6 +27,7 @@ import type {
  LegacyTrigger,
  Trigger,
 } from "./automation";
+import { flattenTriggers } from "./automation";
 import { getConditionDomain, getConditionObjectId } from "./condition";
 import type {
  DeviceCondition,
@@ -107,6 +108,36 @@ const formatNumericLimitValue = (
    : value;
 };

+export interface TriggerInfo {
+  id: string;
+  label: string;
+  triggerType: string;
+  count: number;
+}
+
+export const getTriggerInfos = (
+  triggers: Trigger[] | undefined,
+  hass: HomeAssistant,
+  entityRegistry: EntityRegistryEntry[]
+): TriggerInfo[] => {
+  if (!triggers) {
+    return [];
+  }
+  const map = new Map<string, TriggerInfo>();
+  for (const t of flattenTriggers(triggers)) {
+    if (isTriggerList(t) || !t.id || map.get(t.id)) {
+      continue;
+    }
+    map.set(t.id, {
+      id: t.id,
+      label: describeTrigger(t, hass, entityRegistry),
+      triggerType: t.trigger,
+      count: 1,
+    });
+  }
+  return Array.from(map.values());
+};
+
 export const describeTrigger = (
  trigger: Trigger,
  hass: HomeAssistant,
@@ -2,16 +2,23 @@ import { computeAreaName } from "../../common/entity/compute_area_name";
 import { computeDeviceNameDisplay } from "../../common/entity/compute_device_name";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { getDeviceArea } from "../../common/entity/context/get_device_context";
+import type { LocalizeFunc } from "../../common/translations/localize";
+import { computeRTL } from "../../common/util/compute_rtl";
 import type { HaDevicePickerDeviceFilterFunc } from "../../components/device/ha-device-picker";
 import type { PickerComboBoxItem } from "../../components/ha-picker-combo-box";
 import type { FuseWeightedKey } from "../../resources/fuseMultiTerm";
 import type { HomeAssistant } from "../../types";
 import type { ConfigEntry } from "../config_entries";
 import type { HaEntityPickerEntityFilterFunc } from "../entity/entity";
+import type {
+  EntityRegistryDisplayEntry,
+  EntityRegistryEntry,
+} from "../entity/entity_registry";
 import { domainToName } from "../integration";
 import {
  getDeviceEntityDisplayLookup,
  type DeviceEntityDisplayLookup,
+  type DeviceRegistryEntry,
 } from "./device_registry";

 export interface DevicePickerItem extends PickerComboBoxItem {
@@ -19,6 +26,46 @@ export interface DevicePickerItem extends PickerComboBoxItem {
  domain_name?: string;
 }

+export interface DeviceAreaLabel {
+  areaName?: string;
+  viaDeviceName?: string;
+  viaDeviceAreaName?: string;
+}
+
+export const computeDeviceAreaLabel = (
+  device: DeviceRegistryEntry,
+  areas: HomeAssistant["areas"],
+  devices: HomeAssistant["devices"],
+  states: HomeAssistant["states"],
+  localize: LocalizeFunc,
+  language: HomeAssistant["language"],
+  translationMetadata: HomeAssistant["translationMetadata"],
+  viaDeviceEntities?: EntityRegistryEntry[] | EntityRegistryDisplayEntry[]
+): DeviceAreaLabel => {
+  const area = getDeviceArea(device, areas);
+
+  const viaDevice = device.via_device_id
+    ? devices[device.via_device_id]
+    : undefined;
+  const viaDeviceName = viaDevice
+    ? computeDeviceNameDisplay(viaDevice, localize, states, viaDeviceEntities)
+    : undefined;
+  const viaDeviceArea = viaDevice ? getDeviceArea(viaDevice, areas) : undefined;
+  const viaDeviceAreaName = viaDeviceArea
+    ? computeAreaName(viaDeviceArea)
+    : undefined;
+
+  const isRTL = computeRTL(language, translationMetadata.translations);
+
+  const areaName = area
+    ? computeAreaName(area)
+    : viaDeviceAreaName
+      ? `${viaDeviceAreaName}${isRTL ? " ◂ " : " ▸ "}${viaDeviceName}`
+      : viaDeviceName || undefined;
+
+  return { areaName, viaDeviceName, viaDeviceAreaName };
+};
+
 export const deviceComboBoxKeys: FuseWeightedKey[] = [
  {
    name: "search_labels.deviceName",
@@ -36,6 +83,14 @@ export const deviceComboBoxKeys: FuseWeightedKey[] = [
    name: "search_labels.domain",
    weight: 4,
  },
+  {
+    name: "search_labels.viaDeviceName",
+    weight: 3,
+  },
+  {
+    name: "search_labels.viaDeviceArea",
+    weight: 3,
+  },
 ];

 export const getDevices = (
@@ -149,9 +204,19 @@ export const getDevices = (
      deviceEntityLookup[device.id]
    );

-    const area = getDeviceArea(device, hass.areas);
-
-    const areaName = area ? computeAreaName(area) : undefined;
+    const { areaName, viaDeviceName, viaDeviceAreaName } =
+      computeDeviceAreaLabel(
+        device,
+        hass.areas,
+        hass.devices,
+        hass.states,
+        hass.localize,
+        hass.language,
+        hass.translationMetadata,
+        device.via_device_id
+          ? deviceEntityLookup[device.via_device_id]
+          : undefined
+      );

    const configEntry = device.primary_config_entry
      ? configEntryLookup?.[device.primary_config_entry]
@@ -174,6 +239,8 @@ export const getDevices = (
        areaName: areaName || null,
        domain: domain || null,
        domainName: domainName || null,
+        viaDeviceName: viaDeviceName || null,
+        viaDeviceArea: viaDeviceAreaName || null,
      },
      sorting_label: [primary, areaName, domainName].filter(Boolean).join("_"),
    };
@@ -8,6 +8,7 @@ import type {
  Trigger,
  TriggerList,
 } from "./automation";
+import { flattenTriggers } from "./automation";
 import type { Selector, TargetSelector } from "./selector";

 export const TRIGGER_COLLECTIONS: AutomationElementGroupCollection[] = [
@@ -56,6 +57,11 @@ export const TRIGGER_COLLECTIONS: AutomationElementGroupCollection[] = [
 export const isTriggerList = (trigger: Trigger): trigger is TriggerList =>
  "triggers" in trigger;

+export const getTriggerIds = (triggers: Trigger[]): string[] =>
+  flattenTriggers(triggers)
+    .map((trigger) => trigger.id)
+    .filter((id): id is string => !!id);
+
 export interface TriggerDescription {
  target?: TargetSelector["target"];
  fields: Record<
@@ -25,7 +25,7 @@ import type {
 } from "home-assistant-js-websocket";
 import { dump } from "js-yaml";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
-import { LitElement, html, nothing } 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 memoizeOne from "memoize-one";
@@ -44,6 +44,7 @@ import type { HaAutomationRow } from "../../../../components/automation/ha-autom
 import "../../../../components/automation/ha-automation-row-event-chip";
 import "../../../../components/automation/ha-automation-row-live-test";
 import type { LiveTestState } from "../../../../components/automation/ha-automation-row-live-test";
+import "../../../../components/ha-alert";
 import "../../../../components/ha-card";
 import "../../../../components/ha-condition-icon";
 import "../../../../components/ha-dropdown";
@@ -51,18 +52,26 @@ import type { HaDropdownSelectEvent } from "../../../../components/ha-dropdown";
 import "../../../../components/ha-dropdown-item";
 import "../../../../components/ha-expansion-panel";
 import "../../../../components/ha-icon-button";
+import "../../../../components/ha-tooltip";
+import "../../../../components/ha-trigger-icon";
 import type {
  AutomationClipboard,
+  AutomationConfig,
  Condition,
  ConditionSidebarConfig,
  PlatformCondition,
+  TriggerCondition,
 } from "../../../../data/automation";
 import {
+  automationConfigContext,
  isCondition,
  subscribeCondition,
  testCondition,
 } from "../../../../data/automation";
-import { describeCondition } from "../../../../data/automation_i18n";
+import {
+  describeCondition,
+  getTriggerInfos,
+} from "../../../../data/automation_i18n";
 import type { ConditionDescriptions } from "../../../../data/condition";
 import { CONDITION_BUILDING_BLOCKS } from "../../../../data/condition";
 import {
@@ -82,6 +91,7 @@ import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import { showEditorToast } from "../editor-toast";
 import "../ha-automation-editor-warning";
+import "../ha-trigger-id-chip";
 import { overflowStyles, rowStyles } from "../styles";
 import "../target/ha-automation-row-targets";
 import "./ha-automation-condition-editor";
@@ -155,6 +165,10 @@ export default class HaAutomationConditionRow extends LitElement {

  @state() private _liveTestResult: LiveTestState = "unknown";

+  @state()
+  @consume({ context: automationConfigContext, subscribe: true })
+  private _automationConfig?: AutomationConfig;
+
  @state()
  @consume({ context: fullEntitiesContext, subscribe: true })
  _entityReg: EntityRegistryEntry[] = [];
@@ -213,9 +227,13 @@ export default class HaAutomationConditionRow extends LitElement {
        .condition=${this.condition.condition}
      ></ha-condition-icon>
      <h3 slot="header">
-        ${capitalizeFirstLetter(
-          describeCondition(this.condition, this.hass, this._entityReg)
-        )}
+        ${this.condition.condition === "trigger"
+          ? this._renderTriggerConditionDescription(
+              this.condition as TriggerCondition
+            )
+          : capitalizeFirstLetter(
+              describeCondition(this.condition, this.hass, this._entityReg)
+            )}
        ${target !== undefined || (descriptionHasTarget && !this._isNew)
          ? this._renderTargets(
              target,
@@ -529,9 +547,11 @@ export default class HaAutomationConditionRow extends LitElement {
              >${this._renderRow()}
              <ha-automation-row-live-test
                slot="icons"
-                .state=${this._liveTestResult}
+                .state=${this.condition.condition !== "trigger"
+                  ? this._liveTestResult
+                  : "unknown"}
                .label=${this.hass.localize(
-                  `ui.panel.config.automation.editor.conditions.live_test_state.${this._liveTestResult}`
+                  `ui.panel.config.automation.editor.conditions.live_test_state.${this.condition.condition !== "trigger" ? this._liveTestResult : "unknown"}`
                )}
              ></ha-automation-row-live-test
            ></ha-automation-row>`
@@ -564,6 +584,67 @@ export default class HaAutomationConditionRow extends LitElement {
    `;
  }

+  private _getTriggerInfos = memoizeOne(getTriggerInfos);
+
+  private _renderTriggerConditionDescription(condition: TriggerCondition) {
+    const ids = ensureArray(condition.id ?? []).filter((id) => id !== "");
+    const prefix = capitalizeFirstLetter(
+      this.hass
+        .localize(
+          "ui.panel.config.automation.editor.conditions.type.trigger.description.full",
+          { id: "" }
+        )
+        .trim()
+    );
+    if (!ids.length) {
+      return html`${prefix}
+        <div class="trigger warning">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.conditions.type.trigger.description.no_trigger"
+          )}
+        </div>`;
+    }
+
+    const triggers = ensureArray(this._automationConfig?.triggers || []);
+
+    const triggerInfos = this._getTriggerInfos(
+      triggers,
+      this.hass,
+      this._entityReg
+    );
+    const infoById = new Map(triggerInfos.map((info) => [info.id, info]));
+    return html`${prefix}
+    ${ids
+      .filter((id) => infoById.get(id))
+      .map((id) => {
+        const info = infoById.get(id)!;
+
+        const triggerIcon = html`<ha-trigger-icon
+          .slot=${ids.length < 4 ? "start" : ""}
+          .hass=${this.hass}
+          .trigger=${info.triggerType}
+        ></ha-trigger-icon>`;
+
+        return html`
+          <div class="trigger">
+            ${ids.length < 4 ? triggerIcon : nothing}
+            <ha-trigger-id-chip id=${`trigger-${id}`} .triggerId=${id}>
+            </ha-trigger-id-chip>
+            ${ids.length < 4
+              ? html`<span>${info.label}</span>`
+              : html`<ha-tooltip .for=${`trigger-${id}`}></ha-tooltip>`}
+            ${ids.length >= 4
+              ? html`<ha-tooltip .for=${`trigger-${id}`}>
+                  ${ids.length >= 4
+                    ? html`<div>${triggerIcon}${info.label}</div>`
+                    : nothing}
+                </ha-tooltip>`
+              : nothing}
+          </div>
+        `;
+      })}`;
+  }
+
  private _renderTargets = memoizeOne(
    (
      target?: HassServiceTarget,
@@ -1107,7 +1188,26 @@ export default class HaAutomationConditionRow extends LitElement {
  }

  static get styles(): CSSResultGroup {
-    return [rowStyles, overflowStyles];
+    return [
+      rowStyles,
+      overflowStyles,
+      css`
+        .trigger {
+          display: flex;
+          align-items: center;
+          gap: var(--ha-space-2);
+          background-color: var(--ha-color-fill-neutral-normal-resting);
+          border-radius: var(--ha-border-radius-md);
+          padding-inline: var(--ha-space-2);
+          color: var(--ha-color-on-neutral-normal);
+          height: 32px;
+        }
+        .trigger.warning {
+          background-color: var(--ha-color-fill-warning-normal-resting);
+          color: var(--ha-color-on-warning-normal);
+        }
+      `,
+    ];
  }
 }

@@ -1,26 +1,30 @@
-import type { UnsubscribeFunc } from "home-assistant-js-websocket";
-import { html, LitElement } from "lit";
+import { consume } from "@lit/context";
+import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../../../../common/array/ensure-array";
 import { fireEvent } from "../../../../../common/dom/fire_event";
+import "../../../../../components/ha-alert";
 import "../../../../../components/ha-form/ha-form";
-import type { SchemaUnion } from "../../../../../components/ha-form/types";
 import "../../../../../components/ha-select";
+import "../../../../../components/item/ha-list-item-option";
+import type { HaListItemOption } from "../../../../../components/item/ha-list-item-option";
+import "../../../../../components/list/ha-list-selectable";
+import type { HaListSelectable } from "../../../../../components/list/ha-list-selectable";
+import type { HaListSelectedDetail } from "../../../../../components/list/types";
 import {
-  flattenTriggers,
+  automationConfigContext,
  type AutomationConfig,
-  type Trigger,
  type TriggerCondition,
 } from "../../../../../data/automation";
+import {
+  getTriggerInfos,
+  type TriggerInfo,
+} from "../../../../../data/automation_i18n";
+import { fullEntitiesContext } from "../../../../../data/context";
+import type { EntityRegistryEntry } from "../../../../../data/entity/entity_registry";
 import type { HomeAssistant } from "../../../../../types";
-
-const getTriggersIds = (triggers: Trigger[]): string[] => {
-  const triggerIds = flattenTriggers(triggers)
-    .map((t) => ("id" in t ? t.id : undefined))
-    .filter(Boolean) as string[];
-  return Array.from(new Set(triggerIds));
-};
+import "../../ha-trigger-id-chip";

@customElement("ha-automation-condition-trigger")
 export class HaTriggerCondition extends LitElement {
@@ -30,9 +34,25 @@ export class HaTriggerCondition extends LitElement {

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

-  @state() private _triggerIds: string[] = [];
+  @state()
+  @consume({ context: automationConfigContext, subscribe: true })
+  private _automationConfig?: AutomationConfig;

-  private _unsub?: UnsubscribeFunc;
+  @state()
+  @consume({ context: fullEntitiesContext, subscribe: true })
+  private _entityReg: EntityRegistryEntry[] = [];
+
+  private _triggerInfos = memoizeOne(
+    (
+      triggers: AutomationConfig["triggers"] | undefined,
+      entityReg: EntityRegistryEntry[]
+    ): TriggerInfo[] =>
+      getTriggerInfos(
+        triggers ? ensureArray(triggers) : undefined,
+        this.hass,
+        entityReg
+      )
+  );

  public static get defaultConfig(): TriggerCondition {
    return {
@@ -41,89 +61,106 @@ export class HaTriggerCondition extends LitElement {
    };
  }

-  private _schema = memoizeOne(
-    (triggerIds: string[]) =>
-      [
-        {
-          name: "id",
-          selector: {
-            select: {
-              multiple: true,
-              options: triggerIds,
-            },
-          },
-          required: true,
-        },
-      ] as const
-  );
-
-  connectedCallback() {
-    super.connectedCallback();
-    const details = { callback: (config) => this._automationUpdated(config) };
-    fireEvent(this, "subscribe-automation-config", details);
-    this._unsub = (details as any).unsub;
-  }
-
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    if (this._unsub) {
-      this._unsub();
-    }
-  }
-
  protected render() {
-    if (!this._triggerIds.length) {
-      return this.hass.localize(
-        "ui.panel.config.automation.editor.conditions.type.trigger.no_triggers"
-      );
-    }
+    const selectedIds: (string | number)[] = ensureArray(
+      this.condition.id || []
+    );

-    const schema = this._schema(this._triggerIds);
+    const triggerInfos = this._triggerInfos(
+      this._automationConfig?.triggers,
+      this._entityReg
+    );
+
+    if (!triggerInfos.length && !selectedIds.length) {
+      return html`
+        <ha-alert alert-type="info">
+          ${this.hass.localize(
+            "ui.panel.config.automation.editor.conditions.type.trigger.no_triggers"
+          )}
+        </ha-alert>
+      `;
+    }

    return html`
-      <ha-form
-        .schema=${schema}
-        .data=${this.condition}
-        .hass=${this.hass}
-        .disabled=${this.disabled}
-        .computeLabel=${this._computeLabelCallback}
-        @value-changed=${this._valueChanged}
-      ></ha-form>
+      <ha-list-selectable @ha-list-selected=${this._valueChanged} multi>
+        ${this._renderOptions(selectedIds, triggerInfos)}
+      </ha-list-selectable>
    `;
  }

-  private _computeLabelCallback = (
-    schema: SchemaUnion<ReturnType<typeof this._schema>>
-  ): string =>
-    this.hass.localize(
-      `ui.panel.config.automation.editor.conditions.type.trigger.${schema.name}`
-    );
-
-  private _automationUpdated(config?: AutomationConfig) {
-    this._triggerIds = config?.triggers
-      ? getTriggersIds(ensureArray(config.triggers))
-      : [];
+  private _renderOptions(
+    selectedIds: (string | number)[],
+    triggerInfos: TriggerInfo[]
+  ) {
+    return html`
+      ${triggerInfos.map(
+        (info) => html`
+          <ha-list-item-option
+            .value=${info.id}
+            .selected=${selectedIds.includes(info.id)}
+            appearance="checkbox"
+          >
+            <div class="option" slot="headline">
+              <ha-trigger-id-chip
+                id=${`trigger-${info.id}`}
+                .triggerId=${info.id}
+              >
+              </ha-trigger-id-chip>
+              ${info.label}
+            </div>
+          </ha-list-item-option>
+        `
+      )}
+    `;
  }

-  private _valueChanged(ev: CustomEvent): void {
+  private _valueChanged(ev: CustomEvent<HaListSelectedDetail>): void {
    ev.stopPropagation();
-    const newValue = ev.detail.value;
+    if (
+      !ev.detail.diff ||
+      (!ev.detail.diff?.added.size && !ev.detail.diff?.removed.size)
+    ) {
+      return;
+    }

-    if (typeof newValue.id === "string") {
-      if (!this._triggerIds.some((id) => id === newValue.id)) {
-        newValue.id = "";
-      }
-    } else if (Array.isArray(newValue.id)) {
-      newValue.id = newValue.id.filter((_id) =>
-        this._triggerIds.some((id) => id === _id)
-      );
-      if (!newValue.id.length) {
-        newValue.id = "";
+    const ids = ensureArray(this.condition.id || []);
+
+    const valueSet = ev.detail.diff.added.size
+      ? ev.detail.diff.added
+      : ev.detail.diff.removed;
+
+    const index = valueSet.values().next().value;
+
+    if (index === undefined) {
+      return;
+    }
+    const triggerId = (
+      (ev.currentTarget as HaListSelectable).items[index] as HaListItemOption
+    ).value;
+    if (triggerId === undefined || triggerId === "") {
+      return;
+    }
+
+    if (ev.detail.diff.added.size) {
+      ids.push(triggerId);
+    } else {
+      const removeIndex = ids.indexOf(triggerId);
+      if (removeIndex > -1) {
+        ids.splice(removeIndex, 1);
      }
    }

-    fireEvent(this, "value-changed", { value: newValue });
+    fireEvent(this, "value-changed", { value: { ...this.condition, id: ids } });
  }
+
+  static styles = css`
+    .option {
+      display: flex;
+      align-items: center;
+      gap: var(--ha-space-1);
+      color: var(--ha-color-on-neutral-normal);
+    }
+  `;
 }

 declare global {
@@ -1,4 +1,5 @@
 import "@home-assistant/webawesome/dist/components/divider/divider";
+import { provide } from "@lit/context";
 import {
  mdiAppleKeyboardCommand,
  mdiCog,
@@ -20,10 +21,9 @@ import {
  mdiTransitConnection,
  mdiUndo,
 } from "@mdi/js";
-import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { UndoRedoController } from "../../../common/controllers/undo-redo-controller";
 import { fireEvent } from "../../../common/dom/fire_event";
@@ -31,6 +31,7 @@ import { goBack, navigate } from "../../../common/navigate";
 import { promiseTimeout } from "../../../common/util/promise-timeout";
 import "../../../components/ha-button";
 import "../../../components/ha-dropdown";
+import type { HaDropdownSelectEvent } from "../../../components/ha-dropdown";
 import "../../../components/ha-dropdown-item";
 import "../../../components/ha-icon";
 import "../../../components/ha-icon-button";
@@ -45,6 +46,7 @@ import type {
  Trigger,
 } from "../../../data/automation";
 import {
+  automationConfigContext,
  deleteAutomation,
  fetchAutomationFileConfig,
  getAutomationEditorInitData,
@@ -72,13 +74,12 @@ import { PreventUnsavedMixin } from "../../../mixins/prevent-unsaved-mixin";
 import { haStyle } from "../../../resources/styles";
 import type { Entries, ValueChangedEvent } from "../../../types";
 import { isMac } from "../../../util/is_mac";
-import { showEditorToast } from "./editor-toast";
 import { showAssignCategoryDialog } from "../category/show-dialog-assign-category";
 import { showAutomationModeDialog } from "./automation-mode-dialog/show-dialog-automation-mode";
 import { showAutomationSaveDialog } from "./automation-save-dialog/show-dialog-automation-save";
 import { showAutomationSaveTimeoutDialog } from "./automation-save-timeout-dialog/show-dialog-automation-save-timeout";
-import { ADD_AUTOMATION_ELEMENT_QUERY_PARAM } from "./show-add-automation-element-dialog";
 import "./blueprint-automation-editor";
+import { showEditorToast } from "./editor-toast";
 import type { EditorDomainHooks } from "./ha-automation-script-editor-mixin";
 import {
  AutomationScriptEditorMixin,
@@ -86,7 +87,7 @@ import {
 } from "./ha-automation-script-editor-mixin";
 import "./manual-automation-editor";
 import type { HaManualAutomationEditor } from "./manual-automation-editor";
-import type { HaDropdownSelectEvent } from "../../../components/ha-dropdown";
+import { ADD_AUTOMATION_ELEMENT_QUERY_PARAM } from "./show-add-automation-element-dialog";

 declare global {
  interface HTMLElementTagNameMap {
@@ -94,10 +95,6 @@ declare global {
  }
  // for fire event
  interface HASSDomEvents {
-    "subscribe-automation-config": {
-      callback: (config: AutomationConfig) => void;
-      unsub?: UnsubscribeFunc;
-    };
    "ui-mode-not-available": Error;
    "move-down": undefined;
    "move-up": undefined;
@@ -125,12 +122,9 @@ export class HaAutomationEditor extends AutomationScriptEditorMixin<AutomationCo

  @query("ha-yaml-editor") private _yamlEditor?: HaYamlEditor;

-  private _configSubscriptions: Record<
-    string,
-    (config?: AutomationConfig) => void
-  > = {};
-
-  private _configSubscriptionsId = 1;
+  @provide({ context: automationConfigContext })
+  @state()
+  protected config?: AutomationConfig;

  private _newAutomationId?: string;

@@ -404,10 +398,7 @@ export class HaAutomationEditor extends AutomationScriptEditorMixin<AutomationCo
            </ha-svg-icon>
          </ha-dropdown-item>
        </ha-dropdown>
-        <div
-          class=${this.mode === "yaml" ? "yaml-mode" : ""}
-          @subscribe-automation-config=${this._subscribeAutomationConfig}
-        >
+        <div class=${this.mode === "yaml" ? "yaml-mode" : ""}>
          ${this.mode === "gui"
            ? html`
                <div>
@@ -638,12 +629,6 @@ export class HaAutomationEditor extends AutomationScriptEditorMixin<AutomationCo
    ) {
      this._setEntityId();
    }
-
-    if (changedProps.has("config")) {
-      Object.values(this._configSubscriptions).forEach((sub) =>
-        sub(this.config)
-      );
-    }
  }

  private _setEntityId() {
@@ -1021,15 +1006,6 @@ export class HaAutomationEditor extends AutomationScriptEditorMixin<AutomationCo
    }
  }

-  private _subscribeAutomationConfig(ev) {
-    const id = this._configSubscriptionsId++;
-    this._configSubscriptions[id] = ev.detail.callback;
-    ev.detail.unsub = () => {
-      delete this._configSubscriptions[id];
-    };
-    ev.detail.callback(this.config);
-  }
-
  protected supportedShortcuts(): SupportedShortcuts {
    return {
      s: () => this._handleSaveAutomation(),
@@ -0,0 +1,62 @@
+import { mdiPound } from "@mdi/js";
+import { css, html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
+import "../../../components/ha-svg-icon";
+
+/**
+ * Home Assistant trigger ID chip component
+ *
+ * @element ha-trigger-id-chip
+ * @extends {LitElement}
+ *
+ * @summary
+ * A small chip that displays an automation trigger ID prefixed with a hash icon.
+ *
+ * @slot start - Optional content rendered before the hash icon (usually an icon).
+ *
+ * @attr {string} trigger-id - The trigger ID to display.
+ * @attr {boolean} warning - Renders the chip with warning colors.
+ */
+@customElement("ha-trigger-id-chip")
+export class HaTriggerIdChip extends LitElement {
+  @property({ attribute: "trigger-id" }) public triggerId!: string;
+
+  @property({ type: Boolean, reflect: true }) public warning = false;
+
+  protected render() {
+    return html`
+      <slot name="start"></slot>
+      <ha-svg-icon .path=${mdiPound}></ha-svg-icon>
+      <span>${this.triggerId}</span>
+    `;
+  }
+
+  static styles = css`
+    :host {
+      background-color: var(--card-background-color);
+      border-radius: var(--ha-border-radius-sm);
+      border: var(--ha-border-width-sm) solid
+        var(--ha-color-border-neutral-normal);
+      --mdc-icon-size: 16px;
+      display: inline-flex;
+      gap: var(--ha-space-1);
+      align-items: center;
+      color: var(--ha-color-on-neutral-normal);
+      padding: 0 var(--ha-space-1);
+      font-weight: var(--ha-font-weight-medium);
+      line-height: 20px;
+      height: 20px;
+    }
+    :host([warning]) {
+      border-color: var(--ha-color-border-warning-normal);
+      color: var(--ha-color-on-warning-normal);
+      background-color: var(--ha-color-fill-warning-quiet-resting);
+    }
+  `;
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-trigger-id-chip": HaTriggerIdChip;
+  }
+}
@@ -32,11 +32,11 @@ import {
  normalizeAutomationConfig,
 } from "../../../data/automation";
 import { getActionType, type Action } from "../../../data/script";
-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 { ManualEditorMixin } from "./ha-manual-editor-mixin";
 import { showPasteReplaceDialog } from "./paste-replace-dialog/show-dialog-paste-replace";
 import { manualEditorStyles, saveFabStyles } from "./styles";
@@ -14,13 +14,15 @@ import {
  mdiStopCircleOutline,
 } from "@mdi/js";
 import type { PropertyValues } from "lit";
-import { html, LitElement, nothing } from "lit";
+import { css, 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 { handleStructError } from "../../../../common/structs/handle-errors";
 import type { HaDropdownSelectEvent } from "../../../../components/ha-dropdown";
 import "../../../../components/ha-dropdown-item";
+import "../../../../components/ha-svg-icon";
+import "../../../../components/ha-tooltip";
 import type {
  LegacyTrigger,
  Trigger,
@@ -35,6 +37,7 @@ import {
 import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import "../ha-automation-comment";
+import "../ha-trigger-id-chip";
 import { overflowStyles, sidebarEditorStyles } from "../styles";
 import "../trigger/ha-automation-trigger-editor";
 import type HaAutomationTriggerEditor from "../trigger/ha-automation-trigger-editor";
@@ -57,8 +60,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
  @property({ type: Number, attribute: "sidebar-key" })
  public sidebarKey?: number;

-  @state() private _requestShowId = false;
-
  @state() private _warnings?: string[];

  @query(".sidebar-editor")
@@ -66,7 +67,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {

  protected willUpdate(changedProperties: PropertyValues<this>) {
    if (changedProperties.has("config")) {
-      this._requestShowId = false;
      this._warnings = undefined;
      if (this.config) {
        this.yamlMode = this.config.yamlMode;
@@ -111,11 +111,21 @@ export default class HaAutomationSidebarTrigger extends LitElement {
        @wa-select=${this._handleDropdownSelect}
      >
        <span slot="title">${title}</span>
-        <span slot="subtitle"
-          >${subtitle}${rowDisabled
-            ? ` (${this.hass.localize("ui.panel.config.automation.editor.actions.disabled")})`
-            : ""}</span
-        >
+        <div slot="subtitle" class="subtitle">
+          ${subtitle}
+          ${"id" in this.config.config
+            ? html`<ha-trigger-id-chip
+                id="trigger-id-chip"
+                .triggerId=${(
+                  this.config.config as Exclude<Trigger, TriggerList>
+                ).id}
+              >
+              </ha-trigger-id-chip>`
+            : nothing}
+          ${rowDisabled
+            ? `(${this.hass.localize("ui.panel.config.automation.editor.actions.disabled")})`
+            : nothing}
+        </div>
        <ha-dropdown-item
          slot="menu-items"
          value="rename"
@@ -147,18 +157,16 @@ export default class HaAutomationSidebarTrigger extends LitElement {
              </div>
            </ha-dropdown-item>`
          : nothing}
-        ${!this.yamlMode &&
-        !("id" in this.config.config) &&
-        !this._requestShowId
-          ? html`<ha-dropdown-item
+        ${type !== "list"
+          ? html` <ha-dropdown-item
              slot="menu-items"
-              value="show_id"
+              value="edit_id"
              .disabled=${this.disabled || type === "list"}
            >
              <ha-svg-icon slot="icon" .path=${mdiIdentifier}></ha-svg-icon>
              <div class="overflow-label">
                ${this.hass.localize(
-                  "ui.panel.config.automation.editor.triggers.edit_id"
+                  `ui.panel.config.automation.editor.triggers.${"id" in this.config.config ? "edit" : "add"}_id`
                )}
                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
              </div>
@@ -335,7 +343,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
            @value-changed=${this._valueChangedSidebar}
            @yaml-changed=${this._yamlChangedSidebar}
            .uiSupported=${this.config.uiSupported}
-            .showId=${this._requestShowId}
            .yamlMode=${this.yamlMode}
            .disabled=${this.disabled}
            @ui-mode-not-available=${this._handleUiModeNotAvailable}
@@ -386,10 +393,6 @@ export default class HaAutomationSidebarTrigger extends LitElement {
    fireEvent(this, "toggle-yaml-mode");
  };

-  private _showTriggerId = () => {
-    this._requestShowId = true;
-  };
-
  private _handleDropdownSelect(ev: HaDropdownSelectEvent) {
    const action = ev.detail?.item?.value;

@@ -404,8 +407,8 @@ export default class HaAutomationSidebarTrigger extends LitElement {
      case "edit_comment":
        this.config.editComment();
        break;
-      case "show_id":
-        this._showTriggerId();
+      case "edit_id":
+        this.config.editId();
        break;
      case "duplicate":
        this.config.duplicate();
@@ -431,7 +434,16 @@ export default class HaAutomationSidebarTrigger extends LitElement {
    }
  }

-  static styles = [sidebarEditorStyles, overflowStyles];
+  static styles = [
+    sidebarEditorStyles,
+    overflowStyles,
+    css`
+      .subtitle {
+        display: flex;
+        gap: var(--ha-space-1);
+      }
+    `,
+  ];
 }

 declare global {
@@ -0,0 +1,119 @@
+import { consume, type ContextType } from "@lit/context";
+import type { CSSResultGroup } from "lit";
+import { LitElement, css, html, nothing } from "lit";
+import { customElement, state } from "lit/decorators";
+import "../../../../components/ha-alert";
+import "../../../../components/ha-button";
+import "../../../../components/ha-dialog";
+import "../../../../components/ha-dialog-footer";
+import "../../../../components/input/ha-input";
+import type { HaInput } from "../../../../components/input/ha-input";
+import { internationalizationContext } from "../../../../data/context";
+import { DialogMixin } from "../../../../dialogs/dialog-mixin";
+import { haStyle, haStyleDialog } from "../../../../resources/styles";
+import type { EditTriggerIdDialogParams } from "./show-edit-trigger-id";
+
+@customElement("ha-automation-edit-trigger-id-dialog")
+class HaAutomationEditTriggerIdDialog extends DialogMixin<EditTriggerIdDialogParams>(
+  LitElement
+) {
+  @state() private _newId = "";
+
+  @state()
+  @consume({ context: internationalizationContext, subscribe: true })
+  protected _i18n!: ContextType<typeof internationalizationContext>;
+
+  connectedCallback() {
+    super.connectedCallback();
+    this._setInitialId();
+  }
+
+  private _setInitialId() {
+    if (this.params?.id) {
+      this._newId = this.params.id;
+    }
+  }
+
+  protected render() {
+    if (!this.params) {
+      return nothing;
+    }
+
+    const title = this._i18n.localize(
+      `ui.panel.config.automation.editor.triggers.${
+        this.params.id ? "edit_id" : "add_id"
+      }`
+    );
+
+    return html`
+      <ha-dialog open header-title=${title}>
+        <ha-input
+          autofocus
+          .label=${this._i18n.localize(
+            "ui.panel.config.automation.editor.triggers.id"
+          )}
+          .value=${this._newId}
+          @input=${this._idChanged}
+          @keydown=${this._handleKeyDown}
+        ></ha-input>
+        <ha-alert alert-type="info">
+          ${this._i18n.localize(
+            "ui.panel.config.automation.editor.triggers.id_description"
+          )}
+        </ha-alert>
+        <ha-dialog-footer slot="footer">
+          <ha-button
+            slot="secondaryAction"
+            appearance="plain"
+            @click=${this.closeDialog}
+          >
+            ${this._i18n.localize("ui.common.cancel")}
+          </ha-button>
+          <ha-button slot="primaryAction" @click=${this._save}>
+            ${this._i18n.localize("ui.common.save")}
+          </ha-button>
+        </ha-dialog-footer>
+      </ha-dialog>
+    `;
+  }
+
+  private _idChanged(ev: InputEvent) {
+    const target = ev.target as HaInput;
+    this._newId = target.value ?? "";
+  }
+
+  private _handleKeyDown(ev: KeyboardEvent) {
+    if (ev.key === "Enter") {
+      ev.preventDefault();
+      this._save();
+    }
+  }
+
+  private _save(): void {
+    const trimmed = this._newId.trim();
+    this.params!.onUpdate(trimmed || undefined);
+    this.closeDialog();
+  }
+
+  static get styles(): CSSResultGroup {
+    return [
+      haStyle,
+      haStyleDialog,
+      css`
+        ha-input {
+          width: 100%;
+        }
+        ha-alert {
+          display: block;
+          margin-top: var(--ha-space-6);
+        }
+      `,
+    ];
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-automation-edit-trigger-id-dialog": HaAutomationEditTriggerIdDialog;
+  }
+}
@@ -6,7 +6,6 @@ import { dynamicElement } from "../../../../common/dom/dynamic-element-directive
 import { fireEvent } from "../../../../common/dom/fire_event";
 import "../../../../components/ha-yaml-editor";
 import type { HaYamlEditor } from "../../../../components/ha-yaml-editor";
-import "../../../../components/input/ha-input";
 import type { Trigger } from "../../../../data/automation";
 import { migrateAutomationTrigger } from "../../../../data/automation";
 import type { TriggerDescription } from "../../../../data/trigger";
@@ -31,8 +30,6 @@ export default class HaAutomationTriggerEditor extends LitElement {

  @property({ type: Boolean, attribute: "sidebar" }) public inSidebar = false;

-  @property({ type: Boolean, attribute: "show-id" }) public showId = false;
-
  @property({ attribute: false }) public description?: TriggerDescription;

  @query("ha-yaml-editor") public yamlEditor?: HaYamlEditor;
@@ -42,8 +39,6 @@ export default class HaAutomationTriggerEditor extends LitElement {

    const yamlMode = this.yamlMode || !this.uiSupported;

-    const showId = "id" in this.trigger || this.showId;
-
    return html`
      <div
        class=${classMap({
@@ -77,18 +72,6 @@ export default class HaAutomationTriggerEditor extends LitElement {
              ></ha-yaml-editor>
            `
          : html`
-              ${showId && !isTriggerList(this.trigger)
-                ? html`
-                    <ha-input
-                      .label=${this.hass.localize(
-                        "ui.panel.config.automation.editor.triggers.id"
-                      )}
-                      .value=${this.trigger.id || ""}
-                      .disabled=${this.disabled}
-                      @change=${this._idChanged}
-                    ></ha-input>
-                  `
-                : nothing}
              <div @value-changed=${this._onUiChanged}>
                ${this.description
                  ? html`<ha-automation-trigger-platform
@@ -108,24 +91,6 @@ export default class HaAutomationTriggerEditor extends LitElement {
    `;
  }

-  private _idChanged(ev: CustomEvent) {
-    if (isTriggerList(this.trigger)) return;
-    const newId = (ev.target as any).value;
-
-    if (newId === (this.trigger.id ?? "")) {
-      return;
-    }
-    const value = { ...this.trigger };
-    if (!newId) {
-      delete value.id;
-    } else {
-      value.id = newId;
-    }
-    fireEvent(this, "value-changed", {
-      value,
-    });
-  }
-
  private _onYamlChange(ev: CustomEvent) {
    ev.stopPropagation();
    if (!ev.detail.isValid) {
@@ -160,9 +125,6 @@ export default class HaAutomationTriggerEditor extends LitElement {
          border-top: 1px solid var(--divider-color);
          border-bottom: 1px solid var(--divider-color);
        }
-        ha-input {
-          margin-bottom: var(--ha-space-3);
-        }
      `,
    ];
  }
@@ -11,6 +11,7 @@ import {
  mdiContentPaste,
  mdiDelete,
  mdiDotsVertical,
+  mdiIdentifier,
  mdiPlayCircleOutline,
  mdiPlaylistEdit,
  mdiPlusCircleMultipleOutline,
@@ -48,6 +49,7 @@ import "../../../../components/ha-dropdown-item";
 import "../../../../components/ha-expansion-panel";
 import "../../../../components/ha-icon-button";
 import "../../../../components/ha-svg-icon";
+import "../../../../components/ha-tooltip";
 import { TRIGGER_ICONS } from "../../../../components/ha-trigger-icon";
 import type {
  AutomationClipboard,
@@ -73,10 +75,12 @@ import type { HomeAssistant } from "../../../../types";
 import { isMac } from "../../../../util/is_mac";
 import { showEditorToast } from "../editor-toast";
 import "../ha-automation-editor-warning";
+import "../ha-trigger-id-chip";
 import { overflowStyles, rowStyles } from "../styles";
 import "../target/ha-automation-row-targets";
 import "./ha-automation-trigger-editor";
 import type HaAutomationTriggerEditor from "./ha-automation-trigger-editor";
+import { showEditTriggerIdDialog } from "./show-edit-trigger-id";
 import "./types/ha-automation-trigger-calendar";
 import "./types/ha-automation-trigger-conversation";
 import "./types/ha-automation-trigger-device";
@@ -244,6 +248,14 @@ export default class HaAutomationTriggerRow extends LitElement {
            .trigger=${(this.trigger as Exclude<Trigger, TriggerList>).trigger}
          ></ha-trigger-icon>`}
      <h3 slot="header">
+        ${type !== "list" && (this.trigger as Exclude<Trigger, TriggerList>).id
+          ? html`<ha-trigger-id-chip
+              id="trigger-id-chip"
+              slot="leading-icon"
+              .triggerId=${(this.trigger as Exclude<Trigger, TriggerList>).id}
+            >
+            </ha-trigger-id-chip>`
+          : nothing}
        ${describeTrigger(this.trigger, this.hass, this._entityReg)}
        ${target !== undefined || (descriptionHasTarget && !this._isNew)
          ? this._renderTargets(
@@ -321,6 +333,17 @@ export default class HaAutomationTriggerRow extends LitElement {
              )}
            </ha-dropdown-item>`
          : nothing}
+        ${type !== "list"
+          ? html`<ha-dropdown-item value="edit_id" .disabled=${this.disabled}>
+              <ha-svg-icon slot="icon" .path=${mdiIdentifier}></ha-svg-icon>
+              <div class="overflow-label">
+                ${this.hass.localize(
+                  `ui.panel.config.automation.editor.triggers.${"id" in this.trigger ? "edit" : "add"}_id`
+                )}
+                <span class="shortcut-placeholder ${isMac ? "mac" : ""}"></span>
+              </div>
+            </ha-dropdown-item>`
+          : nothing}
        <wa-divider></wa-divider>

        <ha-dropdown-item value="duplicate" .disabled=${this.disabled}>
@@ -694,6 +717,7 @@ export default class HaAutomationTriggerRow extends LitElement {
          this.focus();
        }
      },
+      editId: this._editTriggerId,
      rename: () => {
        this._renameTrigger();
      },
@@ -805,6 +829,34 @@ export default class HaAutomationTriggerRow extends LitElement {
    });
  }

+  private _editTriggerId = () => {
+    if (isTriggerList(this.trigger)) {
+      return;
+    }
+    const trigger = this.trigger as Exclude<Trigger, TriggerList>;
+    showEditTriggerIdDialog(this, {
+      id: trigger.id,
+      onUpdate: (newId) => {
+        if (newId === (trigger.id ?? undefined)) {
+          return;
+        }
+        const value: Trigger = { ...trigger };
+        if (newId) {
+          value.id = newId;
+        } else {
+          delete value.id;
+        }
+        fireEvent(this, "value-changed", {
+          value,
+        });
+
+        if (this._selected && this.optionsInSidebar) {
+          this.openSidebar(value); // refresh sidebar
+        }
+      },
+    });
+  };
+
  private _renameTrigger = async (): Promise<void> => {
    if (isTriggerList(this.trigger)) return;
    const alias = await showPromptDialog(this, {
@@ -989,6 +1041,9 @@ export default class HaAutomationTriggerRow extends LitElement {
      case "edit_comment":
        this._editCommentTrigger();
        break;
+      case "edit_id":
+        this._editTriggerId();
+        break;
      case "duplicate":
        this._duplicateTrigger();
        break;
@@ -8,6 +8,7 @@ import type { PropertyValues } from "lit";
 import { html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
+import { ensureArray } from "../../../../common/array/ensure-array";
 import { fireEvent } from "../../../../common/dom/fire_event";
 import { stopPropagation } from "../../../../common/dom/stop_propagation";
 import "../../../../components/ha-button";
@@ -24,12 +25,12 @@ import type { TriggerDescriptions } from "../../../../data/trigger";
 import { isTriggerList, subscribeTriggers } from "../../../../data/trigger";
 import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
 import { EDITOR_SAVE_FAB_TOAST_BOTTOM_OFFSET } from "../editor-toast";
+import { AutomationSortableListMixin } from "../ha-automation-sortable-list-mixin";
 import {
  getAddAutomationElementTargetFromQuery,
  PASTE_VALUE,
  showAddAutomationElementDialog,
 } from "../show-add-automation-element-dialog";
-import { AutomationSortableListMixin } from "../ha-automation-sortable-list-mixin";
 import { automationRowsStyles } from "../styles";
 import "./ha-automation-trigger-row";
 import type HaAutomationTriggerRow from "./ha-automation-trigger-row";
@@ -67,6 +68,38 @@ export default class HaAutomationTrigger extends AutomationSortableListMixin<Tri
    this.highlightedTriggers = items;
  }

+  protected override pasteItem(ev: CustomEvent) {
+    if (this.root && ev.detail.item) {
+      const pasted = deepClone(ev.detail.item) as Trigger;
+      ev.detail.item = pasted;
+    }
+    super.pasteItem(ev);
+  }
+
+  protected override insertAfter(ev: CustomEvent) {
+    // Only dedupe when a single trigger is being inserted.
+    const incoming = ensureArray(ev.detail.value) as Trigger[];
+    if (this.root && incoming.length === 1) {
+      const trigger = deepClone(incoming[0]);
+      ev.detail.value = trigger;
+    }
+    super.insertAfter(ev);
+  }
+
+  protected override duplicateItem(ev: CustomEvent) {
+    if (this.root) {
+      const index = (ev.target as any).index;
+      const duplicated = deepClone(this.triggers[index]);
+      fireEvent(this, "value-changed", {
+        // @ts-expect-error Requires library bump to ES2023
+        value: this.triggers.toSpliced(index + 1, 0, duplicated),
+      });
+      ev.stopPropagation();
+      return;
+    }
+    super.duplicateItem(ev);
+  }
+
  public disconnectedCallback() {
    super.disconnectedCallback();
    this._unsubscribe();
@@ -213,23 +246,28 @@ export default class HaAutomationTrigger extends AutomationSortableListMixin<Tri
  private _addTrigger = (value: string, target?: HassServiceTarget) => {
    let triggers: Trigger[];
    if (value === PASTE_VALUE) {
-      triggers = this.triggers.concat(deepClone(this._clipboard!.trigger!));
-    } else if (isDynamic(value)) {
-      triggers = this.triggers.concat({
-        trigger: getValueFromDynamic(value),
-        target,
-      });
+      const pasted = deepClone(this._clipboard!.trigger!);
+      triggers = this.triggers.concat(pasted);
    } else {
-      const trigger = value as Exclude<Trigger, TriggerList>["trigger"];
-      const elClass = customElements.get(
-        `ha-automation-trigger-${trigger}`
-      ) as CustomElementConstructor & {
-        defaultConfig: Trigger;
-      };
-      triggers = this.triggers.concat({
-        ...elClass.defaultConfig,
-        ...(target?.entity_id ? { entity_id: target.entity_id } : {}),
-      });
+      let newTrigger: Trigger;
+      if (isDynamic(value)) {
+        newTrigger = {
+          trigger: getValueFromDynamic(value),
+          target,
+        };
+      } else {
+        const trigger = value as Exclude<Trigger, TriggerList>["trigger"];
+        const elClass = customElements.get(
+          `ha-automation-trigger-${trigger}`
+        ) as CustomElementConstructor & {
+          defaultConfig: Trigger;
+        };
+        newTrigger = {
+          ...elClass.defaultConfig,
+          ...(target?.entity_id ? { entity_id: target.entity_id } : {}),
+        };
+      }
+      triggers = this.triggers.concat(newTrigger);
    }
    this.focusLastItemOnChange = true;
    fireEvent(this, "value-changed", { value: triggers });
@@ -0,0 +1,22 @@
+import type { LitElement } from "lit";
+import { fireEvent } from "../../../../common/dom/fire_event";
+
+export const loadEditTriggerIdDialog = () =>
+  import("./ha-automation-edit-trigger-id-dialog");
+
+export interface EditTriggerIdDialogParams {
+  id?: string;
+  onUpdate: (newId: string | undefined) => void;
+}
+
+export const showEditTriggerIdDialog = (
+  element: LitElement,
+  dialogParams: EditTriggerIdDialogParams
+): void => {
+  fireEvent(element, "show-dialog", {
+    parentElement: element,
+    dialogTag: "ha-automation-edit-trigger-id-dialog",
+    dialogImport: loadEditTriggerIdDialog,
+    dialogParams,
+  });
+};
@@ -1,6 +1,6 @@
 import "@home-assistant/webawesome/dist/components/divider/divider";
+import { consume } from "@lit/context";
 import { mdiCog, mdiContentCopy } from "@mdi/js";
-import type { UnsubscribeFunc } from "home-assistant-js-websocket";
 import type { PropertyValues } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
@@ -13,9 +13,10 @@ import "../../../../../components/ha-dropdown-item";
 import "../../../../../components/ha-icon-button";
 import "../../../../../components/input/ha-input";
 import type { HaInput } from "../../../../../components/input/ha-input";
-import type {
-  AutomationConfig,
-  WebhookTrigger,
+import {
+  automationConfigContext,
+  type AutomationConfig,
+  type WebhookTrigger,
 } from "../../../../../data/automation";
 import type { HomeAssistant } from "../../../../../types";
 import { showEditorToast } from "../../editor-toast";
@@ -33,9 +34,9 @@ export class HaWebhookTrigger extends LitElement {

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

-  @state() private _config?: AutomationConfig;
-
-  private _unsub?: UnsubscribeFunc;
+  @consume({ context: automationConfigContext, subscribe: true })
+  @state()
+  private _config?: AutomationConfig;

  public static get defaultConfig(): WebhookTrigger {
    return {
@@ -46,24 +47,6 @@ export class HaWebhookTrigger extends LitElement {
    };
  }

-  connectedCallback() {
-    super.connectedCallback();
-    const details = {
-      callback: (config) => {
-        this._config = config;
-      },
-    };
-    fireEvent(this, "subscribe-automation-config", details);
-    this._unsub = (details as any).unsub;
-  }
-
-  disconnectedCallback() {
-    super.disconnectedCallback();
-    if (this._unsub) {
-      this._unsub();
-    }
-  }
-
  private _generateWebhookId(): string {
    // The webhook_id should be treated like a password. Generate a default
    // value that would be hard for someone to guess. This generates a
@@ -18,6 +18,7 @@ import type { HASSDomEvent } from "../../../common/dom/fire_event";
 import { computeDeviceNameDisplay } from "../../../common/entity/compute_device_name";
 import { computeFloorName } from "../../../common/entity/compute_floor_name";
 import { computeStateDomain } from "../../../common/entity/compute_state_domain";
+import { getDeviceArea } from "../../../common/entity/context/get_device_context";
 import {
  PROTOCOL_INTEGRATIONS,
  protocolIntegrationPicked,
@@ -58,6 +59,7 @@ import {
  deserializeFilters,
  serializeFilters,
 } from "../../../data/data_table_filters";
+import { computeDeviceAreaLabel } from "../../../data/device/device_picker";
 import type {
  DeviceEntityLookup,
  DeviceRegistryEntry,
@@ -458,17 +460,29 @@ export class HaConfigDeviceDashboard extends LitElement {
          .map((lbl) => labelReg!.find((label) => label.label_id === lbl))
          .filter((entry): entry is LabelRegistryEntry => entry !== undefined);

-        let floorName;
-        if (
-          device.area_id &&
-          areas[device.area_id]?.floor_id &&
-          this.hass.floors
-        ) {
-          const floorId = areas[device.area_id].floor_id;
-          if (this.hass.floors[floorId!]) {
-            floorName = computeFloorName(this.hass.floors[floorId!]);
-          }
-        }
+        const { areaName } = computeDeviceAreaLabel(
+          device,
+          this.hass.areas,
+          this.hass.devices,
+          this.hass.states,
+          this.hass.localize,
+          this.hass.language,
+          this.hass.translationMetadata,
+          device.via_device_id
+            ? deviceEntityLookup[device.via_device_id]
+            : undefined
+        );
+
+        const floorArea =
+          getDeviceArea(device, areas) ??
+          (device.via_device_id && this.hass.devices[device.via_device_id]
+            ? getDeviceArea(this.hass.devices[device.via_device_id], areas)
+            : undefined);
+        const floorId = floorArea?.floor_id;
+        const floorName =
+          floorId && this.hass.floors?.[floorId]
+            ? computeFloorName(this.hass.floors[floorId])
+            : undefined;

        return {
          ...device,
@@ -484,10 +498,7 @@ export class HaConfigDeviceDashboard extends LitElement {
          manufacturer:
            device.manufacturer ||
            `<${localize("ui.panel.config.devices.data_table.unknown")}>`,
-          area:
-            device.area_id && areas[device.area_id]
-              ? areas[device.area_id].name
-              : undefined,
+          area: areaName,
          floor: floorName,
          integration: deviceEntries.length
            ? deviceEntries
@@ -5164,7 +5164,9 @@
              },
              "id": "Trigger ID",
              "optional": "Optional",
-              "edit_id": "Edit ID",
+              "add_id": "Add trigger ID",
+              "edit_id": "Edit trigger ID",
+              "id_description": "Use trigger IDs in a Triggered by condition to run different actions depending on which trigger started the automation.",
              "duplicate": "[%key:ui::common::duplicate%]",
              "re_order": "Re-order",
              "rename": "Rename",
@@ -5594,7 +5596,8 @@
                  "id": "Trigger",
                  "description": {
                    "picker": "Tests if the automation has been triggered by a specific trigger.",
-                    "full": "If triggered by {id}"
+                    "full": "If triggered by {id}",
+                    "no_trigger": "No trigger selected"
                  }
                },
                "zone": {
@@ -6666,10 +6666,10 @@ __metadata:
  languageName: node
  linkType: hard

-"date-fns@npm:4.2.0":
-  version: 4.2.0
-  resolution: "date-fns@npm:4.2.0"
-  checksum: 10/6f50c3da98286a93807ad7c1b790ba753d6ea17d028cf0ffe39aa208693d940100a9069ec444f9436dc010de6a94242b8cb459e86e92e8d1948c553f4d141f71
+"date-fns@npm:4.2.1":
+  version: 4.2.1
+  resolution: "date-fns@npm:4.2.1"
+  checksum: 10/c2731946a2d022935b3641062cd64bcdd62a65066115fee3490ba360a17fbf42134918493c43acb2c5c995b9ea4a2c7f505f0d9c02e73351cd2899b13e081729
  languageName: node
  linkType: hard

@@ -8635,7 +8635,7 @@ __metadata:
    core-js: "npm:3.49.0"
    cropperjs: "npm:1.6.2"
    culori: "npm:4.0.2"
-    date-fns: "npm:4.2.0"
+    date-fns: "npm:4.2.1"
    deep-clone-simple: "npm:1.1.1"
    deep-freeze: "npm:0.0.1"
    del: "npm:8.0.1"
Author	SHA1	Message	Date
Wendelin	a15bfb4efe	Fix types	2026-05-27 08:24:02 +02:00
Wendelin	7454e856b2	Clean up	2026-05-26 16:01:36 +02:00
Wendelin	fa43ca949d	Add trigger position reference warning	2026-05-22 12:25:50 +02:00
Wendelin	ac50ba4edc	Add new edit trigger	2026-05-21 17:09:52 +02:00
WendelinandGitHub	58d4edaa63	Respect via device in device picker, device list (#52131 ) * Respect via device in device picker * Add context to device data table too	2026-05-21 16:01:43 +02:00
WendelinandGitHub	176841e647	Automation triggers - auto IDs (#52129 ) * Add auto trigger ids * improve * Fix paste with no trigger id * Fix trigger-id-chip and add jsdocs * review	2026-05-21 16:52:03 +03:00
renovate[bot]GitHubrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	0759e82b47	Update dependency date-fns to v4.2.1 (#52135 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-05-21 16:44:50 +03:00