Merge remote-tracking branch 'origin/main' into fix/v4-deploy-workflow

Author: nicktrn

internal-packages/run-engine/src/engine/systems/checkpointSystem.ts

@@ -283,6 +283,7 @@ export class CheckpointSystem {
         environmentType: snapshot.environmentType,
         projectId: snapshot.projectId,
         organizationId: snapshot.organizationId,
+        batchId: snapshot.batchId ?? undefined,
         completedWaitpoints: snapshot.completedWaitpoints,
         workerId,
         runnerId,

internal-packages/run-engine/src/engine/systems/dequeueSystem.ts

@@ -374,6 +374,7 @@ export class DequeueSystem {
                   projectId: snapshot.projectId,
                   organizationId: snapshot.organizationId,
                   checkpointId: snapshot.checkpointId ?? undefined,
+                  batchId: snapshot.batchId ?? undefined,
                   completedWaitpoints: snapshot.completedWaitpoints,
                   workerId,
                   runnerId,

internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts

@@ -218,6 +218,8 @@ export class RunAttemptSystem {
                 environmentType: latestSnapshot.environmentType,
                 projectId: latestSnapshot.projectId,
                 organizationId: latestSnapshot.organizationId,
+                batchId: latestSnapshot.batchId ?? undefined,
+                completedWaitpoints: latestSnapshot.completedWaitpoints,
                 workerId,
                 runnerId,
               });