Merge branch 'main' into issue/ffmpegv7

Author: Rudra-Sankha-Sinhamahapatra

.changeset/four-needles-add.md

@@ -0,0 +1,12 @@
+---
+"@trigger.dev/redis-worker": major
+"@trigger.dev/react-hooks": major
+"@trigger.dev/sdk": major
+"trigger.dev": major
+"@trigger.dev/python": major
+"@trigger.dev/build": major
+"@trigger.dev/core": major
+"@trigger.dev/rsc": major
+---
+
+Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4

.changeset/pre.json

@@ -0,0 +1,28 @@
+{
+  "mode": "pre",
+  "tag": "v4-beta",
+  "initialVersions": {
+    "coordinator": "0.0.1",
+    "docker-provider": "0.0.1",
+    "kubernetes-provider": "0.0.1",
+    "supervisor": "0.0.1",
+    "webapp": "1.0.0",
+    "@trigger.dev/build": "3.3.17",
+    "trigger.dev": "3.3.17",
+    "@trigger.dev/core": "3.3.17",
+    "@trigger.dev/python": "3.3.17",
+    "@trigger.dev/react-hooks": "3.3.17",
+    "@trigger.dev/redis-worker": "3.3.17",
+    "@trigger.dev/rsc": "3.3.17",
+    "@trigger.dev/sdk": "3.3.17"
+  },
+  "changesets": [
+    "breezy-turtles-talk",
+    "four-needles-add",
+    "honest-files-decide",
+    "nice-colts-boil",
+    "red-wasps-cover",
+    "smart-coins-hammer",
+    "weak-jobs-hide"
+  ]
+}

apps/supervisor/src/util.ts

@@ -5,6 +5,12 @@ export function getDockerHostDomain() {
   return isMacOs || isWindows ? "host.docker.internal" : "localhost";
 }
 
-export function getRunnerId(runId: string) {
-  return `runner-${runId.replace("run_", "")}`;
+export function getRunnerId(runId: string, attemptNumber?: number) {
+  const parts = ["runner", runId.replace("run_", "")];
+
+  if (attemptNumber && attemptNumber > 1) {
+    parts.push(`attempt-${attemptNumber}`);
+  }
+
+  return parts.join("-");
 }

apps/supervisor/src/workloadManager/docker.ts

@@ -22,7 +22,7 @@ export class DockerWorkloadManager implements WorkloadManager {
   async create(opts: WorkloadManagerCreateOptions) {
     this.logger.log("[DockerWorkloadProvider] Creating container", { opts });
 
-    const runnerId = getRunnerId(opts.runFriendlyId);
+    const runnerId = getRunnerId(opts.runFriendlyId, opts.nextAttemptNumber);
 
     const runArgs = [
       "run",

apps/supervisor/src/workloadManager/kubernetes.ts

@@ -31,7 +31,7 @@ export class KubernetesWorkloadManager implements WorkloadManager {
   async create(opts: WorkloadManagerCreateOptions) {
     this.logger.log("[KubernetesWorkloadManager] Creating container", { opts });
 
-    const runnerId = getRunnerId(opts.runFriendlyId);
+    const runnerId = getRunnerId(opts.runFriendlyId, opts.nextAttemptNumber);
 
     try {
       await this.k8s.core.createNamespacedPod({

apps/webapp/app/components/navigation/SideMenu.tsx

@@ -473,7 +473,7 @@ function SwitchOrganizations({
 
   return (
     <Popover onOpenChange={(open) => setMenuOpen(open)} open={isMenuOpen}>
-      <div onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
+      <div onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave} className="flex">
         <PopoverTrigger className="w-full justify-between overflow-hidden focus-custom">
           <ButtonContent
             variant="small-menu-item"

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

@@ -248,7 +248,7 @@ function buildTimelineItems(run: TimelineSpanRun): TimelineItem[] {
         items.push({
           type: "line",
           id: "executing",
-          title: formatDuration(run.executedAt, run.updatedAt),
+          title: formatDuration(run.executedAt, run.completedAt ?? run.updatedAt),
           state,
           shouldRender: true,
           variant: "normal",
@@ -271,7 +271,7 @@ function buildTimelineItems(run: TimelineSpanRun): TimelineItem[] {
         items.push({
           type: "line",
           id: "legacy-executing",
-          title: formatDuration(run.startedAt, run.updatedAt),
+          title: formatDuration(run.startedAt, run.completedAt ?? run.updatedAt),
           state,
           shouldRender: true,
           variant: "normal",
@@ -296,7 +296,7 @@ function buildTimelineItems(run: TimelineSpanRun): TimelineItem[] {
       type: "event",
       id: "finished",
       title: "Finished",
-      date: run.updatedAt,
+      date: run.completedAt ?? run.updatedAt,
       previousDate: run.executedAt ?? run.startedAt ?? undefined,
       state,
       shouldRender: true,

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

@@ -73,15 +73,14 @@ export function TaskRunsTable({
   allowSelection = false,
   variant = "dimmed",
 }: RunsTableProps) {
-  const user = useUser();
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
   const checkboxes = useRef<(HTMLInputElement | null)[]>([]);
   const { selectedItems, has, hasAll, select, deselect, toggle } = useSelectedItems(allowSelection);
   const { isManagedCloud } = useFeatures();
 
-  const showCompute = user.admin && isManagedCloud;
+  const showCompute = isManagedCloud;
 
   const navigateCheckboxes = useCallback(
     (event: React.KeyboardEvent<HTMLInputElement>, index: number) => {
@@ -371,7 +370,9 @@ export function TaskRunsTable({
                 </TableCell>
                 {showCompute && (
                   <TableCell to={path} className="tabular-nums">
-                    {run.costInCents > 0 ? formatCurrencyAccurate(run.costInCents / 100) : "–"}
+                    {run.costInCents > 0
+                      ? formatCurrencyAccurate((run.costInCents + run.baseCostInCents) / 100)
+                      : "–"}
                   </TableCell>
                 )}
                 <TableCell to={path}>

apps/webapp/app/env.server.ts

@@ -444,7 +444,9 @@ const EnvironmentSchema = z.object({
   // Run Engine 2.0
   RUN_ENGINE_WORKER_COUNT: z.coerce.number().int().default(4),
   RUN_ENGINE_TASKS_PER_WORKER: z.coerce.number().int().default(10),
+  RUN_ENGINE_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(10),
   RUN_ENGINE_WORKER_POLL_INTERVAL: z.coerce.number().int().default(100),
+  RUN_ENGINE_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(100),
   RUN_ENGINE_TIMEOUT_PENDING_EXECUTING: z.coerce.number().int().default(60_000),
   RUN_ENGINE_TIMEOUT_PENDING_CANCEL: z.coerce.number().int().default(60_000),
   RUN_ENGINE_TIMEOUT_EXECUTING: z.coerce.number().int().default(60_000),

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

@@ -209,6 +209,7 @@ export class RunListPresenter extends BasePresenter {
         lockedAt: Date | null;
         delayUntil: Date | null;
         updatedAt: Date;
+        completedAt: Date | null;
         isTest: boolean;
         spanId: string;
         idempotencyKey: string | null;
@@ -238,6 +239,7 @@ export class RunListPresenter extends BasePresenter {
     tr."delayUntil" AS "delayUntil",
     tr."lockedAt" AS "lockedAt",
     tr."updatedAt" AS "updatedAt",
+    tr."completedAt" AS "completedAt",
     tr."isTest" AS "isTest",
     tr."spanId" AS "spanId",
     tr."idempotencyKey" AS "idempotencyKey",
@@ -383,7 +385,9 @@ WHERE
           startedAt: startedAt ? startedAt.toISOString() : undefined,
           delayUntil: run.delayUntil ? run.delayUntil.toISOString() : undefined,
           hasFinished,
-          finishedAt: hasFinished ? run.updatedAt.toISOString() : undefined,
+          finishedAt: hasFinished
+            ? run.completedAt?.toISOString() ?? run.updatedAt.toISOString()
+            : undefined,
           isTest: run.isTest,
           status: run.status,
           version: run.version,