From 7f96e7712be0ce6150823297e0b89567b7b61c29 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 14 Jan 2026 20:51:18 +0100
Subject: [PATCH] feat(scaffolder-backend): simplify abort handling in
 debug:wait action

Signed-off-by: mtt-artis <mtt-artis@gmail.com>
---
 .../src/scaffolder/actions/builtin/debug/wait.ts           | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts
index e048720f29..321a5f46a8 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/debug/wait.ts
@@ -85,14 +85,11 @@ export function createWaitAction(options?: {
       }
 
       await new Promise(resolve => {
-        const controller = new AbortController();
         const timeoutHandle = setTimeout(abort, delayTime.toMillis());
-        ctx.signal?.addEventListener('abort', abort);
+        ctx.signal?.addEventListener('abort', abort, { once: true });
 
         function abort() {
-          ctx.signal?.removeEventListener('abort', abort);
-          clearTimeout(timeoutHandle!);
-          controller.abort();
+          clearTimeout(timeoutHandle);
           resolve('finished');
         }
       });