chore: merge main into release for new releases

Author: Marfuen

apps/api/.env.example

@@ -9,6 +9,7 @@ APP_AWS_REGION=
 APP_AWS_ACCESS_KEY_ID=
 APP_AWS_SECRET_ACCESS_KEY=
 APP_AWS_ORG_ASSETS_BUCKET=
+APP_AWS_ENDPOINT="" # optional for using services like MinIO
 
 DATABASE_URL=
 

apps/api/package.json

@@ -26,7 +26,7 @@
     "@react-email/components": "^0.0.41",
     "@trigger.dev/build": "4.0.6",
     "@trigger.dev/sdk": "4.0.6",
-    "@trycompai/db": "^1.3.20",
+    "@trycompai/db": "1.3.21",
     "@trycompai/email": "workspace:*",
     "@upstash/redis": "^1.34.2",
     "@upstash/vector": "^1.2.2",

apps/api/src/app/s3.ts

@@ -11,6 +11,7 @@ const logger = new Logger('S3');
 const APP_AWS_REGION = process.env.APP_AWS_REGION;
 const APP_AWS_ACCESS_KEY_ID = process.env.APP_AWS_ACCESS_KEY_ID;
 const APP_AWS_SECRET_ACCESS_KEY = process.env.APP_AWS_SECRET_ACCESS_KEY;
+const APP_AWS_ENDPOINT = process.env.APP_AWS_ENDPOINT;
 
 export const BUCKET_NAME = process.env.APP_AWS_BUCKET_NAME;
 export const APP_AWS_QUESTIONNAIRE_UPLOAD_BUCKET =
@@ -37,11 +38,13 @@ try {
   }
 
   s3ClientInstance = new S3Client({
+    endpoint: APP_AWS_ENDPOINT || undefined,
     region: APP_AWS_REGION,
     credentials: {
       accessKeyId: APP_AWS_ACCESS_KEY_ID,
       secretAccessKey: APP_AWS_SECRET_ACCESS_KEY,
     },
+    forcePathStyle: !!APP_AWS_ENDPOINT,
   });
 } catch (error) {
   logger.error(

apps/api/src/assistant-chat/assistant-chat.controller.ts

@@ -34,7 +34,10 @@ import type { AssistantChatMessage } from './assistant-chat.types';
 export class AssistantChatController {
   constructor(private readonly assistantChatService: AssistantChatService) {}
 
-  private getUserScopedContext(auth: AuthContextType): { organizationId: string; userId: string } {
+  private getUserScopedContext(auth: AuthContextType): {
+    organizationId: string;
+    userId: string;
+  } {
     // Defensive checks (should already be guaranteed by HybridAuthGuard + AuthContext decorator)
     if (!auth.organizationId) {
       throw new BadRequestException('Organization ID is required');
@@ -69,7 +72,9 @@ export class AssistantChatController {
       },
     },
   })
-  async getHistory(@AuthContext() auth: AuthContextType): Promise<{ messages: AssistantChatMessage[] }> {
+  async getHistory(
+    @AuthContext() auth: AuthContextType,
+  ): Promise<{ messages: AssistantChatMessage[] }> {
     const { organizationId, userId } = this.getUserScopedContext(auth);
 
     const messages = await this.assistantChatService.getHistory({
@@ -105,7 +110,9 @@ export class AssistantChatController {
     summary: 'Clear assistant chat history',
     description: 'Deletes the current user-scoped assistant chat history.',
   })
-  async clearHistory(@AuthContext() auth: AuthContextType): Promise<{ success: true }> {
+  async clearHistory(
+    @AuthContext() auth: AuthContextType,
+  ): Promise<{ success: true }> {
     const { organizationId, userId } = this.getUserScopedContext(auth);
 
     await this.assistantChatService.clearHistory({
@@ -116,5 +123,3 @@ export class AssistantChatController {
     return { success: true };
   }
 }
-
-

apps/api/src/assistant-chat/assistant-chat.dto.ts

@@ -1,5 +1,11 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsArray, IsIn, IsNumber, IsString, ValidateNested } from 'class-validator';
+import {
+  IsArray,
+  IsIn,
+  IsNumber,
+  IsString,
+  ValidateNested,
+} from 'class-validator';
 import { Type } from 'class-transformer';
 
 export class AssistantChatMessageDto {
@@ -27,5 +33,3 @@ export class SaveAssistantChatHistoryDto {
   @Type(() => AssistantChatMessageDto)
   messages!: AssistantChatMessageDto[];
 }
-
-

apps/api/src/assistant-chat/assistant-chat.module.ts

@@ -9,5 +9,3 @@ import { AssistantChatService } from './assistant-chat.service';
   providers: [AssistantChatService],
 })
 export class AssistantChatModule {}
-
-

apps/api/src/assistant-chat/assistant-chat.service.ts

@@ -17,7 +17,10 @@ type GetAssistantChatKeyParams = {
   userId: string;
 };
 
-const getAssistantChatKey = ({ organizationId, userId }: GetAssistantChatKeyParams): string => {
+const getAssistantChatKey = ({
+  organizationId,
+  userId,
+}: GetAssistantChatKeyParams): string => {
   return `assistant-chat:v1:${organizationId}:${userId}`;
 };
 
@@ -27,17 +30,24 @@ export class AssistantChatService {
    * Default TTL is 7 days. This is intended to behave like "session context"
    * rather than a long-term, searchable archive.
    */
-  private readonly ttlSeconds = Number(process.env.ASSISTANT_CHAT_TTL_SECONDS ?? 60 * 60 * 24 * 7);
+  private readonly ttlSeconds = Number(
+    process.env.ASSISTANT_CHAT_TTL_SECONDS ?? 60 * 60 * 24 * 7,
+  );
 
-  async getHistory(params: GetAssistantChatKeyParams): Promise<AssistantChatMessage[]> {
+  async getHistory(
+    params: GetAssistantChatKeyParams,
+  ): Promise<AssistantChatMessage[]> {
     const key = getAssistantChatKey(params);
     const raw = await assistantChatRedisClient.get<unknown>(key);
     const parsed = StoredMessagesSchema.safeParse(raw);
     if (!parsed.success) return [];
     return parsed.data;
   }
 
-  async saveHistory(params: GetAssistantChatKeyParams, messages: AssistantChatMessage[]): Promise<void> {
+  async saveHistory(
+    params: GetAssistantChatKeyParams,
+    messages: AssistantChatMessage[],
+  ): Promise<void> {
     const key = getAssistantChatKey(params);
     // Always validate before writing to keep the cache shape stable.
     const validated = StoredMessagesSchema.parse(messages);
@@ -49,5 +59,3 @@ export class AssistantChatService {
     await assistantChatRedisClient.del(key);
   }
 }
-
-

apps/api/src/assistant-chat/assistant-chat.types.ts

@@ -4,5 +4,3 @@ export type AssistantChatMessage = {
   text: string;
   createdAt: number;
 };
-
-

apps/api/src/assistant-chat/upstash-redis.client.ts

@@ -19,7 +19,11 @@ class InMemoryRedis {
     return record.value as T;
   }
 
-  async set(key: string, value: unknown, options?: { ex?: number }): Promise<'OK'> {
+  async set(
+    key: string,
+    value: unknown,
+    options?: { ex?: number },
+  ): Promise<'OK'> {
     const expiresAt = options?.ex ? Date.now() + options.ex * 1000 : undefined;
     this.storage.set(key, { value, expiresAt });
     return 'OK';
@@ -32,7 +36,8 @@ class InMemoryRedis {
 }
 
 const hasUpstashConfig =
-  !!process.env.UPSTASH_REDIS_REST_URL && !!process.env.UPSTASH_REDIS_REST_TOKEN;
+  !!process.env.UPSTASH_REDIS_REST_URL &&
+  !!process.env.UPSTASH_REDIS_REST_TOKEN;
 
 export const assistantChatRedisClient: Pick<Redis, 'get' | 'set' | 'del'> =
   hasUpstashConfig
@@ -41,5 +46,3 @@ export const assistantChatRedisClient: Pick<Redis, 'get' | 'set' | 'del'> =
         token: process.env.UPSTASH_REDIS_REST_TOKEN!,
       })
     : (new InMemoryRedis() as unknown as Pick<Redis, 'get' | 'set' | 'del'>);
-
-

apps/api/src/attachments/attachments.service.ts

@@ -14,6 +14,7 @@ import {
 import { randomBytes } from 'crypto';
 import { AttachmentResponseDto } from '../tasks/dto/task-responses.dto';
 import { UploadAttachmentDto } from './upload-attachment.dto';
+import { s3Client } from '@/app/s3';
 
 @Injectable()
 export class AttachmentsService {
@@ -27,20 +28,14 @@ export class AttachmentsService {
     // Safe to access environment variables directly since they're validated
     this.bucketName = process.env.APP_AWS_BUCKET_NAME!;
 
-    if (
-      !process.env.APP_AWS_ACCESS_KEY_ID ||
-      !process.env.APP_AWS_SECRET_ACCESS_KEY
-    ) {
-      console.warn('AWS credentials are missing, S3 client may fail');
+    if (!s3Client) {
+      console.error('S3 Client is not initialized. Check AWS S3 configuration.');
+      throw new Error(
+        'S3 Client is not initialized. Check AWS S3 configuration.',
+      );
     }
 
-    this.s3Client = new S3Client({
-      region: process.env.APP_AWS_REGION || 'us-east-1',
-      credentials: {
-        accessKeyId: process.env.APP_AWS_ACCESS_KEY_ID!,
-        secretAccessKey: process.env.APP_AWS_SECRET_ACCESS_KEY!,
-      },
-    });
+    this.s3Client = s3Client;
   }
 
   /**
@@ -385,6 +380,25 @@ export class AttachmentsService {
     return this.generateSignedUrl(s3Key);
   }
 
+  /**
+   * Generate presigned download URL with a custom download filename
+   */
+  async getPresignedDownloadUrlWithFilename(
+    s3Key: string,
+    downloadFilename: string,
+  ): Promise<string> {
+    const sanitizedFilename = this.sanitizeHeaderValue(downloadFilename);
+    const getCommand = new GetObjectCommand({
+      Bucket: this.bucketName,
+      Key: s3Key,
+      ResponseContentDisposition: `attachment; filename="${sanitizedFilename}"`,
+    });
+
+    return getSignedUrl(this.s3Client, getCommand, {
+      expiresIn: this.SIGNED_URL_EXPIRY,
+    });
+  }
+
   async getObjectBuffer(s3Key: string): Promise<Buffer> {
     const getCommand = new GetObjectCommand({
       Bucket: this.bucketName,