Revert "Squashed commit of the following:"

This reverts commit b837b5a.

Author: nicktrn

.changeset/config.json

@@ -7,13 +7,27 @@
     }
   ],
   "commit": false,
-  "fixed": [["@trigger.dev/*", "trigger.dev"]],
+  "fixed": [
+    [
+      "@trigger.dev/*",
+      "trigger.dev"
+    ]
+  ],
   "linked": [],
   "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
-  "ignore": ["webapp", "proxy", "coordinator", "docker-provider", "kubernetes-provider"],
+  "ignore": [
+    "webapp",
+    "emails",
+    "proxy",
+    "@trigger.dev/database",
+    "coordinator",
+    "docker-provider",
+    "kubernetes-provider",
+    "@trigger.dev/otlp-importer"
+  ],
   "___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
     "onlyUpdatePeerDependentsWhenOutOfRange": true
   }
-}
+}

.github/workflows/unit-tests.yml

@@ -27,8 +27,5 @@ jobs:
       - name: 📥 Download deps
         run: pnpm install --frozen-lockfile
 
-      - name: 📀 Generate Prisma Client
-        run: pnpm run generate
-
       - name: 🧪 Run Unit Tests
         run: pnpm run test

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "internal-packages/otlp-importer/protos"]
-	path = internal-packages/otlp-importer/protos
+[submodule "packages/otlp-importer/protos"]
+	path = packages/otlp-importer/protos
 	url = https://github.com/open-telemetry/opentelemetry-proto.git

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

@@ -613,7 +613,7 @@ export function SelectPopover({
         "z-50 flex flex-col overflow-clip rounded border border-charcoal-700 bg-background-bright shadow-md outline-none animate-in fade-in-40",
         "min-w-[max(180px,calc(var(--popover-anchor-width)+0.5rem))]",
         "max-w-[min(480px,var(--popover-available-width))]",
-        "max-h-[min(520px,var(--popover-available-height))]",
+        "max-h-[min(480px,var(--popover-available-height))]",
         "origin-[var(--popover-transform-origin)]",
         className
       )}

apps/webapp/app/components/primitives/Select.tsx

@@ -235,11 +235,9 @@ export function useTree<TData, TFilterValue>({
     getItemKey: (index) => state.visibleNodeIds[index],
     getScrollElement: () => parentRef.current,
     estimateSize: (index: number) => {
-      const treeItem = tree[index];
-      if (!treeItem) return 0;
       return estimatedRowHeight({
-        node: treeItem,
-        state: state.nodes[treeItem.id],
+        node: tree[index],
+        state: state.nodes[tree[index].id],
         index,
       });
     },

apps/webapp/app/components/primitives/TreeView/TreeView.tsx

@@ -324,12 +324,6 @@ export function RunInspector({
                     </Property.Value>
                   </Property.Item>
                 )}
-                <Property.Item>
-                  <Property.Label>Max duration</Property.Label>
-                  <Property.Value>
-                    {run.maxDurationInSeconds ? `${run.maxDurationInSeconds}s` : "–"}
-                  </Property.Value>
-                </Property.Item>
                 <Property.Item>
                   <Property.Label>Run invocation cost</Property.Label>
                   <Property.Value>

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

@@ -8,14 +8,12 @@ import {
   NoSymbolIcon,
   PauseCircleIcon,
   RectangleStackIcon,
-  StopIcon,
   TrashIcon,
   XCircleIcon,
 } from "@heroicons/react/20/solid";
 import { TaskRunStatus } from "@trigger.dev/database";
 import assertNever from "assert-never";
 import { SnowflakeIcon } from "lucide-react";
-import { TimedOutIcon } from "~/assets/icons/TimedOutIcon";
 import { Spinner } from "~/components/primitives/Spinner";
 import { cn } from "~/utils/cn";
 
@@ -29,7 +27,6 @@ export const allTaskRunStatuses = [
   "COMPLETED_SUCCESSFULLY",
   "CANCELED",
   "COMPLETED_WITH_ERRORS",
-  "TIMED_OUT",
   "CRASHED",
   "PAUSED",
   "INTERRUPTED",
@@ -47,7 +44,6 @@ export const filterableTaskRunStatuses = [
   "COMPLETED_SUCCESSFULLY",
   "CANCELED",
   "COMPLETED_WITH_ERRORS",
-  "TIMED_OUT",
   "CRASHED",
   "INTERRUPTED",
   "SYSTEM_FAILURE",
@@ -69,7 +65,6 @@ const taskRunStatusDescriptions: Record<TaskRunStatus, string> = {
   PAUSED: "Task has been paused by the user",
   CRASHED: "Task has crashed and won't be retried",
   EXPIRED: "Task has surpassed its ttl and won't be executed",
-  TIMED_OUT: "Task has failed because it exceeded its maxDuration",
 };
 
 export const QUEUED_STATUSES = [
@@ -145,8 +140,6 @@ export function TaskRunStatusIcon({
       return <FireIcon className={cn(runStatusClassNameColor(status), className)} />;
     case "EXPIRED":
       return <TrashIcon className={cn(runStatusClassNameColor(status), className)} />;
-    case "TIMED_OUT":
-      return <TimedOutIcon className={cn(runStatusClassNameColor(status), className)} />;
 
     default: {
       assertNever(status);
@@ -181,8 +174,6 @@ export function runStatusClassNameColor(status: TaskRunStatus): string {
       return "text-error";
     case "CRASHED":
       return "text-error";
-    case "TIMED_OUT":
-      return "text-error";
     default: {
       assertNever(status);
     }
@@ -219,8 +210,6 @@ export function runStatusTitle(status: TaskRunStatus): string {
       return "Crashed";
     case "EXPIRED":
       return "Expired";
-    case "TIMED_OUT":
-      return "Timed out";
     default: {
       assertNever(status);
     }

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

@@ -9,13 +9,11 @@ import { BeakerIcon, BookOpenIcon, CheckIcon } from "@heroicons/react/24/solid";
 import { useLocation } from "@remix-run/react";
 import { formatDuration, formatDurationMilliseconds } from "@trigger.dev/core/v3";
 import { useCallback, useRef } from "react";
-import { Badge } from "~/components/primitives/Badge";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Checkbox } from "~/components/primitives/Checkbox";
 import { Dialog, DialogTrigger } from "~/components/primitives/Dialog";
 import { Header3 } from "~/components/primitives/Headers";
 import { useSelectedItems } from "~/components/primitives/SelectedItemsProvider";
-import { SimpleTooltip } from "~/components/primitives/Tooltip";
 import { useEnvironments } from "~/hooks/useEnvironments";
 import { useFeatures } from "~/hooks/useFeatures";
 import { useOrganization } from "~/hooks/useOrganizations";
@@ -41,12 +39,9 @@ import {
 import { CancelRunDialog } from "./CancelRunDialog";
 import { LiveTimer } from "./LiveTimer";
 import { ReplayRunDialog } from "./ReplayRunDialog";
+import { TaskRunStatusCombo } from "./TaskRunStatus";
 import { RunTag } from "./RunTag";
-import {
-  descriptionForTaskRunStatus,
-  filterableTaskRunStatuses,
-  TaskRunStatusCombo,
-} from "./TaskRunStatus";
+import { Badge } from "~/components/primitives/Badge";
 
 type RunsTableProps = {
   total: number;
@@ -131,27 +126,7 @@ export function TaskRunsTable({
           <TableHeaderCell>Env</TableHeaderCell>
           <TableHeaderCell>Task</TableHeaderCell>
           <TableHeaderCell>Version</TableHeaderCell>
-          <TableHeaderCell
-            tooltip={
-              <div className="flex flex-col divide-y divide-grid-dimmed">
-                {filterableTaskRunStatuses.map((status) => (
-                  <div
-                    key={status}
-                    className="grid grid-cols-[8rem_1fr] gap-x-2 py-2 first:pt-1 last:pb-1"
-                  >
-                    <div className="mb-0.5 flex items-center gap-1.5 whitespace-nowrap">
-                      <TaskRunStatusCombo status={status} />
-                    </div>
-                    <Paragraph variant="extra-small" className="!text-wrap text-text-dimmed">
-                      {descriptionForTaskRunStatus(status)}
-                    </Paragraph>
-                  </div>
-                ))}
-              </div>
-            }
-          >
-            Status
-          </TableHeaderCell>
+          <TableHeaderCell>Status</TableHeaderCell>
           <TableHeaderCell>Started</TableHeaderCell>
           <TableHeaderCell
             colSpan={3}
@@ -312,11 +287,7 @@ export function TaskRunsTable({
                 </TableCell>
                 <TableCell to={path}>{run.version ?? "–"}</TableCell>
                 <TableCell to={path}>
-                  <SimpleTooltip
-                    content={descriptionForTaskRunStatus(run.status)}
-                    disableHoverableContent
-                    button={<TaskRunStatusCombo status={run.status} />}
-                  />
+                  <TaskRunStatusCombo status={run.status} />
                 </TableCell>
                 <TableCell to={path}>
                   {run.startedAt ? <DateTime date={run.startedAt} /> : "–"}

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

@@ -42,7 +42,6 @@ export const TaskRunStatus = {
   CRASHED: "CRASHED",
   DELAYED: "DELAYED",
   EXPIRED: "EXPIRED",
-  TIMED_OUT: "TIMED_OUT",
 } as const satisfies Record<TaskRunStatusType, TaskRunStatusType>;
 
 export const JobRunStatus = {

apps/webapp/app/database-types.ts

@@ -1,51 +1,77 @@
-import {
-  Prisma,
-  PrismaClient,
-  PrismaClientOrTransaction,
-  PrismaReplicaClient,
-  PrismaTransactionClient,
-  PrismaTransactionOptions,
-} from "@trigger.dev/database";
+import { Prisma, PrismaClient } from "@trigger.dev/database";
 import invariant from "tiny-invariant";
 import { z } from "zod";
 import { env } from "./env.server";
 import { logger } from "./services/logger.server";
 import { isValidDatabaseUrl } from "./utils/db";
 import { singleton } from "./utils/singleton";
-import { $transaction as transac } from "@trigger.dev/database";
 
-export type {
-  PrismaTransactionClient,
-  PrismaClientOrTransaction,
-  PrismaTransactionOptions,
-  PrismaReplicaClient,
+export type PrismaTransactionClient = Omit<
+  PrismaClient,
+  "$connect" | "$disconnect" | "$on" | "$transaction" | "$use" | "$extends"
+>;
+
+export type PrismaClientOrTransaction = PrismaClient | PrismaTransactionClient;
+
+function isTransactionClient(prisma: PrismaClientOrTransaction): prisma is PrismaTransactionClient {
+  return !("$transaction" in prisma);
+}
+
+function isPrismaKnownError(error: unknown): error is Prisma.PrismaClientKnownRequestError {
+  return (
+    typeof error === "object" && error !== null && "code" in error && typeof error.code === "string"
+  );
+}
+
+export type PrismaTransactionOptions = {
+  /** The maximum amount of time (in ms) Prisma Client will wait to acquire a transaction from the database. The default value is 2000ms. */
+  maxWait?: number;
+
+  /** The maximum amount of time (in ms) the interactive transaction can run before being canceled and rolled back. The default value is 5000ms. */
+  timeout?: number;
+
+  /**  Sets the transaction isolation level. By default this is set to the value currently configured in your database. */
+  isolationLevel?: Prisma.TransactionIsolationLevel;
+
+  swallowPrismaErrors?: boolean;
 };
 
 export async function $transaction<R>(
   prisma: PrismaClientOrTransaction,
   fn: (prisma: PrismaTransactionClient) => Promise<R>,
   options?: PrismaTransactionOptions
 ): Promise<R | undefined> {
-  return transac(
-    prisma,
-    fn,
-    (error) => {
+  if (isTransactionClient(prisma)) {
+    return fn(prisma);
+  }
+
+  try {
+    return await (prisma as PrismaClient).$transaction(fn, options);
+  } catch (error) {
+    if (isPrismaKnownError(error)) {
       logger.error("prisma.$transaction error", {
         code: error.code,
         meta: error.meta,
         stack: error.stack,
         message: error.message,
         name: error.name,
       });
-    },
-    options
-  );
+
+      if (options?.swallowPrismaErrors) {
+        return;
+      }
+    }
+
+    throw error;
+  }
 }
 
 export { Prisma };
 
 export const prisma = singleton("prisma", getClient);
 
+export type PrismaReplicaClient = Omit<PrismaClient, "$transaction">;
+
 export const $replica: PrismaReplicaClient = singleton(
   "replica",
   () => getReplicaClient() ?? prisma

apps/webapp/app/db.server.ts

@@ -213,9 +213,6 @@ const EnvironmentSchema = z.object({
   TASK_PAYLOAD_OFFLOAD_THRESHOLD: z.coerce.number().int().default(524_288), // 512KB
   TASK_PAYLOAD_MAXIMUM_SIZE: z.coerce.number().int().default(3_145_728), // 3MB
   TASK_RUN_METADATA_MAXIMUM_SIZE: z.coerce.number().int().default(4_096), // 4KB
-
-  MAXIMUM_DEV_QUEUE_SIZE: z.coerce.number().int().optional(),
-  MAXIMUM_DEPLOYED_QUEUE_SIZE: z.coerce.number().int().optional(),
 });
 
 export type Environment = z.infer<typeof EnvironmentSchema>;

apps/webapp/app/env.server.ts

@@ -119,7 +119,6 @@ export function batchTaskRunItemStatusForRunStatus(
     case TaskRunStatus.SYSTEM_FAILURE:
     case TaskRunStatus.CRASHED:
     case TaskRunStatus.EXPIRED:
-    case TaskRunStatus.TIMED_OUT:
       return BatchTaskRunItemStatus.FAILED;
     case TaskRunStatus.PENDING:
     case TaskRunStatus.WAITING_FOR_DEPLOY: