Merge remote-tracking branch 'origin/main' into fix-dequeue-snapshot-batch-ids

Author: matt-aitken

apps/webapp/app/components/run/RunTimeline.tsx

@@ -345,11 +345,11 @@ export function RunTimelineEvent({
       <div className="relative flex flex-col items-center justify-center">
         <EventMarker variant={variant} state={state} style={style} />
       </div>
-      <div className="flex items-baseline justify-between gap-3">
+      <div className="flex min-w-0 items-baseline justify-between gap-3">
         <TooltipProvider disableHoverableContent>
           <Tooltip>
-            <TooltipTrigger className="cursor-default">
-              <span className="font-medium text-text-bright">{title}</span>
+            <TooltipTrigger className="min-w-0 max-w-full cursor-default text-left">
+              <div className="truncate font-medium text-text-bright">{title}</div>
             </TooltipTrigger>
             {helpText && (
               <TooltipContent className="flex items-center gap-1 text-xs">
@@ -359,7 +359,9 @@ export function RunTimelineEvent({
           </Tooltip>
         </TooltipProvider>
         {subtitle ? (
-          <span className="text-xs tabular-nums text-text-dimmed">{subtitle}</span>
+          <span className="whitespace-nowrap text-xs tabular-nums text-text-dimmed">
+            {subtitle}
+          </span>
         ) : null}
       </div>
     </div>

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.tokens/route.tsx

@@ -163,9 +163,13 @@ export default function Page() {
                             token,
                             filters
                           );
+                          const rowIsSelected = waitpointParam === token.id;
 
                           return (
-                            <TableRow key={token.id}>
+                            <TableRow
+                              key={token.id}
+                              className={rowIsSelected ? "bg-grid-dimmed" : undefined}
+                            >
                               <TableCell to={path}>
                                 <span className="opacity-60">
                                   <DateTime date={token.createdAt} />

docs/snippets/paused-execution-free.mdx

@@ -1,4 +1,4 @@
-<Note>
-  In the Trigger.dev Cloud we automatically pause execution of tasks when they are waiting for
-  longer than a few seconds. You are not charged when execution is paused.
-</Note>
+In the Trigger.dev Cloud we automatically pause execution of tasks when they are waiting for
+longer than a few seconds.
+
+When triggering and waiting for subtasks, the parent is checkpointed and while waiting does not count towards compute usage. When waiting for a time period (`wait.for` or `wait.until`), if the wait is longer than 5 seconds we checkpoint and it does not count towards compute usage.

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

@@ -194,6 +194,11 @@ export class CheckpointSystem {
             metadata: snapshot.metadata,
           },
           previousSnapshotId: snapshot.id,
+          batchId: snapshot.batchId ?? undefined,
+          completedWaitpoints: snapshot.completedWaitpoints.map((waitpoint) => ({
+            id: waitpoint.id,
+            index: waitpoint.index,
+          })),
           environmentId: snapshot.environmentId,
           environmentType: snapshot.environmentType,
           projectId: snapshot.projectId,

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

@@ -369,6 +369,14 @@ export class WaitpointTimeoutError extends Error {
   }
 }
 
+const DURATION_WAIT_CHARGE_THRESHOLD_MS = 5000;
+
+function printWaitBelowThreshold() {
+  console.warn(
+    `Waits of ${DURATION_WAIT_CHARGE_THRESHOLD_MS / 1000}s or less count towards compute usage.`
+  );
+}
+
 export const wait = {
   for: async (options: WaitForOptions) => {
     const ctx = taskContext.ctx;
@@ -380,6 +388,36 @@ export const wait = {
 
     const start = Date.now();
     const durationInMs = calculateDurationInMs(options);
+
+    if (durationInMs <= DURATION_WAIT_CHARGE_THRESHOLD_MS) {
+      return tracer.startActiveSpan(
+        `wait.for()`,
+        async (span) => {
+          if (durationInMs <= 0) {
+            return;
+          }
+
+          printWaitBelowThreshold();
+
+          await new Promise((resolve) => setTimeout(resolve, durationInMs));
+        },
+        {
+          attributes: {
+            [SemanticInternalAttributes.STYLE_ICON]: "wait",
+            ...accessoryAttributes({
+              items: [
+                {
+                  text: nameForWaitOptions(options),
+                  variant: "normal",
+                },
+              ],
+              style: "codepath",
+            }),
+          },
+        }
+      );
+    }
+
     const date = new Date(start + durationInMs);
     const result = await apiClient.waitForDuration(ctx.run.id, {
       date: date,
@@ -417,6 +455,46 @@ export const wait = {
       throw new Error("wait.forToken can only be used from inside a task.run()");
     }
 
+    // Calculate duration in ms
+    const durationInMs = options.date.getTime() - Date.now();
+
+    if (durationInMs <= DURATION_WAIT_CHARGE_THRESHOLD_MS) {
+      return tracer.startActiveSpan(
+        `wait.for()`,
+        async (span) => {
+          if (durationInMs === 0) {
+            return;
+          }
+
+          if (durationInMs < 0) {
+            if (options.throwIfInThePast) {
+              throw new Error("Date is in the past");
+            }
+
+            return;
+          }
+
+          printWaitBelowThreshold();
+
+          await new Promise((resolve) => setTimeout(resolve, durationInMs));
+        },
+        {
+          attributes: {
+            [SemanticInternalAttributes.STYLE_ICON]: "wait",
+            ...accessoryAttributes({
+              items: [
+                {
+                  text: options.date.toISOString(),
+                  variant: "normal",
+                },
+              ],
+              style: "codepath",
+            }),
+          },
+        }
+      );
+    }
+
     const apiClient = apiClientManager.clientOrThrow();
 
     const result = await apiClient.waitForDuration(ctx.run.id, {