Merge pull request #1330 from trycompai/mariano/docker

Marfuen · web-flow · commit 24df40598d58 · 2025-08-19T11:16:24.000-04:00
[dev] [Marfuen] mariano/docker
diff --git a/apps/app/package.json b/apps/app/package.json
@@ -44,8 +44,8 @@
     "@tiptap/extension-table-cell": "^2.22.3",
     "@tiptap/extension-table-header": "^2.22.3",
     "@tiptap/extension-table-row": "^2.22.3",
-    "@trigger.dev/react-hooks": "3.3.17",
-    "@trigger.dev/sdk": "3.3.17",
+    "@trigger.dev/react-hooks": "4",
+    "@trigger.dev/sdk": "4",
     "@trycompai/db": "^1.3.4",
     "@types/canvas-confetti": "^1.9.0",
     "@types/three": "^0.177.0",
@@ -101,7 +101,7 @@
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
-    "@trigger.dev/build": "3.3.17",
+    "@trigger.dev/build": "4",
     "@types/d3": "^7.4.3",
     "@types/node": "^24.0.3",
     "@vitejs/plugin-react": "^4.6.0",
@@ -136,7 +136,7 @@
     "build": "next build",
     "db:generate": "bun run db:getschema && prisma generate",
     "db:getschema": "cp ../../node_modules/@trycompai/db/dist/schema.prisma prisma/schema.prisma",
-    "deploy:trigger-prod": "npx trigger.dev@3.3.17 deploy",
+    "deploy:trigger-prod": "npx trigger.dev@4.0.0 deploy",
     "dev": "bun i && bunx concurrently --kill-others --names \"next,trigger\" --prefix-colors \"yellow,blue\" \"next dev --turbo -p 3000\" \"bun run trigger:dev\"",
     "lint": "next lint && prettier --check .",
     "prebuild": "bun run db:generate",
@@ -153,7 +153,7 @@
     "test:e2e:ui": "playwright test --ui",
     "test:ui": "vitest --ui",
     "test:watch": "vitest --watch",
-    "trigger:dev": "npx trigger.dev@3.3.17 dev",
+    "trigger:dev": "npx trigger.dev@4.0.0 dev",
     "typecheck": "tsc --noEmit"
   }
 }
diff --git a/apps/app/src/actions/policies/update-policy-action.ts b/apps/app/src/actions/policies/update-policy-action.ts
@@ -1,7 +1,7 @@
 'use server';
 
 import { db } from '@db';
-import { logger } from '@trigger.dev/sdk/v3';
+import { logger } from '@trigger.dev/sdk';
 import { revalidatePath, revalidateTag } from 'next/cache';
 import { authActionClient } from '../safe-action';
 import { updatePolicySchema } from '../schema';
diff --git a/apps/app/src/actions/research-vendor.ts b/apps/app/src/actions/research-vendor.ts
@@ -1,7 +1,7 @@
 'use server';
 
 import { researchVendor } from '@/jobs/tasks/scrape/research';
-import { tasks } from '@trigger.dev/sdk/v3';
+import { tasks } from '@trigger.dev/sdk';
 import { z } from 'zod';
 import { authActionClient } from './safe-action';
 
diff --git a/apps/app/src/actions/trigger/heal-access-token.ts b/apps/app/src/actions/trigger/heal-access-token.ts
@@ -1,6 +1,6 @@
 'use server';
 
-import { auth } from '@trigger.dev/sdk/v3';
+import { auth } from '@trigger.dev/sdk';
 import { cookies } from 'next/headers';
 
 // Server action that can set cookies (called from client components or forms)
diff --git a/apps/app/src/app/(app)/[orgId]/components/OnboardingTracker.tsx b/apps/app/src/app/(app)/[orgId]/components/OnboardingTracker.tsx
@@ -115,11 +115,10 @@ export const OnboardingTracker = ({ onboarding }: { onboarding: Onboarding }) =>
     const friendlyStatus = getFriendlyStatusName(run.status);
 
     switch (run.status) {
-      case 'WAITING_FOR_DEPLOY':
+      case 'WAITING':
       case 'QUEUED':
       case 'EXECUTING':
-      case 'REATTEMPTING':
-      case 'FROZEN':
+      case 'PENDING_VERSION':
       case 'DELAYED':
         return (
           <div className="flex flex-col items-center justify-center gap-2 text-center">
@@ -156,8 +155,8 @@ export const OnboardingTracker = ({ onboarding }: { onboarding: Onboarding }) =>
       case 'FAILED':
       case 'CANCELED':
       case 'CRASHED':
-      case 'INTERRUPTED':
       case 'SYSTEM_FAILURE':
+      case 'DEQUEUED':
       case 'EXPIRED':
       case 'TIMED_OUT': {
         const errorMessage = run.error?.message || 'An unexpected issue occurred.';
diff --git a/apps/app/src/app/(app)/[orgId]/tests/dashboard/actions/run-tests.ts b/apps/app/src/app/(app)/[orgId]/tests/dashboard/actions/run-tests.ts
@@ -3,7 +3,7 @@
 import { sendIntegrationResults } from '@/jobs/tasks/integration/integration-results';
 import { auth } from '@/utils/auth';
 import { db } from '@db';
-import { runs, tasks } from '@trigger.dev/sdk/v3';
+import { tasks } from '@trigger.dev/sdk';
 import { revalidatePath } from 'next/cache';
 import { headers } from 'next/headers';
 
@@ -56,7 +56,7 @@ export const runTests = async () => {
     };
   }
 
-  const batchHandle = await tasks.batchTrigger<typeof sendIntegrationResults>(
+  const batchHandle = await tasks.batchTriggerAndWait<typeof sendIntegrationResults>(
     'send-integration-results',
     integrations.map((integration) => ({
       payload: {
@@ -72,20 +72,6 @@ export const runTests = async () => {
     })),
   );
 
-  let existingRuns = await runs.list({
-    status: 'EXECUTING',
-    batch: batchHandle.batchId,
-  });
-
-  while (existingRuns.data.length > 0) {
-    console.log(`Waiting for existing runs to complete: ${existingRuns.data.length}`);
-    await new Promise((resolve) => setTimeout(resolve, 500));
-    existingRuns = await runs.list({
-      status: 'EXECUTING',
-      batch: batchHandle.batchId,
-    });
-  }
-
   revalidatePath(`/${orgId}/tests/dashboard`);
   return {
     success: true,
diff --git a/apps/app/src/app/(app)/onboarding/actions/complete-onboarding.ts b/apps/app/src/app/(app)/onboarding/actions/complete-onboarding.ts
@@ -5,7 +5,7 @@ import { steps } from '@/app/(app)/setup/lib/constants';
 import { createFleetLabelForOrg } from '@/jobs/tasks/device/create-fleet-label-for-org';
 import { onboardOrganization as onboardOrganizationTask } from '@/jobs/tasks/onboarding/onboard-organization';
 import { db } from '@db';
-import { tasks } from '@trigger.dev/sdk/v3';
+import { tasks } from '@trigger.dev/sdk';
 import { revalidatePath } from 'next/cache';
 import { cookies, headers } from 'next/headers';
 import { z } from 'zod';
@@ -80,19 +80,9 @@ export const completeOnboarding = authActionClient
       });
 
       // Now trigger the jobs that were skipped during minimal creation
-      const handle = await tasks.trigger<typeof onboardOrganizationTask>(
-        'onboard-organization',
-        {
-          organizationId: parsedInput.organizationId,
-        },
-        {
-          queue: {
-            name: 'onboard-organization',
-            concurrencyLimit: 5,
-          },
-          concurrencyKey: parsedInput.organizationId,
-        },
-      );
+      const handle = await tasks.trigger<typeof onboardOrganizationTask>('onboard-organization', {
+        organizationId: parsedInput.organizationId,
+      });
 
       // Update onboarding record with job ID
       await db.onboarding.update({
diff --git a/apps/app/src/app/(app)/setup/actions/create-organization.ts b/apps/app/src/app/(app)/setup/actions/create-organization.ts
@@ -10,7 +10,7 @@ import { createFleetLabelForOrg } from '@/jobs/tasks/device/create-fleet-label-f
 import { onboardOrganization as onboardOrganizationTask } from '@/jobs/tasks/onboarding/onboard-organization';
 import { auth } from '@/utils/auth';
 import { db } from '@db';
-import { tasks } from '@trigger.dev/sdk/v3';
+import { tasks } from '@trigger.dev/sdk';
 import { revalidatePath } from 'next/cache';
 import { cookies, headers } from 'next/headers';
 import { companyDetailsSchema, steps } from '../lib/constants';
@@ -173,19 +173,9 @@ export const createOrganization = authActionClientWithoutOrg
         revalidatePath(`/${org.organizationId}`);
       }
 
-      const handle = await tasks.trigger<typeof onboardOrganizationTask>(
-        'onboard-organization',
-        {
-          organizationId: orgId,
-        },
-        {
-          queue: {
-            name: 'onboard-organization',
-            concurrencyLimit: 5,
-          },
-          concurrencyKey: orgId,
-        },
-      );
+      const handle = await tasks.trigger<typeof onboardOrganizationTask>('onboard-organization', {
+        organizationId: orgId,
+      });
 
       // Set triggerJobId to signal that the job is running.
       await db.onboarding.update({
diff --git a/apps/app/src/jobs/lib/prompts.ts b/apps/app/src/jobs/lib/prompts.ts
@@ -1,6 +1,6 @@
 import { Policy } from '@db';
 import type { JSONContent } from '@tiptap/react';
-import { logger } from '@trigger.dev/sdk/v3';
+import { logger } from '@trigger.dev/sdk';
 
 export const generatePrompt = ({
   policy,
diff --git a/apps/app/src/jobs/lib/research.ts b/apps/app/src/jobs/lib/research.ts
@@ -1,5 +1,5 @@
 import { env } from '@/env.mjs';
-import { logger } from '@trigger.dev/sdk/v3';
+import { logger } from '@trigger.dev/sdk';
 import { z, ZodSchema } from 'zod';
 
 export const initialResponseSchema = z.object({
diff --git a/apps/app/src/jobs/tasks/device/create-fleet-label-for-all-orgs.ts b/apps/app/src/jobs/tasks/device/create-fleet-label-for-all-orgs.ts
@@ -1,5 +1,5 @@
 import { db } from '@db';
-import { logger, task } from '@trigger.dev/sdk/v3';
+import { logger, task } from '@trigger.dev/sdk';
 import { createFleetLabelForOrg } from './create-fleet-label-for-org';
 
 export const createFleetLabelForAllOrgs = task({
diff --git a/apps/app/src/jobs/tasks/device/create-fleet-label-for-org.ts b/apps/app/src/jobs/tasks/device/create-fleet-label-for-org.ts
@@ -1,9 +1,13 @@
 import { getFleetInstance } from '@/lib/fleet';
 import { db } from '@db';
-import { logger, task } from '@trigger.dev/sdk/v3';
+import { logger, queue, task } from '@trigger.dev/sdk';
+
+// Optional: define a queue if we want to control concurrency in v4
+const fleetQueue = queue({ name: 'create-fleet-label-for-org', concurrencyLimit: 10 });
 
 export const createFleetLabelForOrg = task({
   id: 'create-fleet-label-for-org',
+  queue: fleetQueue,
   retry: {
     maxAttempts: 3,
   },
diff --git a/apps/app/src/jobs/tasks/integration/integration-results.ts b/apps/app/src/jobs/tasks/integration/integration-results.ts
@@ -1,7 +1,7 @@
 import { decrypt } from '@comp/app/src/lib/encryption';
 import { type DecryptFunction, getIntegrationHandler } from '@comp/integrations';
 import { db } from '@db';
-import { logger, schemaTask } from '@trigger.dev/sdk/v3';
+import { logger, schemaTask } from '@trigger.dev/sdk';
 import { z } from 'zod';
 
 export const sendIntegrationResults = schemaTask({
diff --git a/apps/app/src/jobs/tasks/integration/integration-schedule.ts b/apps/app/src/jobs/tasks/integration/integration-schedule.ts
@@ -1,5 +1,5 @@
 import { db } from '@db';
-import { logger, schedules } from '@trigger.dev/sdk/v3';
+import { logger, schedules } from '@trigger.dev/sdk';
 import { sendIntegrationResults } from './integration-results';
 
 export const sendIntegrationSchedule = schedules.task({
diff --git a/apps/app/src/jobs/tasks/onboarding/onboard-organization.ts b/apps/app/src/jobs/tasks/onboarding/onboard-organization.ts
@@ -10,45 +10,20 @@ import {
   RiskTreatmentType,
   VendorCategory,
 } from '@db';
-import { logger, task, tasks } from '@trigger.dev/sdk/v3';
+import { logger, queue, task, tasks } from '@trigger.dev/sdk';
 import { generateObject, generateText } from 'ai';
 import axios from 'axios';
 import z from 'zod';
 import type { researchVendor } from '../scrape/research';
 import { VENDOR_RISK_ASSESSMENT_PROMPT } from './prompts/vendor-risk-assessment';
 import { updatePolicies } from './update-policies';
 
+// v4 queues must be declared in advance
+const onboardOrgQueue = queue({ name: 'onboard-organization', concurrencyLimit: 10 });
+
 export const onboardOrganization = task({
   id: 'onboard-organization',
-  cleanup: async ({ organizationId }: { organizationId: string }) => {
-    await db.onboarding.update({
-      where: {
-        organizationId,
-      },
-      data: { triggerJobId: null },
-    });
-
-    try {
-      logger.info(`Revalidating path ${process.env.NEXT_PUBLIC_BETTER_AUTH_URL}/${organizationId}`);
-      const revalidateResponse = await axios.post(
-        `${process.env.NEXT_PUBLIC_BETTER_AUTH_URL}/api/revalidate/path`,
-        {
-          path: `${process.env.NEXT_PUBLIC_BETTER_AUTH_URL}/${organizationId}`,
-          secret: process.env.REVALIDATION_SECRET,
-          type: 'layout',
-        },
-      );
-
-      if (!revalidateResponse.data?.revalidated) {
-        logger.error(`Failed to revalidate path: ${revalidateResponse.statusText}`);
-        logger.error(revalidateResponse.data);
-      } else {
-        logger.info('Revalidated path successfully');
-      }
-    } catch (err) {
-      logger.error('Error revalidating path', { err });
-    }
-  },
+  queue: onboardOrgQueue,
   run: async (payload: { organizationId: string }) => {
     logger.info(`Start onboarding organization ${payload.organizationId}`);
 
@@ -260,17 +235,14 @@ Please perform a comprehensive vendor risk assessment for this vendor using the
     });
 
     if (fullPolicies.length > 0) {
+      // v4: queues are predefined on the task; trigger without on-demand queue options
       await updatePolicies.batchTriggerAndWait(
         fullPolicies.map((policy) => ({
           payload: {
             organizationId: payload.organizationId,
             policyId: policy.id,
             contextHub: contextHub.map((c) => `${c.question}\n${c.answer}`).join('\n'),
           },
-          queue: {
-            name: 'update-policies',
-            concurrencyLimit: 5,
-          },
           concurrencyKey: payload.organizationId,
         })),
       );
@@ -285,5 +257,34 @@ Please perform a comprehensive vendor risk assessment for this vendor using the
 
     logger.info(`Created ${extractRisks.object.risks.length} risks`);
     logger.info(`Created ${extractVendors.object.vendors.length} vendors`);
+
+    const organizationId = payload.organizationId;
+    await db.onboarding.update({
+      where: {
+        organizationId,
+      },
+      data: { triggerJobId: null },
+    });
+
+    try {
+      logger.info(`Revalidating path ${process.env.NEXT_PUBLIC_BETTER_AUTH_URL}/${organizationId}`);
+      const revalidateResponse = await axios.post(
+        `${process.env.NEXT_PUBLIC_BETTER_AUTH_URL}/api/revalidate/path`,
+        {
+          path: `${process.env.NEXT_PUBLIC_BETTER_AUTH_URL}/${organizationId}`,
+          secret: process.env.REVALIDATION_SECRET,
+          type: 'layout',
+        },
+      );
+
+      if (!revalidateResponse.data?.revalidated) {
+        logger.error(`Failed to revalidate path: ${revalidateResponse.statusText}`);
+        logger.error(revalidateResponse.data);
+      } else {
+        logger.info('Revalidated path successfully');
+      }
+    } catch (err) {
+      logger.error('Error revalidating path', { err });
+    }
   },
 });
diff --git a/apps/app/src/jobs/tasks/onboarding/update-policies.ts b/apps/app/src/jobs/tasks/onboarding/update-policies.ts
@@ -1,7 +1,7 @@
 import { openai } from '@ai-sdk/openai';
 import { db } from '@db';
 import type { JSONContent } from '@tiptap/react';
-import { logger, schemaTask } from '@trigger.dev/sdk/v3';
+import { logger, queue, schemaTask } from '@trigger.dev/sdk';
 import { generateObject, NoObjectGeneratedError } from 'ai';
 import { z } from 'zod';
 import { generatePrompt } from '../../lib/prompts';
@@ -10,8 +10,12 @@ if (!process.env.OPENAI_API_KEY) {
   throw new Error('OPENAI_API_KEY is not set');
 }
 
+// v4: define queue ahead of time
+export const updatePoliciesQueue = queue({ name: 'update-policies', concurrencyLimit: 5 });
+
 export const updatePolicies = schemaTask({
   id: 'update-policies',
+  queue: updatePoliciesQueue,
   schema: z.object({
     organizationId: z.string(),
     policyId: z.string(),
diff --git a/apps/app/src/jobs/tasks/scrape/research.ts b/apps/app/src/jobs/tasks/scrape/research.ts
@@ -1,6 +1,6 @@
 import { researchJobCore } from '@/jobs/lib/research';
 import { db } from '@db';
-import { schemaTask } from '@trigger.dev/sdk/v3';
+import { schemaTask } from '@trigger.dev/sdk';
 import { z } from 'zod';
 
 const firecrawlDataSchema = z.object({
diff --git a/apps/app/trigger.config.ts b/apps/app/trigger.config.ts
@@ -1,7 +1,7 @@
 import { PrismaInstrumentation } from '@prisma/instrumentation';
 import { syncVercelEnvVars } from '@trigger.dev/build/extensions/core';
 import { puppeteer } from '@trigger.dev/build/extensions/puppeteer';
-import { defineConfig } from '@trigger.dev/sdk/v3';
+import { defineConfig } from '@trigger.dev/sdk';
 import { prismaExtension } from './customPrismaExtension';
 
 export default defineConfig({
diff --git a/bun.lock b/bun.lock
diff --git a/packages/ui/package.json b/packages/ui/package.json
