Fix for batch waits not working

Author: matt-aitken

apps/webapp/app/v3/services/batchTriggerV3.server.ts

@@ -204,11 +204,15 @@ export class BatchTriggerV3Service extends WithRunEngine {
 
           //block the parent with any existing children
           if (body.resumeParentOnCompletion && body.parentRunId) {
-            await this.#blockParentRun({
-              parentRunId: body.parentRunId,
-              childFriendlyIds: runs.flatMap((r) => (r.isCached ? [r.id] : [])),
-              environment,
-            });
+            const existingChildFriendlyIds = runs.flatMap((r) => (r.isCached ? [r.id] : []));
+
+            if (existingChildFriendlyIds.length > 0) {
+              await this.#blockParentRun({
+                parentRunId: body.parentRunId,
+                childFriendlyIds: existingChildFriendlyIds,
+                environment,
+              });
+            }
           }
 
           // Calculate how many new runs we need to create
@@ -885,8 +889,8 @@ export class BatchTriggerV3Service extends WithRunEngine {
   }) {
     const runsWithAssociatedWaitpoints = await this._prisma.taskRun.findMany({
       where: {
-        friendlyId: {
-          in: childFriendlyIds,
+        id: {
+          in: childFriendlyIds.map((r) => RunId.fromFriendlyId(r)),
         },
       },
       select: {
@@ -899,7 +903,7 @@ export class BatchTriggerV3Service extends WithRunEngine {
     });
 
     await this._engine.blockRunWithWaitpoint({
-      runId: parentRunId,
+      runId: RunId.fromFriendlyId(parentRunId),
       waitpointId: runsWithAssociatedWaitpoints.flatMap((r) =>
         r.associatedWaitpoint ? [r.associatedWaitpoint.id] : []
       ),

apps/webapp/app/v3/services/triggerTaskV2.server.ts

@@ -163,7 +163,7 @@ export class TriggerTaskServiceV2 extends WithRunEngine {
       //todo we will pass in the `parentRun` and `resumeParentOnCompletion`
       const parentRun = body.options?.parentRunId
         ? await this._prisma.taskRun.findFirst({
-            where: { friendlyId: body.options.parentRunId },
+            where: { id: RunId.fromFriendlyId(body.options.parentRunId) },
           })
         : undefined;
 
@@ -298,7 +298,7 @@ export class TriggerTaskServiceV2 extends WithRunEngine {
                     tags,
                     oneTimeUseToken: options.oneTimeUseToken,
                     parentTaskRunId: parentRun?.id,
-                    rootTaskRunId: parentRun?.rootTaskRunId ?? undefined,
+                    rootTaskRunId: parentRun?.rootTaskRunId ?? parentRun?.id,
                     batchId: body.options?.parentBatch ?? undefined,
                     resumeParentOnCompletion: body.options?.resumeParentOnCompletion,
                     depth,

packages/trigger-sdk/src/v3/shared.ts

@@ -791,6 +791,8 @@ export async function batchTriggerByIdAndWait<TTask extends AnyTask>(
             })
           ),
           dependentAttempt: ctx.attempt.id,
+          parentRunId: ctx.run.id,
+          resumeParentOnCompletion: true,
         },
         {
           processingStrategy: options?.triggerSequentially ? "sequential" : undefined,
@@ -1127,6 +1129,8 @@ export async function batchTriggerAndWaitTasks<TTasks extends readonly AnyTask[]
             })
           ),
           dependentAttempt: ctx.attempt.id,
+          parentRunId: ctx.run.id,
+          resumeParentOnCompletion: true,
         },
         {
           processingStrategy: options?.triggerSequentially ? "sequential" : undefined,
@@ -1234,6 +1238,8 @@ async function batchTrigger_internal<TRunTypes extends AnyRunTypes>(
 ): Promise<BatchRunHandleFromTypes<TRunTypes>> {
   const apiClient = apiClientManager.clientOrThrow();
 
+  const ctx = taskContext.ctx;
+
   const response = await apiClient.batchTriggerV2(
     {
       items: await Promise.all(
@@ -1259,6 +1265,7 @@ async function batchTrigger_internal<TRunTypes extends AnyRunTypes>(
               parentAttempt: taskContext.ctx?.attempt.id,
               metadata: item.options?.metadata,
               maxDuration: item.options?.maxDuration,
+              parentRunId: ctx?.run.id,
             },
           };
         })
@@ -1430,13 +1437,13 @@ async function batchTriggerAndWait_internal<TIdentifier extends string, TPayload
                   maxAttempts: item.options?.maxAttempts,
                   metadata: item.options?.metadata,
                   maxDuration: item.options?.maxDuration,
-                  resumeParentOnCompletion: true,
-                  parentRunId: ctx.run.id,
                 },
               };
             })
           ),
           dependentAttempt: ctx.attempt.id,
+          resumeParentOnCompletion: true,
+          parentRunId: ctx.run.id,
         },
         {
           processingStrategy: options?.triggerSequentially ? "sequential" : undefined,