chore: merge main into release for new releases

Author: Marfuen

.github/workflows/trigger-api-tasks-deploy-main.yml

@@ -31,6 +31,9 @@ jobs:
       - name: Build Integration Platform package
         working-directory: ./packages/integration-platform
         run: bun run build
+      - name: Build Email package
+        working-directory: ./packages/email
+        run: bun run build
       - name: Build DB package
         working-directory: ./packages/db
         run: bun run build

.github/workflows/trigger-api-tasks-deploy-release.yml

@@ -35,6 +35,10 @@ jobs:
         working-directory: ./packages/integration-platform
         run: bun run build
 
+      - name: Build Email package
+        working-directory: ./packages/email
+        run: bun run build
+
       - name: Build DB package
         working-directory: ./packages/db
         run: bun run build

apps/api/emailExtension.ts

@@ -0,0 +1,121 @@
+import type {
+  BuildContext,
+  BuildExtension,
+  BuildManifest,
+} from '@trigger.dev/build';
+import type { Plugin } from 'esbuild';
+import { existsSync } from 'node:fs';
+import { cp, mkdir } from 'node:fs/promises';
+import { resolve } from 'node:path';
+
+const PACKAGE_NAME = '@trycompai/email';
+
+/**
+ * Custom Trigger.dev build extension for @trycompai/email workspace package.
+ *
+ * Since @trycompai/email is a workspace package (not published to npm),
+ * we need to:
+ * 1. Add an esbuild plugin to resolve the import path during build
+ * 2. Copy the built dist files into the trigger.dev deployment
+ */
+export function emailExtension(): EmailExtension {
+  return new EmailExtension();
+}
+
+class EmailExtension implements BuildExtension {
+  public readonly name = 'EmailExtension';
+  private _packagePath: string | undefined;
+
+  async onBuildStart(context: BuildContext) {
+    if (context.target === 'dev') {
+      return;
+    }
+
+    this._packagePath = this.findPackageRoot(context.workingDir);
+
+    if (!this._packagePath) {
+      throw new Error(
+        [
+          `EmailExtension could not find ${PACKAGE_NAME}.`,
+          'Make sure the package is built (run `bun run build` in packages/email).',
+        ].join('\n'),
+      );
+    }
+
+    context.logger.debug(`Found email package at ${this._packagePath}`);
+
+    const packagePath = this._packagePath;
+    const resolvePlugin: Plugin = {
+      name: 'resolve-email',
+      setup(build) {
+        build.onResolve({ filter: /^@trycompai\/email$/ }, () => {
+          return {
+            path: resolve(packagePath, 'dist/index.js'),
+          };
+        });
+
+        build.onResolve(
+          { filter: /^@trycompai\/email\// },
+          (args) => {
+            const subpath = args.path.replace(`${PACKAGE_NAME}/`, '');
+            return {
+              path: resolve(packagePath, 'dist', `${subpath}/index.js`),
+            };
+          },
+        );
+      },
+    };
+
+    context.registerPlugin(resolvePlugin);
+  }
+
+  async onBuildComplete(context: BuildContext, manifest: BuildManifest) {
+    if (context.target === 'dev') {
+      return;
+    }
+
+    const packagePath = this._packagePath;
+    if (!packagePath) {
+      return;
+    }
+
+    const packageDistPath = resolve(packagePath, 'dist');
+
+    const destPath = resolve(
+      manifest.outputPath,
+      'node_modules/@trycompai/email',
+    );
+    const destDistPath = resolve(destPath, 'dist');
+
+    await mkdir(destDistPath, { recursive: true });
+
+    await cp(packageDistPath, destDistPath, { recursive: true });
+
+    const packageJsonPath = resolve(packagePath, 'package.json');
+    if (existsSync(packageJsonPath)) {
+      await cp(packageJsonPath, resolve(destPath, 'package.json'));
+    }
+
+    context.logger.log(
+      'Copied @trycompai/email to deployment bundle',
+    );
+  }
+
+  private findPackageRoot(workingDir: string): string | undefined {
+    const candidates = [
+      resolve(workingDir, '../../packages/email'),
+      resolve(workingDir, '../packages/email'),
+    ];
+
+    for (const candidate of candidates) {
+      if (
+        existsSync(candidate) &&
+        existsSync(resolve(candidate, 'dist/index.js'))
+      ) {
+        return candidate;
+      }
+    }
+
+    return undefined;
+  }
+}

apps/api/trigger.config.ts

@@ -2,6 +2,7 @@ import { PrismaInstrumentation } from '@prisma/instrumentation';
 import { syncVercelEnvVars } from '@trigger.dev/build/extensions/core';
 import { defineConfig } from '@trigger.dev/sdk';
 import { prismaExtension } from './customPrismaExtension';
+import { emailExtension } from './emailExtension';
 import { integrationPlatformExtension } from './integrationPlatformExtension';
 
 export default defineConfig({
@@ -16,6 +17,7 @@ export default defineConfig({
         dbPackageVersion: '^1.3.15', // Version of @trycompai/db package with compiled JS
       }),
       integrationPlatformExtension(),
+      emailExtension(),
       syncVercelEnvVars(),
     ],
   },

apps/app/src/actions/organization/update-organization-device-agent-step-action.ts

@@ -0,0 +1,46 @@
+'use server';
+
+import { db } from '@db';
+import { revalidatePath, revalidateTag } from 'next/cache';
+import { headers } from 'next/headers';
+import { authActionClient } from '../safe-action';
+import { organizationDeviceAgentStepSchema } from '../schema';
+
+export const updateOrganizationDeviceAgentStepAction = authActionClient
+  .inputSchema(organizationDeviceAgentStepSchema)
+  .metadata({
+    name: 'update-organization-device-agent-step',
+    track: {
+      event: 'update-organization-device-agent-step',
+      channel: 'server',
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    const { deviceAgentStepEnabled } = parsedInput;
+    const { activeOrganizationId } = ctx.session;
+
+    if (!activeOrganizationId) {
+      throw new Error('No active organization');
+    }
+
+    try {
+      await db.organization.update({
+        where: { id: activeOrganizationId },
+        data: { deviceAgentStepEnabled },
+      });
+
+      const headersList = await headers();
+      let path = headersList.get('x-pathname') || headersList.get('referer') || '';
+      path = path.replace(/\/[a-z]{2}\//, '/');
+
+      revalidatePath(path);
+      revalidateTag(`organization_${activeOrganizationId}`, 'max');
+
+      return {
+        success: true,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new Error('Failed to update device agent step setting');
+    }
+  });

apps/app/src/actions/organization/update-organization-security-training-step-action.ts

@@ -0,0 +1,46 @@
+'use server';
+
+import { db } from '@db';
+import { revalidatePath, revalidateTag } from 'next/cache';
+import { headers } from 'next/headers';
+import { authActionClient } from '../safe-action';
+import { organizationSecurityTrainingStepSchema } from '../schema';
+
+export const updateOrganizationSecurityTrainingStepAction = authActionClient
+  .inputSchema(organizationSecurityTrainingStepSchema)
+  .metadata({
+    name: 'update-organization-security-training-step',
+    track: {
+      event: 'update-organization-security-training-step',
+      channel: 'server',
+    },
+  })
+  .action(async ({ parsedInput, ctx }) => {
+    const { securityTrainingStepEnabled } = parsedInput;
+    const { activeOrganizationId } = ctx.session;
+
+    if (!activeOrganizationId) {
+      throw new Error('No active organization');
+    }
+
+    try {
+      await db.organization.update({
+        where: { id: activeOrganizationId },
+        data: { securityTrainingStepEnabled },
+      });
+
+      const headersList = await headers();
+      let path = headersList.get('x-pathname') || headersList.get('referer') || '';
+      path = path.replace(/\/[a-z]{2}\//, '/');
+
+      revalidatePath(path);
+      revalidateTag(`organization_${activeOrganizationId}`, 'max');
+
+      return {
+        success: true,
+      };
+    } catch (error) {
+      console.error(error);
+      throw new Error('Failed to update security training step setting');
+    }
+  });

apps/app/src/actions/schema.ts

@@ -69,6 +69,14 @@ export const organizationEvidenceApprovalSchema = z.object({
   evidenceApprovalEnabled: z.boolean(),
 });
 
+export const organizationDeviceAgentStepSchema = z.object({
+  deviceAgentStepEnabled: z.boolean(),
+});
+
+export const organizationSecurityTrainingStepSchema = z.object({
+  securityTrainingStepEnabled: z.boolean(),
+});
+
 // Risks
 export const createRiskSchema = z.object({
   title: z