@hed-hog/core 0.0.362 → 0.0.365

package/src/auth/auth.controller.ts

@@ -46,6 +46,17 @@ export class AuthController {
     return this.service.verifyUser(locale, id);
   }
 
+  @NoRole()
+  @Get('desktop-token')
+  async desktopToken(
+    @User() { id },
+    @Locale() locale: string,
+    @Ip() ipAddress: string,
+    @Headers('user-agent') userAgent: string,
+  ) {
+    return this.service.issueDesktopToken(locale, id, ipAddress, userAgent);
+  }
+
   @NoRole()
   @Get('roles')
   async roles(@UserOptional() user, @Locale() locale: string) {
@@ -61,12 +72,13 @@ export class AuthController {
     @Res({ passthrough: true }) res,
     @Body('refreshToken') refreshTokenFromBody: string,
     @Headers('user-agent') userAgent: string,
+    @Headers('x-browser-id') browserId: string,
     @Ip() ipAddress: string
   ) {
     const tokenSource = req.cookies['rt'] ? 'cookie' : (refreshTokenFromBody ? 'body' : 'none');
     this.logger.debug(`[AuthController] POST /auth/refresh tokenSource=${tokenSource} ip=${ipAddress}`);
     const currentRefreshToken = req.cookies['rt'] || refreshTokenFromBody;
-    const { session, refreshToken, accessToken } = await this.service.refreshAccessToken(locale, currentRefreshToken, ipAddress, userAgent);
+    const { session, refreshToken, accessToken } = await this.service.refreshAccessToken(locale, currentRefreshToken, ipAddress, userAgent, browserId || null);
     await this.token.setRefreshTokenCookie(locale, res, refreshToken, session.expires_at);
 
     return {
@@ -82,9 +94,10 @@ export class AuthController {
     @Body() data: LoginDTO,
     @Ip() ipAddress: string,
     @Headers('user-agent') userAgent: string,
+    @Headers('x-browser-id') browserId: string,
     @Res({ passthrough: true }) res,
   ) {
-    return this.service.loginWithEmailAndPassword(res, locale, ipAddress, userAgent, data);
+    return this.service.loginWithEmailAndPassword(res, locale, ipAddress, userAgent, data, browserId || null);
   }
 
   @Public()
@@ -94,9 +107,10 @@ export class AuthController {
     @Body() {token, code}: LoginEmailVerificationDTO,
     @Ip() ipAddress: string,
     @Headers('user-agent') userAgent: string,
+    @Headers('x-browser-id') browserId: string,
     @Res({ passthrough: true }) res,
   ) {
-    return this.service.emailVerificationLogin(locale, token, code, ipAddress, userAgent, res);
+    return this.service.emailVerificationLogin(locale, token, code, ipAddress, userAgent, res, browserId || null);
   }
 
   @Public()
@@ -124,6 +138,7 @@ export class AuthController {
     @Body() { token, code, methodType }: LoginWithCodeDTO,
     @Ip() ipAddress: string,
     @Headers('user-agent') userAgent: string,
+    @Headers('x-browser-id') browserId: string,
     @Res({ passthrough: true }) res,
   ) {
     const { accessToken, refreshToken, session, requiresPasswordReset } = await this.service.verifyMfaCode(
@@ -132,7 +147,8 @@ export class AuthController {
       code,
       ipAddress,
       userAgent,
-      methodType
+      methodType,
+      browserId || null,
     );
 
     await this.token.setRefreshTokenCookie(locale, res, refreshToken, session.expires_at);
@@ -146,6 +162,7 @@ export class AuthController {
     @Body() { token, code }: LoginWithRecoveryCodeDTO,
     @Ip() ipAddress: string,
     @Headers('user-agent') userAgent: string,
+    @Headers('x-browser-id') browserId: string,
     @Res({ passthrough: true }) res,
   ) {
     const { accessToken, refreshToken, session, requiresPasswordReset } = await this.service.verifyMfaRecoveryCode(
@@ -153,7 +170,8 @@ export class AuthController {
       token,
       code,
       ipAddress,
-      userAgent
+      userAgent,
+      browserId || null,
     );
 
     await this.token.setRefreshTokenCookie(locale, res, refreshToken, session.expires_at);

package/src/auth/auth.service.ts

@@ -43,8 +43,8 @@ export class AuthService {
     private readonly challenge: ChallengeService,
   ) { }
 
-  async getAuthenticationPayload(locale: string, userId: number, ipAddress: string, userAgent: string) {
-    const { token: refreshToken, session } = await this.session.create(locale, userId, ipAddress, userAgent);
+  async getAuthenticationPayload(locale: string, userId: number, ipAddress: string, userAgent: string, browserId?: string | null) {
+    const { token: refreshToken, session } = await this.session.create(locale, userId, ipAddress, userAgent, browserId);
     const payload = { sub: userId, sessionId: session.id };
     const accessToken = await this.token.createAccessToken(payload);
     await this.prisma.user.update({ where: { id: userId }, data: { last_login_at: new Date() } });
@@ -58,6 +58,11 @@ export class AuthService {
 
   }
 
+  async issueDesktopToken(locale: string, userId: number, ipAddress: string, userAgent: string) {
+    const { accessToken, refreshToken } = await this.getAuthenticationPayload(locale, userId, ipAddress, userAgent);
+    return { accessToken, refreshToken };
+  }
+
   private hasPendingPasswordReset(user: User | any) {
     return Boolean(
       user?.user_credential?.some(
@@ -264,7 +269,7 @@ export class AuthService {
     }
   }
 
-  async emailVerificationLogin(locale: string, token: string, code: string, ipAddress: string, userAgent: string, res: any) {
+  async emailVerificationLogin(locale: string, token: string, code: string, ipAddress: string, userAgent: string, res: any, browserId?: string | null) {
 
     try {
       const payload = await this.token.verify(locale, token);
@@ -317,14 +322,14 @@ export class AuthService {
 
       const user = await this.user.findUserById(locale, challenge.user_identifier.user_id);
 
-      return this.login(locale, user as unknown as User, ipAddress, userAgent, res);
+      return this.login(locale, user as unknown as User, ipAddress, userAgent, res, browserId);
 
     } catch (error) {
         throw error;
     }
   }
 
-  private async login(locale: string, user: User, ipAddress: string, userAgent: string, res: any) {
+  private async login(locale: string, user: User, ipAddress: string, userAgent: string, res: any, browserId?: string | null) {
 
     const emails = await this.prisma.user_identifier.findMany({
       where: {
@@ -342,7 +347,8 @@ export class AuthService {
       locale,
       user.id,
       ipAddress,
-      userAgent
+      userAgent,
+      browserId,
     );
 
     for (const emailObj of emails) {
@@ -382,6 +388,7 @@ export class AuthService {
     ipAddress: string,
     userAgent: string,
     { email, password }: LoginDTO,
+    browserId?: string | null,
   ) {
 
     const user = await this.user.findUserByEmail(locale, email);
@@ -446,7 +453,7 @@ export class AuthService {
 
     }
 
-    return this.login(locale, user as unknown as User, ipAddress, userAgent, res);
+    return this.login(locale, user as unknown as User, ipAddress, userAgent, res, browserId);
   }
 
   async verifyRoles(_locale: string, userId: number) {
@@ -474,7 +481,7 @@ export class AuthService {
     };
   }
 
-  async refreshAccessToken(locale: string, refreshToken: string, ipAddress: string, userAgent: string) {
+  async refreshAccessToken(locale: string, refreshToken: string, ipAddress: string, userAgent: string, browserId?: string | null) {
 
     if (!refreshToken) {
       this.logger.warn(`[AuthService] refreshAccessToken called without token ip=${ipAddress}`);
@@ -487,7 +494,8 @@ export class AuthService {
       locale,
       refreshToken,
       ipAddress,
-      userAgent
+      userAgent,
+      browserId,
     );
 
     const user = await this.user.findUserById(locale, session.user_id);
@@ -573,7 +581,7 @@ export class AuthService {
     return { accessToken, refreshToken, session }
   }
 
-  async verifyMfaCode(locale: string, mfaToken: string, code: string, ipAddress: string, userAgent: string, methodType?: 'totp' | 'email' | 'recovery') {
+  async verifyMfaCode(locale: string, mfaToken: string, code: string, ipAddress: string, userAgent: string, methodType?: 'totp' | 'email' | 'recovery', browserId?: string | null) {
     const payload = await this.token.verifyMfaChallengeToken(mfaToken);
     const user = await this.prisma.user.findUnique({
       where: { id: payload.userId },
@@ -673,7 +681,8 @@ export class AuthService {
       locale,
       user.id,
       ipAddress,
-      userAgent
+      userAgent,
+      browserId,
     );
 
     this.mail.sendTemplatedMail(
@@ -697,7 +706,7 @@ export class AuthService {
     return { accessToken, refreshToken, session, requiresPasswordReset };
   }
 
-  async verifyMfaRecoveryCode(locale: string, mfaToken: string, recoveryCode: string, ipAddress: string, userAgent: string) {
+  async verifyMfaRecoveryCode(locale: string, mfaToken: string, recoveryCode: string, ipAddress: string, userAgent: string, browserId?: string | null) {
     const payload = await this.token.verifyMfaChallengeToken(mfaToken);
     const user = await this.prisma.user.findUnique({
       where: { id: payload.userId },
@@ -729,7 +738,8 @@ export class AuthService {
       locale,
       user.id,
       ipAddress,
-      userAgent
+      userAgent,
+      browserId,
     );
 
     await this.user.registerUserActivity(user.id, "login");
@@ -815,7 +825,7 @@ export class AuthService {
     return options;
   }
 
-  async verifyWebAuthnAuthentication(locale: string, mfaToken: string, assertionResponse: any, ipAddress: string, userAgent: string) {
+  async verifyWebAuthnAuthentication(locale: string, mfaToken: string, assertionResponse: any, ipAddress: string, userAgent: string, browserId?: string | null) {
     const { verifyAuthenticationResponse } = await import('@simplewebauthn/server');
     const payload = await this.token.verifyMfaChallengeToken(mfaToken);
     const userId = payload.userId;
@@ -880,7 +890,8 @@ export class AuthService {
       locale,
       userId,
       ipAddress,
-      userAgent
+      userAgent,
+      browserId,
     );
 
     const user = await this.prisma.user.findFirst({ where: { id: userId } });

package/src/core.module.ts

@@ -41,6 +41,7 @@ import { IsEmailWithSettingsConstraint } from './validators/is-email-with-settin
 import { IsPinCodeWithSettingConstraint } from './validators/is-pin-code-with-setting.validator';
 import { IsStrongPasswordWithSettingsConstraint } from './validators/is-strong-password-with-settings.validator';
 import { ValidatorServiceLocator } from './validators/service-locator';
+import { AiInstructionModule } from './ai-instruction/ai-instruction.module';
 import { IntegrationProfileModule } from './integration-profile/integration-profile.module';
 import { WebhookIntegrationModule } from './webhook-integration/webhook-integration.module';
 
@@ -76,6 +77,7 @@ import { WebhookIntegrationModule } from './webhook-integration/webhook-integrat
     forwardRef(() => OAuthModule),
     forwardRef(() => IntegrationModule),
     forwardRef(() => WebhookIntegrationModule),
+    forwardRef(() => AiInstructionModule),
     forwardRef(() => McpModule),
     forwardRef(() => McpChatModule),
     forwardRef(() => PdfModule),
@@ -97,6 +99,7 @@ import { WebhookIntegrationModule } from './webhook-integration/webhook-integrat
     FileModule,
     SessionModule,
     AiModule,
+    AiInstructionModule,
     IntegrationModule,
     WebhookIntegrationModule,
     IsStrongPasswordWithSettingsConstraint,

package/src/file/file.service.ts

@@ -10,6 +10,7 @@ import {
   CreateFunctionCommand,
   GetFunctionConfigurationCommand,
   LambdaClient,
+  UpdateFunctionCodeCommand,
   UpdateFunctionConfigurationCommand,
 } from '@aws-sdk/client-lambda';
 import {
@@ -291,6 +292,43 @@ export class FileService implements OnModuleInit {
     }
   }
 
+  async openReadStreamWithRange(fileId: number, start?: number, end?: number) {
+    if (!fileId) throw new BadRequestException('No file ID provided');
+
+    const file = await this.prismaService.file.findUnique({
+      where: { id: fileId },
+      include: { file_mimetype: true },
+    });
+
+    if (!file) throw new NotFoundException(`File not found: ${fileId}`);
+
+    const provider = await this.getProvider();
+    const providerPath = this.resolveProviderPath(file);
+    const totalSize: number = file.size ?? 0;
+
+    const resolvedStart = start ?? 0;
+    const resolvedEnd = end !== undefined ? end : totalSize > 0 ? totalSize - 1 : undefined;
+    const hasRange = start !== undefined;
+
+    const stream = await provider.readStream(
+      providerPath,
+      hasRange ? { start: resolvedStart, end: resolvedEnd } : undefined,
+    );
+
+    const contentLength =
+      resolvedEnd !== undefined ? resolvedEnd - resolvedStart + 1 : totalSize;
+
+    return {
+      file,
+      stream,
+      totalSize,
+      start: resolvedStart,
+      end: resolvedEnd,
+      contentLength,
+      mimetype: file.file_mimetype?.name ?? 'application/octet-stream',
+    };
+  }
+
   async downloadToPath(
     fileId: number,
     destinationPath: string,
@@ -834,10 +872,40 @@ export class FileService implements OnModuleInit {
       }),
     );
 
-    const merged = {
-      ...(current.Environment?.Variables ?? {}),
-      ...params.environmentVariables,
-    };
+    this.logger.log(
+      `updateLambdaEnvironmentVariables: fn=${params.functionName} region=${params.region} ` +
+      `currentStatus=${current.LastUpdateStatus} ` +
+      `incomingKeys=[${Object.keys(params.environmentVariables).join(',')}]`,
+    );
+
+    const LAMBDA_RESERVED_KEYS = new Set([
+      'AWS_REGION',
+      'AWS_DEFAULT_REGION',
+      'AWS_LAMBDA_FUNCTION_NAME',
+      'AWS_LAMBDA_FUNCTION_MEMORY_SIZE',
+      'AWS_LAMBDA_FUNCTION_VERSION',
+      'AWS_LAMBDA_LOG_GROUP_NAME',
+      'AWS_LAMBDA_LOG_STREAM_NAME',
+      'AWS_LAMBDA_RUNTIME_API',
+      'AWS_EXECUTION_ENV',
+      'LAMBDA_TASK_ROOT',
+      'LAMBDA_RUNTIME_DIR',
+      'TZ',
+      '_HANDLER',
+    ]);
+
+    const merged = Object.fromEntries(
+      Object.entries({
+        ...(current.Environment?.Variables ?? {}),
+        ...params.environmentVariables,
+      }).filter(([key]) => !LAMBDA_RESERVED_KEYS.has(key)),
+    );
+
+    this.logger.log(
+      `updateLambdaEnvironmentVariables: sending merged keys=[${Object.keys(merged).join(',')}] ` +
+      `WEBHOOK_URL=${merged['WEBHOOK_URL'] ?? '(not set)'} ` +
+      `WEBHOOK_SECRET_LEN=${merged['WEBHOOK_SECRET']?.length ?? 0}`,
+    );
 
     await lambda.send(
       new UpdateFunctionConfigurationCommand({
@@ -848,12 +916,76 @@ export class FileService implements OnModuleInit {
       }),
     );
 
+    this.logger.log(`updateLambdaEnvironmentVariables: UpdateFunctionConfiguration sent, polling for completion`);
+
+    // Wait for configuration update to leave InProgress before returning.
+    const cfgDeadline = Date.now() + 60_000;
+    let finalStatus = 'unknown';
+    let confirmedVars: Record<string, string> = {};
+    while (Date.now() < cfgDeadline) {
+      const poll = await lambda.send(
+        new GetFunctionConfigurationCommand({ FunctionName: params.functionName }),
+      );
+      finalStatus = poll.LastUpdateStatus ?? 'unknown';
+      confirmedVars = (poll.Environment?.Variables ?? {}) as Record<string, string>;
+      if (finalStatus !== 'InProgress') break;
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+    }
+
+    this.logger.log(
+      `updateLambdaEnvironmentVariables: done, finalStatus=${finalStatus} ` +
+      `confirmedKeys=[${Object.keys(confirmedVars).join(',')}] ` +
+      `confirmedWEBHOOK_URL=${confirmedVars['WEBHOOK_URL'] ?? '(missing)'} ` +
+      `confirmedWEBHOOK_SECRET_LEN=${confirmedVars['WEBHOOK_SECRET']?.length ?? 0}`,
+    );
+
     return {
       functionName: current.FunctionName ?? params.functionName,
       functionArn: current.FunctionArn ?? null,
     };
   }
 
+  async updateLambdaFunctionCode(params: {
+    functionName: string;
+    region: string;
+    accessKeyId: string;
+    secretAccessKey: string;
+    sessionToken?: string;
+    zipFile: Uint8Array;
+  }) {
+    const lambda = new LambdaClient({
+      region: params.region,
+      credentials: {
+        accessKeyId: params.accessKeyId,
+        secretAccessKey: params.secretAccessKey,
+        ...(params.sessionToken ? { sessionToken: params.sessionToken } : {}),
+      },
+    });
+
+    const result = await lambda.send(
+      new UpdateFunctionCodeCommand({
+        FunctionName: params.functionName,
+        ZipFile: params.zipFile,
+      }),
+    );
+
+    // Wait until the function leaves InProgress state before returning,
+    // so subsequent UpdateFunctionConfiguration calls don't get ResourceConflictException.
+    const deadline = Date.now() + 60_000;
+    while (Date.now() < deadline) {
+      const config = await lambda.send(
+        new GetFunctionConfigurationCommand({ FunctionName: params.functionName }),
+      );
+      if (config.LastUpdateStatus !== 'InProgress') break;
+      await new Promise((resolve) => setTimeout(resolve, 2000));
+    }
+
+    return {
+      functionName: result.FunctionName ?? params.functionName,
+      functionArn: result.FunctionArn ?? null,
+    };
+  }
+
   async createLambdaFunctionIfMissing(params: {
     functionName: string;
     region: string;

package/src/file/provider/abstract.provider.ts

@@ -1,6 +1,8 @@
 import { v4 } from 'uuid';
 import { MulterFile } from '../../types/multer';
 
+export type ReadStreamOptions = { start?: number; end?: number };
+
 interface IProvider {
   uploadFromString(
     destination: string,
@@ -14,7 +16,7 @@ interface IProvider {
     filePath: string,
     options?: { filename?: string; mimetype?: string },
   ): Promise<any>;
-  readStream(filepath: string): Promise<any>;
+  readStream(filepath: string, options?: ReadStreamOptions): Promise<any>;
   delete(filepath: string): Promise<any>;
   metaData(filepath: string): Promise<any>;
   buffer(filepath: string): Promise<any>;
@@ -35,7 +37,7 @@ export abstract class AbstractProvider implements IProvider {
     filePath: string,
     options?: { filename?: string; mimetype?: string },
   ): Promise<any>;
-  abstract readStream(filepath: string): Promise<any>;
+  abstract readStream(filepath: string, options?: ReadStreamOptions): Promise<any>;
   abstract delete(filepath: string): Promise<any>;
   abstract metaData(filepath: string): Promise<any>;
   abstract buffer(filepath: string): Promise<any>;

package/src/file/provider/azure.provider.ts

@@ -120,14 +120,17 @@ export class AzureProvider extends AbstractProvider {
     return await blobClient.delete();
   }
 
-  async readStream(filepath: string): Promise<any> {
+  async readStream(filepath: string, options?: { start?: number; end?: number }): Promise<any> {
     const blobServiceClient = await this.getClient();
     const containerClient = blobServiceClient.getContainerClient(
       this.setting['storage-abs-container'],
     );
     const blobClient = containerClient.getBlockBlobClient(filepath);
-
-    const downloadBlockBlobResponse = await blobClient.download();
+    const offset = options?.start ?? 0;
+    const count = options?.start !== undefined && options?.end !== undefined
+      ? options.end - options.start + 1
+      : undefined;
+    const downloadBlockBlobResponse = await blobClient.download(offset, count);
     return downloadBlockBlobResponse.readableStreamBody;
   }
 

package/src/file/provider/gcs.provider.ts

@@ -87,12 +87,14 @@ export class GCSProvider extends AbstractProvider {
 
     return objectPath;
   }
-  async readStream(filepath: string): Promise<any> {
+  async readStream(filepath: string, options?: { start?: number; end?: number }): Promise<any> {
     const storage = await this.getClient();
     const bucket = storage.bucket(this.setting['storage-gcs-bucket']);
     const file = bucket.file(filepath);
-
-    return file.createReadStream();
+    const rangeOpts: any = {};
+    if (options?.start !== undefined) rangeOpts.start = options.start;
+    if (options?.end !== undefined) rangeOpts.end = options.end;
+    return file.createReadStream(Object.keys(rangeOpts).length > 0 ? rangeOpts : undefined);
   }
   async delete(filepath: string): Promise<any> {
     const storage = await this.getClient();

package/src/file/provider/local.provider.ts

@@ -5,7 +5,7 @@ import { copyFile, mkdir, stat, unlink, writeFile } from 'fs/promises';
 import * as path from 'path';
 import { basename, join, sep } from 'path';
 import { Stream } from 'stream';
-import { AbstractProvider } from './abstract.provider';
+import { AbstractProvider, ReadStreamOptions } from './abstract.provider';
 
 export class LocalProvider extends AbstractProvider {
   constructor(
@@ -127,14 +127,18 @@ export class LocalProvider extends AbstractProvider {
     return unlink(fullPath);
   }
 
-  async readStream(filepath: string): Promise<Stream> {
+  async readStream(filepath: string, options?: ReadStreamOptions): Promise<Stream> {
     const fullPath = this.resolveFilepath(filepath);
 
     if (!existsSync(fullPath)) {
       throw new BadRequestException(`File not found: ${fullPath}`);
     }
 
-    return createReadStream(fullPath);
+    const rangeOpts: { start?: number; end?: number } = {};
+    if (options?.start !== undefined) rangeOpts.start = options.start;
+    if (options?.end !== undefined) rangeOpts.end = options.end;
+
+    return createReadStream(fullPath, Object.keys(rangeOpts).length > 0 ? rangeOpts : undefined);
   }
 
   async metaData(filepath: string): Promise<any> {

package/src/file/provider/s3.provider.ts

@@ -184,14 +184,16 @@ export class S3Provider extends AbstractProvider {
     return true;
   }
 
-  async readStream(filepath: string): Promise<Readable> {
+  async readStream(filepath: string, options?: { start?: number; end?: number }): Promise<Readable> {
     const s3 = await this.getClient();
     const key = this.resolveS3Key(filepath);
-    const command = new GetObjectCommand({
-      Bucket: this.setting['storage-s3-bucket'],
-      Key: key,
-    });
-    const result = await s3.send(command);
+    const params: any = { Bucket: this.setting['storage-s3-bucket'], Key: key };
+    if (options?.start !== undefined || options?.end !== undefined) {
+      const start = options?.start ?? 0;
+      const end = options?.end !== undefined ? options.end : '';
+      params.Range = `bytes=${start}-${end}`;
+    }
+    const result = await s3.send(new GetObjectCommand(params));
     // @ts-ignore
     return result.Body as Readable;
   }

package/src/file/provider/spaces.provider.ts

@@ -209,15 +209,16 @@ export class SpacesProvider extends AbstractProvider {
     return true;
   }
 
-  async readStream(filepath: string): Promise<Readable> {
+  async readStream(filepath: string, options?: { start?: number; end?: number }): Promise<Readable> {
     const s3 = await this.getClient();
     const key = this.resolveKey(filepath);
-    const result = await s3.send(
-      new GetObjectCommand({
-        Bucket: this.setting['storage-spaces-bucket'],
-        Key: key,
-      }),
-    );
+    const params: any = { Bucket: this.setting['storage-spaces-bucket'], Key: key };
+    if (options?.start !== undefined || options?.end !== undefined) {
+      const start = options?.start ?? 0;
+      const end = options?.end !== undefined ? options.end : '';
+      params.Range = `bytes=${start}-${end}`;
+    }
+    const result = await s3.send(new GetObjectCommand(params));
     // @ts-ignore
     return result.Body as Readable;
   }

package/src/mcp-chat/mcp-chat.module.ts

@@ -1,17 +1,19 @@
-import { PrismaModule } from '@hed-hog/api-prisma';
-import { Module, forwardRef } from '@nestjs/common';
-import { McpModule } from '../mcp/mcp.module';
-import { SettingModule } from '../setting/setting.module';
-import { McpChatController } from './mcp-chat.controller';
-import { McpChatService } from './mcp-chat.service';
-
-@Module({
-  imports: [
-    forwardRef(() => PrismaModule),
-    forwardRef(() => SettingModule),
-    forwardRef(() => McpModule),
-  ],
-  controllers: [McpChatController],
-  providers: [McpChatService],
-})
-export class McpChatModule {}
+import { PrismaModule } from '@hed-hog/api-prisma';
+import { Module, forwardRef } from '@nestjs/common';
+import { AiInstructionModule } from '../ai-instruction/ai-instruction.module';
+import { McpModule } from '../mcp/mcp.module';
+import { SettingModule } from '../setting/setting.module';
+import { McpChatController } from './mcp-chat.controller';
+import { McpChatService } from './mcp-chat.service';
+
+@Module({
+  imports: [
+    forwardRef(() => PrismaModule),
+    forwardRef(() => SettingModule),
+    forwardRef(() => McpModule),
+    forwardRef(() => AiInstructionModule),
+  ],
+  controllers: [McpChatController],
+  providers: [McpChatService],
+})
+export class McpChatModule {}