tap action: run an automation, a script or a scene — with a confirm guard

Owner's spec (2026-07-29), agreed points: one 'Run' action covering the three runnable domains of HA (a script is the idiomatic 'action' — with automations alone people would build trigger-less dummies); the confirm checkbox guards BOTH toggle and run; covers and valves join the card-wide toggle so curtains work natively. - marker.tap_action gains 'run'; marker.tap_target (schema-bounded to automation./script./scene. ids); marker.tap_confirm. - the dialog: a searchable picker over the three domains (friendly name + kind), save refuses a run action without a target, a vanished target gets a warning hint; the checkbox shows for any actionable tap (explicit or effective-default toggle). - the tap: automation.trigger / script.turn_on / scene.turn_on, started/ error toasts; with confirm on — our own dialog (not window.confirm, it must work on a wall tablet), Esc/backdrop/Cancel = no call. The guard covers the controls-toggle path too. - 'run' is explicit-only by construction: it needs a per-marker target, so it can never arrive as a card-wide default. - covers: the old test pinned 'garage stays shut' — that intent survives as COVER_GUARDED_CLASSES (garage/door/gate stay out of the CARD-WIDE toggle; an explicit per-device toggle remains the owner's conscious choice). Locks/alarms stay forbidden everywhere, run included is not affected — we do not inspect automation contents, same trust as HA's own Run button. Tests: unit resolveTapAction/runServiceFor + cover guard, backend schema parity picks 'run' automatically + tap_target bounds, smoke_tap_run with 11 assertions (picker, search, save guard, confirm cancel/ok, per-domain services, missing target). smoke_tap_ctx: 4 options now. Inventory: 148 / 52 / 43 / 72.
2026-08-01 00:48:29 +00:00 · 2026-07-30 01:26:30 +03:00
parent f56bceef27
commit 3e976562ff
13 changed files with 434 additions and 75 deletions
@@ -18,7 +18,7 @@ import {
  snapToWall, openingAmount, interiorPoint, poleOfInaccessibility,
  averageLqi, fitView, declump, safeUrl, resolveTapAction, floorsOf, type FloorInfo,
  stateIcon, lightColorOf, isAlarmState, parseRoomRef, diffNewDevices, glowColorOf, doorSector, hasRoomBehind, controlsAction, isControllable,
-  spaceDisplayOf, roomFillStyle, fillColorsOf, DEFAULT_FILL_COLORS, type FillColors,
+  spaceDisplayOf, roomFillStyle, fillColorsOf, DEFAULT_FILL_COLORS, type FillColors, runServiceFor, RUN_TARGET_DOMAINS,
  isActiveState, DEFAULT_ROOM_COLOR, DEFAULT_ROOM_OPACITY,
  DEFAULT_TEMP_MIN, DEFAULT_TEMP_MAX, type SpaceDisplay,
  referencedContentUrls,
@@ -248,6 +248,8 @@ class HouseplanCard extends LitElement {
  private _roHdr?: ResizeObserver;
  private _onWinResize?: () => void;
  private _hdrH = 118; // measured px above the stage (see the observer in updated())
+  /** The accidental-tap guard: pending confirmation for a toggle/run tap. */
+  private _tapConfirm: { text: string; exec: () => void } | null = null;
  private _onboardingShown = false; // the auto space dialog is shown once per session

  private _rulesDialog: { rules: IconRule[]; test: string; busy: boolean } | null = null;
@@ -283,7 +285,10 @@ class HouseplanCard extends LitElement {
    rippleSize: number;  // in icon diameters
    size: number;        // icon size multiplier
    angle: number;       // icon rotation, degrees
-    tapAction: string;   // '' = the effective default (defaultTap)
+    tapAction: string;
+    tapTarget: string;    // 'run': automation./script./scene. entity id
+    tapConfirm: boolean;  // ask before toggle/run
+    runFilter: string;   // '' = the effective default (defaultTap)
    defaultTap: 'info' | 'toggle';
    controls: string[];  // entities this icon toggles as a group
    controlsFilter: string;
@@ -364,6 +369,7 @@ class HouseplanCard extends LitElement {

  static properties = {
    _hdrH: { state: true },
+    _tapConfirm: { state: true },
    hass: { attribute: false },
    _config: { state: true },
    _space: { state: true },
@@ -457,6 +463,7 @@ class HouseplanCard extends LitElement {
  private _onKey(e: KeyboardEvent): void {
    if (e.key === 'Escape') {
      // close the topmost open dialog; info popups first, then editors
+      if (this._tapConfirm) { this._tapConfirm = null; return; }
      if (this._openingInfo) { this._openingInfo = null; return; }
      if (this._infoCard) { this._infoCard = null; return; }
      if (this._rulesDialog) { this._rulesDialog = null; return; }
@@ -1288,22 +1295,53 @@ class HouseplanCard extends LitElement {
      return;
    }
    const domain = d.primary ? d.primary.split('.')[0] : null;
+    // the accidental-tap guard (owner's spec 2026-07-29): any state-changing
+    // action — toggle or run — may ask first. The dialog is ours, not the
+    // browser confirm(), so it works and looks right on a wall tablet.
+    const guarded = (text: string, exec: () => void): void => {
+      if (d.marker?.tap_confirm) this._tapConfirm = { text, exec };
+      else exec();
+    };
    // a switch with bound targets: the EXPLICIT per-marker toggle flips them
    // all with HA-group semantics (any on -> all off). Owner's decision:
    // controls never fire on the card-wide default action.
    const controls = (d.marker?.controls || []).filter(isControllable);
    if (d.tapAction === 'toggle' && controls.length) {
      const act = controlsAction(controls.map((e) => this.hass.states[e]?.state));
-      this.hass
-        .callService('homeassistant', act, { entity_id: controls })
-        .catch((e: any) => this._showToast(this._t('toast.error', { err: this._errText(e) })));
+      guarded(this._t('confirm.tap_toggle', { name: d.name }), () => {
+        this.hass
+          .callService('homeassistant', act, { entity_id: controls })
+          .catch((e: any) => this._showToast(this._t('toast.error', { err: this._errText(e) })));
+      });
+      return;
+    }
+    const action = resolveTapAction(
+      d.tapAction, undefined, domain,
+      d.primary ? this.hass.states[d.primary]?.attributes?.device_class : null,
+    );
+    if (action === 'run') {
+      const target = d.marker?.tap_target || '';
+      const svc = runServiceFor(target);
+      const st = this.hass.states[target];
+      if (!svc || !st) {
+        this._showToast(this._t('toast.run_target_missing'));
+        return;
+      }
+      const name = st.attributes?.friendly_name || target;
+      guarded(this._t('confirm.tap_run', { name }), () => {
+        this.hass
+          .callService(svc.domain, svc.service, { entity_id: target })
+          .then(() => this._showToast(this._t('toast.run_started', { name })))
+          .catch((e: any) => this._showToast(this._t('toast.error', { err: this._errText(e) })));
+      });
      return;
    }
-    const action = resolveTapAction(d.tapAction, undefined, domain);
    if (action === 'toggle' && d.primary) {
-      this.hass
-        .callService('homeassistant', 'toggle', { entity_id: d.primary })
-        .catch((e: any) => this._showToast(this._t('toast.error', { err: this._errText(e) })));
+      guarded(this._t('confirm.tap_toggle', { name: d.name }), () => {
+        this.hass
+          .callService('homeassistant', 'toggle', { entity_id: d.primary })
+          .catch((e: any) => this._showToast(this._t('toast.error', { err: this._errText(e) })));
+      });
      return;
    }
    if (action === 'more-info' && d.primary) {
@@ -2796,6 +2834,9 @@ class HouseplanCard extends LitElement {
        size: Number(d.marker?.size) > 0 ? Number(d.marker!.size) : 1,
        angle: Number(d.marker?.angle) || 0,
        tapAction: d.marker?.tap_action || '',
+        tapTarget: d.marker?.tap_target || '',
+        tapConfirm: d.marker?.tap_confirm === true,
+        runFilter: '',
        defaultTap: d.primary?.split('.')[0] === 'light' ? 'toggle' : 'info',
        controls: [...(d.marker?.controls || [])],
        controlsFilter: '',
@@ -2820,7 +2861,8 @@ class HouseplanCard extends LitElement {
        name: '', binding: 'virtual', bindingMode: 'virtual', bindingOpen: false,
        showEntities: false, bindingFilter: '', icon: '', autoIcon: '',
        display: 'badge', rippleColor: '', rippleSize: 3, size: 1, angle: 0,
-        tapAction: '', defaultTap: 'info', controls: [], controlsFilter: '', isLight: false,
+        tapAction: '', tapTarget: '', tapConfirm: false, runFilter: '',
+        defaultTap: 'info', controls: [], controlsFilter: '', isLight: false,
        glowRadius: '', model: '',
        link: '', description: '', pdfs: [], room: '', hideFromPlan: false, busy: false,
        uploadId: 'up_' + Date.now().toString(36) + Math.random().toString(36).slice(2, 6),
@@ -2828,6 +2870,22 @@ class HouseplanCard extends LitElement {
    }
  }

+  /** Runnable targets for the 'run' tap action: automations, scripts, scenes. */
+  private _runCandidates(): { value: string; label: string; sub: string }[] {
+    const out: { value: string; label: string; sub: string }[] = [];
+    for (const dom of RUN_TARGET_DOMAINS) {
+      for (const [eid, st] of Object.entries<any>(this.hass.states)) {
+        if (!eid.startsWith(dom + '.')) continue;
+        out.push({
+          value: eid,
+          label: st?.attributes?.friendly_name || eid,
+          sub: this._t(('run.' + dom) as any),
+        });
+      }
+    }
+    return out.sort((a, b) => a.sub.localeCompare(b.sub) || a.label.localeCompare(b.label));
+  }
+
  /** Binding candidates: HA devices + group/helper entities, minus the ones already placed. */
  private _bindingCandidates(): { value: string; label: string; sub: string }[] {
    const h = this.hass;
@@ -2989,6 +3047,10 @@ class HouseplanCard extends LitElement {
      this._showToast(this._t('toast.virtual_name_required'));
      return;
    }
+    if (dlg.tapAction === 'run' && !dlg.tapTarget) {
+      this._showToast(this._t('toast.run_target_required'));
+      return;
+    }
    this._markerDialog = { ...dlg, busy: true };
    try {
      const cfg = this._serverCfg!;
@@ -3014,6 +3076,8 @@ class HouseplanCard extends LitElement {
        size: dlg.size !== 1 ? dlg.size : null,
        angle: dlg.angle ? dlg.angle : null,
        tap_action: dlg.tapAction || null,
+        tap_target: dlg.tapAction === 'run' ? dlg.tapTarget || null : null,
+        tap_confirm: dlg.tapConfirm ? true : null,
        controls: dlg.controls.length ? dlg.controls : null,
        // pdfs may be rewritten below when rebinding changes the marker id
        is_light: dlg.isLight ? true : null,
@@ -4200,6 +4264,20 @@ class HouseplanCard extends LitElement {
            </div>`
          : nothing}
        ${this._kioskDialog ? this._renderKioskDialog() : nothing}
+        ${this._tapConfirm
+          ? html`<div class="menuwrap dialogwrap" @click=${() => (this._tapConfirm = null)}>
+              <div class="dialog" @click=${(e: Event) => e.stopPropagation()}>
+                <div class="body"><p>${this._tapConfirm.text}</p></div>
+                <div class="row">
+                  <span class="spacer"></span>
+                  <button class="btn ghost" @click=${() => (this._tapConfirm = null)}>${this._t('btn.cancel')}</button>
+                  <button class="btn on" @click=${() => { const c = this._tapConfirm!; this._tapConfirm = null; c.exec(); }}>
+                    <ha-icon icon="mdi:check"></ha-icon>${this._t('btn.run')}
+                  </button>
+                </div>
+              </div>
+            </div>`
+          : nothing}
        ${this._toast ? html`<div class="toast">${this._toast}</div>` : nothing}
      </ha-card>
    `;
@@ -5312,6 +5390,42 @@ class HouseplanCard extends LitElement {
              ([v, k]) => html`<option value=${v} ?selected=${(d.tapAction || d.defaultTap) === v}>${this._t(k as any)}</option>`,
            )}
          </select>
+          ${d.tapAction === 'run'
+            ? (() => {
+                const q = d.runFilter.trim().toLowerCase();
+                const cands = this._runCandidates().filter(
+                  (c) => !q || c.label.toLowerCase().includes(q) || c.value.includes(q),
+                );
+                const cur = d.tapTarget ? this._runCandidates().find((c) => c.value === d.tapTarget) : null;
+                return html`
+                  <label>${this._t('marker.run_target_label')}</label>
+                  ${d.tapTarget && !cur
+                    ? html`<div class="rhint">${this._t('marker.run_target_gone', { id: d.tapTarget })}</div>`
+                    : nothing}
+                  <input class="namein" type="text" placeholder=${this._t('marker.run_search_ph')}
+                    .value=${cur ? cur.label : d.runFilter}
+                    @focus=${(e: Event) => { (e.target as HTMLInputElement).select(); }}
+                    @input=${(e: Event) => (this._markerDialog = { ...d, runFilter: (e.target as HTMLInputElement).value, tapTarget: '' })} />
+                  ${!cur
+                    ? html`<div class="candlist">
+                        ${cands.slice(0, 40).map(
+                          (c) => html`<div class="cand ${c.value === d.tapTarget ? 'sel' : ''}"
+                            @click=${() => (this._markerDialog = { ...d, tapTarget: c.value, runFilter: '' })}>
+                            <span class="cl">${c.label}</span><span class="cs">${c.sub}</span>
+                          </div>`,
+                        )}
+                        ${!cands.length ? html`<div class="cand muted">${this._t('marker.nothing_found')}</div>` : nothing}
+                      </div>`
+                    : nothing}`;
+              })()
+            : nothing}
+          ${d.tapAction === 'run' || d.tapAction === 'toggle' || (!d.tapAction && d.defaultTap === 'toggle')
+            ? html`<label class="srcrow" title=${this._t('marker.tap_confirm_tip')}>
+                <input type="checkbox" .checked=${d.tapConfirm}
+                  @change=${(e: Event) => (this._markerDialog = { ...d, tapConfirm: (e.target as HTMLInputElement).checked })} />
+                <span>${this._t('marker.tap_confirm')}</span>
+              </label>`
+            : nothing}

          <label>${this._t('marker.controls_label')}</label>
          <div class="rhint">${this._t('marker.controls_hint')}</div>
@@ -340,5 +340,20 @@
  "toast.plans_list_failed": "Could not list the stored plans: {err}",
  "toast.plan_delete_failed": "Could not delete the plan: {err}",
  "marker.hide": "Hide device from plan",
-  "marker.hide_tip": "The device is not drawn on the plan but still counts toward the room signal. To see it: the \"Show hidden\" button in the device editor."
+  "marker.hide_tip": "The device is not drawn on the plan but still counts toward the room signal. To see it: the \"Show hidden\" button in the device editor.",
+  "tap.run": "Run automation/script/scene",
+  "marker.run_target_label": "What to run",
+  "marker.run_search_ph": "Search: automation, script or scene…",
+  "marker.run_target_gone": "Target {id} not found — pick again",
+  "marker.tap_confirm": "Ask for confirmation",
+  "marker.tap_confirm_tip": "Show a confirmation dialog before acting — a guard against accidental taps.",
+  "run.automation": "automation",
+  "run.script": "script",
+  "run.scene": "scene",
+  "confirm.tap_run": "Run \"{name}\"?",
+  "confirm.tap_toggle": "Toggle \"{name}\"?",
+  "toast.run_started": "Started: {name}",
+  "toast.run_target_missing": "Run target not found — check the device settings",
+  "toast.run_target_required": "Pick an automation, script or scene",
+  "btn.run": "Run"
 }
@@ -340,5 +340,20 @@
  "toast.plans_list_failed": "Не удалось получить список планов: {err}",
  "toast.plan_delete_failed": "Не удалось удалить план: {err}",
  "marker.hide": "Скрыть устройство с плана",
-  "marker.hide_tip": "Устройство не отображается на плане, но участвует в расчёте сигнала комнаты. Показать: кнопка «Показать скрытые» в редакторе устройств."
+  "marker.hide_tip": "Устройство не отображается на плане, но участвует в расчёте сигнала комнаты. Показать: кнопка «Показать скрытые» в редакторе устройств.",
+  "tap.run": "Запустить автоматизацию/скрипт/сцену",
+  "marker.run_target_label": "Что запускать",
+  "marker.run_search_ph": "Поиск: автоматизация, скрипт или сцена…",
+  "marker.run_target_gone": "Цель {id} не найдена — выберите заново",
+  "marker.tap_confirm": "Спрашивать подтверждение",
+  "marker.tap_confirm_tip": "Перед выполнением показать диалог подтверждения — защита от случайных нажатий.",
+  "run.automation": "автоматизация",
+  "run.script": "скрипт",
+  "run.scene": "сцена",
+  "confirm.tap_run": "Запустить «{name}»?",
+  "confirm.tap_toggle": "Переключить «{name}»?",
+  "toast.run_started": "Запущено: {name}",
+  "toast.run_target_missing": "Цель запуска не найдена — проверьте настройки устройства",
+  "toast.run_target_required": "Выберите автоматизацию, скрипт или сцену",
+  "btn.run": "Выполнить"
 }
@@ -596,7 +596,7 @@ export function safeUrl(url: string | null | undefined): string | null {

 // ---------------- tap actions ----------------

-export type TapAction = 'info' | 'more-info' | 'toggle';
+export type TapAction = 'info' | 'more-info' | 'toggle' | 'run';

 /** Domains a card-wide `tap_action: toggle` may toggle (accidental-tap safe). */
 /**
@@ -615,12 +615,12 @@ export type TapAction = 'info' | 'more-info' | 'toggle';
 * Adding an option here and forgetting the schema now fails the test suite.
 */
 export const DISPLAY_MODES = ['badge', 'ripple', 'icon_ripple', 'value'] as const;
-export const TAP_ACTIONS = ['info', 'more-info', 'toggle'] as const;
+export const TAP_ACTIONS = ['info', 'more-info', 'toggle', 'run'] as const;
 /** Space-level fill: 'glow' is a whole-space light model, not a per-room one. */
 export const SPACE_FILL_MODES = ['none', 'lqi', 'light', 'temp', 'glow'] as const;
 export const ROOM_FILL_MODES = ['none', 'lqi', 'light', 'temp'] as const;

-export const TOGGLE_SAFE_DOMAINS = new Set(['light', 'switch', 'fan', 'humidifier']);
+export const TOGGLE_SAFE_DOMAINS = new Set(['light', 'switch', 'fan', 'humidifier', 'cover', 'valve']);

 /**
 * Domains that must NEVER toggle from a plan tap, even with an explicit
@@ -637,10 +637,16 @@ export const TOGGLE_FORBIDDEN_DOMAINS = new Set(['lock', 'alarm_control_panel'])
 * TOGGLE_SAFE_DOMAINS; an explicit per-device toggle affects any domain
 * except TOGGLE_FORBIDDEN_DOMAINS. Everything else falls back to 'info'.
 */
+/** Cover classes that stay OUT of the card-wide toggle: an accidental tap
+ *  opening the garage or the driveway gate is a security matter, like locks.
+ *  An explicit per-device toggle remains the owner's conscious choice. */
+export const COVER_GUARDED_CLASSES = new Set(['garage', 'door', 'gate']);
+
 export function resolveTapAction(
  explicit: string | null | undefined,
  cardDefault: string | null | undefined,
  domain: string | null | undefined,
+  deviceClass?: string | null,
 ): TapAction {
  // Pure light sources (the device's PRIMARY function is a lamp: bulbs,
  // chandeliers, night lights, light groups) toggle by default — no explicit
@@ -648,10 +654,30 @@ export function resolveTapAction(
  // backlight) have a non-light primary and keep the info default.
  const want = explicit || cardDefault || (domain === 'light' ? 'toggle' : 'info');
  if (want === 'more-info') return 'more-info';
+  // 'run' is EXPLICIT-only by construction: it needs a per-marker target, so
+  // it can never arrive as a card-wide default
+  if (want === 'run') return explicit === 'run' ? 'run' : 'info';
  if (want !== 'toggle') return 'info';
  if (!domain || TOGGLE_FORBIDDEN_DOMAINS.has(domain)) return 'info';
  if (explicit === 'toggle') return 'toggle';
-  return TOGGLE_SAFE_DOMAINS.has(domain) ? 'toggle' : 'info';
+  if (!TOGGLE_SAFE_DOMAINS.has(domain)) return 'info';
+  // covers joined the safe set for curtains and blinds (owner, 2026-07-29) —
+  // but the garage door is a cover too, and it stays shut on a default tap
+  if (domain === 'cover' && COVER_GUARDED_CLASSES.has(String(deviceClass || ''))) return 'info';
+  return 'toggle';
+}
+
+/** Domains a tap may RUN (owner's spec 2026-07-29): the runnable units of
+ *  HA. An automation is triggered, a script and a scene are turned on. */
+export const RUN_TARGET_DOMAINS = ['automation', 'script', 'scene'] as const;
+
+/** Service to start a runnable target, or null when the id is not runnable. */
+export function runServiceFor(target: string | null | undefined): { domain: string; service: string } | null {
+  const dom = String(target || '').split('.')[0];
+  if (dom === 'automation') return { domain: 'automation', service: 'trigger' };
+  if (dom === 'script') return { domain: 'script', service: 'turn_on' };
+  if (dom === 'scene') return { domain: 'scene', service: 'turn_on' };
+  return null;
 }

 // ---------------- floors import ----------------
@@ -51,6 +51,10 @@ export interface Marker {
  description?: string | null;
  pdfs?: PdfRef[];
  tap_action?: string | null; // per-device override: 'info' | 'more-info' | 'toggle'
+  /** 'run' target: automation./script./scene. entity id. */
+  tap_target?: string | null;
+  /** Ask before toggle/run — accidental-tap guard (owner's spec). */
+  tap_confirm?: boolean | null;
  room_id?: string | null; // manual placement into a room WITHOUT an HA area (sub-area rooms)
  display?: 'badge' | 'ripple' | 'icon_ripple' | 'value' | null; // how the device is drawn
  ripple_color?: string | null;