Merge branch 'main' into v3/worker-attempt-creation

Author: nicktrn

.changeset/cool-comics-burn.md

@@ -0,0 +1,5 @@
+---
+"trigger.dev": patch
+---
+
+Fixing missing logs when importing client @opentelemetry/api

.changeset/five-toes-destroy.md

@@ -0,0 +1,7 @@
+---
+"@trigger.dev/sdk": patch
+"trigger.dev": patch
+"@trigger.dev/core": patch
+---
+
+v3: Environment variable management API and SDK, along with resolveEnvVars CLI hook

.changeset/hot-fishes-retire.md

@@ -0,0 +1,5 @@
+---
+trigger.dev: patch
+---
+
+Fix TypeScript inclusion in tsconfig.json for `cli-v3 init`

.changeset/pre.json

@@ -55,6 +55,7 @@
     "clever-apes-collect",
     "clever-carrots-travel",
     "clever-donkeys-hunt",
+    "cool-comics-burn",
     "cool-glasses-bake",
     "cuddly-feet-approve",
     "dry-walls-check",
@@ -63,9 +64,11 @@
     "eleven-paws-join",
     "famous-boats-tease",
     "few-students-share",
+    "five-toes-destroy",
     "funny-swans-destroy",
     "gorgeous-gorillas-compete",
     "green-bags-wink",
+    "hot-fishes-retire",
     "khaki-apricots-design",
     "khaki-poems-lay",
     "late-icons-lie",
@@ -109,7 +112,9 @@
     "smart-olives-eat",
     "spicy-lamps-smoke",
     "strange-ghosts-matter",
+    "strange-sheep-pull",
     "strong-lemons-add",
+    "strong-owls-know",
     "stupid-bulldogs-applaud",
     "sweet-lizards-press",
     "swift-dragons-peel",
@@ -126,6 +131,7 @@
     "tiny-elephants-scream",
     "tricky-bulldogs-heal",
     "tricky-ladybugs-unite",
-    "two-pumas-wait"
+    "two-pumas-wait",
+    "warm-planes-taste"
   ]
 }

.changeset/strange-sheep-pull.md

@@ -0,0 +1,6 @@
+---
+"@trigger.dev/sdk": patch
+"@trigger.dev/core": patch
+---
+
+v2: Better handle recovering from platform communication errors by auto-yielding back to the platform in case of temporary API failures

.changeset/strong-owls-know.md

@@ -0,0 +1,6 @@
+---
+"@trigger.dev/sdk": patch
+"@trigger.dev/core": patch
+---
+
+When a v2 run hits the rate limit, reschedule with the reset date

.changeset/warm-planes-taste.md

@@ -0,0 +1,7 @@
+---
+"trigger.dev": patch
+---
+
+v3: Prevent legacy-peer-deps=true from breaking deploys
+
+When a global `.npmrc` file includes `legacy-peer-deps=true`, deploys would fail on the `npm ci` step because the package-lock.json wouldn't match the `package.json` file. This is because inside the image build, the `.npmrc` file would not be picked up and so `legacy-peer-deps` would end up being false (which is the default). This change forces the `package-lock.json` file to be created using `legacy-peer-deps=false`

.vscode/launch.json

@@ -45,6 +45,14 @@
       "cwd": "${workspaceFolder}/references/v3-catalog",
       "sourceMaps": true
     },
+    {
+      "type": "node-terminal",
+      "request": "launch",
+      "name": "Debug V3 Management",
+      "command": "pnpm run management",
+      "cwd": "${workspaceFolder}/references/v3-catalog",
+      "sourceMaps": true
+    },
     {
       "type": "node",
       "request": "attach",

CONTRIBUTING.md

@@ -17,6 +17,7 @@ branch are tagged into a release periodically.
 - [Node.js](https://nodejs.org/en) version 20.11.1
 - [pnpm package manager](https://pnpm.io/installation) version 8.15.5
 - [Docker](https://www.docker.com/get-started/)
+- [protobuf](https://github.com/protocolbuffers/protobuf)
 
 ### Setup
 
@@ -102,13 +103,17 @@ First, make sure you are running the webapp according to the instructions above.
 4. Build the CLI
 
 ```sh
+# Build the CLI
 pnpm run build --filter trigger.dev
+# Make it accessible to `pnpm exec`
+pnpm i
 ```
 
 5. Change into the `<root>/references/v3-catalog` directory and authorize the CLI to the local server:
 
 ```sh
 cd references/v3-catalog
+cp .env.example .env
 pnpm exec triggerdev login -a http://localhost:3030
 ```
 

apps/webapp/app/assets/icons/v3.svg

@@ -1,14 +1,23 @@
 import { Clipboard, ClipboardCheck } from "lucide-react";
 import type { Language, PrismTheme } from "prism-react-renderer";
-import Highlight, { defaultProps } from "prism-react-renderer";
+import { Highlight, Prism } from "prism-react-renderer";
 import { forwardRef, useCallback, useState } from "react";
 import { cn } from "~/utils/cn";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../primitives/Tooltip";
 import { Paragraph } from "../primitives/Paragraph";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../primitives/Tooltip";
 
 //This is a fork of https://github.com/mantinedev/mantine/blob/master/src/mantine-prism/src/Prism/Prism.tsx
 //it didn't support highlighting lines by dimming the rest of the code, or animations on the highlighting
 
+async function setup() {
+  (typeof global !== "undefined" ? global : window).Prism = Prism;
+  //@ts-ignore
+  await import("prismjs/components/prism-json");
+  //@ts-ignore
+  await import("prismjs/components/prism-typescript");
+}
+setup();
+
 type CodeBlockProps = {
   /** Code which will be highlighted */
   code: string;
@@ -238,7 +247,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
         )}
 
         {shouldHighlight ? (
-          <Highlight {...defaultProps} theme={theme} code={code} language={language}>
+          <Highlight theme={theme} code={code} language={language}>
             {({
               className: inheritedClassName,
               style: inheritedStyle,
@@ -283,7 +292,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
 
                       return (
                         <div
-                          key={lineProps.key}
+                          key={lineNumber}
                           {...lineProps}
                           className={cn(
                             "flex w-full justify-start transition-opacity duration-500",
@@ -312,7 +321,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
                               const tokenProps = getTokenProps({ token, key });
                               return (
                                 <span
-                                  key={tokenProps.key}
+                                  key={key}
                                   {...tokenProps}
                                   style={{
                                     color: tokenProps?.style?.color as string,

apps/webapp/app/components/code/CodeBlock.tsx

@@ -7,14 +7,15 @@ import {
   XMarkIcon,
 } from "@heroicons/react/20/solid";
 import { Form } from "@remix-run/react";
-import {
-  BulkActionType,
+import type {
   RuntimeEnvironment,
-  TaskRunStatus,
   TaskTriggerSource,
+  TaskRunStatus,
+  BulkActionType,
 } from "@trigger.dev/database";
 import { ListFilterIcon } from "lucide-react";
-import { ReactNode, startTransition, useCallback, useMemo, useState } from "react";
+import type { ReactNode } from "react";
+import { startTransition, useCallback, useMemo, useState } from "react";
 import { z } from "zod";
 import { TaskIcon } from "~/assets/icons/TaskIcon";
 import { EnvironmentLabel, environmentTitle } from "~/components/environments/EnvironmentLabel";
@@ -43,14 +44,15 @@ import { Button } from "../../primitives/Buttons";
 import {
   TaskRunStatusCombo,
   allTaskRunStatuses,
+  filterableTaskRunStatuses,
   descriptionForTaskRunStatus,
   runStatusTitle,
 } from "./TaskRunStatus";
 import { TaskTriggerSourceIcon } from "./TaskTriggerSource";
 import { DateTime } from "~/components/primitives/DateTime";
 import { BulkActionStatusCombo } from "./BulkAction";
 
-export const TaskAttemptStatus = z.nativeEnum(TaskRunStatus);
+export const TaskAttemptStatus = z.enum(allTaskRunStatuses);
 
 export const TaskRunListSearchFilters = z.object({
   cursor: z.string().optional(),
@@ -271,7 +273,7 @@ function MainMenu({ searchValue, trigger, clearSearchValue, setFilterType }: Men
   );
 }
 
-const statuses = allTaskRunStatuses.map((status) => ({
+const statuses = filterableTaskRunStatuses.map((status) => ({
   title: runStatusTitle(status),
   value: status,
 }));

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

@@ -7,7 +7,7 @@ import {
   XCircleIcon,
 } from "@heroicons/react/20/solid";
 import type { TaskRunAttemptStatus as TaskRunAttemptStatusType } from "@trigger.dev/database";
-import { TaskRunAttemptStatus } from "@trigger.dev/database";
+import { TaskRunAttemptStatus } from "~/database-types";
 import assertNever from "assert-never";
 import { SnowflakeIcon } from "lucide-react";
 import { Spinner } from "~/components/primitives/Spinner";
@@ -17,7 +17,7 @@ export const allTaskRunAttemptStatuses = Object.values(
   TaskRunAttemptStatus
 ) as TaskRunAttemptStatusType[];
 
-export type ExtendedTaskAttemptStatus = (typeof allTaskRunAttemptStatuses)[number] | "ENQUEUED";
+export type ExtendedTaskAttemptStatus = TaskRunAttemptStatusType | "ENQUEUED";
 
 export function TaskRunAttemptStatusCombo({
   status,

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

@@ -25,9 +25,24 @@ export const allTaskRunStatuses = [
   "CANCELED",
   "COMPLETED_WITH_ERRORS",
   "CRASHED",
+  "PAUSED",
   "INTERRUPTED",
   "SYSTEM_FAILURE",
-] as TaskRunStatus[];
+] as const satisfies Readonly<Array<TaskRunStatus>>;
+
+export const filterableTaskRunStatuses = [
+  "WAITING_FOR_DEPLOY",
+  "PENDING",
+  "EXECUTING",
+  "RETRYING_AFTER_FAILURE",
+  "WAITING_TO_RESUME",
+  "COMPLETED_SUCCESSFULLY",
+  "CANCELED",
+  "COMPLETED_WITH_ERRORS",
+  "CRASHED",
+  "INTERRUPTED",
+  "SYSTEM_FAILURE",
+] as const satisfies Readonly<Array<TaskRunStatus>>;
 
 const taskRunStatusDescriptions: Record<TaskRunStatus, string> = {
   PENDING: "Task is waiting to be executed",

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

@@ -0,0 +1,68 @@
+// There's a weird issue with importing values from the prisma client
+// when using Remix Vite + pnpm + prisma
+// As long as they're only used as types it's ok
+// Import types here and validate hardcoded enums
+
+import type {
+  BatchTaskRunItemStatus as BatchTaskRunItemStatusType,
+  TaskRunAttemptStatus as TaskRunAttemptStatusType,
+  TaskRunStatus as TaskRunStatusType,
+  JobRunStatus as JobRunStatusType,
+  RuntimeEnvironmentType as RuntimeEnvironmentTypeType,
+} from "@trigger.dev/database";
+
+export const BatchTaskRunItemStatus = {
+  PENDING: "PENDING",
+  FAILED: "FAILED",
+  CANCELED: "CANCELED",
+  COMPLETED: "COMPLETED",
+} as const satisfies Record<BatchTaskRunItemStatusType, BatchTaskRunItemStatusType>;
+
+export const TaskRunAttemptStatus = {
+  PENDING: "PENDING",
+  EXECUTING: "EXECUTING",
+  PAUSED: "PAUSED",
+  FAILED: "FAILED",
+  CANCELED: "CANCELED",
+  COMPLETED: "COMPLETED",
+} as const satisfies Record<TaskRunAttemptStatusType, TaskRunAttemptStatusType>;
+
+export const TaskRunStatus = {
+  PENDING: "PENDING",
+  WAITING_FOR_DEPLOY: "WAITING_FOR_DEPLOY",
+  EXECUTING: "EXECUTING",
+  WAITING_TO_RESUME: "WAITING_TO_RESUME",
+  RETRYING_AFTER_FAILURE: "RETRYING_AFTER_FAILURE",
+  PAUSED: "PAUSED",
+  CANCELED: "CANCELED",
+  INTERRUPTED: "INTERRUPTED",
+  COMPLETED_SUCCESSFULLY: "COMPLETED_SUCCESSFULLY",
+  COMPLETED_WITH_ERRORS: "COMPLETED_WITH_ERRORS",
+  SYSTEM_FAILURE: "SYSTEM_FAILURE",
+  CRASHED: "CRASHED",
+} as const satisfies Record<TaskRunStatusType, TaskRunStatusType>;
+
+export const JobRunStatus = {
+  PENDING: "PENDING",
+  QUEUED: "QUEUED",
+  WAITING_ON_CONNECTIONS: "WAITING_ON_CONNECTIONS",
+  PREPROCESSING: "PREPROCESSING",
+  STARTED: "STARTED",
+  EXECUTING: "EXECUTING",
+  WAITING_TO_CONTINUE: "WAITING_TO_CONTINUE",
+  WAITING_TO_EXECUTE: "WAITING_TO_EXECUTE",
+  SUCCESS: "SUCCESS",
+  FAILURE: "FAILURE",
+  TIMED_OUT: "TIMED_OUT",
+  ABORTED: "ABORTED",
+  CANCELED: "CANCELED",
+  UNRESOLVED_AUTH: "UNRESOLVED_AUTH",
+  INVALID_PAYLOAD: "INVALID_PAYLOAD",
+} as const satisfies Record<JobRunStatusType, JobRunStatusType>;
+
+export const RuntimeEnvironmentType = {
+  PRODUCTION: "PRODUCTION",
+  STAGING: "STAGING",
+  DEVELOPMENT: "DEVELOPMENT",
+  PREVIEW: "PREVIEW",
+} as const satisfies Record<RuntimeEnvironmentTypeType, RuntimeEnvironmentTypeType>;

apps/webapp/app/database-types.ts

@@ -70,7 +70,9 @@ export { Prisma };
 
 export const prisma = singleton("prisma", getClient);
 
-export const $replica: Omit<PrismaClient, "$transaction"> = singleton(
+export type PrismaReplicaClient = Omit<PrismaClient, "$transaction">;
+
+export const $replica: PrismaReplicaClient = singleton(
   "replica",
   () => getReplicaClient() ?? prisma
 );

apps/webapp/app/db.server.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { SecretStoreOptionsSchema } from "./services/secrets/secretStore.server";
+import { SecretStoreOptionsSchema } from "./services/secrets/secretStoreOptionsSchema.server";
 import { isValidRegex } from "./utils/regex";
 import { isValidDatabaseUrl } from "./utils/db";
 

apps/webapp/app/env.server.ts

@@ -1,6 +1,7 @@
-import { RuntimeEnvironmentType, type RuntimeEnvironment } from "@trigger.dev/database";
+import type { RuntimeEnvironment } from "@trigger.dev/database";
 import { prisma } from "~/db.server";
 import { customAlphabet } from "nanoid";
+import { RuntimeEnvironmentType } from "~/database-types";
 
 const apiKeyId = customAlphabet(
   "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",