Run Engine 2.0 trigger idempotency

apps/webapp/app/assets/icons/TaskCachedIcon.tsx

@@ -0,0 +1,49 @@
+export function TaskCachedIcon({ className }: { className?: string }) {
+  return (
+    <svg
+      className={className}
+      width="16"
+      height="16"
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g clipPath="url(#clip0_15584_76102)">
+        <path
+          d="M0.5 3.5L0.5 2.5C0.5 1.39543 1.39543 0.5 2.5 0.5H3.5"
+          stroke="#3B82F6"
+          strokeLinecap="square"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M15.5 12.5L15.5 13.5C15.5 14.6046 14.6046 15.5 13.5 15.5L12.5 15.5"
+          stroke="#3B82F6"
+          strokeLinecap="square"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M12.5 0.5L13.5 0.5C14.6046 0.5 15.5 1.39543 15.5 2.5L15.5 3.5"
+          stroke="#3B82F6"
+          strokeLinecap="square"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M3.5 15.5L2.5 15.5C1.39543 15.5 0.5 14.6046 0.5 13.5L0.5 12.5"
+          stroke="#3B82F6"
+          strokeLinecap="square"
+          strokeLinejoin="round"
+        />
+        <path d="M11.1799 4.19V5.598H8.8479V12H7.1649V5.598H4.8219V4.19H11.1799Z" fill="#3B82F6" />
+        <line x1="6" y1="15.5" x2="10" y2="15.5" stroke="#3B82F6" />
+        <line x1="6" y1="0.5" x2="10" y2="0.5" stroke="#3B82F6" />
+        <line x1="15.5" y1="6" x2="15.5" y2="10" stroke="#3B82F6" />
+        <line x1="0.5" y1="6" x2="0.5" y2="10" stroke="#3B82F6" />
+      </g>
+      <defs>
+        <clipPath id="clip0_15584_76102">
+          <rect width="16" height="16" fill="white" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}

apps/webapp/app/components/runs/v3/BatchFilters.tsx

@@ -359,8 +359,8 @@ function BatchIdDropdown({
   if (batchId) {
     if (!batchId.startsWith("batch_")) {
       error = "Batch IDs start with 'batch_'";
-    } else if (batchId.length !== 27) {
-      error = "Batch IDs are 27 characters long";
+    } else if (batchId.length !== 27 && batchId.length !== 31) {
+      error = "Batch IDs are 27/32 characters long";
     }
   }
 

apps/webapp/app/components/runs/v3/RunFilters.tsx

@@ -763,8 +763,8 @@ function RunIdDropdown({
   if (runId) {
     if (!runId.startsWith("run_")) {
       error = "Run IDs start with 'run_'";
-    } else if (runId.length !== 25) {
-      error = "Run IDs are 25 characters long";
+    } else if (runId.length !== 25 && runId.length !== 29) {
+      error = "Run IDs are 25/30 characters long";
     }
   }
 

apps/webapp/app/components/runs/v3/RunIcon.tsx

@@ -7,6 +7,7 @@ import {
 } from "@heroicons/react/20/solid";
 import { AttemptIcon } from "~/assets/icons/AttemptIcon";
 import { TaskIcon } from "~/assets/icons/TaskIcon";
+import { TaskCachedIcon } from "~/assets/icons/TaskCachedIcon";
 import { NamedIcon } from "~/components/primitives/NamedIcon";
 import { cn } from "~/utils/cn";
 
@@ -41,6 +42,8 @@ export function RunIcon({ name, className, spanName }: TaskIconProps) {
   switch (name) {
     case "task":
       return <TaskIcon className={cn(className, "text-blue-500")} />;
+    case "task-cached":
+      return <TaskCachedIcon className={cn(className, "text-blue-500")} />;
     case "scheduled":
       return <ClockIcon className={cn(className, "text-sun-500")} />;
     case "attempt":

apps/webapp/app/presenters/v3/SpanPresenter.server.ts

@@ -2,6 +2,7 @@ import {
   MachinePresetName,
   parsePacket,
   prettyPrintPacket,
+  SemanticInternalAttributes,
   TaskRunError,
 } from "@trigger.dev/core/v3";
 import { RUNNING_STATUSES } from "~/components/runs/v3/TaskRunStatus";
@@ -39,7 +40,22 @@ export class SpanPresenter extends BasePresenter {
       throw new Error("Project not found");
     }
 
-    const run = await this.getRun(spanId);
+    const parentRun = await this._prisma.taskRun.findFirst({
+      select: {
+        traceId: true,
+      },
+      where: {
+        friendlyId: runFriendlyId,
+      },
+    });
+
+    if (!parentRun) {
+      return;
+    }
+
+    const { traceId } = parentRun;
+
+    const run = await this.getRun(traceId, spanId);
     if (run) {
       return {
         type: "run" as const,
@@ -48,7 +64,7 @@ export class SpanPresenter extends BasePresenter {
     }
 
     //get the run
-    const span = await this.getSpan(runFriendlyId, spanId);
+    const span = await this.getSpan(traceId, spanId);
 
     if (!span) {
       throw new Error("Span not found");
@@ -60,10 +76,17 @@ export class SpanPresenter extends BasePresenter {
     };
   }
 
-  async getRun(spanId: string) {
+  async getRun(traceId: string, spanId: string) {
+    const span = await eventRepository.getSpan(spanId, traceId);
+
+    if (!span) {
+      return;
+    }
+
     const run = await this._replica.taskRun.findFirst({
       select: {
         id: true,
+        spanId: true,
         traceId: true,
         //metadata
         number: true,
@@ -92,13 +115,15 @@ export class SpanPresenter extends BasePresenter {
         //status + duration
         status: true,
         startedAt: true,
+        firstAttemptStartedAt: true,
         createdAt: true,
         updatedAt: true,
         queuedAt: true,
         completedAt: true,
         logsDeletedAt: true,
         //idempotency
         idempotencyKey: true,
+        idempotencyKeyExpiresAt: true,
         //delayed
         delayUntil: true,
         //ttl
@@ -161,9 +186,13 @@ export class SpanPresenter extends BasePresenter {
           },
         },
       },
-      where: {
-        spanId,
-      },
+      where: span.originalRun
+        ? {
+            friendlyId: span.originalRun,
+          }
+        : {
+            spanId,
+          },
     });
 
     if (!run) {
@@ -238,8 +267,6 @@ export class SpanPresenter extends BasePresenter {
       }
     }
 
-    const span = await eventRepository.getSpan(spanId, run.traceId);
-
     const metadata = run.metadata
       ? await prettyPrintPacket(run.metadata, run.metadataType, {
           filteredKeys: ["$$streams", "$$streamsVersion", "$$streamsBaseUrl"],
@@ -296,6 +323,7 @@ export class SpanPresenter extends BasePresenter {
       status: run.status,
       createdAt: run.createdAt,
       startedAt: run.startedAt,
+      firstAttemptStartedAt: run.firstAttemptStartedAt,
       updatedAt: run.updatedAt,
       delayUntil: run.delayUntil,
       expiredAt: run.expiredAt,
@@ -307,6 +335,8 @@ export class SpanPresenter extends BasePresenter {
       sdkVersion: run.lockedToVersion?.sdkVersion,
       isTest: run.isTest,
       environmentId: run.runtimeEnvironment.id,
+      idempotencyKey: run.idempotencyKey,
+      idempotencyKeyExpiresAt: run.idempotencyKeyExpiresAt,
       schedule: run.schedule
         ? {
             friendlyId: run.schedule.friendlyId,
@@ -349,24 +379,13 @@ export class SpanPresenter extends BasePresenter {
       engine: run.engine,
       masterQueue: run.masterQueue,
       secondaryMasterQueue: run.secondaryMasterQueue,
+      spanId: run.spanId,
+      isCached: !!span.originalRun,
     };
   }
 
-  async getSpan(runFriendlyId: string, spanId: string) {
-    const run = await this._prisma.taskRun.findFirst({
-      select: {
-        traceId: true,
-      },
-      where: {
-        friendlyId: runFriendlyId,
-      },
-    });
-
-    if (!run) {
-      return;
-    }
-
-    const span = await eventRepository.getSpan(spanId, run.traceId);
+  async getSpan(traceId: string, spanId: string) {
+    const span = await eventRepository.getSpan(spanId, traceId);
 
     if (!span) {
       return;

apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts

@@ -108,6 +108,7 @@ const { action, loader } = createActionApiRoute(
       return json(
         {
           id: run.friendlyId,
+          isCached: run.isCached,
         },
         {
           headers: $responseHeaders,

apps/webapp/app/routes/api.v1.tasks.batch.ts

@@ -9,13 +9,11 @@ import { AuthenticatedEnvironment, getOneTimeUseToken } from "~/services/apiAuth
 import { logger } from "~/services/logger.server";
 import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 import { resolveIdempotencyKeyTTL } from "~/utils/idempotencyKeys.server";
-import { determineEngineVersion } from "~/v3/engineVersion.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
 import {
   BatchProcessingStrategy,
   BatchTriggerV2Service,
 } from "~/v3/services/batchTriggerV2.server";
-import { BatchTriggerV3Service } from "~/v3/services/batchTriggerV3.server";
 import { OutOfEntitlementError } from "~/v3/services/triggerTask.server";
 import { HeadersSchema } from "./api.v1.tasks.$taskId.trigger";
 
@@ -88,15 +86,7 @@ const { action, loader } = createActionApiRoute(
       resolveIdempotencyKeyTTL(idempotencyKeyTTL) ??
       new Date(Date.now() + 24 * 60 * 60 * 1000 * 30);
 
-    const version = await determineEngineVersion({
-      environment: authentication.environment,
-      version: engineVersion ?? undefined,
-    });
-
-    const service =
-      version === "V1"
-        ? new BatchTriggerV2Service(batchProcessingStrategy ?? undefined)
-        : new BatchTriggerV3Service(batchProcessingStrategy ?? undefined);
+    const service = new BatchTriggerV2Service(batchProcessingStrategy ?? undefined);
 
     try {
       const batch = await service.call(authentication.environment, body, {

apps/webapp/app/routes/api.v2.batches.$batchId.ts

@@ -0,0 +1,40 @@
+import { json } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { $replica } from "~/db.server";
+import { createLoaderApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+
+const ParamsSchema = z.object({
+  batchId: z.string(),
+});
+
+export const loader = createLoaderApiRoute(
+  {
+    params: ParamsSchema,
+    allowJWT: true,
+    corsStrategy: "all",
+    findResource: (params, auth) => {
+      return $replica.batchTaskRun.findFirst({
+        where: {
+          friendlyId: params.batchId,
+          runtimeEnvironmentId: auth.environment.id,
+        },
+      });
+    },
+    authorization: {
+      action: "read",
+      resource: (batch) => ({ batch: batch.friendlyId }),
+      superScopes: ["read:runs", "read:all", "admin"],
+    },
+  },
+  async ({ resource: batch }) => {
+    return json({
+      id: batch.friendlyId,
+      status: batch.status,
+      idempotencyKey: batch.idempotencyKey ?? undefined,
+      createdAt: batch.createdAt,
+      updatedAt: batch.updatedAt,
+      runCount: batch.runCount,
+      runs: batch.runIds,
+    });
+  }
+);