From 898ab7c7011df90a1dd25ec7529de504f2237dc5 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 25 Sep 2026 15:21:18 +0100
Subject: [PATCH] [safe_mode] Use register_apply_action for
 safe_mode.mark_successful (#19605)

---
 esphome/components/safe_mode/__init__.py      | 20 ++++---------------
 esphome/components/safe_mode/automation.h     | 12 -----------
 .../components/safe_mode/common-enabled.yaml  |  3 +++
 3 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 esphome/components/safe_mode/automation.h

diff --git a/esphome/components/safe_mode/__init__.py b/esphome/components/safe_mode/__init__.py
index 9bc8a263c8..5d03ed70a8 100644
--- a/esphome/components/safe_mode/__init__.py
+++ b/esphome/components/safe_mode/__init__.py
@@ -10,8 +10,8 @@ from esphome.const import (
     CONF_STORAGE,
     KEY_PAST_SAFE_MODE,
 )
-from esphome.core import CORE, ID, CoroPriority, coroutine_with_priority
-from esphome.cpp_generator import MockObj, RawExpression, TemplateArgsType
+from esphome.core import CORE, CoroPriority, coroutine_with_priority
+from esphome.cpp_generator import RawExpression
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@paulmonigatti", "@jsuanet", "@kbx81"]
@@ -22,7 +22,6 @@ CONF_ON_SAFE_MODE = "on_safe_mode"
 
 safe_mode_ns = cg.esphome_ns.namespace("safe_mode")
 SafeModeComponent = safe_mode_ns.class_("SafeModeComponent", cg.Component)
-MarkSuccessfulAction = safe_mode_ns.class_("MarkSuccessfulAction", automation.Action)
 
 
 def _remove_id_if_disabled(value: ConfigType) -> ConfigType:
@@ -53,26 +52,15 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-@automation.register_action(
+automation.register_apply_action(
     "safe_mode.mark_successful",
-    MarkSuccessfulAction,
     cv.Schema(
         {
             cv.GenerateID(): cv.use_id(SafeModeComponent),
         }
     ),
-    synchronous=True,
+    automation.ApplyCall("mark_successful()"),
 )
-async def safe_mode_mark_successful_to_code(
-    config: ConfigType,
-    action_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    parent = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg)
-    cg.add(var.set_parent(parent))
-    return var
 
 
 _CALLBACK_AUTOMATIONS = (
diff --git a/esphome/components/safe_mode/automation.h b/esphome/components/safe_mode/automation.h
deleted file mode 100644
index e2858dff34..0000000000
--- a/esphome/components/safe_mode/automation.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-#include "esphome/core/automation.h"
-#include "safe_mode.h"
-
-namespace esphome::safe_mode {
-
-template<typename... Ts> class MarkSuccessfulAction final : public Action<Ts...>, public Parented<SafeModeComponent> {
- public:
-  void play(const Ts &...x) override { this->parent_->mark_successful(); }
-};
-
-}  // namespace esphome::safe_mode
diff --git a/tests/components/safe_mode/common-enabled.yaml b/tests/components/safe_mode/common-enabled.yaml
index 43025c60db..b2a10b6d93 100644
--- a/tests/components/safe_mode/common-enabled.yaml
+++ b/tests/components/safe_mode/common-enabled.yaml
@@ -3,6 +3,7 @@ wifi:
   password: password1
 
 safe_mode:
+  id: safe_mode_1
   boot_is_good_after: 2min
   num_attempts: 3
   reboot_timeout: 2min
@@ -20,3 +21,5 @@ switch:
 esphome:
   on_boot:
     - safe_mode.mark_successful
+    - safe_mode.mark_successful:
+        id: safe_mode_1