chore: merge main into feat/agent-storybook-gallery (post-squash of #4525)

Author: kathiekiwi

.server-changes/scope-declarative-schedule-sync.md

@@ -0,0 +1,6 @@
+---
+area: webapp
+type: improvement
+---
+
+Make background worker registration cheaper for projects with many scheduled tasks by scoping declarative schedule reconciliation to the current environment and dropping redundant schedule lookups.

.server-changes/scope-env-var-create-precheck.md

@@ -0,0 +1,6 @@
+---
+area: webapp
+type: improvement
+---
+
+Speed up setting and importing environment variables for projects with many variables.

apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts

@@ -1,5 +1,10 @@
 import type { AuthenticatedEnvironment } from "@trigger.dev/core/v3/auth/environment";
-import { Prisma, type PrismaClient, type RuntimeEnvironmentType } from "@trigger.dev/database";
+import {
+  boundedIn,
+  Prisma,
+  type PrismaClient,
+  type RuntimeEnvironmentType,
+} from "@trigger.dev/database";
 import { z } from "zod";
 import { environmentFullTitle } from "~/components/environments/EnvironmentLabel";
 import { $replica, $transaction, prisma, type PrismaReplicaClient } from "~/db.server";
@@ -66,9 +71,15 @@ export class EnvironmentVariablesRepository implements Repository {
           },
         },
         environmentVariables: {
+          where: {
+            key: { in: boundedIn(options.variables.map((v) => v.key)) },
+          },
           select: {
             key: true,
             values: {
+              where: {
+                environmentId: { in: boundedIn(options.environmentIds) },
+              },
               select: {
                 environment: {
                   select: { id: true, type: true },

apps/webapp/app/v3/services/checkSchedule.server.ts

@@ -131,12 +131,14 @@ export class CheckScheduleService extends BaseService {
         projectId,
         active: true,
         environment: {
+          projectId,
           type: {
             not: "DEVELOPMENT",
           },
           archivedAt: null,
         },
         taskSchedule: {
+          projectId,
           active: true,
         },
       },

apps/webapp/app/v3/services/createBackgroundWorker.server.ts

@@ -655,9 +655,21 @@ export async function syncDeclarativeSchedules(
     where: {
       type: "DECLARATIVE",
       projectId: environment.projectId,
+      instances: {
+        some: {
+          environmentId: environment.id,
+        },
+      },
     },
-    include: {
-      instances: true,
+    select: {
+      id: true,
+      friendlyId: true,
+      taskIdentifier: true,
+      instances: {
+        select: {
+          environmentId: true,
+        },
+      },
     },
   });
 
@@ -764,16 +776,9 @@ export async function syncDeclarativeSchedules(
 
   //Delete instances for this environment
   //Delete schedules that have no instances left
-  const potentiallyDeletableSchedules = await prisma.taskSchedule.findMany({
-    where: {
-      id: {
-        in: boundedIn(Array.from(missingSchedules)),
-      },
-    },
-    include: {
-      instances: true,
-    },
-  });
+  const potentiallyDeletableSchedules = existingDeclarativeSchedules.filter((schedule) =>
+    missingSchedules.has(schedule.id)
+  );
 
   const scheduleIdsToDelete: string[] = [];
   const scheduleIdsToDetachFromEnvironment: string[] = [];