From 89ac144340becffe83c38445b14b2185d55faad2 Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Wed, 16 Apr 2025 09:36:26 +0100
Subject: [PATCH] do not carry over previous batch id when blocking with
 waitpoint

---
 .../run-engine/src/engine/systems/waitpointSystem.ts           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts b/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts
index b2eb9e539..2d4d6b338 100644
--- a/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts
@@ -422,7 +422,8 @@ export class WaitpointSystem {
           environmentType: snapshot.environmentType,
           projectId: snapshot.projectId,
           organizationId: snapshot.organizationId,
-          batchId: batch?.id ?? snapshot.batchId ?? undefined,
+          // Do NOT carry over the batchId from the previous snapshot
+          batchId: batch?.id,
           workerId,
           runnerId,
         });