From 89832ff0e225d9d5d9d5bfa05f4a2599657574d7 Mon Sep 17 00:00:00 2001
From: bhunt02 <bridgette.hunt02@outlook.com>
Date: Tue, 14 Oct 2025 15:51:48 -0700
Subject: [PATCH 1/8] big old commit with all the frontend/backend changes i've
 made so far to the chatbot, will be written up later

---
 packages/common/chatbot-api-types.ts          | 714 +++++++++++++++++
 packages/common/index.ts                      | 335 +++-----
 packages/common/tsconfig.json                 |   2 +-
 .../components/CourseCloneForm.tsx            |  14 +-
 .../components/CourseCloneFormModal.tsx       |   8 +-
 .../components/ImageCropperModal.tsx          |  56 +-
 .../components/DashboardPresetComponent.tsx   |   1 +
 .../components/filters/QueueFilter.tsx        |   3 +-
 .../components/filters/StaffFilter.tsx        |   3 +-
 .../components/filters/StudentFilter.tsx      |   3 +-
 .../EditChatbotDocumentChunkModal.tsx         | 112 ---
 .../components/UpsertDocumentChunkModal.tsx   | 195 +++++
 .../settings/chatbot_knowledge_base/page.tsx  | 379 +++++----
 .../components/AddChatbotQuestionModal.tsx    | 179 -----
 .../components/EditChatbotQuestionModal.tsx   | 457 -----------
 .../components/UpsertChatbotQuestionModal.tsx | 429 +++++++++++
 .../settings/chatbot_questions/page.tsx       | 716 ++++++++----------
 .../components/AddChatbotDocumentModal.tsx    |  22 +-
 .../components/ChatbotSettingsModal.tsx       |  58 +-
 .../components/EditChatbotDocumentModal.tsx   | 142 ++++
 .../components/LegacyChatbotSettingsModal.tsx |  10 +-
 .../settings/chatbot_settings/page.tsx        | 298 +++++---
 .../ChatbotDocumentContentTooltip.tsx         |  39 +
 .../components/ChatbotListDocumentItem.tsx    | 189 +++++
 .../components/ChatbotSelectCitations.tsx     | 201 +++++
 .../settings/components/CustomPagination.tsx  | 265 +++++++
 .../components/QuizContentPreviewModal.tsx    |   5 +-
 .../components/UpsertIntegrationModal.tsx     |   1 +
 .../settings/lms_integrations/page.tsx        |   4 +-
 .../course/[cid]/(settings)/settings/util.ts  |  82 ++
 .../modals/ConvertChatbotQToAnytimeQModal.tsx |  11 +-
 .../modals/ConvertQueueQToAnytimeQModal.tsx   |   8 +-
 .../modals/CreateAsyncQuestionModal.tsx       |  11 +-
 .../modals/EditAsyncCentreModal.tsx           |   9 +-
 .../components/modals/PostResponseModal.tsx   |   1 +
 .../course/[cid]/components/CheckInModal.tsx  |   1 +
 .../[cid]/components/CreateQueueModal.tsx     |   1 +
 .../[cid]/components/chatbot/Chatbot.tsx      | 402 +++++-----
 .../components/chatbot/ChatbotCitation.tsx    | 150 ++++
 .../components/chatbot/ChatbotProvider.tsx    |  36 +-
 .../app/(dashboard)/course/[cid]/page.tsx     |  17 +-
 .../modals/AddStudentsToQueueModal.tsx        |   6 +-
 .../modals/AssignmentReportModal.tsx          |   3 +-
 .../[qid]/components/modals/CantFindModal.tsx |   1 +
 .../components/modals/CreateDemoModal.tsx     |   1 +
 .../components/modals/CreateQuestionModal.tsx |   1 +
 .../components/modals/EditQueueModal.tsx      |  27 +-
 .../modals/EventEndedCheckoutStaffModal.tsx   |   1 +
 .../components/modals/JoinZoomNowModal.tsx    |   1 +
 .../modals/PromptStudentToLeaveQueueModal.tsx |   3 +-
 .../modals/StudentRemovedFromQueueModal.tsx   |   1 +
 .../modals/StudentRephraseModal.tsx           |   1 +
 .../schedule/components/CreateEventModal.tsx  |  70 +-
 .../schedule/components/EditEventModal.tsx    |  55 +-
 .../ai/components/AddModelModal.tsx           |   6 +-
 .../components/BatchCourseCloneModal.tsx      |  11 +-
 .../organization/lms_integrations/page.tsx    |   2 +
 .../components/DeleteConfirmationModal.tsx    |   5 +-
 .../settings/components/SemesterModal.tsx     |   3 +-
 .../profile/components/UserChatbotHistory.tsx |  28 +-
 packages/frontend/app/api/index.ts            | 212 +++---
 .../app/components/ChangeLogModal.tsx         |   7 +-
 packages/frontend/app/globals.css             |  45 +-
 packages/frontend/app/typings/chatbot.ts      |   4 +-
 packages/frontend/app/utils/generalUtils.ts   |  29 +
 packages/server/ormconfig.ts                  |   4 +-
 .../server/src/chatbot/chatbot-api.service.ts | 543 +++++++------
 .../chatbot-provider.entity.ts                |   7 +-
 .../chatbot-settings.subscriber.ts            |  51 +-
 .../course-chatbot-settings.entity.ts         |   4 +-
 .../llm-type.entity.ts                        |   4 +-
 .../organization-chatbot-settings.entity.ts   |   4 +-
 ...n.entity.ts => chatbot-question.entity.ts} |  36 +-
 .../server/src/chatbot/chatbot.controller.ts  | 485 ++++++------
 .../src/chatbot/chatbot.service.spec.ts       | 117 ++-
 .../server/src/chatbot/chatbot.service.ts     | 395 ++++++++--
 .../server/src/chatbot/interaction.entity.ts  |  16 +-
 .../src/chatbot/questionDocument.entity.ts    |  27 -
 .../server/src/course/course.service.spec.ts  |   6 +-
 packages/server/src/course/course.service.ts  |  26 +-
 .../server/src/insights/insight-objects.ts    |   2 +-
 .../lmsIntegration/lmsIntegration.service.ts  | 148 +---
 packages/server/src/seed/seed.controller.ts   |   2 +-
 packages/server/test/chatbot.integration.ts   |  10 +-
 84 files changed, 4916 insertions(+), 3063 deletions(-)
 create mode 100644 packages/common/chatbot-api-types.ts
 delete mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/EditChatbotDocumentChunkModal.tsx
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/UpsertDocumentChunkModal.tsx
 delete mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/AddChatbotQuestionModal.tsx
 delete mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/EditChatbotQuestionModal.tsx
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/UpsertChatbotQuestionModal.tsx
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/EditChatbotDocumentModal.tsx
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotDocumentContentTooltip.tsx
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotListDocumentItem.tsx
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotSelectCitations.tsx
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/CustomPagination.tsx
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/util.ts
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/ChatbotCitation.tsx
 rename packages/server/src/chatbot/{question.entity.ts => chatbot-question.entity.ts} (62%)
 delete mode 100644 packages/server/src/chatbot/questionDocument.entity.ts

diff --git a/packages/common/chatbot-api-types.ts b/packages/common/chatbot-api-types.ts
new file mode 100644
index 000000000..5a191a660
--- /dev/null
+++ b/packages/common/chatbot-api-types.ts
@@ -0,0 +1,714 @@
+import { Transform, Type } from 'class-transformer'
+import {
+  IsArray,
+  IsBoolean,
+  IsDate,
+  IsEnum,
+  IsInstance,
+  IsInt,
+  IsNumber,
+  IsObject,
+  IsOptional,
+  IsString,
+  ValidateNested,
+} from 'class-validator'
+
+/* KEEP UP TO DATE */
+
+export enum DocumentType {
+  Inserted = 'inserted_document',
+  InsertedLMS = 'inserted_lms_document',
+  InsertedQuestion = 'inserted_question',
+  PDF = 'pdf',
+  PPTX = 'pptx',
+  DOCX = 'docx',
+  MD = 'md',
+  TXT = 'txt',
+  CSV = 'csv',
+  TSV = 'tsv',
+}
+
+export const DocumentTypeDisplayMap = {
+  [DocumentType.Inserted]: 'Inserted',
+  [DocumentType.InsertedLMS]: 'LMS',
+  [DocumentType.InsertedQuestion]: 'Inserted Question',
+  [DocumentType.PDF]: 'PDF',
+  [DocumentType.PPTX]: 'PPTX',
+  [DocumentType.DOCX]: 'DOCX',
+  [DocumentType.MD]: 'MD',
+  [DocumentType.TXT]: 'TXT',
+  [DocumentType.CSV]: 'CSV',
+  [DocumentType.TSV]: 'TSV',
+}
+
+export const DocumentTypeColorMap = {
+  [DocumentType.Inserted]: '#5E60CE',
+  [DocumentType.InsertedLMS]: '#4EA8DE',
+  [DocumentType.InsertedQuestion]: '#56CFE1',
+  [DocumentType.PDF]: '#E63946',
+  [DocumentType.PPTX]: '#F77F00',
+  [DocumentType.DOCX]: '#457B9D',
+  [DocumentType.MD]: '#CA00CA',
+  [DocumentType.TXT]: '#00D844',
+  [DocumentType.CSV]: '#FFB703',
+  [DocumentType.TSV]: '#8338EC',
+}
+
+export enum ChatbotQueryTypeEnum {
+  DEFAULT = 'default',
+  ABSTRACT = 'abstract',
+}
+
+export class ChatMessage {
+  @IsString()
+  type!: string
+
+  @IsString()
+  message!: string
+}
+
+export class ImageDescription {
+  @IsInt()
+  imageId!: number
+
+  @IsString()
+  description!: string
+}
+
+export class Citation {
+  @IsString()
+  docName!: string
+
+  @IsEnum(DocumentType)
+  type!: DocumentType
+
+  @IsString()
+  @IsOptional()
+  sourceLink?: string
+
+  @IsObject()
+  @IsOptional()
+  confidences?: Record<number, number>
+
+  @IsArray()
+  @Type(() => Number)
+  @IsOptional()
+  pageNumbers?: number[]
+
+  @IsString()
+  documentId!: string
+
+  @IsString()
+  questionId!: string
+
+  @IsString()
+  @IsOptional()
+  aggregateId?: string
+}
+
+export class ChatbotAskBody {
+  @IsString()
+  question!: string
+
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => ChatMessage)
+  history!: ChatMessage[]
+}
+
+export class ChatbotAskResponse {
+  @IsString()
+  question!: string
+
+  @IsString()
+  answer!: string
+
+  @IsInt()
+  courseId!: number
+
+  @IsString()
+  questionId!: string
+
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => Citation)
+  citations!: Citation[]
+
+  @IsBoolean()
+  verified!: boolean
+
+  @IsBoolean()
+  isPreviousQuestion!: boolean
+
+  @IsOptional()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => ImageDescription)
+  imageDescriptions?: ImageDescription[]
+}
+
+export class ChatbotQueryBody {
+  @IsString()
+  query!: string
+
+  @IsEnum(ChatbotQueryTypeEnum)
+  type!: ChatbotQueryTypeEnum
+
+  @IsObject()
+  @IsOptional()
+  params?: Record<string, any>
+
+  @IsInt()
+  @IsOptional()
+  courseId?: number
+}
+
+export class ChatbotProviderResponse {
+  @IsString()
+  type!: string
+
+  @IsOptional()
+  @IsString()
+  baseUrl!: string
+
+  @IsString()
+  defaultModelName!: string
+
+  @IsString()
+  defaultVisionModelName!: string
+
+  @IsOptional()
+  @IsObject()
+  headers?: Record<string, string>
+}
+
+export class ChatbotModelResponse {
+  @IsInstance(ChatbotProviderResponse)
+  @ValidateNested()
+  @Type(() => ChatbotProviderResponse)
+  provider!: ChatbotProviderResponse
+
+  @IsString()
+  modelName!: string
+}
+
+export class ChatbotOrganizationSettings {
+  @IsInstance(ChatbotProviderResponse)
+  @ValidateNested()
+  @Type(() => ChatbotProviderResponse)
+  defaultProvider!: ChatbotProviderResponse
+}
+
+export class ChatbotCourseSettingsProperties {
+  @IsOptional()
+  @IsInstance(ChatbotOrganizationSettings)
+  @ValidateNested()
+  organizationSettings?: ChatbotOrganizationSettings
+
+  @IsOptional()
+  @IsInstance(ChatbotModelResponse)
+  @ValidateNested()
+  model?: ChatbotModelResponse
+
+  @IsOptional()
+  @IsString()
+  modelName?: string
+
+  @IsString()
+  prompt!: string
+
+  @IsNumber()
+  similarityThresholdDocuments!: number
+
+  @IsNumber()
+  similarityThresholdQuestions!: number
+
+  @IsNumber()
+  temperature!: number
+
+  @IsInt()
+  topK!: number
+}
+
+export class CreateChatbotCourseSettingsBody extends ChatbotCourseSettingsProperties {}
+
+export class UpdateChatbotCourseSettingsBody {
+  @IsOptional()
+  @IsInstance(ChatbotOrganizationSettings)
+  @ValidateNested()
+  organizationSettings?: ChatbotOrganizationSettings
+
+  @IsOptional()
+  @IsInstance(ChatbotModelResponse)
+  @ValidateNested()
+  model?: ChatbotModelResponse
+
+  @IsOptional()
+  @IsString()
+  modelName?: string
+
+  @IsOptional()
+  @IsString()
+  prompt?: string
+
+  @IsOptional()
+  @IsNumber()
+  similarityThresholdDocuments?: number
+
+  @IsOptional()
+  @IsNumber()
+  similarityThresholdQuestions?: number
+
+  @IsOptional()
+  @IsNumber()
+  temperature?: number
+
+  @IsOptional()
+  @IsInt()
+  topK?: number
+}
+
+export class CreateDocumentAggregateBody {
+  @IsString()
+  title!: string
+
+  @IsString()
+  source!: string
+
+  @IsString()
+  documentText!: string
+
+  @IsString()
+  @IsOptional()
+  lmsDocumentId?: string
+
+  @IsString()
+  @IsOptional()
+  prefix?: string
+}
+
+export class UpdateDocumentAggregateBody {
+  @IsString()
+  @IsOptional()
+  title?: string
+
+  @IsString()
+  @IsOptional()
+  source?: string
+
+  @IsString()
+  @IsOptional()
+  documentText?: string
+
+  @IsString()
+  @IsOptional()
+  lmsDocumentId?: string
+
+  @IsString()
+  @IsOptional()
+  prefix?: string
+}
+
+export class UploadDocumentAggregateBody {
+  @IsString()
+  source!: string
+
+  @Transform((params) =>
+    params.value === 'true'
+      ? true
+      : params.value === 'false'
+        ? false
+        : undefined,
+  )
+  @IsBoolean()
+  @IsOptional()
+  parseAsPng?: boolean
+
+  @IsString()
+  @IsOptional()
+  lmsDocumentId?: string
+
+  @IsString()
+  @IsOptional()
+  prefix?: string
+}
+
+export class UploadURLDocumentAggregateBody {
+  @IsString()
+  url!: string
+
+  @IsString()
+  @IsOptional()
+  source?: string
+
+  @Transform((params) =>
+    params.value === 'true'
+      ? true
+      : params.value === 'false'
+        ? false
+        : undefined,
+  )
+  @IsBoolean()
+  @IsOptional()
+  parseAsPng?: boolean
+
+  @IsString()
+  @IsOptional()
+  lmsDocumentId?: string
+
+  @IsString()
+  @IsOptional()
+  prefix?: string
+}
+
+export class CloneCourseDocumentsBody {
+  @IsOptional()
+  @IsBoolean()
+  includeDocuments?: boolean
+
+  @IsOptional()
+  @IsBoolean()
+  includeInsertedQuestions?: boolean
+  @IsOptional()
+  @IsBoolean()
+  includeInsertedDocuments?: boolean
+
+  @IsObject()
+  docIdMap!: Record<string, string>
+}
+
+export class CreateDocumentChunkBody {
+  @IsString()
+  content!: string
+
+  @IsEnum(DocumentType)
+  type!: DocumentType
+
+  @IsBoolean()
+  @IsOptional()
+  disabled?: boolean
+
+  @IsString()
+  @IsOptional()
+  title?: string
+
+  @IsString()
+  @IsOptional()
+  source?: string
+
+  @IsArray({ each: true })
+  @Type(() => Number)
+  @IsOptional()
+  lines?: [number, number]
+
+  @IsInt()
+  @IsOptional()
+  pageNumber?: number
+
+  @IsInt()
+  @IsOptional()
+  asyncQuestionId?: number
+
+  @IsString()
+  @IsOptional()
+  aggregateId?: string
+
+  @IsString()
+  @IsOptional()
+  questionId?: string
+
+  @IsString()
+  @IsOptional()
+  prefix?: string
+}
+
+export class UpdateDocumentChunkBody {
+  @IsString()
+  @IsOptional()
+  content?: string
+
+  @IsEnum(DocumentType)
+  @IsOptional()
+  type?: DocumentType
+
+  @IsBoolean()
+  @IsOptional()
+  disabled?: boolean
+
+  @IsString()
+  @IsOptional()
+  title?: string
+
+  @IsString()
+  @IsOptional()
+  source?: string
+
+  @IsArray({ each: true })
+  @Type(() => Number)
+  @IsOptional()
+  lines?: [number, number]
+
+  @IsInt()
+  @IsOptional()
+  pageNumber?: number
+
+  @IsInt()
+  @IsOptional()
+  asyncQuestionId?: number
+
+  @IsString()
+  @IsOptional()
+  aggregateId?: string
+
+  @IsString()
+  @IsOptional()
+  questionId?: string
+
+  @IsString()
+  @IsOptional()
+  prefix?: string
+}
+
+export class CreateQuestionBody {
+  @IsString()
+  question!: string
+
+  @IsString()
+  answer!: string
+
+  @IsArray()
+  @Type(() => String)
+  @IsOptional()
+  @ValidateNested({ each: true })
+  sourceDocumentIds?: string[]
+
+  @IsBoolean()
+  @IsOptional()
+  verified?: boolean
+
+  @IsBoolean()
+  @IsOptional()
+  suggested?: boolean
+}
+
+export class UpdateQuestionBody extends CreateQuestionBody {
+  @IsString()
+  @IsOptional()
+  question!: string
+
+  @IsString()
+  @IsOptional()
+  answer!: string
+}
+
+export class SuggestedQuestionResponse {
+  @IsString()
+  id!: string
+
+  @IsInt()
+  courseId!: number
+
+  @IsString()
+  question!: string
+
+  @IsString()
+  answer!: string
+
+  @IsDate()
+  askedAt!: Date
+
+  @IsBoolean()
+  verified!: boolean
+
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => Citation)
+  citations!: Citation[]
+}
+
+export class ChatbotCourseSettingsResponse extends ChatbotCourseSettingsProperties {
+  @IsInt()
+  courseId!: number
+}
+
+export class ChatbotDocumentAggregateResponse {
+  @IsString()
+  id!: string
+
+  @IsInt()
+  courseId!: number
+
+  @IsString()
+  title!: string
+
+  @IsEnum(DocumentType)
+  type!: DocumentType
+
+  @IsString()
+  source!: string
+
+  @IsString()
+  @IsOptional()
+  lmsDocumentId?: string
+
+  @IsArray()
+  @Type(() => ChatbotDocumentResponse)
+  @ValidateNested({ each: true })
+  subDocuments!: ChatbotDocumentResponse[]
+}
+
+export class ChatbotQuestionResponse {
+  @IsString()
+  id!: string
+
+  @IsInt()
+  courseId!: number
+
+  @IsString()
+  question!: string
+
+  @IsString()
+  answer!: string
+
+  @IsDate()
+  @Transform((params) => new Date(params.value))
+  askedAt!: Date
+
+  @IsBoolean()
+  inserted!: boolean
+
+  @IsBoolean()
+  suggested!: boolean
+
+  @IsBoolean()
+  verified!: boolean
+
+  @IsArray()
+  @Type(() => ChatbotDocumentResponse)
+  insertedDocuments!: ChatbotDocumentResponse[]
+
+  @IsArray()
+  @Type(() => ChatbotCitationResponse)
+  @ValidateNested({ each: true })
+  citations!: ChatbotCitationResponse[]
+}
+
+export class ChatbotDocumentResponse {
+  @IsString()
+  id!: string
+
+  @IsInt()
+  courseId!: number
+
+  @IsString()
+  content!: string
+
+  @IsEnum(DocumentType)
+  type!: DocumentType
+
+  @IsBoolean()
+  disabled!: boolean
+
+  @IsString()
+  @IsOptional()
+  title?: string
+
+  @IsString()
+  @IsOptional()
+  source?: string
+
+  @IsArray()
+  @Type(() => Number)
+  @ValidateNested({ each: true })
+  lines?: [number, number]
+
+  @IsInt()
+  @IsOptional()
+  pageNumber?: number
+
+  @IsInt()
+  @IsOptional()
+  asyncQuestionId?: number
+
+  @IsDate()
+  @Transform((params) => new Date(params.value))
+  firstInsertedAt!: Date
+
+  @IsArray()
+  @Type(() => ChatbotDocumentQueryResponse)
+  @ValidateNested({ each: true })
+  queries!: ChatbotDocumentQueryResponse[]
+
+  @IsArray()
+  @Type(() => ChatbotCitationResponse)
+  @ValidateNested({ each: true })
+  citations!: ChatbotCitationResponse[]
+
+  @IsString()
+  @IsOptional()
+  aggregateId?: string
+
+  @IsString()
+  @IsOptional()
+  questionId?: string
+
+  @IsInstance(ChatbotQuestionResponse)
+  @IsOptional()
+  parentQuestion?: ChatbotQuestionResponse
+
+  @IsInstance(ChatbotDocumentAggregateResponse)
+  @IsOptional()
+  aggregate?: ChatbotDocumentAggregateResponse
+}
+
+export class ChatbotDocumentQueryResponse {
+  @IsString()
+  id!: string
+
+  @IsString()
+  documentId!: string
+
+  @IsString()
+  query!: string
+
+  @IsInstance(ChatbotDocumentResponse)
+  document!: ChatbotDocumentResponse
+}
+
+export class ChatbotCitationResponse {
+  @IsString()
+  documentId!: string
+
+  @IsString()
+  questionId!: string
+
+  @IsDate()
+  citedAt!: Date
+
+  @IsNumber()
+  @IsOptional()
+  confidence?: number
+
+  @IsInstance(ChatbotQuestionResponse)
+  question!: ChatbotQuestionResponse
+
+  @IsInstance(ChatbotDocumentResponse)
+  document!: ChatbotDocumentResponse
+}
+
+export class ChatbotDocumentListResponse {
+  @IsString()
+  @IsOptional()
+  aggregateId?: string
+
+  @IsString()
+  type!: 'aggregate' | 'chunk'
+
+  @IsString()
+  title!: string
+
+  @IsArray()
+  @Type(() => ChatbotDocumentResponse)
+  @ValidateNested({ each: true })
+  documents!: ChatbotDocumentResponse[]
+}
diff --git a/packages/common/index.ts b/packages/common/index.ts
index f39b4a0ee..14a57af58 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -1,4 +1,4 @@
-import { Exclude, Type } from 'class-transformer'
+import { Exclude, Expose, Type } from 'class-transformer'
 import {
   IsArray,
   IsBoolean,
@@ -19,6 +19,15 @@ import {
 import 'reflect-metadata'
 import { Cache } from 'cache-manager'
 import { Ajv } from 'ajv'
+import {
+  ChatbotAskBody,
+  ChatbotAskResponse,
+  ChatbotQuestionResponse,
+  ChatMessage,
+  Citation,
+} from './chatbot-api-types'
+
+export * from './chatbot-api-types'
 
 export const PROD_URL = 'https://coursehelp.ubc.ca'
 
@@ -215,9 +224,8 @@ export type CourseCloneAttributes = {
     chatbot?: {
       settings?: boolean
       documents?: boolean
-      manuallyCreatedChunks?: boolean
       insertedQuestions?: boolean
-      insertedLMSData?: boolean
+      insertedDocuments?: boolean
     }
   }
 }
@@ -238,9 +246,8 @@ export const defaultCourseCloneAttributes: CourseCloneAttributes = {
     chatbot: {
       settings: true,
       documents: true,
-      manuallyCreatedChunks: true,
       insertedQuestions: true,
-      insertedLMSData: false,
+      insertedDocuments: false,
     },
   },
 }
@@ -334,175 +341,119 @@ export enum AccountType {
 
 // chatbot questions and interactions
 
-export interface UpdateDocumentChunkParams {
-  documentText: string
-  metadata: {
-    name: string
-    source: string
-  }
-}
-
-// comes from helpme db
-export interface ChatbotQuestionResponseHelpMeDB {
-  id: number
-  vectorStoreId: string
-  interactionId: number
-  questionText: string
-  responseText: string
-  timestamp: Date
-  userScore: number
-  suggested: boolean
-  isPreviousQuestion: boolean
-  correspondingChatbotQuestion?: ChatbotQuestionResponseChatbotDB // used by chatbot_questions page on frontend
-  timesAsked?: number // same as above
-}
-
-// comes from chatbot db
-export interface ChatbotQuestionResponseChatbotDB {
-  id: string
-  pageContent: string // this is the question
-  metadata: {
-    answer: string
-    timestamp?: string // i found a chatbot question without a timestamp 😭
-    courseId: string
-    verified: boolean
-    sourceDocuments: SourceDocument[]
-    suggested: boolean
-    inserted?: boolean
-  }
-  userScoreTotal?: number // NOT returned from db, it's calculated and used by chatbot_questions page on frontend
-  timesAsked?: number // same as above
-  interactionsWithThisQuestion?: InteractionResponse[] // same as above
-  mostRecentlyAskedHelpMeVersion?: ChatbotQuestionResponseHelpMeDB | null // same as above
-}
+export class PaginatedResponse<T> {
+  @IsInt()
+  total!: number
 
-interface Loc {
-  pageNumber: number
+  @IsArray()
+  items!: T[]
 }
 
-// source document return type (from chatbot db)
-export interface SourceDocument {
-  id?: string
-  metadata?: {
-    loc?: Loc
-    name: string
-    type?: string
-    source?: string
-    courseId?: string
-    fromLMS?: boolean
-    apiDocId?: number
-  }
-  type?: string
-  // TODO: is it content or pageContent? since this file uses both. EDIT: It seems to be both/either. Gross.
-  content?: string
-  pageContent: string
-  docName: string
-  docId?: string // no idea if this exists in the actual data EDIT: yes it does, sometimes
-  pageNumbers?: number[] // same with this, but this might only be for the edit question modal
-  pageNumbersString?: string // used only for the edit question modal
-  sourceLink?: string
-  pageNumber?: number
-  key?: string // used for front-end rendering
-}
+export class HelpMeChatMessage extends ChatMessage {
+  @IsBoolean()
+  @IsOptional()
+  verified?: boolean
 
-export interface PreDeterminedQuestion {
-  id: string
-  pageContent: string
-  metadata: {
-    answer: string
-    courseId: string
-    inserted: boolean
-    sourceDocuments: SourceDocument[]
-    suggested: boolean
-    verified: boolean
-  }
-}
+  @IsArray()
+  @IsOptional()
+  @Type(() => Citation)
+  @ValidateNested({ each: true })
+  citations?: Citation[]
 
-export interface Message {
-  type: 'apiMessage' | 'userMessage'
-  message: string | void
-  verified?: boolean
-  sourceDocuments?: SourceDocument[]
+  @IsString()
+  @IsOptional()
   questionId?: string
-  thinkText?: string | null // used on frontend only
-}
 
-export interface ChatbotQueryParams {
-  query: string
-  type: 'default' | 'abstract'
+  @IsString()
+  @IsOptional()
+  thinkText?: string // used on frontend only
 }
 
-export interface ChatbotAskParams {
-  question: string
-  history: Message[]
+export class HelpMeChatbotAskBody extends ChatbotAskBody {
+  @IsString()
+  question!: string
+
+  @IsArray()
+  @Type(() => HelpMeChatMessage)
+  @ValidateNested({ each: true })
+  history!: HelpMeChatMessage[]
+
+  @IsInt()
+  @IsOptional()
   interactionId?: number
-  onlySaveInChatbotDB?: boolean
+
+  @IsBoolean()
+  @IsOptional()
+  save?: boolean
 }
 
-export interface ChatbotAskSuggestedParams {
-  question: string
-  responseText: string
-  vectorStoreId: string
+export class ChatbotAskSuggestedBody {
+  @IsString()
+  vectorStoreId!: string
 }
 
-export interface AddDocumentChunkParams {
-  documentText: string
-  metadata: {
-    name: string
-    type: string
-    source?: string
-    loc?: Loc
-    id?: string
-    courseId?: number
-  }
-  prefix?: string
+export class HelpMeChatbotQuestionResponse {
+  @IsInt()
+  id!: number
+
+  @IsString()
+  vectorStoreId!: string
+
+  @IsInt()
+  interactionId!: number
+
+  @IsInt()
+  userScore!: number
+
+  @IsBoolean()
+  isPreviousQuestion!: boolean
+
+  @IsDate()
+  @IsOptional()
+  timestamp?: Date
+
+  @IsInstance(ChatbotQuestionResponse)
+  @IsOptional()
+  chatbotQuestion?: ChatbotQuestionResponse
 }
 
-export interface AddDocumentAggregateParams {
-  name: string
-  source: string
-  documentText: string
-  metadata?: any
-  prefix?: string
+export class HelpMeChatbotQuestionTableResponse extends HelpMeChatbotQuestionResponse {
+  @IsArray()
+  @ValidateNested({ each: true })
+  @IsOptional()
+  children?: HelpMeChatbotQuestionTableResponse[]
+
+  @IsBoolean()
+  @IsOptional()
+  isChild?: boolean
+
+  @IsInt()
+  @IsOptional()
+  userScoreTotal?: number
+
+  @IsInt()
+  @IsOptional()
+  timesAsked?: number
 }
 
-export interface UpdateDocumentAggregateParams {
-  documentText: string
-  metadata?: any
-  prefix?: string
+export class HelpMeChatbotAskResponse extends ChatbotAskResponse {
+  internal!: Omit<HelpMeChatbotQuestionResponse, 'chatbotQuestion'>
 }
 
-export interface UpdateChatbotQuestionParams {
-  id: string
-  inserted?: boolean
-  sourceDocuments?: SourceDocument[]
-  question?: string
-  answer?: string
-  verified?: boolean
-  suggested?: boolean
-  selectedDocuments?: {
-    docId: string
-    pageNumbersString: string
-  }[]
-}
-
-// this is the response from the backend when new questions are asked
-// if question is I don't know, only answer and questionId are returned
-export interface ChatbotAskResponse {
-  chatbotRepoVersion: ChatbotAskResponseChatbotDB
-  helpmeRepoVersion: ChatbotQuestionResponseHelpMeDB | null
-}
-
-// comes from /ask from chatbot db
-export interface ChatbotAskResponseChatbotDB {
-  question: string
-  answer: string
-  questionId: string
-  interactionId: number
-  sourceDocuments?: SourceDocument[]
-  verified: boolean
-  courseId: string
-  isPreviousQuestion: boolean
+export class InteractionResponse {
+  @Expose()
+  @IsInt()
+  id!: number
+
+  @Expose()
+  @IsDate()
+  timestamp!: Date
+
+  @IsArray()
+  @Type(() => HelpMeChatbotQuestionResponse)
+  @ValidateNested({ each: true })
+  @IsOptional()
+  questions?: HelpMeChatbotQuestionResponse[]
 }
 
 export enum ChatbotServiceType {
@@ -510,20 +461,10 @@ export enum ChatbotServiceType {
   LATEST = 'latest',
 }
 
-export interface AddChatbotQuestionParams {
-  question: string
-  answer: string
-  verified: boolean
-  suggested: boolean
-  sourceDocuments: SourceDocument[]
-}
-
 export interface OrganizationChatbotSettings {
   id: number
-
   defaultProvider: ChatbotProvider
   providers: ChatbotProvider[]
-
   default_prompt?: string
   default_temperature?: number
   default_topK?: number
@@ -880,41 +821,6 @@ export class UpdateLLMTypeBody {
   additionalNotes?: string[]
 }
 
-export interface ChatbotSettings {
-  id: string
-  pageContent: string
-  metadata: ChatbotSettingsMetadata
-}
-
-export interface ProviderMetadata {
-  type: ChatbotServiceProvider
-  baseUrl: string
-  apiKey: string
-  defaultModelName: string
-  defaultVisionModelName: string
-  headers: ChatbotAllowedHeaders
-}
-
-export interface ModelMetadata {
-  provider: ProviderMetadata
-  modelName: string
-}
-
-export interface OrganizationChatbotSettingsMetadata {
-  defaultProvider: ProviderMetadata
-}
-
-export interface ChatbotSettingsMetadata {
-  organizationSettings?: OrganizationChatbotSettingsMetadata
-  model?: ModelMetadata
-  modelName?: string
-  prompt: string
-  similarityThresholdDocuments: number
-  similarityThresholdQuestions: number
-  temperature: number
-  topK: number
-}
-
 export class UpsertCourseChatbotSettings {
   @IsInt()
   @IsOptional()
@@ -937,30 +843,6 @@ export class UpsertCourseChatbotSettings {
   topK?: number
 }
 
-export type ChatbotSettingsUpdateParams = Partial<ChatbotSettingsMetadata>
-
-export interface InteractionResponse {
-  id: number
-  timestamp: Date
-  questions?: ChatbotQuestionResponseHelpMeDB[]
-}
-
-export class ChatbotDocument {
-  id!: number
-  name!: number
-  type!: string
-  subDocumentIds!: string[]
-}
-
-export type GetInteractionsAndQuestionsResponse = {
-  helpmeDB: InteractionResponse[]
-  chatbotDB: ChatbotQuestionResponseChatbotDB[]
-}
-
-export type GetChatbotHistoryResponse = {
-  history: InteractionResponse[]
-}
-
 /**
  * A Queue that students can join with their tickets.
  * @param id - The unique id number for a Queue.
@@ -3498,7 +3380,7 @@ export function parseThinkBlock(answer: string) {
 
   if (!match) {
     // No <think> block, return the text unchanged
-    return { thinkText: null, cleanAnswer: answer }
+    return { thinkText: undefined, cleanAnswer: answer }
   }
 
   const thinkText = match[1].trim()
@@ -3560,6 +3442,8 @@ export const ERROR_MESSAGES = {
       'Organization settings could not be created; organization not found.',
   },
   chatbotController: {
+    textFileTooBig:
+      'Text-only files (.txt, .csv, .md) must be less than 2 MB in size.',
     organizationSettingsAlreadyExists:
       'Chatbot settings for this organization already exists.',
     organizationSettingsNotFound:
@@ -3575,6 +3459,9 @@ export const ERROR_MESSAGES = {
       `Specified chatbot provider is not an ${provider} provider.`,
   },
   chatbotService: {
+    missingVectorStoreId:
+      'Cannot create question, corresponding vector store ID for question not specified',
+    interactionNotFound: 'Interaction with specified ID was not found.',
     defaultModelNotFound:
       'Specified default model was not found in list of models',
     courseSettingsNotFound:
diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json
index 4fe490521..b45b4e4c8 100644
--- a/packages/common/tsconfig.json
+++ b/packages/common/tsconfig.json
@@ -1,4 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["index.ts"]
+  "include": ["index.ts","chatbot-api-types.ts"]
 }
diff --git a/packages/frontend/app/(dashboard)/components/CourseCloneForm.tsx b/packages/frontend/app/(dashboard)/components/CourseCloneForm.tsx
index ae98bbe70..aa46b7ebb 100644
--- a/packages/frontend/app/(dashboard)/components/CourseCloneForm.tsx
+++ b/packages/frontend/app/(dashboard)/components/CourseCloneForm.tsx
@@ -275,9 +275,9 @@ const CourseCloneForm: React.FC<CourseCloneFormProps> = ({
           <Checkbox />
         </Form.Item>
         <Form.Item
-          name={['toClone', 'chatbot', 'manuallyCreatedChunks']}
+          name={['toClone', 'chatbot', 'insertedDocuments']}
           valuePropName="checked"
-          label="Manually Created Chunks"
+          label="Inserted Documents"
           layout="horizontal"
           tooltip="Clone over any manually created chatbot document chunks you had created."
           className={`${formItemClassNames}`}
@@ -294,16 +294,6 @@ const CourseCloneForm: React.FC<CourseCloneFormProps> = ({
         >
           <Checkbox />
         </Form.Item>
-        <Form.Item
-          name={['toClone', 'chatbot', 'insertedLMSData']}
-          valuePropName="checked"
-          label="Inserted LMS Data"
-          layout="horizontal"
-          tooltip="Clone over any LMS data (e.g. assignment descriptions, announcements) that was inserted as a source into the chatbot. Defaulted to false since announcements usually have outdated information."
-          className={`${formItemClassNames}`}
-        >
-          <Checkbox />
-        </Form.Item>
       </div>
     </Form>
   )
diff --git a/packages/frontend/app/(dashboard)/components/CourseCloneFormModal.tsx b/packages/frontend/app/(dashboard)/components/CourseCloneFormModal.tsx
index ce9246f22..a2c6e6613 100644
--- a/packages/frontend/app/(dashboard)/components/CourseCloneFormModal.tsx
+++ b/packages/frontend/app/(dashboard)/components/CourseCloneFormModal.tsx
@@ -100,6 +100,7 @@ const CourseCloneFormModal: React.FC<CourseCloneFormModalProps> = ({
         </Button>
       </div>
       <Modal
+        centered
         title={`Clone ${courseName}`}
         open={visible}
         onOk={handleClone}
@@ -118,17 +119,12 @@ const CourseCloneFormModal: React.FC<CourseCloneFormModalProps> = ({
                   form.getFieldValue([
                     'toClone',
                     'chatbot',
-                    'manuallyCreatedChunks',
+                    'insertedDocuments',
                   ]) ||
                   form.getFieldValue([
                     'toClone',
                     'chatbot',
                     'insertedQuestions',
-                  ]) ||
-                  form.getFieldValue([
-                    'toClone',
-                    'chatbot',
-                    'insertedLMSData',
                   ])) && (
                   <p>
                     Note that you may want to review and remove any out-of-date
diff --git a/packages/frontend/app/(dashboard)/components/ImageCropperModal.tsx b/packages/frontend/app/(dashboard)/components/ImageCropperModal.tsx
index 25f8e8918..73b170c4c 100644
--- a/packages/frontend/app/(dashboard)/components/ImageCropperModal.tsx
+++ b/packages/frontend/app/(dashboard)/components/ImageCropperModal.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { Button, Modal, Upload, message } from 'antd'
+import { Button, message, Modal, Upload } from 'antd'
 import { UploadOutlined } from '@ant-design/icons'
 import React, { useCallback, useState } from 'react'
 import Cropper from 'react-easy-crop'
@@ -128,6 +128,7 @@ const ImageCropperModal: React.FC<ImageCropperModalProps> = ({
 
   return (
     <Modal
+      centered
       title={`Crop ${imgName}`}
       open={isOpen}
       onOk={handleCropComplete}
@@ -142,33 +143,34 @@ const ImageCropperModal: React.FC<ImageCropperModalProps> = ({
         xl: '70%',
         xxl: '65%',
       }}
-      className="flex flex-col items-center justify-center"
     >
-      <Upload
-        customRequest={async ({ file }) => await handleUpload(file)}
-        beforeUpload={beforeUpload}
-        className="mb-2"
-        showUploadList={false}
-        maxCount={1}
-        accept=".jpg,.jpeg,.png,.webp,.avif,.gif,.svg,.tiff"
-      >
-        <Button className="min-w-[85vw] py-5 lg:min-w-[30vw]">
-          <UploadOutlined />
-          <span className="ml-2">{`Upload ${imgName}`}</span>
-        </Button>
-      </Upload>
-      <div className="relative mt-2 min-h-80 w-full">
-        <Cropper
-          image={imageSrc ?? ''}
-          crop={crop}
-          zoom={zoom}
-          aspect={aspect}
-          onCropChange={setCrop}
-          onZoomChange={setZoom}
-          onCropComplete={onCropCompleteCallback}
-          cropShape={circular ? 'round' : 'rect'}
-          showGrid={false}
-        />
+      <div className={'flex flex-col items-center justify-center'}>
+        <Upload
+          customRequest={async ({ file }) => await handleUpload(file)}
+          beforeUpload={beforeUpload}
+          className="mb-2"
+          showUploadList={false}
+          maxCount={1}
+          accept=".jpg,.jpeg,.png,.webp,.avif,.gif,.svg,.tiff"
+        >
+          <Button className="min-w-[85vw] py-5 lg:min-w-[30vw]">
+            <UploadOutlined />
+            <span className="ml-2">{`Upload ${imgName}`}</span>
+          </Button>
+        </Upload>
+        <div className="relative mt-2 min-h-80 w-full">
+          <Cropper
+            image={imageSrc ?? ''}
+            crop={crop}
+            zoom={zoom}
+            aspect={aspect}
+            onCropChange={setCrop}
+            onZoomChange={setZoom}
+            onCropComplete={onCropCompleteCallback}
+            cropShape={circular ? 'round' : 'rect'}
+            showGrid={false}
+          />
+        </div>
       </div>
     </Modal>
   )
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/DashboardPresetComponent.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/DashboardPresetComponent.tsx
index b96187a9e..069cee2c5 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/DashboardPresetComponent.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/DashboardPresetComponent.tsx
@@ -139,6 +139,7 @@ const DashboardPresetComponent: React.FC<DashboardPresetComponentProps> = ({
     <>
       {insightsList != undefined && (
         <Modal
+          centered
           title={'Create New Dashboard Preset'}
           width={'48rem'}
           open={isCreationModalOpen}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/QueueFilter.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/QueueFilter.tsx
index 6201255fa..67878df17 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/QueueFilter.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/QueueFilter.tsx
@@ -1,4 +1,4 @@
-import { Button, Modal, Checkbox, List, Input } from 'antd'
+import { Button, Checkbox, Input, List, Modal } from 'antd'
 import { useMemo, useState } from 'react'
 import { useInsightContext } from '@/app/(dashboard)/course/[cid]/(insights)/context/InsightsContext'
 import { QueuePartial } from '@koh/common'
@@ -39,6 +39,7 @@ const QueueFilter: React.FC<QueueFilterProps> = ({
     queueDetails != undefined && (
       <>
         <Modal
+          centered
           title={'Select Queues'}
           open={modalOpen}
           onCancel={onClose}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/StaffFilter.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/StaffFilter.tsx
index 56286f623..7a27b1d95 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/StaffFilter.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/StaffFilter.tsx
@@ -1,4 +1,4 @@
-import { Button, Modal, Pagination, Checkbox, List, Input } from 'antd'
+import { Button, Checkbox, Input, List, Modal, Pagination } from 'antd'
 import { useMemo, useState } from 'react'
 import { useInsightContext } from '@/app/(dashboard)/course/[cid]/(insights)/context/InsightsContext'
 import { UserPartial } from '@koh/common'
@@ -38,6 +38,7 @@ const StaffFilter: React.FC<StaffFilterProps> = ({
     staffDetails != undefined && (
       <>
         <Modal
+          centered
           title={'Select Staff'}
           open={modalOpen}
           onCancel={onClose}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/StudentFilter.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/StudentFilter.tsx
index 981f6dfc1..236b9de72 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/StudentFilter.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(insights)/components/filters/StudentFilter.tsx
@@ -1,4 +1,4 @@
-import { Button, Modal, Pagination, Checkbox, List, Input } from 'antd'
+import { Button, Checkbox, Input, List, Modal, Pagination } from 'antd'
 import { useMemo, useState } from 'react'
 import { useInsightContext } from '@/app/(dashboard)/course/[cid]/(insights)/context/InsightsContext'
 import { UserPartial } from '@koh/common'
@@ -38,6 +38,7 @@ const StudentFilter: React.FC<StudentFilterProps> = ({
     studentDetails != undefined && (
       <>
         <Modal
+          centered
           title={'Select Students'}
           open={modalOpen}
           onCancel={onClose}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/EditChatbotDocumentChunkModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/EditChatbotDocumentChunkModal.tsx
deleted file mode 100644
index 963aa2ba8..000000000
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/EditChatbotDocumentChunkModal.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-'use client'
-
-import { ReactElement } from 'react'
-import { Form, Input, message, Modal } from 'antd'
-import TextArea from 'antd/es/input/TextArea'
-import { getErrorMessage } from '@/app/utils/generalUtils'
-import { SourceDocument } from '@koh/common'
-import { API } from '@/app/api'
-
-interface FormValues {
-  documentName: string
-  content: string
-  source: string
-}
-
-interface EditDocumentChunkModalProps {
-  editingRecord: SourceDocument
-  open: boolean
-  courseId: number
-  onSuccessfulUpdate: (value: SourceDocument[]) => void
-  onCancel: () => void
-}
-
-const EditDocumentChunkModal: React.FC<EditDocumentChunkModalProps> = ({
-  editingRecord,
-  open,
-  courseId,
-  onSuccessfulUpdate,
-  onCancel,
-}): ReactElement => {
-  const [form] = Form.useForm()
-
-  const onFinish = async (values: FormValues) => {
-    await API.chatbot.staffOnly
-      .updateDocumentChunk(courseId, editingRecord.id || '', {
-        documentText: values.content,
-        metadata: {
-          name: values.documentName,
-          source: values.source,
-        },
-      })
-      .then((updatedDocs) => {
-        message.success('Document updated successfully.')
-        onSuccessfulUpdate(updatedDocs)
-      })
-      .catch((e) => {
-        const errorMessage = getErrorMessage(e)
-        message.error('Failed to update document: ' + errorMessage)
-      })
-  }
-
-  return (
-    <Modal
-      open={open}
-      title={
-        <div className="flex items-center justify-start gap-x-3">
-          <div>Edit Document Chunk</div>
-        </div>
-      }
-      okText="Save Changes"
-      cancelText="Cancel"
-      okButtonProps={{
-        autoFocus: true,
-        htmlType: 'submit',
-      }}
-      onCancel={onCancel}
-      width={800}
-      destroyOnHidden
-      modalRender={(dom) => (
-        <Form
-          layout="vertical"
-          form={form}
-          name="form_in_modal"
-          initialValues={{
-            documentName: editingRecord.metadata?.name,
-            content: editingRecord.pageContent,
-            source: editingRecord.metadata?.source,
-          }}
-          clearOnDestroy
-          onFinish={(values) => onFinish(values)}
-        >
-          {dom}
-        </Form>
-      )}
-    >
-      <Form.Item
-        label="Document Name"
-        name="documentName"
-        tooltip={`This is the "name" of the document that this chunk came from `}
-        rules={[{ required: true, message: 'Please input the document name' }]}
-      >
-        <Input />
-      </Form.Item>
-      <Form.Item
-        label="Content"
-        name="content"
-        tooltip={`This is the text that was parsed during the document upload process. The Retrieval Augmented Generation (RAG) system searches through this content to find relevant information for the chatbot to use in its response.`}
-      >
-        <TextArea autoSize={{ minRows: 3, maxRows: 10 }} />
-      </Form.Item>
-      <Form.Item
-        label="Source Link"
-        name="source"
-        tooltip="When a student clicks on the citation, they will be redirected to this link"
-      >
-        <Input />
-      </Form.Item>
-    </Modal>
-  )
-}
-
-export default EditDocumentChunkModal
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/UpsertDocumentChunkModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/UpsertDocumentChunkModal.tsx
new file mode 100644
index 000000000..78f883f24
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/UpsertDocumentChunkModal.tsx
@@ -0,0 +1,195 @@
+import {
+  ChatbotDocumentResponse,
+  CreateDocumentChunkBody,
+  DocumentType,
+  UpdateDocumentChunkBody,
+} from '@koh/common'
+import { Form, Input, InputNumber, message, Modal, Switch, Tooltip } from 'antd'
+import { InfoCircleOutlined } from '@ant-design/icons'
+import { useCallback, useEffect, useMemo } from 'react'
+
+type UpsertDocumentChunkModalProps = {
+  open: boolean
+  editingChunk?: ChatbotDocumentResponse
+  addDocument: (props: CreateDocumentChunkBody) => void
+  updateDocument: (id: string, props: UpdateDocumentChunkBody) => void
+  onCancel: () => void
+}
+
+const UpsertDocumentChunkModal: React.FC<UpsertDocumentChunkModalProps> = ({
+  open,
+  editingChunk,
+  addDocument,
+  updateDocument,
+  onCancel,
+}) => {
+  const [form] = Form.useForm<UpdateDocumentChunkBody>()
+
+  const initialValues = useMemo(() => {
+    if (editingChunk != undefined) {
+      const vals: any = {}
+      Object.entries(editingChunk)
+        .filter(([key]) =>
+          [
+            'content',
+            'type',
+            'disabled',
+            'title',
+            'source',
+            'lines',
+            'pageNumber',
+          ].includes(key),
+        )
+        .map(([k, v]) => (vals[k] = v))
+      return vals
+    } else {
+      return {
+        type: DocumentType.Inserted,
+        title: 'Manually Inserted Information',
+        disabled: false,
+      }
+    }
+  }, [editingChunk])
+
+  const resetForm = useCallback(() => {
+    form.resetFields()
+    form.setFieldsValue(initialValues)
+  }, [form, initialValues])
+
+  useEffect(() => {
+    resetForm()
+  }, [initialValues, resetForm])
+
+  return (
+    <>
+      <style>{`
+        .ant-form-item .ant-form-item-label > label {
+          width: 100%;
+        }
+      `}</style>
+      <Modal
+        open={open}
+        centered
+        title={
+          <div className="flex items-center justify-start gap-x-3">
+            <div>
+              {editingChunk != undefined ? 'Edit' : 'Create'} Document Chunk
+            </div>
+          </div>
+        }
+        okText={editingChunk != undefined ? 'Save Changes' : 'Create'}
+        cancelText={'Cancel'}
+        okButtonProps={{
+          autoFocus: true,
+          htmlType: 'submit',
+        }}
+        onOk={() => {
+          form
+            .validateFields()
+            .then((values) => {
+              if (editingChunk != undefined) {
+                updateDocument(editingChunk.id, values)
+              } else {
+                addDocument(values as any)
+              }
+            })
+            .catch((err) => message.error(err))
+        }}
+        onCancel={() => {
+          onCancel()
+          resetForm()
+        }}
+        destroyOnHidden
+      >
+        <Form<any>
+          form={form}
+          initialValues={initialValues}
+          layout={'vertical'}
+        >
+          <div className="flex flex-col gap-1">
+            <Form.Item hidden name="type" />
+            <Form.Item
+              label={
+                <div className={'flex w-full justify-between'}>
+                  <Tooltip title="This title will appear in the citation when the document is pulled to augment the chatbot response.">
+                    Document Title <InfoCircleOutlined />
+                  </Tooltip>
+                </div>
+              }
+              name="title"
+              rules={[
+                {
+                  required: true,
+                  message: 'Please input the document title!',
+                },
+              ]}
+            >
+              <Input />
+            </Form.Item>
+            <Form.Item
+              label={
+                <Tooltip title="This is the information that will be retrieved for augmenting the chatbot response.">
+                  Document Content <InfoCircleOutlined />
+                </Tooltip>
+              }
+              name="content"
+              rules={[
+                {
+                  required: true,
+                  message: 'Please input the document content!',
+                },
+              ]}
+            >
+              <Input.TextArea />
+            </Form.Item>
+            <Form.Item
+              label={
+                <Tooltip title="When a student clicks on the citation, a new tab or window will be opened to this link.">
+                  Source <InfoCircleOutlined />
+                </Tooltip>
+              }
+              name="source"
+              rules={[
+                {
+                  pattern: new RegExp(/^(https?:\/\/\S+|\/\S*|\.{1,2}\/\S*)$/),
+                  message: 'Please enter a valid URL or relative path.',
+                },
+              ]}
+            >
+              <Input />
+            </Form.Item>
+            <Form.Item
+              label={
+                <Tooltip title="When the document is cited, this will appear in the citation. If applicable, it may be auto-navigated to when the source link is clicked.">
+                  Page Number <InfoCircleOutlined />
+                </Tooltip>
+              }
+              name="pageNumber"
+              rules={[
+                {
+                  type: 'number',
+                  message: 'Please enter a valid page number',
+                  min: 0,
+                },
+              ]}
+            >
+              <InputNumber />
+            </Form.Item>
+            <Form.Item
+              name={'disabled'}
+              label={
+                <Tooltip title="This will enable or disable the document from being cited by the chatbot.">
+                  Disabled <InfoCircleOutlined />
+                </Tooltip>
+              }
+            >
+              <Switch />
+            </Form.Item>
+          </div>
+        </Form>
+      </Modal>
+    </>
+  )
+}
+
+export default UpsertDocumentChunkModal
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx
index b12038bb4..3c69aee37 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx
@@ -1,30 +1,33 @@
 'use client'
 
-import { ReactElement, use, useCallback, useEffect, useState } from 'react'
+import { ReactElement, use, useEffect, useState } from 'react'
 import {
+  Badge,
   Button,
   Empty,
-  Form,
   Input,
-  InputNumber,
   message,
   Modal,
+  Pagination,
   Table,
 } from 'antd'
 import Link from 'next/link'
 import { getErrorMessage } from '@/app/utils/generalUtils'
 import Highlighter from 'react-highlight-words'
 import ExpandableText from '@/app/components/ExpandableText'
-import EditDocumentChunkModal from './components/EditChatbotDocumentChunkModal'
-import { AddDocumentChunkParams, SourceDocument } from '@koh/common'
+import {
+  ChatbotDocumentResponse,
+  CreateDocumentChunkBody,
+  DocumentType,
+  DocumentTypeColorMap,
+  DocumentTypeDisplayMap,
+  UpdateDocumentChunkBody,
+} from '@koh/common'
 import { API } from '@/app/api'
 import ChatbotHelpTooltip from '../components/ChatbotHelpTooltip'
-
-interface FormValues {
-  content: string
-  source: string
-  pageNumber: string
-}
+import UpsertDocumentChunkModal from './components/UpsertDocumentChunkModal'
+import { getPaginatedChatbotDocuments } from '@/app/(dashboard)/course/[cid]/(settings)/settings/util'
+import { DeleteOutlined, EditOutlined } from '@ant-design/icons'
 
 interface ChatbotDocumentsProps {
   params: Promise<{ cid: string }>
@@ -35,33 +38,21 @@ export default function ChatbotDocuments(
 ): ReactElement {
   const params = use(props.params)
   const courseId = Number(params.cid)
-  const [documents, setDocuments] = useState<SourceDocument[]>([])
-  const [filteredDocuments, setFilteredDocuments] = useState<SourceDocument[]>(
-    [],
-  )
+
+  const [documents, setDocuments] = useState<ChatbotDocumentResponse[]>([])
+  const [total, setTotal] = useState<number>(0)
+  const [page, setPage] = useState(1)
+  const [pageSize, setPageSize] = useState(10)
   const [search, setSearch] = useState('')
-  const [editingRecord, setEditingRecord] = useState<SourceDocument | null>(
-    null,
-  )
-  const [editRecordModalOpen, setEditRecordModalOpen] = useState(false)
-  const [form] = Form.useForm()
-  const [addDocChunkPopupVisible, setAddDocChunkPopupVisible] = useState(false)
 
-  const addDocument = async (values: FormValues) => {
-    const body: AddDocumentChunkParams = {
-      documentText: values.content,
-      metadata: {
-        name: 'Manually Inserted Information',
-        type: 'inserted_document',
-        source: values.source ?? undefined,
-        loc: values.pageNumber
-          ? { pageNumber: parseInt(values.pageNumber) }
-          : undefined,
-      },
-    }
+  const [editingChunk, setEditingChunk] = useState<ChatbotDocumentResponse>()
+  const [upsertModalOpen, setUpsertModalOpen] = useState(false)
+
+  const addDocument = async (values: CreateDocumentChunkBody) => {
     await API.chatbot.staffOnly
-      .addDocumentChunk(courseId, body)
+      .addDocumentChunk(courseId, values)
       .then((addedDocs) => {
+        setUpsertModalOpen(false)
         message.success(
           `Document${addedDocs.length > 1 ? 's' : ''} added successfully.`,
         )
@@ -70,7 +61,15 @@ export default function ChatbotDocuments(
             `Document was too large to fit into one chunk. It was split into ${addedDocs.length} document chunks.`,
           )
         }
-        fetchDocuments()
+        getPaginatedChatbotDocuments(
+          API.chatbot.staffOnly.getAllDocumentChunks,
+          courseId,
+          page,
+          pageSize,
+          setTotal,
+          setDocuments,
+          search,
+        )
       })
       .catch((e) => {
         const errorMessage = getErrorMessage(e)
@@ -78,57 +77,74 @@ export default function ChatbotDocuments(
       })
   }
 
-  const handleSearch = useCallback(
-    (e: { target: { value: string } }) => {
-      const searchTerm = e.target.value
-      setSearch(searchTerm)
-      const filtered = filterDocuments(documents, searchTerm)
-
-      setFilteredDocuments(filtered)
-    },
-    [documents],
-  )
+  const updateDocument = async (
+    id: string,
+    values: UpdateDocumentChunkBody,
+  ) => {
+    const original = documents.find((v) => v.id == id)
+    if (!original) {
+      message.error('Could not update document chunk, original was not found.')
+      return
+    }
 
-  const fetchDocuments = useCallback(async () => {
+    // Strip out identical properties
+    Object.entries(original).forEach(([k, v]) => {
+      if (k in values && (values as any)[k] === v) {
+        ;(values as any)[k] = undefined
+      }
+    })
     await API.chatbot.staffOnly
-      .getAllDocumentChunks(courseId)
-      .then((response) => {
-        response = response.map((doc) => ({
-          ...doc,
-          key: doc.id,
-        }))
-        setDocuments(response)
-        setFilteredDocuments(filterDocuments(response, search))
+      .updateDocumentChunk(courseId, id, values)
+      .then((updatedDocs) => {
+        message.success(`Document updated successfully.`)
+        if (updatedDocs.length > 1) {
+          message.info(
+            `The text content was too large and it was split into ${updatedDocs.length} new document chunks.`,
+            6,
+          )
+        }
+        setEditingChunk(undefined)
+        setUpsertModalOpen(false)
+        getPaginatedChatbotDocuments(
+          API.chatbot.staffOnly.getAllDocumentChunks,
+          courseId,
+          page,
+          pageSize,
+          setTotal,
+          setDocuments,
+          search,
+        )
       })
       .catch((e) => {
         const errorMessage = getErrorMessage(e)
-        message.error('Failed to load documents: ' + errorMessage)
+        message.error('Failed to add document: ' + errorMessage)
       })
-  }, [courseId, setDocuments, setFilteredDocuments, search])
+  }
 
   useEffect(() => {
     if (courseId) {
-      fetchDocuments()
+      getPaginatedChatbotDocuments(
+        API.chatbot.staffOnly.getAllDocumentChunks,
+        courseId,
+        page,
+        pageSize,
+        setTotal,
+        setDocuments,
+        search,
+      )
     }
-  }, [courseId, fetchDocuments])
+  }, [courseId, page, pageSize])
 
   const columns = [
     {
-      title: 'Name',
-      dataIndex: ['metadata', 'name'],
-      key: 'name',
+      title: 'Title',
+      dataIndex: 'title',
+      key: 'title',
       width: 300,
-      sorter: (a: SourceDocument, b: SourceDocument) => {
-        if (a.metadata?.name && b.metadata?.name) {
-          return a.metadata.name.localeCompare(b.metadata.name)
-        } else {
-          return 0
-        }
-      },
-      render: (text: string, record: SourceDocument) => (
+      render: (text: string, record: ChatbotDocumentResponse) => (
         <ExpandableText maxRows={4}>
           <Link
-            href={record.metadata?.source ?? ''}
+            href={record.source ?? ''}
             target="_blank"
             prefetch={false}
             rel="noopener noreferrer"
@@ -151,8 +167,8 @@ export default function ChatbotDocuments(
     },
     {
       title: 'Chunk Content',
-      dataIndex: ['pageContent'],
-      key: 'pageContent',
+      dataIndex: 'content',
+      key: 'content',
       render: (text: string) => (
         <ExpandableText maxRows={4}>
           {/*
@@ -172,27 +188,47 @@ export default function ChatbotDocuments(
     },
     {
       title: 'Page #',
-      dataIndex: ['metadata', 'loc', 'pageNumber'],
+      dataIndex: 'pageNumber',
       key: 'pageNumber',
-      width: 40,
+      width: '5%',
+    },
+    {
+      title: 'Type',
+      dataIndex: 'type',
+      key: 'type',
+      width: '10%',
+      render: (type: DocumentType) => (
+        <Badge
+          count={DocumentTypeDisplayMap[type] ?? (DocumentType as any)[type]}
+          color={DocumentTypeColorMap[type] ?? '#7C7C7C'}
+        />
+      ),
     },
     {
       title: 'Actions',
       key: 'actions',
       width: 100,
-      render: (_: any, record: SourceDocument) => (
-        <div>
-          <Button className="m-2" onClick={() => showModal(record)}>
+      render: (_: any, record: ChatbotDocumentResponse) => (
+        <div className={'flex flex-col gap-1'}>
+          <Button
+            onClick={() => {
+              setEditingChunk(record)
+              setUpsertModalOpen(true)
+            }}
+            variant={'outlined'}
+            color={'blue'}
+            icon={<EditOutlined />}
+          >
             Edit
           </Button>
           <Button
-            className="m-2"
             danger
+            icon={<DeleteOutlined />}
             onClick={() => {
               Modal.confirm({
                 title: 'Are you sure you want to delete this document chunk?',
                 content:
-                  'Note that this will not modify the original document nor any chatbot questions that reference this chunk. \n\nThis action cannot be undone.',
+                  'Note that this will cascade to any citations which reference this chunk, and remove it from any parent question or documents. \n\nThis action cannot be undone.',
                 okText: 'Yes',
                 okType: 'danger',
                 cancelText: 'No',
@@ -212,16 +248,19 @@ export default function ChatbotDocuments(
     },
   ]
 
-  const showModal = (record: SourceDocument) => {
-    setEditingRecord(record)
-    setEditRecordModalOpen(true)
-  }
-
   const deleteDocument = async (documentId: string) => {
     await API.chatbot.staffOnly
       .deleteDocumentChunk(courseId, documentId)
       .then(() => {
-        fetchDocuments()
+        getPaginatedChatbotDocuments(
+          API.chatbot.staffOnly.getAllDocumentChunks,
+          courseId,
+          page,
+          pageSize,
+          setTotal,
+          setDocuments,
+          search,
+        )
         message.success('Document deleted successfully.')
       })
       .catch((e) => {
@@ -232,6 +271,18 @@ export default function ChatbotDocuments(
 
   return (
     <div className="m-auto my-5">
+      {upsertModalOpen && (
+        <UpsertDocumentChunkModal
+          open={upsertModalOpen}
+          editingChunk={editingChunk}
+          addDocument={addDocument}
+          updateDocument={updateDocument}
+          onCancel={() => {
+            setEditingChunk(undefined)
+            setUpsertModalOpen(false)
+          }}
+        />
+      )}
       <div className="flex w-full items-center justify-between">
         <div>
           <h3 className="m-0 p-0 text-4xl font-bold text-gray-900">
@@ -244,97 +295,57 @@ export default function ChatbotDocuments(
         <div className="flex flex-col items-center gap-2 md:flex-row">
           <ChatbotHelpTooltip forPage="chatbot_knowledge_base" />
           <Button
-            type={addDocChunkPopupVisible ? 'default' : 'primary'}
-            onClick={() => setAddDocChunkPopupVisible(!addDocChunkPopupVisible)}
+            type={'primary'}
+            onClick={() => {
+              setEditingChunk(undefined)
+              setUpsertModalOpen(true)
+            }}
           >
-            {addDocChunkPopupVisible ? 'Close Add New Chunk' : 'Add New Chunk'}
+            Add New Chunk
           </Button>
         </div>
       </div>
-      {addDocChunkPopupVisible && (
-        <div className="h-70 top-50 fixed right-1 z-50 w-[360px] bg-white p-4 shadow-lg">
-          <Form form={form} onFinish={addDocument}>
-            <div className="flex items-center justify-between">
-              <h2 className="text-2xl font-bold">Add New Chunk</h2>
-            </div>
-            <div className="mt-4">
-              <Form.Item
-                label="Content"
-                name="content"
-                rules={[
-                  {
-                    required: true,
-                    message: 'Please input the document content!',
-                  },
-                ]}
-              >
-                <Input.TextArea />
-              </Form.Item>
-              {/* <Form.Item label="Edited Chunk" name="editedChunk">
-              <Input.TextArea />
-            </Form.Item> */}
-              <Form.Item
-                label="Source"
-                name="source"
-                rules={[
-                  {
-                    type: 'url',
-                    message: 'Please enter a valid URL',
-                  },
-                ]}
-                tooltip="When a student clicks on the citation, they will be redirected to this link"
-              >
-                <Input />
-              </Form.Item>
-              <Form.Item
-                label="Page Number"
-                name="pageNumber"
-                rules={[
-                  {
-                    type: 'number',
-                    message: 'Please enter a valid page number',
-                    min: 0,
-                  },
-                ]}
-              >
-                <InputNumber />
-              </Form.Item>
-              <div className="mt-4 flex justify-end">
-                <Button
-                  className="m-2"
-                  key="cancel"
-                  onClick={() => {
-                    form.resetFields() // clear form
-                    setAddDocChunkPopupVisible(false)
-                  }}
-                >
-                  Cancel
-                </Button>
-                <Button
-                  className="m-2"
-                  key="submit"
-                  type="primary"
-                  htmlType="submit"
-                >
-                  Submit
-                </Button>
-              </div>
-            </div>
-          </Form>
-        </div>
-      )}
       <hr className="my-5 w-full"></hr>
-      <Input
-        placeholder={'Search chunk name or content...'}
-        value={search}
-        onChange={handleSearch}
-        onPressEnter={fetchDocuments}
-      />
+      <div className={'flex justify-between gap-1'}>
+        <Input
+          placeholder={'Search chunk name or content and press enter...'}
+          value={search}
+          onChange={(e) => {
+            e.preventDefault()
+            setSearch(e.target.value)
+          }}
+          onPressEnter={() => {
+            setPage(1)
+            getPaginatedChatbotDocuments(
+              API.chatbot.staffOnly.getAllDocumentChunks,
+              courseId,
+              page,
+              pageSize,
+              setTotal,
+              setDocuments,
+              search,
+            )
+          }}
+        />
+        <Pagination
+          style={{ float: 'right' }}
+          total={total}
+          pageSizeOptions={[10, 20, 30, 50]}
+          showSizeChanger
+          current={page}
+          pageSize={pageSize}
+          onChange={(page, pageSize) => {
+            setPage(page)
+            setPageSize(pageSize)
+          }}
+        />
+      </div>
       <Table
         columns={columns}
-        dataSource={filteredDocuments}
+        dataSource={documents}
         size="small"
         className="w-full"
+        pagination={false}
         locale={{
           emptyText: (
             <Empty
@@ -352,40 +363,6 @@ export default function ChatbotDocuments(
           ),
         }}
       />
-      {editingRecord && (
-        <EditDocumentChunkModal
-          open={editRecordModalOpen}
-          editingRecord={editingRecord}
-          courseId={courseId}
-          onCancel={() => {
-            setEditingRecord(null)
-            setEditRecordModalOpen(false)
-          }}
-          onSuccessfulUpdate={async (updatedDocs) => {
-            if (updatedDocs.length > 1) {
-              message.info(
-                `The text content was too large and it was split into ${updatedDocs.length} new document chunks.`,
-                6,
-              )
-            }
-            await fetchDocuments()
-            setEditingRecord(null)
-            setEditRecordModalOpen(false)
-          }}
-        />
-      )}
     </div>
   )
 }
-
-const filterDocuments = (documents: SourceDocument[], search: string) => {
-  return documents.filter((doc) => {
-    const isNameMatch = doc.metadata?.name
-      ? doc.metadata.name.toLowerCase().includes(search.toLowerCase())
-      : false
-    const isContentMatch = doc.pageContent
-      ? doc.pageContent.toLowerCase().includes(search.toLowerCase())
-      : false
-    return isNameMatch || isContentMatch
-  })
-}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/AddChatbotQuestionModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/AddChatbotQuestionModal.tsx
deleted file mode 100644
index 9fb835648..000000000
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/AddChatbotQuestionModal.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-import { useState } from 'react'
-import { Checkbox, Form, Input, Modal, Select, message } from 'antd'
-import { getErrorMessage } from '@/app/utils/generalUtils'
-import MarkdownGuideTooltipBody from './MarkdownGuideTooltipBody'
-import { SourceDocument } from '@koh/common'
-import { API } from '@/app/api'
-
-interface FormValues {
-  question: string
-  answer: string
-  verified: boolean
-  suggested: boolean
-}
-
-interface AddChatbotQuestionModalProps {
-  open: boolean
-  courseId: number
-  existingDocuments: SourceDocument[]
-  onCancel: () => void
-  onAddSuccess: () => void
-}
-
-const AddChatbotQuestionModal: React.FC<AddChatbotQuestionModalProps> = ({
-  open,
-  courseId,
-  existingDocuments,
-  onCancel,
-  onAddSuccess,
-}) => {
-  const [form] = Form.useForm()
-  const [selectedDocuments, setSelectedDocuments] = useState<SourceDocument[]>(
-    [],
-  )
-  const [loading, setLoading] = useState(false)
-
-  const onFinish = async (values: FormValues) => {
-    setLoading(true)
-    selectedDocuments.forEach((doc) => {
-      // Convert string to array of numbers, trimming spaces and ignoring empty entries
-      if (doc.pageNumbersString) {
-        doc.pageNumbers = doc.pageNumbersString
-          .split(',')
-          .map((page) => page.trim())
-          .filter((page) => page !== '')
-          .map((page) => parseInt(page, 10))
-      }
-    })
-
-    await API.chatbot.staffOnly
-      .addQuestion(courseId, {
-        question: values.question,
-        answer: values.answer,
-        verified: values.verified,
-        suggested: values.suggested,
-        sourceDocuments: selectedDocuments,
-      })
-      .then(() => {
-        message.success('Question successfully added')
-        onAddSuccess()
-      })
-      .catch((error) => {
-        const errorMessage = getErrorMessage(error)
-        message.error('Error adding question:' + errorMessage)
-      })
-      .finally(() => {
-        setLoading(false)
-      })
-  }
-
-  return (
-    <Modal
-      open={open}
-      title="Create Question & Answer Pair"
-      okText="Create"
-      cancelText="Cancel"
-      okButtonProps={{
-        autoFocus: true,
-        htmlType: 'submit',
-        loading,
-      }}
-      cancelButtonProps={{
-        danger: true,
-        disabled: loading,
-      }}
-      onCancel={onCancel}
-      destroyOnHidden
-      modalRender={(dom) => (
-        <Form
-          layout="vertical"
-          form={form}
-          initialValues={{ verified: true, suggested: false }}
-          name="form_in_modal"
-          clearOnDestroy
-          onFinish={(values) => onFinish(values)}
-        >
-          {dom}
-        </Form>
-      )}
-    >
-      <Form.Item name="question" label="Question" rules={[{ required: true }]}>
-        <Input.TextArea autoSize={{ minRows: 1, maxRows: 5 }} />
-      </Form.Item>
-      <Form.Item
-        name="answer"
-        label="Answer"
-        tooltip={{
-          title: <MarkdownGuideTooltipBody />,
-          classNames: {
-            body: 'min-w-[420px]',
-          },
-        }}
-        rules={[{ required: true, message: 'Please input the answer text' }]}
-      >
-        <Input.TextArea autoSize={{ minRows: 1, maxRows: 8 }} />
-      </Form.Item>
-      <Form.Item
-        label="Mark Q&A as Verified by Human"
-        layout="horizontal"
-        name="verified"
-        valuePropName="checked"
-      >
-        <Checkbox />
-      </Form.Item>
-      <Form.Item
-        label="Mark Q&A as Suggested"
-        layout="horizontal"
-        name="suggested"
-        valuePropName="checked"
-      >
-        <Checkbox />
-      </Form.Item>
-      <span className="text-base font-bold">Source Documents</span>
-      <Select
-        className="my-4 w-full"
-        placeholder="Select a document to add"
-        mode="multiple"
-        onSelect={(selectedDocId) => {
-          const selectedDoc = existingDocuments.find(
-            (doc) => doc.docId === selectedDocId,
-          )
-          if (selectedDoc) {
-            setSelectedDocuments((prev) => {
-              const isAlreadySelected = prev.some(
-                (doc) => doc.docId === selectedDocId,
-              )
-              if (!isAlreadySelected) {
-                return [...prev, { ...selectedDoc, pageNumbers: [] }]
-              }
-              return prev
-            })
-          }
-        }}
-      >
-        {existingDocuments.map((doc) => (
-          <Select.Option key={doc.docId} value={doc.docId}>
-            {doc.docName}
-          </Select.Option>
-        ))}
-      </Select>
-
-      {selectedDocuments.map((doc) => (
-        <div key={doc.docId}>
-          <span className="font-bold">{doc.docName}</span>
-          <Input
-            key={doc.docId}
-            type="text"
-            placeholder="Enter page numbers (comma separated)"
-            value={doc.pageNumbersString}
-            onChange={(e) => {
-              doc.pageNumbersString = e.target.value
-            }}
-          />
-        </div>
-      ))}
-    </Modal>
-  )
-}
-
-export default AddChatbotQuestionModal
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/EditChatbotQuestionModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/EditChatbotQuestionModal.tsx
deleted file mode 100644
index e7b94bc83..000000000
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/EditChatbotQuestionModal.tsx
+++ /dev/null
@@ -1,457 +0,0 @@
-import { useEffect, useState } from 'react'
-import {
-  Button,
-  Checkbox,
-  Collapse,
-  Form,
-  Input,
-  message,
-  Modal,
-  Tooltip,
-} from 'antd'
-import {
-  AddDocumentChunkParams,
-  SourceDocument,
-  UpdateChatbotQuestionParams,
-} from '@koh/common'
-import { ChatbotQuestionFrontend } from '../page'
-import { getErrorMessage } from '@/app/utils/generalUtils'
-import {
-  CloseOutlined,
-  DeleteOutlined,
-  ExclamationCircleFilled,
-  FileAddOutlined,
-  QuestionCircleOutlined,
-} from '@ant-design/icons'
-import MarkdownGuideTooltipBody from './MarkdownGuideTooltipBody'
-import { API } from '@/app/api'
-
-interface FormValues {
-  question: string
-  answer: string
-  verified: boolean
-  suggested: boolean
-  sourceDocuments: SourceDocument[]
-  selectedDocuments: {
-    docId: string
-    pageNumbersString: string
-  }[]
-}
-
-interface EditChatbotQuestionModalProps {
-  open: boolean
-  editingRecord: ChatbotQuestionFrontend
-  onCancel: () => void
-  onSuccessfulUpdate: () => void
-  cid: number
-  deleteQuestion: (id: string) => void
-}
-
-const EditChatbotQuestionModal: React.FC<EditChatbotQuestionModalProps> = ({
-  open,
-  editingRecord,
-  onCancel,
-  onSuccessfulUpdate,
-  cid,
-  deleteQuestion,
-}) => {
-  const [form] = Form.useForm()
-  const [saveLoading, setSaveLoading] = useState(false)
-
-  const [successfulQAInsert, setSuccessfulQAInsert] = useState(false)
-  // reset successfulQAInsert when the modal is closed
-  useEffect(() => {
-    if (!open) {
-      setSuccessfulQAInsert(false)
-    }
-  }, [open])
-
-  const handleOkInsert = async () => {
-    const values = await form.validateFields()
-    setSaveLoading(true)
-    const newChunk: AddDocumentChunkParams = {
-      documentText: values.question + '\nAnswer:' + values.answer,
-      metadata: {
-        name: 'inserted Q&A',
-        type: 'inserted_question',
-        id: editingRecord.vectorStoreId,
-        courseId: cid,
-      },
-    }
-    await API.chatbot.staffOnly
-      .addDocumentChunk(cid, newChunk)
-      .then(async (docChunks: SourceDocument[]) => {
-        const updatedQuestion: UpdateChatbotQuestionParams = {
-          id: editingRecord.vectorStoreId,
-          inserted: true,
-        }
-        await API.chatbot.staffOnly
-          .updateQuestion(cid, updatedQuestion)
-          .then(() => {
-            message.success(
-              `Document${docChunks.length > 1 ? 's' : ''} inserted successfully. You can now cancel or save the changes you made to the Q&A`,
-              6,
-            )
-            if (docChunks.length > 1)
-              message.info(
-                `Question text was too large! Inserted document was split into ${docChunks.length} document chunks.`,
-                6,
-              )
-            setSuccessfulQAInsert(true)
-          })
-      })
-      .catch((e) => {
-        const errorMessage = getErrorMessage(e)
-        message.error('Failed to add document: ' + errorMessage)
-      })
-      .finally(() => {
-        setSaveLoading(false)
-      })
-  }
-
-  const confirmInsert = () => {
-    Modal.confirm({
-      title:
-        'Are you sure you want to insert this Question and Answer as a new Chatbot Document Chunk?',
-      content: (
-        <div className="flex flex-col gap-y-2">
-          <p>
-            This will treat this question and answer as a source that the AI can
-            then reference and cite in future questions (a new document chunk).
-          </p>
-          <p>
-            The question and answer text will be whatever you have in the fields
-            right now (i.e. you do not have to click &quot;Save Changes&quot;
-            first).
-          </p>
-          <p>The question&apos;s document citations are ignored.</p>
-          <p>Once inserted, this action cannot be undone.</p>
-        </div>
-      ),
-      onOk: handleOkInsert,
-      width: 600,
-      type: 'info',
-      icon: <ExclamationCircleFilled className="text-blue-500" />,
-      okText: 'Insert',
-    })
-  }
-
-  const onFinish = async (values: FormValues) => {
-    if (values.sourceDocuments) {
-      values.sourceDocuments.forEach((doc) => {
-        // Convert string to array of numbers, trimming spaces and ignoring empty entries
-        if (doc.pageNumbersString) {
-          doc.pageNumbers = doc.pageNumbersString
-            .split(',')
-            .map((page) => page.trim())
-            .filter((page) => page !== '')
-            .map((page) => parseInt(page, 10))
-        }
-      })
-    }
-
-    const valuesWithId = {
-      ...values,
-      id: editingRecord.vectorStoreId,
-      sourceDocuments: values.sourceDocuments || [],
-    }
-
-    await API.chatbot.staffOnly
-      .updateQuestion(cid, valuesWithId)
-      .then(() => {
-        message.success('Question updated successfully')
-        onSuccessfulUpdate()
-      })
-      .catch((e) => {
-        const errorMessage = getErrorMessage(e)
-        message.error('Error updating question:' + errorMessage)
-      })
-  }
-
-  return (
-    <Modal
-      open={open}
-      title="Edit Chatbot Question"
-      okText="Save Changes"
-      cancelText="Cancel"
-      okButtonProps={{
-        autoFocus: true,
-        htmlType: 'submit',
-        loading: saveLoading,
-      }}
-      width={{
-        xs: '90%',
-        sm: '85%',
-        md: '75%',
-        lg: '65%',
-        xl: '55%',
-        xxl: '45%',
-      }}
-      onCancel={onCancel}
-      footer={(_, { OkBtn, CancelBtn }) => (
-        <div className="flex flex-wrap justify-between gap-2">
-          <Button
-            icon={<DeleteOutlined />}
-            danger
-            onClick={() => {
-              Modal.confirm({
-                title: 'Are you sure you want to delete this question?',
-                content: 'This action cannot be undone.',
-                okText: 'Yes',
-                okType: 'danger',
-                cancelText: 'No',
-                onOk() {
-                  deleteQuestion(editingRecord.vectorStoreId)
-                  onCancel()
-                },
-              })
-            }}
-          >
-            {' '}
-            Delete{' '}
-          </Button>
-          <div className={`flex flex-wrap justify-end gap-2 md:gap-3`}>
-            <CancelBtn />
-            <OkBtn />
-          </div>
-        </div>
-      )}
-      destroyOnHidden
-      modalRender={(dom) => (
-        <Form
-          layout="vertical"
-          form={form}
-          name="form_in_modal"
-          initialValues={{
-            answer: editingRecord.answer,
-            question: editingRecord.question,
-            verified: editingRecord.verified,
-            suggested: editingRecord.suggested,
-            sourceDocuments: editingRecord.sourceDocuments,
-          }}
-          clearOnDestroy
-          onFinish={onFinish}
-        >
-          {dom}
-        </Form>
-      )}
-    >
-      <Form.Item
-        name="question"
-        label="Question"
-        rules={[{ required: true, message: 'Please input the question text' }]}
-      >
-        <Input.TextArea autoSize={{ minRows: 1, maxRows: 5 }} />
-      </Form.Item>
-      <Form.Item
-        name="answer"
-        tooltip={{
-          title: <MarkdownGuideTooltipBody />,
-          classNames: {
-            body: 'min-w-[420px]',
-          },
-        }}
-        label="Answer"
-        rules={[{ required: true, message: 'Please input the answer text' }]}
-      >
-        <Input.TextArea autoSize={{ minRows: 1, maxRows: 8 }} />
-      </Form.Item>
-      <Form.Item
-        label="Mark Q&A as Verified by Human"
-        layout="horizontal"
-        name="verified"
-        valuePropName="checked"
-        tooltip={
-          <div className="flex flex-col gap-y-2">
-            <p>
-              Answers that are marked verified will appear with a green
-              &apos;verified&apos; checkmark to students.
-            </p>
-            <p>
-              Incentive: if a future student asks a question that is similar to
-              this one, they will get this answer and get reassurance that it
-              was human verified.
-            </p>
-          </div>
-        }
-      >
-        <Checkbox />
-      </Form.Item>
-      <Form.Item
-        label="Mark Q&A as Suggested"
-        layout="horizontal"
-        name="suggested"
-        valuePropName="checked"
-        tooltip={
-          <div className="flex flex-col gap-y-2">
-            <p>
-              When a student starts a new interaction with the chatbot, any
-              questions marked as &apos;suggested&apos; will appear for them to
-              choose if they wish. Upon clicking a suggested question, they
-              instantly get the answer that you set here.
-            </p>
-            <p>
-              Incentive: If someone asks a question you think others might ask
-              and are happy with the answer, you can mark it as suggested.
-            </p>
-          </div>
-        }
-      >
-        <Checkbox />
-      </Form.Item>
-      <Form.Item
-        label="Insert Q&A into Chatbot Knowledge Base"
-        layout="horizontal"
-        tooltip={
-          <div className="flex flex-col gap-y-2">
-            <p>
-              This will treat this question and answer as a source that the AI
-              can then reference and cite in future questions (a new document
-              chunk).
-            </p>
-          </div>
-        }
-      >
-        <Tooltip
-          title={
-            editingRecord.inserted || successfulQAInsert
-              ? 'This question and answer has already been inserted as a new document chunk'
-              : ''
-          }
-        >
-          <Button
-            type="default"
-            onClick={confirmInsert}
-            disabled={editingRecord.inserted || successfulQAInsert}
-            icon={<FileAddOutlined />}
-          >
-            Insert
-          </Button>
-        </Tooltip>
-      </Form.Item>
-      <h3 className="mb-1 text-base font-semibold">
-        Document Citations
-        <Tooltip title="These document citations will be displayed underneath the chatbot answer. Note that modifying these fields does NOT update the original chunks, and it only modifies how the source looks for students.">
-          <QuestionCircleOutlined className="ml-1 text-gray-400" />
-        </Tooltip>
-      </h3>
-      {editingRecord.sourceDocuments &&
-        editingRecord.sourceDocuments.length > 0 && (
-          <Form.List name="sourceDocuments">
-            {(fields, { add, remove }) => (
-              <div className="flex flex-col items-center justify-center gap-y-2">
-                <Collapse
-                  size="small"
-                  className="w-full"
-                  items={fields.map(({ key, name, ...restField }) => ({
-                    key: key,
-                    label: (
-                      <div className="flex items-center justify-between">
-                        <div>
-                          {form.getFieldValue([
-                            'sourceDocuments',
-                            name,
-                            'docName',
-                          ]) || `Document ${key + 1}`}
-                        </div>
-                        <Button
-                          icon={<CloseOutlined />}
-                          onClick={() => remove(name)}
-                          size="small"
-                        >
-                          Remove
-                        </Button>
-                      </div>
-                    ),
-                    children: (
-                      <>
-                        <Form.Item
-                          {...restField}
-                          name={[name, 'docName']}
-                          rules={[
-                            {
-                              required: true,
-                              message: 'Please provide a document name.',
-                            },
-                          ]}
-                          label="Display Document Name"
-                          tooltip="Display document name for students for this question"
-                        >
-                          <Input placeholder="Document Name" />
-                        </Form.Item>
-                        <Form.Item
-                          {...restField}
-                          name={[name, 'sourceLink']}
-                          rules={[
-                            {
-                              required: true,
-                              message: 'Please provide a document preview URL.',
-                            },
-                          ]}
-                          label="Source Link"
-                          tooltip="When a student clicks on the citation, they will be redirected to this link"
-                        >
-                          <Input placeholder="Source Link" />
-                        </Form.Item>
-                        <Form.Item
-                          {...restField}
-                          name={[name, 'pageNumbers']}
-                          rules={[
-                            {
-                              required: true,
-                              message: 'Please provide page numbers.',
-                            },
-                            {
-                              validator: (_, value) => {
-                                if (value && typeof value === 'string') {
-                                  const pageNumbersArray = value.split(
-                                    ',',
-                                  ) as string[]
-                                  if (
-                                    !pageNumbersArray ||
-                                    pageNumbersArray.length === 0
-                                  ) {
-                                    return Promise.reject(
-                                      'Please provide page numbers.',
-                                    )
-                                  }
-                                  const invalidPageNumbers = pageNumbersArray
-                                    .map((page) => page.trim())
-                                    .filter((page) => page !== '')
-                                    .map((page) => parseInt(page, 10))
-                                    .filter((page) => isNaN(page))
-                                  if (invalidPageNumbers.length > 0) {
-                                    return Promise.reject(
-                                      'Please provide valid page numbers (e.g. 1,2,3).',
-                                    )
-                                  }
-                                }
-                                return Promise.resolve()
-                              },
-                            },
-                          ]}
-                          tooltip="These page numbers are just to display to the student what page numbers the information came from."
-                          label="Display Page Numbers (comma separated)"
-                        >
-                          <Input placeholder="1,2,3" />
-                        </Form.Item>
-                      </>
-                    ),
-                  }))}
-                />
-                <Button
-                  type="dashed"
-                  onClick={() => add()}
-                  className="mt-2 w-1/3"
-                >
-                  Add Document Citation
-                </Button>
-              </div>
-            )}
-          </Form.List>
-        )}
-    </Modal>
-  )
-}
-
-export default EditChatbotQuestionModal
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/UpsertChatbotQuestionModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/UpsertChatbotQuestionModal.tsx
new file mode 100644
index 000000000..d0682b76f
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/UpsertChatbotQuestionModal.tsx
@@ -0,0 +1,429 @@
+import { useEffect, useMemo, useState } from 'react'
+import {
+  Button,
+  Form,
+  Input,
+  message,
+  Modal,
+  Switch,
+  Tabs,
+  Tooltip,
+} from 'antd'
+import {
+  ChatbotDocumentResponse,
+  ChatbotQuestionResponse,
+  CreateDocumentChunkBody,
+  CreateQuestionBody,
+  DocumentType,
+  HelpMeChatbotQuestionResponse,
+  UpdateQuestionBody,
+} from '@koh/common'
+import { getErrorMessage } from '@/app/utils/generalUtils'
+import {
+  DeleteOutlined,
+  ExclamationCircleFilled,
+  FileAddOutlined,
+  QuestionCircleOutlined,
+} from '@ant-design/icons'
+import MarkdownGuideTooltipBody from './MarkdownGuideTooltipBody'
+import { API } from '@/app/api'
+import ChatbotSelectCitations from '../../components/ChatbotSelectCitations'
+
+interface FormValues {
+  question: string
+  answer: string
+  verified: boolean
+  suggested: boolean
+  sourceDocumentIds: string[]
+}
+
+interface UpsertChatbotQuestionModalProps {
+  courseId: number
+  open: boolean
+  editingRecord?: Omit<HelpMeChatbotQuestionResponse, 'chatbotQuestion'> & {
+    chatbotQuestion: ChatbotQuestionResponse
+  }
+  onCancel: () => void
+  onUpsert: () => void
+  deleteQuestion: (id: string) => void
+}
+
+const UpsertChatbotQuestionModal: React.FC<UpsertChatbotQuestionModalProps> = ({
+  courseId,
+  open,
+  editingRecord,
+  onCancel,
+  onUpsert,
+  deleteQuestion,
+}) => {
+  const [form] = Form.useForm()
+  const [saveLoading, setSaveLoading] = useState(false)
+
+  const [selectedDocuments, setSelectedDocuments] = useState<string[]>([])
+  const [baseDocuments, setBaseDocuments] = useState<ChatbotDocumentResponse[]>(
+    [],
+  )
+
+  useEffect(() => {
+    if (editingRecord && editingRecord.chatbotQuestion.citations) {
+      setSelectedDocuments(
+        editingRecord.chatbotQuestion.citations.map((c) => c.documentId),
+      )
+      setBaseDocuments(
+        editingRecord.chatbotQuestion.citations.map((c) => c.document),
+      )
+    } else {
+      setSelectedDocuments([])
+      setBaseDocuments([])
+    }
+  }, [editingRecord, editingRecord?.chatbotQuestion.citations])
+
+  useEffect(() => {
+    if (!open) {
+      form.resetFields()
+      setSelectedDocuments([])
+      setBaseDocuments([])
+    }
+  }, [form, open])
+
+  useEffect(() => {
+    if (editingRecord) {
+      form.setFieldsValue({
+        answer: editingRecord.chatbotQuestion.answer,
+        question: editingRecord.chatbotQuestion.question,
+        verified: editingRecord.chatbotQuestion.verified,
+        suggested: editingRecord.chatbotQuestion.suggested,
+      })
+    } else {
+      form.resetFields()
+    }
+  }, [editingRecord, form])
+
+  const [successfulQAInsert, setSuccessfulQAInsert] = useState(false)
+  // reset successfulQAInsert when the modal is closed
+  useEffect(() => {
+    if (!open) {
+      setSuccessfulQAInsert(false)
+    }
+  }, [open])
+
+  const handleInsert = async () => {
+    if (!editingRecord) return
+
+    const values = await form.validateFields()
+    setSaveLoading(true)
+
+    const newChunk: CreateDocumentChunkBody = {
+      content: values.question + '\nAnswer:' + values.answer,
+      title: 'inserted Q&A',
+      type: DocumentType.InsertedQuestion,
+      questionId: editingRecord.vectorStoreId,
+    }
+
+    await API.chatbot.staffOnly
+      .addDocumentChunk(courseId, newChunk)
+      .then(async (docChunks: ChatbotDocumentResponse[]) => {
+        message.success(
+          `Document${docChunks.length > 1 ? 's' : ''} inserted successfully. You can now cancel or save the changes you made to the Q&A`,
+          6,
+        )
+        if (docChunks.length > 1)
+          message.info(
+            `Question text was too large! Inserted document was split into ${docChunks.length} document chunks.`,
+            6,
+          )
+        setSuccessfulQAInsert(true)
+      })
+      .catch((e) => {
+        const errorMessage = getErrorMessage(e)
+        message.error('Failed to add document: ' + errorMessage)
+      })
+      .finally(() => {
+        setSaveLoading(false)
+      })
+  }
+
+  const confirmInsert = () => {
+    Modal.confirm({
+      title:
+        'Are you sure you want to insert this Question and Answer as a new Chatbot Document Chunk?',
+      content: (
+        <div className="flex flex-col gap-y-2">
+          <p>
+            This will treat this question and answer as a source that the AI can
+            then reference and cite in future questions (a new document chunk).
+          </p>
+          <p>
+            The question and answer text will be whatever you have in the fields
+            right now (i.e. you do not have to click &quot;Save Changes&quot;
+            first).
+          </p>
+          <p>The question&apos;s document citations are ignored.</p>
+          <p>Once inserted, this action cannot be undone.</p>
+        </div>
+      ),
+      onOk: handleInsert,
+      width: 600,
+      type: 'info',
+      icon: <ExclamationCircleFilled className="text-blue-500" />,
+      okText: 'Insert',
+    })
+  }
+
+  const onFinish = async (values: FormValues) => {
+    const params: UpdateQuestionBody = {
+      ...values,
+      sourceDocumentIds: values.sourceDocumentIds || [],
+    }
+
+    const thenFx = () => {
+      message.success(
+        `Question ${editingRecord != undefined ? 'updated' : 'created'} successfully`,
+      )
+      onUpsert()
+    }
+    const errFx = (e: any) => {
+      const errorMessage = getErrorMessage(e)
+      message.error(
+        `Error ${editingRecord != undefined ? 'updating' : 'creating'} question:` +
+          errorMessage,
+      )
+    }
+
+    if (editingRecord != undefined) {
+      return await API.chatbot.staffOnly
+        .updateQuestion(courseId, editingRecord.vectorStoreId, params)
+        .then(thenFx)
+        .catch(errFx)
+    } else {
+      return await API.chatbot.staffOnly
+        .addQuestion(courseId, params as CreateQuestionBody)
+        .then(thenFx)
+        .catch(errFx)
+    }
+  }
+
+  const actionsTab = useMemo(() => {
+    if (editingRecord == undefined) return undefined
+    return {
+      key: 'actions',
+      label: 'Actions',
+      children: (
+        <>
+          <Form.Item
+            label="Insert Q&A into Chatbot Knowledge Base"
+            layout="horizontal"
+            tooltip={
+              <div className="flex flex-col gap-y-2">
+                <p>
+                  This will treat this question and answer as a source that the
+                  AI can then reference and cite in future questions (a new
+                  document chunk).
+                </p>
+              </div>
+            }
+          >
+            <Tooltip
+              title={
+                (editingRecord.chatbotQuestion.insertedDocuments?.length ?? 0) >
+                  0 || successfulQAInsert
+                  ? 'This question and answer has already been inserted as a new document chunk'
+                  : ''
+              }
+            >
+              <Button
+                type="default"
+                onClick={confirmInsert}
+                disabled={
+                  (editingRecord.chatbotQuestion.insertedDocuments?.length ??
+                    0) > 0 || successfulQAInsert
+                }
+                icon={<FileAddOutlined />}
+              >
+                Insert
+              </Button>
+            </Tooltip>
+          </Form.Item>
+          <Button
+            icon={<DeleteOutlined />}
+            danger
+            onClick={() => {
+              Modal.confirm({
+                title: 'Are you sure you want to delete this question?',
+                content: 'This action cannot be undone.',
+                okText: 'Yes',
+                okType: 'danger',
+                cancelText: 'No',
+                onOk() {
+                  deleteQuestion(editingRecord.vectorStoreId)
+                  onCancel()
+                },
+              })
+            }}
+          >
+            {' '}
+            Delete{' '}
+          </Button>
+        </>
+      ),
+    }
+  }, [
+    confirmInsert,
+    deleteQuestion,
+    editingRecord,
+    onCancel,
+    successfulQAInsert,
+  ])
+
+  return (
+    <Modal
+      centered
+      open={open}
+      title={`${editingRecord != undefined ? 'Edit' : 'Create'} Chatbot Question`}
+      okText="Save Changes"
+      cancelText="Cancel"
+      okButtonProps={{
+        autoFocus: true,
+        htmlType: 'submit',
+        loading: saveLoading,
+        onClick: () => form.validateFields().then(onFinish).catch(),
+      }}
+      width={{
+        xs: '90%',
+        sm: '85%',
+        md: '75%',
+        lg: '65%',
+        xl: '55%',
+        xxl: '45%',
+      }}
+      onCancel={onCancel}
+      footer={(_, { OkBtn, CancelBtn }) => (
+        <div className={`flex flex-wrap justify-end gap-2 md:gap-3`}>
+          <CancelBtn />
+          <OkBtn />
+        </div>
+      )}
+      destroyOnHidden
+    >
+      <Form layout="vertical" form={form} name="form_in_modal" clearOnDestroy>
+        <Tabs
+          destroyOnHidden={false}
+          items={[
+            {
+              key: 'properties',
+              label: (
+                <span>
+                  Properties
+                  <Tooltip title="These are the main properties of the question, e.g., the question, the answer itself, and whether it is suggested.">
+                    <QuestionCircleOutlined className="ml-1 text-gray-400" />
+                  </Tooltip>
+                </span>
+              ),
+              children: (
+                <>
+                  <Form.Item
+                    name="question"
+                    label="Question"
+                    rules={[
+                      {
+                        required: true,
+                        message: 'Please input the question text',
+                      },
+                    ]}
+                  >
+                    <Input.TextArea autoSize={{ minRows: 1, maxRows: 3 }} />
+                  </Form.Item>
+                  <Form.Item
+                    name="answer"
+                    tooltip={{
+                      title: <MarkdownGuideTooltipBody />,
+                      classNames: {
+                        body: 'min-w-[420px]',
+                      },
+                    }}
+                    label="Answer"
+                    rules={[
+                      {
+                        required: true,
+                        message: 'Please input the answer text',
+                      },
+                    ]}
+                  >
+                    <Input.TextArea autoSize={{ minRows: 1, maxRows: 8 }} />
+                  </Form.Item>
+                  <Form.Item
+                    label="Mark Q&A as Verified by Human"
+                    layout="horizontal"
+                    name="verified"
+                    valuePropName="checked"
+                    tooltip={
+                      <div className="flex flex-col gap-y-2">
+                        <p>
+                          Answers that are marked verified will appear with a
+                          green &apos;verified&apos; checkmark to students.
+                        </p>
+                        <p>
+                          Incentive: if a future student asks a question that is
+                          similar to this one, they will get this answer and get
+                          reassurance that it was human verified.
+                        </p>
+                      </div>
+                    }
+                  >
+                    <Switch />
+                  </Form.Item>
+                  <Form.Item
+                    label="Mark Q&A as Suggested"
+                    layout="horizontal"
+                    name="suggested"
+                    valuePropName="checked"
+                    tooltip={
+                      <div className="flex flex-col gap-y-2">
+                        <p>
+                          When a student starts a new interaction with the
+                          chatbot, any questions marked as &apos;suggested&apos;
+                          will appear for them to choose if they wish. Upon
+                          clicking a suggested question, they instantly get the
+                          answer that you set here.
+                        </p>
+                        <p>
+                          Incentive: If someone asks a question you think others
+                          might ask and are happy with the answer, you can mark
+                          it as suggested.
+                        </p>
+                      </div>
+                    }
+                  >
+                    <Switch />
+                  </Form.Item>
+                </>
+              ),
+            },
+            {
+              key: 'citations',
+              label: (
+                <span>
+                  Document Citations
+                  <Tooltip title="These are the 'citations' that will be displayed underneath the chatbot answer. Adjusting these does not alter the AI answer itself as it is not re-generated.">
+                    <QuestionCircleOutlined className="ml-1 text-gray-400" />
+                  </Tooltip>
+                </span>
+              ),
+              children: (
+                <ChatbotSelectCitations
+                  courseId={courseId}
+                  selectedDocuments={selectedDocuments}
+                  setSelectedDocuments={setSelectedDocuments}
+                  preloadedDocuments={baseDocuments}
+                />
+              ),
+            },
+            ...(actionsTab != undefined ? [actionsTab] : []),
+          ]}
+        ></Tabs>
+      </Form>
+    </Modal>
+  )
+}
+
+export default UpsertChatbotQuestionModal
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/page.tsx
index f608c643c..7c742fdc9 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/page.tsx
@@ -1,6 +1,15 @@
 'use client'
 
-import { Button, Divider, Input, message, Table, Tooltip } from 'antd'
+import {
+  Button,
+  Collapse,
+  Divider,
+  Input,
+  List,
+  message,
+  Table,
+  Tooltip,
+} from 'antd'
 import {
   ReactElement,
   use,
@@ -12,39 +21,150 @@ import {
 import ExpandableText from '@/app/components/ExpandableText'
 import { getErrorMessage } from '@/app/utils/generalUtils'
 import { useUserInfo } from '@/app/contexts/userContext'
-import EditChatbotQuestionModal from './components/EditChatbotQuestionModal'
-import { EditOutlined } from '@ant-design/icons'
+import UpsertChatbotQuestionModal from './components/UpsertChatbotQuestionModal'
+import { EditOutlined, PlusCircleOutlined } from '@ant-design/icons'
 import Highlighter from 'react-highlight-words'
-import AddChatbotQuestionModal from './components/AddChatbotQuestionModal'
 import { formatDateAndTimeForExcel } from '@/app/utils/timeFormatUtils'
 import { API } from '@/app/api'
 import {
-  ChatbotQuestionResponseChatbotDB,
-  ChatbotQuestionResponseHelpMeDB,
-  InteractionResponse,
+  ChatbotCitationResponse,
+  ChatbotDocumentListResponse,
+  ChatbotDocumentResponse,
   parseThinkBlock,
-  SourceDocument,
 } from '@koh/common'
 import { ThumbsDown, ThumbsUp } from 'lucide-react'
 import ChatbotHelpTooltip from '../components/ChatbotHelpTooltip'
+import {
+  extractWords,
+  mapChatbotDocumentsToListForm,
+  QuestionListItem,
+} from '@/app/(dashboard)/course/[cid]/(settings)/settings/util'
+import CustomPagination from '@/app/(dashboard)/course/[cid]/(settings)/settings/components/CustomPagination'
+import ChatbotListDocumentItem from '@/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotListDocumentItem'
+
+const overrides = `
+:root {
+    --base-white: #ffffff;
+    --base-gray: #fafafa;
+    --base-border: #f4f4f4;
+    --hover-darken: 98%;
+    --border-darken: 95%;
+    --sort-darken: 95%;
+    --darken-per-level: 10%;
+
+    --head-cell: var(--base-gray);
+    --head-cell-border: var(--base-border);
+    --head-cell-hover: color-mix(in srgb, var(--head-cell) var(--hover-darken), white);
+    --head-cell-border-hover: color-mix(in srgb, var(--head-cell-border) var(--hover-darken), black);
+
+    --head-sort-cell: color-mix(in srgb, var(--head-cell) var(--sort-darken), black);
+    --head-sort-cell-border: color-mix(in srgb, var(--head-cell-border) var(--border-darken), black);
+    --head-sort-cell-hover: color-mix(in srgb, var(--head-sort-cell) var(--hover-darken), black);
+    --head-sort-cell-border-hover: color-mix(in srgb, var(--head-sort-cell-border) var(--hover-darken), black);
+
+    --body-cell: var(--base-white);
+    --body-cell-border: color-mix(in srgb, var(--base-white) var(--border-darken), black);
+    --body-cell-hover: color-mix(in srgb, var(--body-cell) var(--hover-darken), black);
+    --body-cell-hover-border: color-mix(in srgb, var(--body-cell-border) var(--hover-darken), black);
+
+    --body-cell-sort: var(--body-cell-hover);
+    --body-cell-sort-border: var(--body-cell-hover-border);
+    --body-cell-sort-hover: color-mix(in srgb, var(--body-cell-sort) var(--hover-darken), black);
+    --body-cell-sort-hover-border: color-mix(in srgb, var(--body-cell-sort-border) var(--hover-darken), black);
+
+    --body-cell-expanded: color-mix(in srgb, var(--body-cell) var(--sort-darken), black);
+    --body-cell-expanded-border: color-mix(in srgb, var(--body-cell-border) var(--sort-darken), black);
+    --body-cell-expanded-hover: color-mix(in srgb, var(--body-cell-expanded) var(--hover-darken), black);
+    --body-cell-expanded-hover-border: color-mix(in srgb, var(--body-cell-expanded-border) var(--hover-darken), black);
 
-export interface ChatbotQuestionFrontend {
-  key: string
-  vectorStoreId: string
-  helpMeId?: number
-  question: string
-  answer: string
-  verified?: boolean
-  sourceDocuments: SourceDocument[]
-  suggested: boolean
-  userScore?: number
-  inserted?: boolean
-  createdAt: Date | null
-  timesAsked?: number | null
-  children?: ChatbotQuestionFrontend[] // this is needed by antd table for grouping interactions.
-  isChild?: boolean
+    --body-cell-expanded-sort: var(--body-cell-expanded-hover);
+    --body-cell-expanded-sort-border: var(--body-cell-expanded-hover-border);
+    --body-cell-expanded-sort-hover: color-mix(in srgb, var(--body-cell-expanded-sort) var(--hover-darken), black);
+    --body-cell-expanded-sort-hover-border: color-mix(in srgb, var(--body-cell-expanded-sort-border) var(--hover-darken), black);
 }
 
+.ant-table-wrapper table {
+    border-collapse: separate;
+}
+
+.ant-table-wrapper .ant-table-thead > tr > th {
+    background: var(--head-cell) !important;
+    border: 1px solid var(--head-cell-border) !important;
+}
+
+.ant-table-wrapper .ant-table-thead > tr > th:hover {
+    background: var(--head-cell-hover) !important;
+    border: 1px solid var(--head-cell-border-hover) !important;
+}
+
+.ant-table-wrapper .ant-table-thead th.ant-table-column-sort {
+    background: var(--head-sort-cell) !important;
+    border: 1px solid var(--head-sort-cell-border) !important;
+}
+
+.ant-table-wrapper .ant-table-thead th.ant-table-column-sort:hover {
+    background: var(--head-sort-cell-hover) !important;
+    border: 1px solid var(--head-sort-cell-border-hover) !important;
+}
+
+.ant-table-wrapper tr {
+    background: var(--body-cell) !important;
+    transition: all 0.2s ease;
+}
+
+.ant-table-wrapper tr td {
+    border: 1px solid var(--body-cell-border) !important;
+}
+
+.ant-table-wrapper tr:hover {
+    background: var(--body-cell-hover) !important;
+}
+
+.ant-table-wrapper tr:hover td {
+    border: 1px solid var(--body-cell-hover-border) !important;
+}
+
+.ant-table-wrapper tr.expanded-row {
+    background: var(--body-cell-expanded) !important;
+}
+
+.ant-table-wrapper tr.expanded-row:hover {
+    background: var(--body-cell-expanded-hover) !important;
+}
+
+.ant-table-row td.ant-table-column-sort {
+    background: var(--body-cell-sort) !important;
+    border: 1px solid var(--body-cell-sort-border) !important;
+}
+
+.ant-table-row:hover td.ant-table-column-sort {
+    background: var(--body-cell-sort-hover) !important;
+    border: 1px solid var(--body-cell-sort-hover-border) !important;
+}
+
+.ant-table-wrapper tr.expanded-row td {
+    border: 1px solid var(--body-cell-expanded-border) !important;
+}
+
+.ant-table-wrapper tr.expanded-row:hover td {
+    border: 1px solid var(--body-cell-expanded-sort-hover-border) !important;
+}
+
+.ant-table-row.expanded-row .ant-table-column-sort {
+    background: var(--body-cell-expanded-sort) !important;
+    border: 1px solid var(--body-cell-expanded-sort-border) !important;
+}
+
+.ant-table-row.expanded-row:hover .ant-table-column-sort {
+    background: var(--body-cell-expanded-sort-hover) !important;
+    border: 1px solid var(--body-cell-expanded-sort-hover-border) !important;
+}
+
+.ant-table-wrapper tr.expanded-row td:first-of-type {
+    border-inline-start: 4px solid rgb(54 132 196) !important;
+}
+`
+
 type ChatbotQuestionsProps = {
   params: Promise<{ cid: string }>
 }
@@ -54,27 +174,23 @@ export default function ChatbotQuestions(
 ): ReactElement {
   const params = use(props.params)
   const courseId = Number(params.cid)
-  const [addModelOpen, setAddModelOpen] = useState(false)
   const { userInfo } = useUserInfo()
   const [search, setSearch] = useState('')
-  const [editingRecord, setEditingRecord] =
-    useState<ChatbotQuestionFrontend | null>(null)
-  const [editRecordModalOpen, setEditRecordModalOpen] = useState(false)
-  const [questions, setQuestions] = useState<ChatbotQuestionFrontend[]>([])
-  const [existingDocuments, setExistingDocuments] = useState<SourceDocument[]>(
-    [],
-  )
+  const [page, setPage] = useState(1)
+  const [editingRecord, setEditingRecord] = useState<QuestionListItem>()
+  const [upsertModalOpen, setUpsertModalOpen] = useState(false)
+
+  const [questions, setQuestions] = useState<QuestionListItem[]>([])
   const [dataLoading, setDataLoading] = useState(false)
 
   // choosing to manually control which antd table rows are expanded so that we can expand all children conversations when they click "show conversations"
   const [expandedRowKeys, setExpandedRowKeys] = useState<string[]>([])
-  const handleRowExpand = (record: ChatbotQuestionFrontend) => {
+  const handleRowExpand = (record: QuestionListItem) => {
     let keys = [...expandedRowKeys]
     const parentKey = record.key
     const childKeys = record.children
-      ? record.children.map((child) => child.key)
+      ? record.children.map((child: QuestionListItem) => child.key)
       : []
-
     if (keys.includes(parentKey)) {
       // already expanded, so collapse parent and remove its children
       keys = keys.filter((key) => key !== parentKey && !childKeys.includes(key))
@@ -91,44 +207,33 @@ export default function ChatbotQuestions(
     }
     return questions.filter((question) => {
       return (
-        question.question.toLowerCase().includes(search.toLowerCase()) ||
-        question.answer.toLowerCase().includes(search.toLowerCase()) ||
+        question.chatbotQuestion.question
+          .toLowerCase()
+          .includes(search.toLowerCase()) ||
+        question.chatbotQuestion.answer
+          .toLowerCase()
+          .includes(search.toLowerCase()) ||
         question.children?.some(
           (q) =>
-            q.question.toLowerCase().includes(search.toLowerCase()) ||
-            q.answer.toLowerCase().includes(search.toLowerCase()),
+            q.chatbotQuestion.question
+              .toLowerCase()
+              .includes(search.toLowerCase()) ||
+            q.chatbotQuestion.answer
+              .toLowerCase()
+              .includes(search.toLowerCase()),
         )
       )
     })
   }, [search, questions])
 
-  useEffect(() => {
-    API.chatbot.staffOnly
-      .getAllAggregateDocuments(courseId)
-      .then((res) => {
-        const formattedDocuments = res.map((doc) => ({
-          key: doc.id,
-          docId: doc.id,
-          docName: doc.pageContent,
-          pageContent: doc.pageContent,
-          sourceLink: doc.metadata?.source || '',
-          pageNumbers: doc.metadata?.loc ? [doc.metadata.loc.pageNumber] : [],
-        }))
-        setExistingDocuments(formattedDocuments)
-      })
-      .catch((e) => {
-        message.error('Failed to fetch documents: ' + getErrorMessage(e))
-      })
-  }, [courseId])
-
   const columns: any[] = [
     {
       title: 'Question',
-      dataIndex: 'question',
+      dataIndex: ['chatbotQuestion', 'question'],
       key: 'question',
-      sorter: (a: ChatbotQuestionFrontend, b: ChatbotQuestionFrontend) => {
-        const A = a.question || ''
-        const B = b.question || ''
+      sorter: (a: QuestionListItem, b: QuestionListItem) => {
+        const A = a.chatbotQuestion.question || ''
+        const B = b.chatbotQuestion.question || ''
         return A.localeCompare(B)
       },
       render: (text: string) => (
@@ -150,12 +255,12 @@ export default function ChatbotQuestions(
     },
     {
       title: 'Answer',
-      dataIndex: 'answer',
+      dataIndex: ['chatbotQuestion', 'answer'],
       key: 'answer',
       width: 600,
-      sorter: (a: ChatbotQuestionFrontend, b: ChatbotQuestionFrontend) => {
-        const A = a.answer || ''
-        const B = b.answer || ''
+      sorter: (a: QuestionListItem, b: QuestionListItem) => {
+        const A = a.chatbotQuestion.answer || ''
+        const B = b.chatbotQuestion.answer || ''
         return A.localeCompare(B)
       },
       render: (text: string) => {
@@ -197,67 +302,51 @@ export default function ChatbotQuestions(
     },
     {
       title: 'Document Citations',
-      dataIndex: 'sourceDocuments',
-      key: 'sourceDocuments',
-      render: (sourceDocuments: SourceDocument[]) => {
-        return (
-          <ExpandableText maxRows={3}>
-            <div className="flex flex-col gap-1">
-              {sourceDocuments.map((doc, index) => (
-                <div
-                  className="flex w-fit max-w-[260px] flex-col overflow-hidden rounded-xl bg-slate-100 p-2"
-                  key={index}
-                >
-                  <div className="truncate font-semibold">
-                    {doc.sourceLink ? (
-                      <a
-                        href={doc.sourceLink}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                      >
-                        {doc.docName}
-                      </a>
-                    ) : (
-                      <span>{doc.docName}</span>
-                    )}
-                  </div>
-                  <div className="mt-1 flex gap-1 text-xs">
-                    {doc.pageNumber ? (
-                      <div
-                        key={`${doc.docName}-${doc.pageNumber}`}
-                        className="whitespace-nowrap"
-                      >
-                        p.{doc.pageNumber}
-                      </div>
-                    ) : (
-                      <></>
-                    )}
-                  </div>
-                  <div className="mt-1 flex flex-wrap gap-1 text-xs">
-                    {doc.type ? <></> : <span>{doc.content}</span>}
-                  </div>
-                </div>
-              ))}
-            </div>
-          </ExpandableText>
+      dataIndex: ['chatbotQuestion', 'citations'],
+      key: 'citations',
+      onCell: (record: any) => {
+        return {
+          className:
+            record.chatbotQuestion?.citations?.length > 0
+              ? '[&:not(th)]:p-0 [&:not(th)]:flex [&:not(th)]:flex-col [&:not(th)]:items-start'
+              : undefined,
+        }
+      },
+      render: (citations: ChatbotCitationResponse[]) => {
+        return citations?.length > 0 ? (
+          <Collapse
+            bordered={false}
+            className={'min-w-48 max-w-48'}
+            items={[
+              {
+                key: 'citations',
+                label: `View Citations`,
+                children: <CitationList citations={citations} />,
+              },
+            ]}
+          />
+        ) : (
+          <div className={'flex h-full w-full flex-grow p-2 text-center'}>
+            <p>No Citations</p>
+          </div>
         )
       },
     },
     {
       title: 'Verified',
-      dataIndex: 'verified',
+      dataIndex: ['chatbotQuestion', 'verified'],
       key: 'verified',
-      sorter: (a: ChatbotQuestionFrontend, b: ChatbotQuestionFrontend) => {
-        const A = a.verified ? 1 : 0
-        const B = b.verified ? 1 : 0
+      sorter: (a: QuestionListItem, b: QuestionListItem) => {
+        const A = a.chatbotQuestion.verified ? 1 : 0
+        const B = b.chatbotQuestion.verified ? 1 : 0
         return B - A
       },
       filters: [
         { text: 'Verified', value: true },
         { text: 'Unverified', value: false },
       ],
-      onFilter: (value: boolean, record: ChatbotQuestionFrontend) =>
-        record.verified === value || record.isChild,
+      onFilter: (value: boolean, record: QuestionListItem) =>
+        record.chatbotQuestion.verified === value || record.isChild,
       render: (verified: boolean) => (
         <Tooltip
           title={
@@ -277,19 +366,19 @@ export default function ChatbotQuestions(
     {
       // the dash was put there so that it would line-break (horizontal space is really valuable for this table)
       title: 'Sugg-ested',
-      dataIndex: 'suggested',
+      dataIndex: ['chatbotQuestion', 'suggested'],
       key: 'suggested',
-      sorter: (a: ChatbotQuestionFrontend, b: ChatbotQuestionFrontend) => {
-        const A = a.suggested ? 1 : 0
-        const B = b.suggested ? 1 : 0
+      sorter: (a: QuestionListItem, b: QuestionListItem) => {
+        const A = a.chatbotQuestion.suggested ? 1 : 0
+        const B = b.chatbotQuestion.suggested ? 1 : 0
         return B - A
       },
       filters: [
         { text: 'Suggested', value: true },
         { text: 'Not Suggested', value: false },
       ],
-      onFilter: (value: boolean, record: ChatbotQuestionFrontend) =>
-        record.suggested === value || record.isChild,
+      onFilter: (value: boolean, record: QuestionListItem) =>
+        record.chatbotQuestion.suggested === value || record.isChild,
       render: (suggested: boolean) => (
         <Tooltip
           title={
@@ -311,7 +400,7 @@ export default function ChatbotQuestions(
       dataIndex: 'timesAsked',
       key: 'timesAsked',
       width: 50,
-      sorter: (a: ChatbotQuestionFrontend, b: ChatbotQuestionFrontend) => {
+      sorter: (a: QuestionListItem, b: QuestionListItem) => {
         const A = a.timesAsked ?? 0
         const B = b.timesAsked ?? 0
         return A - B
@@ -319,10 +408,10 @@ export default function ChatbotQuestions(
     },
     {
       title: 'User Score',
-      dataIndex: 'userScore',
+      dataIndex: ['chatbotQuestion', 'userScore'],
       key: 'userScore',
       width: 50,
-      sorter: (a: ChatbotQuestionFrontend, b: ChatbotQuestionFrontend) => {
+      sorter: (a: QuestionListItem, b: QuestionListItem) => {
         const A = a.userScore ?? 0
         const B = b.userScore ?? 0
         return A - B
@@ -386,13 +475,18 @@ export default function ChatbotQuestions(
     },
     {
       title: 'Last Asked',
-      dataIndex: 'createdAt',
+      dataIndex: 'timestamp',
       key: 'createdAt',
       defaultSortOrder: 'descend',
       width: 90,
-      sorter: (a: ChatbotQuestionFrontend, b: ChatbotQuestionFrontend) => {
-        const A = a.createdAt && !a.isChild ? a.createdAt.getTime() : 0
-        const B = b.createdAt && !b.isChild ? b.createdAt.getTime() : 0
+      className: '',
+      sorter: (a: QuestionListItem, b: QuestionListItem) => {
+        a.timestamp =
+          a.timestamp != undefined ? new Date(a.timestamp) : undefined
+        b.timestamp =
+          b.timestamp != undefined ? new Date(b.timestamp) : undefined
+        const A = !a.isChild ? (a.timestamp?.getTime() ?? 0) : 0
+        const B = !b.isChild ? (b.timestamp?.getTime() ?? 0) : 0
         return A - B
       },
       render: (createdAt: Date) => formatDateAndTimeForExcel(createdAt),
@@ -400,7 +494,7 @@ export default function ChatbotQuestions(
     {
       key: 'actions',
       width: 50,
-      render: (_: any, record: ChatbotQuestionFrontend) => (
+      render: (_: any, record: QuestionListItem) => (
         <div className="flex flex-col items-center justify-center gap-2">
           <Button
             onClick={() => showEditModal(record)}
@@ -411,26 +505,29 @@ export default function ChatbotQuestions(
     },
   ]
 
-  const showEditModal = (record: ChatbotQuestionFrontend) => {
+  const showEditModal = (record: QuestionListItem) => {
     setEditingRecord(record)
-    setEditRecordModalOpen(true)
+    setUpsertModalOpen(true)
   }
 
   const getQuestions = useCallback(async () => {
     setDataLoading(true)
-    // NOTE
-    // We store the chatbot questions in two separate backends for some reason
-    // the helpme database stores interactions and has duplicate questions and userScores
-    // the chatbot database stores .sourceDocuments and .verified and .inserted (AND is the only one updated when a question is edited AND is where added questions from AddChatbotQuestionModal go)
-    // we need to fetch both and merge them
-    // this becomes a really hard problem especially if you consider how the first question in an interaction can be a duplicate but subsequent questions can be different
     try {
-      const { helpmeDB, chatbotDB } =
+      const questions =
         await API.chatbot.staffOnly.getInteractionsAndQuestions(courseId)
 
-      const processedQuestions = processQuestions(helpmeDB, chatbotDB)
+      function applyKey(question: QuestionListItem, base: string = '') {
+        question.key =
+          question.id >= 0
+            ? `${base}${question.id}`
+            : `${base}${question.vectorStoreId}`
+        if (question.children && question.children.length > 0) {
+          question.children.forEach((c) => applyKey(c, `${question.key}-`))
+        }
+      }
+      ;(questions as any[]).forEach((q) => applyKey(q))
 
-      setQuestions(processedQuestions)
+      setQuestions(questions as QuestionListItem[])
     } catch (e) {
       const errorMessage = getErrorMessage(e)
       message.error('Failed to fetch questions: ' + errorMessage)
@@ -456,34 +553,25 @@ export default function ChatbotQuestions(
 
   return (
     <div className="md:mr-2">
+      <style>{overrides}</style>
       <title>{`HelpMe | Editing ${userInfo.courses.find((e) => e.course.id === courseId)?.course.name ?? ''} Chatbot Questions`}</title>
       {/* Tailwind color classes used (this will ensure the tailwind parser sees these classes being used and doesn't remove them): 
           bg-green-100 bg-green-200 bg-green-300 bg-green-400 bg-green-500 bg-green-600 bg-green-700 bg-green-800
           bg-red-100 bg-red-200 bg-red-300 bg-red-400 bg-red-500 bg-red-600 bg-red-700 bg-red-800
       */}
-      <AddChatbotQuestionModal
-        open={addModelOpen}
+      <UpsertChatbotQuestionModal
+        open={upsertModalOpen}
         courseId={courseId}
-        existingDocuments={existingDocuments}
-        onCancel={() => setAddModelOpen(false)}
-        onAddSuccess={() => {
-          getQuestions()
-          setAddModelOpen(false)
+        editingRecord={editingRecord}
+        onCancel={() => {
+          setUpsertModalOpen(false)
+          setEditingRecord(undefined)
+        }}
+        deleteQuestion={deleteQuestion}
+        onUpsert={() => {
+          setUpsertModalOpen(false)
         }}
       />
-      {editingRecord && (
-        <EditChatbotQuestionModal
-          open={editRecordModalOpen}
-          cid={courseId}
-          editingRecord={editingRecord}
-          onCancel={() => setEditRecordModalOpen(false)}
-          onSuccessfulUpdate={() => {
-            getQuestions()
-            setEditRecordModalOpen(false)
-          }}
-          deleteQuestion={deleteQuestion}
-        />
-      )}
       <div className="flex w-full items-center justify-between">
         <div className="flex-1">
           <h3 className="m-0 p-0 text-4xl font-bold text-gray-900">
@@ -505,18 +593,37 @@ export default function ChatbotQuestions(
             }}
             onPressEnter={getQuestions}
           />
-          <Button onClick={() => setAddModelOpen(true)}>Add Question</Button>
+          <Button
+            icon={<PlusCircleOutlined />}
+            onClick={() => {
+              setUpsertModalOpen(true)
+              setEditingRecord(undefined)
+            }}
+          >
+            Add Question
+          </Button>
         </div>
       </div>
       <Divider className="my-3" />
-      <Table
+      <Table<QuestionListItem>
         columns={columns}
         bordered
         size="small"
+        pagination={{
+          current: page,
+          total: filteredQuestions.length,
+          pageSize: 10,
+          onChange: (page) => {
+            setPage(page)
+          },
+          showSizeChanger: false,
+        }}
         dataSource={filteredQuestions}
         loading={filteredQuestions.length === 0 && dataLoading}
+        rowHoverable={false}
         expandable={{
           expandedRowKeys: expandedRowKeys,
+          expandedRowClassName: 'expanded-row',
           expandIcon: ({ expanded, record }) =>
             !record.children ? null : !record.children[0].children ? (
               expanded ? (
@@ -566,248 +673,55 @@ export default function ChatbotQuestions(
     </div>
   )
 }
-function mergeChatbotQuestions(
-  helpMeQuestion?: ChatbotQuestionResponseHelpMeDB | null,
-  chatbotQuestion?: ChatbotQuestionResponseChatbotDB | null,
-  timesAsked?: number | null,
-  children?: ChatbotQuestionFrontend[],
-  isChild?: boolean,
-  userScore?: number,
-): ChatbotQuestionFrontend {
-  return {
-    // key must be unique for each row in the table (otherwise weird react re-render things happen)
-    key:
-      (helpMeQuestion?.vectorStoreId ?? '') +
-      helpMeQuestion?.id.toString() +
-      (children && children.length > 0 ? children[0].key : '') +
-      (isChild ? 'child' : ''),
-    vectorStoreId: helpMeQuestion?.vectorStoreId ?? '', // should be guaranteed to exist
-    helpMeId: helpMeQuestion?.id || -1,
-    question:
-      chatbotQuestion?.pageContent ?? helpMeQuestion?.questionText ?? 'error', // chatbot database question takes precedence (in general) since when you edit a question, you only edit it on chatbot database
-    answer:
-      chatbotQuestion?.metadata.answer ??
-      helpMeQuestion?.responseText ??
-      'error',
-    verified: chatbotQuestion?.metadata.verified, // helpme database does not have verified
-    sourceDocuments: chatbotQuestion?.metadata.sourceDocuments ?? [], // helpme database does not have sourceDocuments
-    suggested:
-      chatbotQuestion?.metadata.suggested ?? helpMeQuestion?.suggested ?? false,
-    inserted: chatbotQuestion?.metadata.inserted, // helpme database does not have inserted
-    createdAt: helpMeQuestion?.timestamp
-      ? new Date(
-          helpMeQuestion.timestamp, // prioritize the helpme database for this one (since it stores duplicates n stuff)
-        )
-      : chatbotQuestion?.metadata.timestamp
-        ? new Date(chatbotQuestion.metadata.timestamp)
-        : null,
-    userScore,
-    timesAsked,
-    children,
-    isChild,
-  }
-}
-
-function processQuestions(
-  interactions: InteractionResponse[],
-  allQuestionsData: ChatbotQuestionResponseChatbotDB[],
-): ChatbotQuestionFrontend[] {
-  //
-  // The Join
-  //
-  // We need to process and merge the questions from chatbot and helpme db (in unfortunately O(n^2) time, since we basically need to manually join each chatbot question with helpme question via vectorStoreId)
-  // (there are basically 0 to many helpme db questions for each chatbot db question)
-  const processedQuestions: ChatbotQuestionFrontend[] = []
-  for (const chatbotQuestion of allQuestionsData) {
-    // for each chatbot question, find ALL interactions that have this chatbot question
-    for (const tempInteraction of interactions) {
-      if (
-        !tempInteraction.questions ||
-        tempInteraction.questions.length === 0
-      ) {
-        continue
-      }
-
-      // cycle through all the questions interactions
-      let hasAlreadyBeenAdded = false
-      for (const helpMeQuestion of tempInteraction.questions) {
-        if (helpMeQuestion.vectorStoreId === chatbotQuestion.id) {
-          // a match
-          if (!hasAlreadyBeenAdded) {
-            // to not add the same interaction multiple times
-            if (!chatbotQuestion.interactionsWithThisQuestion) {
-              chatbotQuestion.interactionsWithThisQuestion = []
-            }
-            chatbotQuestion.interactionsWithThisQuestion.push(tempInteraction)
-            hasAlreadyBeenAdded = true
-          }
-          if (
-            !chatbotQuestion.mostRecentlyAskedHelpMeVersion ||
-            chatbotQuestion.mostRecentlyAskedHelpMeVersion.timestamp <
-              helpMeQuestion.timestamp
-          ) {
-            chatbotQuestion.mostRecentlyAskedHelpMeVersion = helpMeQuestion
-          }
-
-          // this will modify the original question object
-          chatbotQuestion.timesAsked = (chatbotQuestion.timesAsked ?? 0) + 1
-          helpMeQuestion.correspondingChatbotQuestion = chatbotQuestion // the join
-          chatbotQuestion.userScoreTotal =
-            (chatbotQuestion.userScoreTotal ?? 0) + helpMeQuestion.userScore
-        }
-      }
-    }
-  }
-
-  //
-  // Formatting the data nicely for the antd table
-  //
-  // this is something like O(n) time since it's just looping over the processed chatbot questions and all of their interactions
-  for (const chatbotQuestion of allQuestionsData) {
-    const timesAsked = chatbotQuestion.timesAsked
-    const mostRecentlyAskedHelpMeVersion =
-      chatbotQuestion.mostRecentlyAskedHelpMeVersion
-    const interactionsWithThisQuestion =
-      chatbotQuestion.interactionsWithThisQuestion ?? []
-    if (interactionsWithThisQuestion.length === 0) {
-      // if there was no corresponding interaction found (e.g. it was a manually added question or anytime question), return what we can
-      processedQuestions.push({
-        key: chatbotQuestion.id,
-        vectorStoreId: chatbotQuestion.id,
-        question: chatbotQuestion.pageContent,
-        answer: chatbotQuestion.metadata.answer,
-        verified: chatbotQuestion.metadata.verified,
-        sourceDocuments: chatbotQuestion.metadata.sourceDocuments ?? [],
-        suggested: chatbotQuestion.metadata.suggested,
-        inserted: chatbotQuestion.metadata.inserted,
-        createdAt: chatbotQuestion.metadata.timestamp
-          ? new Date(chatbotQuestion.metadata.timestamp)
-          : null,
-        timesAsked,
-      })
-    }
 
-    // Now for the children (if you give an antd table item a list of children, it will auto-create sub rows for them):
-    // - if if there are more than 1 interaction for this chatbot question, it will first show the chatbot question and then its children will be all the interactions (children) and their children will be all the questions (grandchildren)
-    // - if there is only 1 interaction for this chatbot question, it will be the first question and its children will be all the other questions in the interaction
-    if (interactionsWithThisQuestion.length > 1) {
-      const children = []
-      for (const interaction of interactionsWithThisQuestion) {
-        // if the interaction is only a single question long, don't add it (since the parent table item *is* this question)
-        if (!interaction.questions || interaction.questions.length <= 1) {
-          continue
-        }
-        const grandchildren = []
-        for (let i = 1; i < interaction.questions.length; i++) {
-          const childHelpMeQuestion = interaction.questions[i]
-          if (!childHelpMeQuestion) {
-            continue
-          }
-
-          grandchildren.push(
-            mergeChatbotQuestions(
-              childHelpMeQuestion,
-              childHelpMeQuestion.correspondingChatbotQuestion,
-              null, // timesAsked is null since its not really helpful information to show in this case
-              undefined,
-              true,
-              chatbotQuestion !==
-                childHelpMeQuestion.correspondingChatbotQuestion
-                ? childHelpMeQuestion.correspondingChatbotQuestion
-                    ?.userScoreTotal
-                : undefined,
-            ),
-          )
-        }
-        grandchildren.sort((a, b) => {
-          const aTime = a.createdAt?.getTime() ?? 0
-          const bTime = b.createdAt?.getTime() ?? 0
-          return aTime - bTime // ascending order
-        })
-
-        // for each child, they are the first question in an interaction and all of their children are the rest of the questions in the interaction
-        children.push(
-          mergeChatbotQuestions(
-            interaction.questions[0],
-            interaction.questions[0].correspondingChatbotQuestion,
-            null,
-            grandchildren.length > 0 ? grandchildren : undefined,
-            true,
-            chatbotQuestion !==
-              interaction.questions[0].correspondingChatbotQuestion
-              ? interaction.questions[0].correspondingChatbotQuestion
-                  ?.userScoreTotal
-              : undefined,
-          ),
-        )
-      }
-
-      children.sort((a, b) => {
-        const aTime = a.createdAt?.getTime() ?? 0
-        const bTime = b.createdAt?.getTime() ?? 0
-        return bTime - aTime // descending order
-      })
-      // finally add on the question and all of its children
-      processedQuestions.push(
-        mergeChatbotQuestions(
-          mostRecentlyAskedHelpMeVersion, // the mostRecentlyAskedHelpMeVersion is just to grab the createdAt date for it
-          chatbotQuestion,
-          timesAsked,
-          children.length > 0 ? children : undefined,
-          false,
-          chatbotQuestion.userScoreTotal,
-        ),
-      )
-    } else if (interactionsWithThisQuestion.length === 1) {
-      // now for case if there is only 1 interaction for this chatbot db question
-      const interaction = interactionsWithThisQuestion[0]
-      if (
-        !interaction.questions ||
-        interaction.questions.length === 0 ||
-        interaction.questions[0].vectorStoreId !== chatbotQuestion.id // don't show the interaction if it doesn't have the chatbot db question as the first question (to avoid duplicates)
-      ) {
-        continue
-      }
+const CitationList: React.FC<{
+  citations: ChatbotCitationResponse[]
+}> = ({ citations }) => {
+  const documents = useMemo(
+    () =>
+      citations
+        .map((v) => v.document)
+        .filter((d) => d != undefined) as ChatbotDocumentResponse[],
+    [citations],
+  )
+  const [pageSize] = useState(3)
+  const [page, setPage] = useState(1)
+  const inDocumentListForm = useMemo(
+    () => mapChatbotDocumentsToListForm(documents),
+    [documents],
+  )
+  const numPages = useMemo(
+    () => Math.ceil(inDocumentListForm.length / pageSize),
+    [inDocumentListForm, pageSize],
+  )
 
-      // make the children all the other questions in the interaction
-      const children = []
-      if (interaction.questions.length > 1) {
-        for (let i = 1; i < interaction.questions.length; i++) {
-          const childHelpMeQuestion = interaction.questions[i]
-          if (!childHelpMeQuestion) {
-            continue
-          }
+  const contentWordMap = useMemo(() => {
+    const rec: Record<string, string[]> = {}
+    documents.forEach((d) => (rec[d.id] = extractWords(d.content)))
+    return rec
+  }, [documents])
 
-          children.push(
-            mergeChatbotQuestions(
-              childHelpMeQuestion,
-              childHelpMeQuestion.correspondingChatbotQuestion,
-              null,
-              undefined,
-              true,
-              childHelpMeQuestion.correspondingChatbotQuestion?.userScoreTotal,
-            ),
-          )
-        }
-      }
-      children.sort((a, b) => {
-        const aTime = a.createdAt?.getTime() ?? 0
-        const bTime = b.createdAt?.getTime() ?? 0
-        return aTime - bTime // ascending order
-      })
+  const paginatedDocuments = useMemo(
+    () => inDocumentListForm.slice((page - 1) * pageSize, page * pageSize),
+    [inDocumentListForm, page, pageSize],
+  )
 
-      // finally add on the question and all of its children
-      processedQuestions.push(
-        mergeChatbotQuestions(
-          interaction.questions[0],
-          chatbotQuestion,
-          timesAsked,
-          children.length > 0 ? children : undefined,
-          false,
-          chatbotQuestion.userScoreTotal,
-        ),
-      )
-    }
-  }
-  return processedQuestions
+  return (
+    <>
+      <List<ChatbotDocumentListResponse>
+        dataSource={paginatedDocuments}
+        pagination={false}
+        renderItem={(citation: ChatbotDocumentListResponse) => (
+          <ChatbotListDocumentItem
+            listDocument={citation}
+            contentWordMap={contentWordMap}
+            mode={'column'}
+            size={'small'}
+            pageSize={5}
+          />
+        )}
+      />
+      <CustomPagination page={page} numPages={numPages} onChange={setPage} />
+    </>
+  )
 }
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
index 36a09805b..0e609e3b6 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
@@ -1,20 +1,11 @@
 'use client'
 
 import {
-  ExclamationCircleFilled,
   FileAddOutlined,
   GithubOutlined,
   UploadOutlined,
 } from '@ant-design/icons'
-import {
-  Form,
-  Input,
-  message,
-  Modal,
-  Popconfirm,
-  Segmented,
-  Switch,
-} from 'antd'
+import { Form, Input, message, Modal, Segmented, Switch } from 'antd'
 import Dragger from 'antd/es/upload/Dragger'
 import { useState } from 'react'
 import { RcFile } from 'antd/lib/upload'
@@ -27,14 +18,14 @@ interface AddChatbotDocumentModalProps {
   courseId: number
   open: boolean
   onClose: () => void
-  getDocuments: () => void
+  getDocumentsProxy: () => void
 }
 
 const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
   courseId,
   open,
   onClose,
-  getDocuments,
+  getDocumentsProxy,
 }) => {
   const [documentType, setDocumentType] = useState('FILE')
   const [loading, setLoading] = useState(false)
@@ -62,7 +53,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
   const handleSuccess = () => {
     setFileList([])
     form.resetFields()
-    getDocuments()
+    getDocumentsProxy()
     onClose()
   }
 
@@ -101,7 +92,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
           )
         } else {
           // success
-          getDocuments()
+          getDocumentsProxy()
           // remove the file from the list
           setFileList((prevFileList) =>
             prevFileList.filter((f) => f.uid !== file.uid),
@@ -139,7 +130,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
 
   const addUrl = async (url: string) => {
     await API.chatbot.staffOnly
-      .addDocumentFromGithub(courseId, url)
+      .addDocumentFromURL(courseId, url)
       .then(async () => {
         message.success('File successfully uploaded')
         handleSuccess()
@@ -153,6 +144,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
 
   return (
     <Modal
+      centered
       title={
         <div className="flex items-center gap-2">
           <FileAddOutlined />
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/ChatbotSettingsModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/ChatbotSettingsModal.tsx
index 48c863e04..f0f26f01f 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/ChatbotSettingsModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/ChatbotSettingsModal.tsx
@@ -8,7 +8,6 @@ import {
   message,
   Modal,
   Select,
-  Space,
   Tooltip,
 } from 'antd'
 import {
@@ -250,6 +249,7 @@ const ChatbotSettingsModal: React.FC<ChatbotSettingsModalProps> = ({
         }
       `}</style>
       <Modal
+        centered
         title={
           <div className="flex items-center gap-2">
             <SettingOutlined />
@@ -264,7 +264,34 @@ const ChatbotSettingsModal: React.FC<ChatbotSettingsModalProps> = ({
         }
         open={open}
         onCancel={onClose}
-        footer={null}
+        footer={
+          <>
+            <Tooltip
+              title={
+                areParamsDefault &&
+                'All parameters are already their default value.'
+              }
+            >
+              <Button
+                onClick={handleReset}
+                loading={isLoadingData || isPerformingAction}
+                disabled={areParamsDefault}
+              >
+                Reset to default settings
+              </Button>
+            </Tooltip>
+            <Tooltip title={!haveSettingsChanged && 'No changes detected.'}>
+              <Button
+                type="primary"
+                htmlType="submit"
+                loading={isLoadingData || isPerformingAction}
+                disabled={!haveSettingsChanged}
+              >
+                Update settings
+              </Button>
+            </Tooltip>
+          </>
+        }
       >
         <Form
           form={form}
@@ -620,33 +647,6 @@ const ChatbotSettingsModal: React.FC<ChatbotSettingsModalProps> = ({
               </div>
             </Form.Item>
           </div>
-
-          <Space className="flex justify-end">
-            <Tooltip
-              title={
-                areParamsDefault &&
-                'All parameters are already their default value.'
-              }
-            >
-              <Button
-                onClick={handleReset}
-                loading={isLoadingData || isPerformingAction}
-                disabled={areParamsDefault}
-              >
-                Reset to default settings
-              </Button>
-            </Tooltip>
-            <Tooltip title={!haveSettingsChanged && 'No changes detected.'}>
-              <Button
-                type="primary"
-                htmlType="submit"
-                loading={isLoadingData || isPerformingAction}
-                disabled={!haveSettingsChanged}
-              >
-                Update settings
-              </Button>
-            </Tooltip>
-          </Space>
         </Form>
       </Modal>
     </>
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/EditChatbotDocumentModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/EditChatbotDocumentModal.tsx
new file mode 100644
index 000000000..758476619
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/EditChatbotDocumentModal.tsx
@@ -0,0 +1,142 @@
+import {
+  ChatbotDocumentAggregateResponse,
+  UpdateDocumentAggregateBody,
+} from '@koh/common'
+import { Form, Input, message, Modal, Tooltip } from 'antd'
+import { InfoCircleOutlined } from '@ant-design/icons'
+import { useCallback, useEffect, useMemo, useState } from 'react'
+
+type EditChatbotDocumentModalProps = {
+  editingDocument: ChatbotDocumentAggregateResponse
+  updateDocument: (id: string, props: UpdateDocumentAggregateBody) => void
+  onCancel: () => void
+}
+
+const EditingChatbotDocumentModal: React.FC<EditChatbotDocumentModalProps> = ({
+  editingDocument,
+  updateDocument,
+  onCancel,
+}) => {
+  const [form] = Form.useForm<UpdateDocumentAggregateBody>()
+  const [canUpdateSource, setCanUpdateSource] = useState(true)
+
+  const initialValues = useMemo(() => {
+    const vals: Record<string, any> = {}
+    Object.entries(editingDocument)
+      .filter(([key]) => ['title', 'source'].includes(key))
+      .map(([k, v]) => (vals[k] = v))
+    if (vals['source'] && vals['source'].startsWith('/')) {
+      setCanUpdateSource(false)
+    }
+    return vals
+  }, [editingDocument])
+
+  const resetForm = useCallback(() => {
+    form.resetFields()
+    form.setFieldsValue(initialValues)
+  }, [form, initialValues])
+
+  useEffect(() => {
+    resetForm()
+  }, [initialValues, resetForm])
+
+  return (
+    <>
+      <style>{`
+        .ant-form-item .ant-form-item-label > label {
+          width: 100%;
+        }
+      `}</style>
+      <Modal
+        open={editingDocument != undefined}
+        centered
+        title={
+          <div className="flex items-center justify-start gap-x-3">
+            <div>Edit Document</div>
+          </div>
+        }
+        okText={'Save Changes'}
+        cancelText={'Cancel'}
+        okButtonProps={{
+          autoFocus: true,
+          htmlType: 'submit',
+        }}
+        onOk={() => {
+          form
+            .validateFields()
+            .then((values) => updateDocument(editingDocument.id, values))
+            .catch((err) => message.error(err))
+        }}
+        onCancel={() => {
+          onCancel()
+          resetForm()
+        }}
+        destroyOnHidden
+      >
+        <Form<UpdateDocumentAggregateBody>
+          form={form}
+          initialValues={initialValues}
+          layout={'vertical'}
+        >
+          <div className="flex flex-col gap-1">
+            <Form.Item
+              label={
+                <div className={'flex w-full justify-between'}>
+                  <Tooltip
+                    title={
+                      'This is the title for the document. Updates apply to all chunks that have not had their title customized.'
+                    }
+                  >
+                    Document Title <InfoCircleOutlined />
+                  </Tooltip>
+                </div>
+              }
+              name="title"
+              rules={[
+                {
+                  required: true,
+                  message: 'Please input the document title!',
+                },
+              ]}
+            >
+              <Input />
+            </Form.Item>
+            <Tooltip
+              title={
+                !canUpdateSource
+                  ? 'This document points to an upload to the HelpMe system. Its source cannot be updated for this reason.'
+                  : undefined
+              }
+            >
+              <Form.Item
+                label={
+                  <Tooltip
+                    title={
+                      'This is the source link for the document. Updates apply to all chunks that have not had their source link customized.'
+                    }
+                  >
+                    Source <InfoCircleOutlined />
+                  </Tooltip>
+                }
+                required={false}
+                name="source"
+                rules={[
+                  {
+                    pattern: new RegExp(
+                      /^(https?:\/\/\S+|\/\S*|\.{1,2}\/\S*)$/,
+                    ),
+                    message: 'Please enter a valid URL or relative path.',
+                  },
+                ]}
+              >
+                <Input disabled={!canUpdateSource} />
+              </Form.Item>
+            </Tooltip>
+          </div>
+        </Form>
+      </Modal>
+    </>
+  )
+}
+
+export default EditingChatbotDocumentModal
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/LegacyChatbotSettingsModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/LegacyChatbotSettingsModal.tsx
index 3f1db6c70..f04af9c29 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/LegacyChatbotSettingsModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/LegacyChatbotSettingsModal.tsx
@@ -21,7 +21,7 @@ import {
 } from '@ant-design/icons'
 import { API } from '@/app/api'
 import { getErrorMessage } from '@/app/utils/generalUtils'
-import { ChatbotSettingsMetadata } from '@koh/common'
+import { ChatbotCourseSettingsProperties } from '@koh/common'
 import ChatbotHelpTooltip from '../../components/ChatbotHelpTooltip'
 
 interface LegacyChatbotSettingsModalProps {
@@ -70,8 +70,11 @@ const LegacyChatbotSettingsModal: React.FC<LegacyChatbotSettingsModalProps> = ({
     await API.chatbot.staffOnly.legacy
       .getSettings(courseId)
       .then((currentChatbotSettings) => {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { courseId, model, organizationSettings, ...rest } =
+          currentChatbotSettings
         form.setFieldsValue({
-          ...currentChatbotSettings.metadata,
+          rest,
         })
       })
       .catch((error) => {
@@ -91,7 +94,7 @@ const LegacyChatbotSettingsModal: React.FC<LegacyChatbotSettingsModalProps> = ({
     }
   }, [open, courseId, fetchChatbotSettings, fetchAvailableModels])
 
-  const handleUpdate = async (values: ChatbotSettingsMetadata) => {
+  const handleUpdate = async (values: ChatbotCourseSettingsProperties) => {
     const updateData = {
       modelName: values.modelName,
       prompt: values.prompt,
@@ -246,6 +249,7 @@ const LegacyChatbotSettingsModal: React.FC<LegacyChatbotSettingsModalProps> = ({
 
   return (
     <Modal
+      centered
       title={
         <div className="flex items-center gap-2">
           <SettingOutlined />
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
index 048fca434..a04b3fb68 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
@@ -1,30 +1,47 @@
 'use client'
 
-import { Button, Input, message, Pagination, Progress, Table } from 'antd'
 import {
-  ReactElement,
-  use,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react'
+  Badge,
+  Button,
+  Input,
+  message,
+  Pagination,
+  Progress,
+  Table,
+  Tooltip,
+} from 'antd'
+import { ReactElement, use, useEffect, useMemo, useState } from 'react'
 import Link from 'next/link'
 import { TableRowSelection } from 'antd/es/table/interface'
 import LegacyChatbotSettingsModal from './components/LegacyChatbotSettingsModal'
 import Highlighter from 'react-highlight-words'
 import AddChatbotDocumentModal from './components/AddChatbotDocumentModal'
-import { ChatbotServiceType, SourceDocument } from '@koh/common'
-import { FileAddOutlined, SettingOutlined } from '@ant-design/icons'
+import {
+  ChatbotDocumentAggregateResponse,
+  ChatbotServiceType,
+  DocumentType,
+  DocumentTypeColorMap,
+  DocumentTypeDisplayMap,
+  UpdateDocumentAggregateBody,
+} from '@koh/common'
+import {
+  DeleteOutlined,
+  EditOutlined,
+  FileAddOutlined,
+  SettingOutlined,
+} from '@ant-design/icons'
 import { API } from '@/app/api'
 import { useUserInfo } from '@/app/contexts/userContext'
 import ChatbotHelpTooltip from '../components/ChatbotHelpTooltip'
 import { getErrorMessage } from '@/app/utils/generalUtils'
 import ChatbotSettingsModal from '@/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/ChatbotSettingsModal'
+import { getPaginatedChatbotDocuments } from '@/app/(dashboard)/course/[cid]/(settings)/settings/util'
+import EditChatbotDocumentModal from '@/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/EditChatbotDocumentModal'
 
 interface ChatbotPanelProps {
   params: Promise<{ cid: string }>
 }
+
 export default function ChatbotSettings(
   props: ChatbotPanelProps,
 ): ReactElement {
@@ -37,15 +54,23 @@ export default function ChatbotSettings(
   const [search, setSearch] = useState('')
   const [selectViewEnabled, setSelectViewEnabled] = useState(false)
   const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([])
-  const [chatbotDocuments, setChatbotDocuments] = useState<SourceDocument[]>([])
-  const [loading, setLoading] = useState(false)
-  const [countProcessed, setCountProcessed] = useState(0)
+
+  const [chatbotDocuments, setChatbotDocuments] = useState<
+    ChatbotDocumentAggregateResponse[]
+  >([])
+  const [totalAggregates, setTotalAggregates] = useState(0)
   const [page, setPage] = useState(1)
   const [pageSize, setPageSize] = useState(10)
+
+  const [editingDocument, setEditingDocument] =
+    useState<ChatbotDocumentAggregateResponse>()
+
+  const [loading, setLoading] = useState(false)
+  const [countProcessed, setCountProcessed] = useState(0)
   const [courseServiceType, setCourseServiceType] =
     useState<ChatbotServiceType>()
 
-  const rowSelection: TableRowSelection<SourceDocument> = {
+  const rowSelection: TableRowSelection<ChatbotDocumentAggregateResponse> = {
     type: 'checkbox',
     onChange: (newSelectedRowKeys: React.Key[]) => {
       setSelectedRowKeys(newSelectedRowKeys)
@@ -76,7 +101,15 @@ export default function ChatbotSettings(
         setCountProcessed(countProcessed + 1)
       }
       message.success('Documents deleted.')
-      getDocuments()
+      await getPaginatedChatbotDocuments(
+        API.chatbot.staffOnly.getAllAggregateDocuments,
+        courseId,
+        page,
+        pageSize,
+        setTotalAggregates,
+        setChatbotDocuments,
+        search,
+      )
     } catch (_e) {
       message.error('Failed to delete documents.')
     } finally {
@@ -87,13 +120,48 @@ export default function ChatbotSettings(
     }
   }
 
-  const handleDeleteDocument = async (record: any) => {
+  const handleUpdateDocument = async (
+    id: string,
+    params: UpdateDocumentAggregateBody,
+  ) => {
+    setLoading(true)
+    await API.chatbot.staffOnly
+      .updateDocument(courseId, id, params)
+      .then(() => {
+        message.success('Document updated.')
+        getPaginatedChatbotDocuments(
+          API.chatbot.staffOnly.getAllAggregateDocuments,
+          courseId,
+          page,
+          pageSize,
+          setTotalAggregates,
+          setChatbotDocuments,
+          search,
+        )
+      })
+      .catch(() => {
+        message.error('Failed to update document.')
+      })
+      .finally(() => {
+        setLoading(false)
+      })
+  }
+
+  const handleDeleteDocument = async (id: string) => {
     setLoading(true)
     await API.chatbot.staffOnly
-      .deleteDocument(courseId, record.docId.toString())
+      .deleteDocument(courseId, id)
       .then(() => {
         message.success('Document deleted.')
-        getDocuments()
+        getPaginatedChatbotDocuments(
+          API.chatbot.staffOnly.getAllAggregateDocuments,
+          courseId,
+          page,
+          pageSize,
+          setTotalAggregates,
+          setChatbotDocuments,
+          search,
+        )
       })
       .catch(() => {
         message.error('Failed to delete document.')
@@ -106,8 +174,8 @@ export default function ChatbotSettings(
   const columns = [
     {
       title: 'Name',
-      dataIndex: 'docName',
-      key: 'docName',
+      dataIndex: 'title',
+      key: 'title',
       render: (text: string) => (
         <>
           {/*
@@ -125,10 +193,23 @@ export default function ChatbotSettings(
         </>
       ),
     },
+    {
+      title: 'Type',
+      dataIndex: 'type',
+      key: 'type',
+      width: '10%',
+      render: (type: DocumentType) => (
+        <Badge
+          count={DocumentTypeDisplayMap[type] ?? (DocumentType as any)[type]}
+          color={DocumentTypeColorMap[type] ?? '#7C7C7C'}
+        />
+      ),
+    },
     {
       title: 'Source',
-      dataIndex: 'sourceLink',
-      key: 'sourceLink',
+      dataIndex: 'source',
+      key: 'source',
+      width: '10%',
       render: (text: string) => (
         <Link
           href={text}
@@ -142,7 +223,7 @@ export default function ChatbotSettings(
     },
     {
       title: (
-        <>
+        <div className={'flex gap-1'}>
           <Button
             disabled={loading}
             onClick={() => setSelectViewEnabled(!selectViewEnabled)}
@@ -168,65 +249,54 @@ export default function ChatbotSettings(
               )}
             />
           )}
-        </>
+        </div>
       ),
       key: 'action',
-      render: (_: any, record: SourceDocument) =>
+      width: '10%',
+      render: (_: any, record: ChatbotDocumentAggregateResponse) =>
         !selectViewEnabled && (
-          <Button
-            disabled={loading}
-            onClick={() => handleDeleteDocument(record)}
-            danger
-          >
-            Delete
-          </Button>
+          <div className={'flex flex-col gap-1'}>
+            <Tooltip
+              title={
+                record.lmsDocumentId != undefined
+                  ? 'LMS documents cannot be edited.'
+                  : undefined
+              }
+            >
+              <Button
+                disabled={loading || record.lmsDocumentId != undefined}
+                icon={<EditOutlined />}
+                variant={'outlined'}
+                color={'blue'}
+                onClick={() => setEditingDocument(record)}
+              >
+                Edit
+              </Button>
+            </Tooltip>
+            <Button
+              disabled={loading}
+              icon={<DeleteOutlined />}
+              onClick={() => handleDeleteDocument(record.id)}
+              danger
+            >
+              Delete
+            </Button>
+          </div>
         ),
     },
   ]
 
-  const getDocuments = useCallback(async () => {
-    await API.chatbot.staffOnly
-      .getAllAggregateDocuments(courseId)
-      .then((response) => {
-        const formattedDocuments = response.map((doc) => ({
-          key: doc.id,
-          docId: doc.id,
-          docName: doc.pageContent,
-          pageContent: doc.pageContent, // idk what's going on here why is there both a docName and pageContent
-          sourceLink: doc.metadata?.source ?? '',
-          pageNumbers: [],
-        }))
-        setChatbotDocuments(formattedDocuments)
-      })
-      .catch((e) => {
-        console.error(e)
-        setChatbotDocuments([])
-      })
-  }, [courseId, setChatbotDocuments])
-
   useEffect(() => {
-    getDocuments()
-  }, [getDocuments])
-
-  const filteredDocuments = useMemo(() => {
-    return chatbotDocuments.filter((doc) =>
-      doc.docName.toLowerCase().includes(search.toLowerCase()),
+    getPaginatedChatbotDocuments(
+      API.chatbot.staffOnly.getAllAggregateDocuments,
+      courseId,
+      page,
+      pageSize,
+      setTotalAggregates,
+      setChatbotDocuments,
+      search,
     )
-  }, [search, chatbotDocuments])
-
-  const totalDocuments = useMemo(
-    () => filteredDocuments.length,
-    [filteredDocuments],
-  )
-
-  const paginatedDocuments = useMemo(
-    () =>
-      filteredDocuments.slice(
-        pageSize * (page - 1),
-        pageSize * (page - 1) + pageSize,
-      ),
-    [filteredDocuments, page, pageSize],
-  )
+  }, [courseId, page, pageSize, search])
 
   return (
     <div className="m-auto my-5">
@@ -235,8 +305,27 @@ export default function ChatbotSettings(
         open={addDocumentModalOpen}
         courseId={courseId}
         onClose={() => setAddDocumentModalOpen(false)}
-        getDocuments={getDocuments}
+        getDocumentsProxy={() => {
+          getPaginatedChatbotDocuments(
+            API.chatbot.staffOnly.getAllAggregateDocuments,
+            courseId,
+            page,
+            pageSize,
+            setTotalAggregates,
+            setChatbotDocuments,
+            search,
+          )
+        }}
       />
+      {editingDocument != undefined && (
+        <EditChatbotDocumentModal
+          editingDocument={editingDocument}
+          updateDocument={(id: string, params: UpdateDocumentAggregateBody) =>
+            handleUpdateDocument(id, params)
+          }
+          onCancel={() => setEditingDocument(undefined)}
+        />
+      )}
       <div className="flex w-full items-center justify-between">
         <div className="">
           <h3 className="text-4xl font-bold text-gray-900">
@@ -269,33 +358,48 @@ export default function ChatbotSettings(
       </div>
       <hr className="my-5 w-full"></hr>
 
-      <Input
-        placeholder={'Search document name...'}
-        // prefix={<SearchOutlined />}
-        value={search}
-        onChange={(e) => {
-          e.preventDefault()
-          setSearch(e.target.value)
-        }}
-        onPressEnter={getDocuments}
-      />
-      <Table
+      <div className={'flex justify-between gap-2'}>
+        <Input
+          placeholder={'Search document name...'}
+          // prefix={<SearchOutlined />}
+          value={search}
+          onChange={(e) => {
+            e.preventDefault()
+            setSearch(e.target.value)
+          }}
+          onPressEnter={() => {
+            setPage(1)
+            getPaginatedChatbotDocuments(
+              API.chatbot.staffOnly.getAllAggregateDocuments,
+              courseId,
+              page,
+              pageSize,
+              setTotalAggregates,
+              setChatbotDocuments,
+              search,
+            )
+          }}
+        />
+        <Pagination
+          style={{ float: 'right' }}
+          total={totalAggregates}
+          pageSizeOptions={[10, 20, 30, 50]}
+          showSizeChanger
+          current={page}
+          pageSize={pageSize}
+          onChange={(page, pageSize) => {
+            setPage(page)
+            setPageSize(pageSize)
+          }}
+        />
+      </div>
+      <Table<ChatbotDocumentAggregateResponse>
         columns={columns}
+        rowKey={'id'}
         rowSelection={selectViewEnabled ? rowSelection : undefined}
-        dataSource={paginatedDocuments}
+        dataSource={chatbotDocuments}
         pagination={false}
       />
-      <div className="my-1"></div>
-      <Pagination
-        style={{ float: 'right' }}
-        total={totalDocuments}
-        pageSizeOptions={[10, 20, 30, 50]}
-        showSizeChanger
-        onChange={(page, pageSize) => {
-          setPage(page)
-          setPageSize(pageSize)
-        }}
-      />
       {chatbotParameterModalOpen &&
         (courseServiceType == ChatbotServiceType.LEGACY ? (
           <LegacyChatbotSettingsModal
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotDocumentContentTooltip.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotDocumentContentTooltip.tsx
new file mode 100644
index 000000000..2854aa39f
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotDocumentContentTooltip.tsx
@@ -0,0 +1,39 @@
+import { useMemo, useState } from 'react'
+import { Tooltip } from 'antd'
+import CustomPagination from '@/app/(dashboard)/course/[cid]/(settings)/settings/components/CustomPagination'
+
+const ChatbotDocumentContentTooltip: React.FC<{
+  words?: string[]
+  children: React.ReactNode
+}> = ({ words, children }) => {
+  const [pageSize] = useState(32)
+  const [page, setPage] = useState(1)
+  const pageCount = useMemo(
+    () => Math.ceil((words?.length ?? 0) / pageSize),
+    [words, pageSize],
+  )
+
+  if (!words || words.length <= 0 || pageCount <= 0) return children
+
+  return (
+    <Tooltip
+      title={
+        <div className={'flex flex-col gap-2'}>
+          <p>{words.slice((page - 1) * pageSize, page * pageSize).join('')}</p>
+          {pageCount > 1 && (
+            <CustomPagination
+              page={page}
+              numPages={pageCount}
+              onChange={(pageNumber) => setPage(pageNumber)}
+              isTooltip={true}
+            />
+          )}
+        </div>
+      }
+    >
+      {children}
+    </Tooltip>
+  )
+}
+
+export default ChatbotDocumentContentTooltip
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotListDocumentItem.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotListDocumentItem.tsx
new file mode 100644
index 000000000..8c9772a94
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotListDocumentItem.tsx
@@ -0,0 +1,189 @@
+import { useMemo, useState } from 'react'
+import { Badge, Checkbox, List, Tooltip } from 'antd'
+import { SourceLinkButton } from '@/app/(dashboard)/course/[cid]/components/chatbot/ChatbotCitation'
+import { ChatbotDocumentListResponse } from '@koh/common'
+import CustomPagination from '@/app/(dashboard)/course/[cid]/(settings)/settings/components/CustomPagination'
+import ChatbotDocumentContentTooltip from '@/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotDocumentContentTooltip'
+import { cn } from '@/app/utils/generalUtils'
+
+const ChatbotListDocumentItem: React.FC<{
+  listDocument: ChatbotDocumentListResponse
+  selectedDocuments?: string[]
+  toggleSelectDocument?: (id: string) => void
+  contentWordMap: Record<string, string[]>
+  mode?: 'row' | 'column'
+  hasSearch?: boolean
+  size?: 'small' | 'default'
+  pageSize?: number
+}> = ({
+  listDocument,
+  selectedDocuments,
+  toggleSelectDocument,
+  contentWordMap,
+  mode = 'row',
+  hasSearch = false,
+  size = 'default',
+  pageSize = 10,
+}) => {
+  const [page, setPage] = useState(1)
+  const numDocs = useMemo(() => listDocument.documents.length, [listDocument])
+  const numPages = useMemo(
+    () => Math.ceil(numDocs / pageSize),
+    [numDocs, pageSize],
+  )
+
+  const inOrder = useMemo(
+    () =>
+      listDocument.documents.sort((a, b) => {
+        const firstDiff = (a.pageNumber ?? 0) - (b.pageNumber ?? 0)
+        if (firstDiff != 0) {
+          return firstDiff
+        }
+        return (a.lines?.[0] ?? 0) - (b.lines?.[0] ?? 0)
+      }),
+    [listDocument.documents],
+  )
+
+  const selectedOnEachPage = useMemo(() => {
+    const record: Record<number, number> = {}
+    for (let i = 1; i <= numPages; i++) {
+      const docs = inOrder.slice((i - 1) * pageSize, i * pageSize)
+      record[i] = docs.filter((d) => selectedDocuments?.includes(d.id)).length
+    }
+    return record
+  }, [inOrder, numPages, pageSize, selectedDocuments])
+
+  const currentCitationPage = useMemo(
+    () => inOrder.slice((page - 1) * pageSize, page * pageSize),
+    [inOrder, page, pageSize],
+  )
+
+  const pageCount = useMemo(() => {
+    const temp: Record<number, number> = {}
+    listDocument.documents.forEach((d) => {
+      if (d.pageNumber != undefined) {
+        temp[d.pageNumber] = (temp[d.pageNumber] ?? 0) + 1
+      }
+    })
+    setPage(1)
+    return temp
+  }, [listDocument.documents])
+
+  return (
+    <List.Item>
+      <div
+        className={cn(
+          mode == 'row' ? 'flex-row justify-between' : 'flex-col justify-start',
+          'flex w-full flex-grow items-center gap-1 rounded-xl border-2 border-slate-200 bg-slate-100 p-0.5',
+        )}
+      >
+        <div
+          className={cn(
+            mode == 'row'
+              ? 'grid grid-cols-2'
+              : 'grid grid-cols-1 place-items-center',
+            size == 'small' ? 'text-[10px]' : 'text-xs',
+            'w-full gap-2',
+          )}
+        >
+          <Tooltip title={listDocument.title}>
+            <p
+              className={cn(
+                mode == 'row' ? 'ml-2 truncate' : 'text-wrap',
+                'w-11/12 font-semibold',
+              )}
+            >
+              {listDocument.title}
+            </p>
+          </Tooltip>
+          {size != 'small' && (
+            <Tooltip
+              title={
+                listDocument.type == 'aggregate'
+                  ? `This is a document aggregate ${hasSearch ? 'matching the search parameters' : ''}.`
+                  : `This is a document chunk matching the ${hasSearch ? 'matching the search parameters' : ''}. It may or may not be part of an aggregate.`
+              }
+            >
+              <Badge
+                color={listDocument.type == 'aggregate' ? '#8922D0' : '#12A844'}
+                count={
+                  (listDocument.type as string).substring(0, 1).toUpperCase() +
+                  (listDocument.type as string).substring(1)
+                }
+              />
+            </Tooltip>
+          )}
+        </div>
+        <div
+          className={cn(
+            mode == 'row' ? 'w-1/2 items-end' : 'w-full',
+            'flex flex-col gap-1',
+          )}
+        >
+          {numDocs > pageSize && (
+            <CustomPagination
+              page={page}
+              numPages={numPages}
+              onChange={(pageNumber) => setPage(pageNumber)}
+              displayCount={selectedOnEachPage}
+              size={size}
+            />
+          )}
+          <div
+            className={cn(
+              mode == 'row' ? 'justify-end' : 'justify-evenly',
+              'flex flex-row flex-wrap gap-1',
+            )}
+          >
+            {currentCitationPage.map((doc, i) => (
+              <div
+                key={doc.id}
+                className={
+                  'flex flex-row justify-between gap-1 rounded-lg bg-blue-100 p-1'
+                }
+              >
+                <ChatbotDocumentContentTooltip words={contentWordMap[doc.id]}>
+                  <div className={'flex flex-row items-center justify-center'}>
+                    <SourceLinkButton
+                      variant={'none'}
+                      title={doc.title ?? 'N/A'}
+                      part={doc.pageNumber}
+                      sourceLink={doc.source ?? 'N/A'}
+                      lines={
+                        doc.pageNumber != undefined &&
+                        pageCount[doc.pageNumber] > 1 &&
+                        doc.lines != undefined
+                          ? {
+                              from: doc.lines[0],
+                              to: doc.lines[1],
+                            }
+                          : undefined
+                      }
+                      linkTitle={
+                        doc.pageNumber == undefined
+                          ? `Chunk ${listDocument.documents.length > 1 ? (page - 1) * pageSize + i + 1 : ''}`.trim()
+                          : undefined
+                      }
+                      size={size}
+                    />
+                  </div>
+                </ChatbotDocumentContentTooltip>
+                {toggleSelectDocument && selectedDocuments && (
+                  <Checkbox
+                    onClick={() =>
+                      toggleSelectDocument != undefined &&
+                      toggleSelectDocument(doc.id)
+                    }
+                    checked={selectedDocuments.includes(doc.id)}
+                  />
+                )}
+              </div>
+            ))}
+          </div>
+        </div>
+      </div>
+    </List.Item>
+  )
+}
+
+export default ChatbotListDocumentItem
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotSelectCitations.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotSelectCitations.tsx
new file mode 100644
index 000000000..1926a6b97
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotSelectCitations.tsx
@@ -0,0 +1,201 @@
+import { Input, List, Pagination, Tabs } from 'antd'
+import { SearchOutlined } from '@ant-design/icons'
+import { useEffect, useMemo, useState } from 'react'
+import { API } from '@/app/api'
+import {
+  ChatbotDocumentListResponse,
+  ChatbotDocumentResponse,
+} from '@koh/common'
+import {
+  extractWords,
+  getPaginatedChatbotDocuments,
+  mapChatbotDocumentsToListForm,
+} from '@/app/(dashboard)/course/[cid]/(settings)/settings/util'
+import ChatbotListDocumentItem from '@/app/(dashboard)/course/[cid]/(settings)/settings/components/ChatbotListDocumentItem'
+
+type ChatbotSelectCitationsProps = {
+  courseId: number
+  selectedDocuments: string[]
+  setSelectedDocuments: React.Dispatch<React.SetStateAction<string[]>>
+  preloadedDocuments?: ChatbotDocumentResponse[]
+}
+
+const ChatbotSelectCitations: React.FC<ChatbotSelectCitationsProps> = ({
+  courseId,
+  selectedDocuments,
+  setSelectedDocuments,
+  preloadedDocuments,
+}) => {
+  const [pageSize] = useState(10)
+  const [listDocuments, setListDocuments] = useState<
+    ChatbotDocumentListResponse[]
+  >([])
+  const documents = useMemo(
+    () =>
+      listDocuments.map((d) => d.documents).reduce((p, c) => [...p, ...c], []),
+    [listDocuments],
+  )
+  const [selected, setSelected] = useState<ChatbotDocumentResponse[]>([])
+
+  const [page, setPage] = useState(1)
+  const [total, setTotal] = useState(0)
+  const [search, setSearch] = useState<string>()
+
+  const contentWordMap = useMemo(() => {
+    const rec: Record<string, string[]> = {}
+
+    ;[...(preloadedDocuments ?? []), ...documents]
+      .filter((v, i, a) => a.findIndex((v0) => v0.id == v.id) == i)
+      .forEach((doc) => (rec[doc.id] = extractWords(doc.content)))
+    return rec
+  }, [preloadedDocuments, documents])
+
+  useEffect(() => {
+    if (preloadedDocuments) {
+      const ids = preloadedDocuments.map((v) => v.id)
+      setSelected((prev) => [
+        ...preloadedDocuments.filter((v) => selectedDocuments.includes(v.id)),
+        ...prev.filter((v) => !ids.includes(v.id)),
+      ])
+    }
+  }, [preloadedDocuments, selectedDocuments])
+
+  const toggleSelectDocument = (id: string) => {
+    let isSelected = false
+    setSelectedDocuments((prev) => {
+      isSelected = !prev.includes(id)
+      return !isSelected ? prev.filter((i) => i != id) : [...prev, id]
+    })
+    const match =
+      documents.find((v) => v.id == id) ??
+      preloadedDocuments?.find((v) => v.id == id)
+    if (isSelected && match) {
+      setSelected((prev) => [...prev, match])
+    } else if (!isSelected) {
+      setSelected((prev) => prev.filter((v) => v.id != id))
+    }
+  }
+
+  useEffect(() => {
+    getPaginatedChatbotDocuments(
+      API.chatbot.staffOnly.getListDocuments,
+      courseId,
+      page,
+      pageSize,
+      setTotal,
+      setListDocuments,
+      search,
+    )
+  }, [courseId, page, pageSize])
+
+  const selectedInListForm = useMemo(
+    () => mapChatbotDocumentsToListForm(selected),
+    [selected],
+  )
+
+  return (
+    <>
+      <style>{`
+      .ant-pagination .ant-pagination-item {
+        background-color: transparent;
+      }
+      
+      .ant-list-items {
+        overflow-y: scroll;
+        max-height: 33vh;
+      }
+    `}</style>
+      {listDocuments.length > 0 && (
+        <div
+          className={
+            'my-1 flex flex-col items-center rounded-md border-2 border-gray-200 p-1 text-xs text-gray-700'
+          }
+        >
+          <p>Hover over page/source links to view source document content.</p>
+          <p>
+            (De)-select citations by clicking the checkbox inside the source
+            link.
+          </p>
+        </div>
+      )}
+      <Tabs
+        items={[
+          {
+            key: 'select',
+            label: 'Select Citations',
+            children: (
+              <>
+                <div className={'my-2 flex justify-between gap-2'}>
+                  <Input
+                    placeholder={'Search document name...'}
+                    prefix={<SearchOutlined />}
+                    value={search}
+                    onChange={(e) => {
+                      e.preventDefault()
+                      setSearch(e.target.value)
+                    }}
+                    onPressEnter={() => {
+                      setPage(1)
+                      getPaginatedChatbotDocuments(
+                        API.chatbot.staffOnly.getListDocuments,
+                        courseId,
+                        page,
+                        pageSize,
+                        setTotal,
+                        setListDocuments,
+                        search,
+                      )
+                    }}
+                  />
+                  <Pagination
+                    total={total}
+                    showSizeChanger={false}
+                    current={page}
+                    pageSize={pageSize}
+                    onChange={(page) => {
+                      setPage(page)
+                    }}
+                  />
+                </div>
+                <List<ChatbotDocumentListResponse>
+                  dataSource={listDocuments}
+                  pagination={false}
+                  renderItem={(listDocument: ChatbotDocumentListResponse) => (
+                    <ChatbotListDocumentItem
+                      listDocument={listDocument}
+                      selectedDocuments={selectedDocuments}
+                      toggleSelectDocument={toggleSelectDocument}
+                      contentWordMap={contentWordMap}
+                      hasSearch={search != undefined}
+                    />
+                  )}
+                />
+              </>
+            ),
+          },
+          {
+            key: 'selected',
+            label: `Selected Citations (${selectedDocuments.length})`,
+            children: (
+              <List<ChatbotDocumentListResponse>
+                dataSource={selectedInListForm}
+                pagination={false}
+                renderItem={(citation: ChatbotDocumentListResponse) => (
+                  <ChatbotListDocumentItem
+                    listDocument={citation}
+                    selectedDocuments={selectedDocuments}
+                    toggleSelectDocument={toggleSelectDocument}
+                    contentWordMap={contentWordMap}
+                    hasSearch={search != undefined}
+                  />
+                )}
+              />
+            ),
+          },
+        ]}
+      ></Tabs>
+    </>
+  )
+}
+
+export default ChatbotSelectCitations
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/CustomPagination.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/CustomPagination.tsx
new file mode 100644
index 000000000..8fb7fbeb3
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/components/CustomPagination.tsx
@@ -0,0 +1,265 @@
+import { useEffect, useMemo, useState } from 'react'
+import { cn } from '@/app/utils/generalUtils'
+import {
+  DoubleLeftOutlined,
+  DoubleRightOutlined,
+  EllipsisOutlined,
+  LeftOutlined,
+  RightOutlined,
+} from '@ant-design/icons'
+import { Badge } from 'antd'
+
+const CustomPagination: React.FC<{
+  page: number
+  numPages: number
+  onChange: (page: number) => void
+  displayCount?: Record<number, number>
+  isTooltip?: boolean
+  size?: 'small' | 'default'
+}> = ({
+  page,
+  numPages,
+  onChange,
+  displayCount,
+  isTooltip = false,
+  size = 'default',
+}) => {
+  const [rightHover, setRightHover] = useState(false)
+  const [leftHover, setLeftHover] = useState(false)
+
+  const options = useMemo(() => {
+    const maxWidth = size == 'small' || page == numPages || page == 1 ? 1 : 2
+    const start = Math.max(page - maxWidth, 1),
+      end = Math.min(page + maxWidth, numPages)
+    const opts: number[] = []
+    for (let i = start; i <= end; i++) {
+      opts.push(i)
+    }
+    return opts
+  }, [size, page, numPages])
+
+  return (
+    <div
+      className={cn(
+        isTooltip ? 'text-white' : 'text-black',
+        size == 'small' ? 'text-[10px]' : 'text-xs',
+        'flex flex-row items-center justify-center gap-1',
+      )}
+    >
+      <PageButton
+        page={'dec'}
+        cur={page}
+        total={numPages}
+        onChange={onChange}
+        isTooltip={isTooltip}
+        size={size}
+      />
+      {options[0] != 1 && (
+        <>
+          <PageButton
+            page={1}
+            cur={page}
+            total={numPages}
+            onChange={onChange}
+            isTooltip={isTooltip}
+            displayCount={displayCount}
+            size={size}
+          />
+          {options.length > 1 && options[0] - 1 > 1 && (
+            <EllipsisButton
+              nextOption={options[0]}
+              direction={-1}
+              numPages={numPages}
+              onChange={onChange}
+              isHovered={leftHover}
+              setHovered={setLeftHover}
+              size={size}
+              isTooltip={isTooltip}
+            />
+          )}
+        </>
+      )}
+      {options.map((i) => (
+        <PageButton
+          key={`page-${i}`}
+          page={i}
+          cur={page}
+          total={numPages}
+          onChange={onChange}
+          isTooltip={isTooltip}
+          displayCount={displayCount}
+          size={size}
+        />
+      ))}
+      {options[options.length - 1] != numPages && (
+        <>
+          {options.length > 1 &&
+            options[options.length - 1] + 1 != numPages && (
+              <EllipsisButton
+                nextOption={options[options.length - 1]}
+                direction={1}
+                numPages={numPages}
+                onChange={onChange}
+                isHovered={rightHover}
+                setHovered={setRightHover}
+                size={size}
+                isTooltip={isTooltip}
+              />
+            )}
+          <PageButton
+            page={numPages}
+            cur={page}
+            total={numPages}
+            onChange={onChange}
+            isTooltip={isTooltip}
+            displayCount={displayCount}
+            size={size}
+          />
+        </>
+      )}
+      <PageButton
+        page={'inc'}
+        cur={page}
+        total={numPages}
+        onChange={onChange}
+        isTooltip={isTooltip}
+        size={size}
+      />
+    </div>
+  )
+}
+
+export default CustomPagination
+
+const EllipsisButton: React.FC<{
+  nextOption: number
+  direction: 1 | -1
+  numPages: number
+  onChange: (page: number) => void
+  isHovered: boolean
+  setHovered: React.Dispatch<React.SetStateAction<boolean>>
+  size: 'default' | 'small'
+  isTooltip: boolean
+}> = ({
+  nextOption,
+  numPages,
+  direction,
+  onChange,
+  isHovered,
+  setHovered,
+  size = 'default',
+  isTooltip = false,
+}) => {
+  useEffect(() => {
+    return () => {
+      setHovered(false)
+    }
+  }, [setHovered])
+
+  return (
+    <div className={cn(size == 'small' ? 'w-1' : 'w-4', 'relative h-8')}>
+      <div
+        className={cn(
+          'flex h-full w-full items-center justify-center',
+          isHovered
+            ? isTooltip
+              ? 'text-blue-400'
+              : 'text-blue-500'
+            : 'text-gray-400',
+        )}
+        onMouseLeave={() => setHovered(false)}
+        onMouseEnter={() => setHovered(true)}
+        onClick={() =>
+          onChange(
+            direction == -1
+              ? Math.max(1, nextOption + direction)
+              : Math.min(numPages, nextOption + direction),
+          )
+        }
+      >
+        {isHovered ? (
+          direction == -1 ? (
+            <DoubleLeftOutlined />
+          ) : (
+            <DoubleRightOutlined />
+          )
+        ) : (
+          <EllipsisOutlined />
+        )}
+      </div>
+    </div>
+  )
+}
+const PageButton: React.FC<{
+  page?: number | 'dec' | 'inc'
+  cur: number
+  total: number
+  onChange: (p: number) => void
+  isTooltip?: boolean
+  displayCount?: Record<number, number>
+  size?: 'small' | 'default'
+}> = ({
+  page,
+  cur,
+  total,
+  onChange,
+  isTooltip = false,
+  displayCount = {},
+  size = 'default',
+}) => {
+  if (page == 'dec' || page == 'inc') {
+    return (
+      <button
+        className={cn(
+          (page == 'dec' && cur - 1 >= 1) || (page == 'inc' && cur + 1 <= total)
+            ? isTooltip
+              ? 'border-white text-white hover:text-blue-300'
+              : 'border-slate-800 text-slate-800 hover:text-blue-500'
+            : 'cursor-default border-gray-400 text-gray-400',
+          size == 'small' ? 'w-4' : 'w-8',
+          'transition-ease-in h-8 bg-transparent transition-all',
+        )}
+        onClick={() => {
+          if (page == 'dec' && cur - 1 >= 1) {
+            onChange(cur - 1)
+          } else if (page == 'inc' && cur + 1 <= total) {
+            onChange(cur + 1)
+          }
+        }}
+      >
+        {page == 'dec' && <LeftOutlined />}
+        {page == 'inc' && <RightOutlined />}
+      </button>
+    )
+  } else {
+    return (
+      <button
+        className={cn(
+          isTooltip
+            ? 'border-2 border-white text-white hover:border-blue-300 hover:text-blue-300'
+            : 'border-slate-700 text-slate-700 hover:border-blue-500 hover:text-blue-500',
+          size == 'small' ? 'w-4' : 'w-8',
+          'transition-ease-in h-8 rounded-md bg-transparent transition-all',
+          page == cur
+            ? isTooltip
+              ? 'border-blue-400 text-blue-400'
+              : 'border-blue-600 text-blue-600'
+            : '',
+          'relative font-semibold',
+        )}
+        onClick={() => onChange(page as number)}
+      >
+        {displayCount && displayCount[page as number] != undefined ? (
+          <Badge
+            className={'absolute -right-1 -top-1'}
+            size={'small'}
+            showZero={false}
+            count={displayCount[page as number]}
+            color={'#229CF0'}
+          />
+        ) : null}
+        {page}
+      </button>
+    )
+  }
+}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/components/QuizContentPreviewModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/components/QuizContentPreviewModal.tsx
index aec400220..64a2fa795 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/components/QuizContentPreviewModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/components/QuizContentPreviewModal.tsx
@@ -1,7 +1,7 @@
 'use client'
 
-import React, { useState, useEffect } from 'react'
-import { Modal, Select, Typography, Spin, Alert, Button } from 'antd'
+import React, { useEffect, useState } from 'react'
+import { Alert, Button, Modal, Select, Spin, Typography } from 'antd'
 import { EyeOutlined } from '@ant-design/icons'
 import { LMSQuiz, LMSQuizAccessLevel } from '@koh/common'
 import { API } from '@/app/api'
@@ -78,6 +78,7 @@ export const QuizContentPreviewModal: React.FC<
 
   return (
     <Modal
+      centered
       title={
         <div>
           <EyeOutlined style={{ marginRight: 8 }} />
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/components/UpsertIntegrationModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/components/UpsertIntegrationModal.tsx
index 4b5203fff..b6d868e37 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/components/UpsertIntegrationModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/components/UpsertIntegrationModal.tsx
@@ -134,6 +134,7 @@ const UpsertIntegrationModal: React.FC<CreateIntegrationModalProps> = ({
 
   return (
     <Modal
+      centered
       title={
         baseIntegration != undefined
           ? 'Update LMS Integration'
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
index e05bb8361..c4ecfb0cc 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/lms_integrations/page.tsx
@@ -26,8 +26,6 @@ import {
   LMSIntegrationPlatform,
   LMSOrganizationIntegrationPartial,
   LMSPage,
-  LMSQuiz,
-  LMSQuizAccessLevel,
   SupportedLMSFileTypes,
 } from '@koh/common'
 import { API } from '@/app/api'
@@ -105,7 +103,6 @@ export default function CourseLMSIntegrationPage(props: {
     files,
     quizzes,
     isLoadingIntegration,
-    isLoadingCourse,
     isLoadingStudents,
     isLoadingAssignments,
     isLoadingAnnouncements,
@@ -907,6 +904,7 @@ export default function CourseLMSIntegrationPage(props: {
             onCreate={() => setUpdateFlag(!updateFlag)}
           />
           <Modal
+            centered
             title={'Are you sure you want to delete this LMS integration?'}
             open={delModalOpen}
             onOk={() => deleteIntegration()}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/util.ts b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/util.ts
new file mode 100644
index 000000000..8067379c2
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/util.ts
@@ -0,0 +1,82 @@
+import { API } from '@/app/api'
+import {
+  ChatbotDocumentListResponse,
+  ChatbotDocumentResponse,
+  ChatbotQuestionResponse,
+  HelpMeChatbotQuestionTableResponse,
+  PaginatedResponse,
+} from '@koh/common'
+
+export type QuestionListItem = Omit<
+  HelpMeChatbotQuestionTableResponse,
+  'children' | 'chatbotQuestion'
+> & {
+  key: string
+  chatbotQuestion: ChatbotQuestionResponse
+  children: QuestionListItem[]
+}
+
+export function mapChatbotDocumentsToListForm(
+  documents: ChatbotDocumentResponse[],
+): ChatbotDocumentListResponse[] {
+  const aggregateMap: Record<string, ChatbotDocumentResponse[]> = {}
+  const standalone: ChatbotDocumentResponse[] = []
+
+  for (const document of documents) {
+    if (document.aggregateId != undefined) {
+      if (aggregateMap[document.aggregateId]) {
+        aggregateMap[document.aggregateId].push(document)
+      } else {
+        aggregateMap[document.aggregateId] = [document]
+      }
+    } else {
+      standalone.push(document)
+    }
+  }
+
+  return [
+    ...Object.keys(aggregateMap).map((k) => ({
+      aggregateId: k,
+      type: 'aggregate' as 'aggregate' | 'chunk',
+      title: aggregateMap[k].find((v) => v.title != undefined)?.title ?? 'N/A',
+      documents: aggregateMap[k],
+    })),
+    ...standalone.map((v) => ({
+      title: v.title ?? 'N/A',
+      type: 'chunk' as 'aggregate' | 'chunk',
+      documents: [v],
+    })),
+  ]
+}
+
+export function extractWords(content?: string): string[] {
+  if (!content) return []
+  const words = content.match(/(\s*\S*\s*)/g)?.map((v) => v) ?? []
+  if (words.length > 0 && words[words.length - 1].trim() == '') {
+    return words.slice(0, words.length - 1)
+  }
+  return words
+}
+
+export async function getPaginatedChatbotDocuments<T>(
+  apiFunction: (...params: any[]) => Promise<PaginatedResponse<T>>,
+  courseId: number,
+  page: number,
+  pageSize: number,
+  setTotal: React.Dispatch<React.SetStateAction<number>>,
+  setDocuments: React.Dispatch<React.SetStateAction<T[]>>,
+  search?: string,
+) {
+  await apiFunction
+    .call(API, courseId, page, pageSize, search)
+    .then((response) => {
+      //response.items.forEach((v) => (v as any)['key'] = v.id);
+      setTotal(response.total)
+      setDocuments(response.items)
+    })
+    .catch((e) => {
+      console.error(e)
+      setTotal(0)
+      setDocuments([])
+    })
+}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/ConvertChatbotQToAnytimeQModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/ConvertChatbotQToAnytimeQModal.tsx
index 98add0d57..3c0687b6e 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/ConvertChatbotQToAnytimeQModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/ConvertChatbotQToAnytimeQModal.tsx
@@ -1,11 +1,11 @@
-import { useMemo, useState, useEffect } from 'react'
-import { Modal, Input, Form, message, Checkbox, Tooltip } from 'antd'
+import { useEffect, useMemo, useState } from 'react'
+import { Checkbox, Form, Input, message, Modal, Tooltip } from 'antd'
 import { useUserInfo } from '@/app/contexts/userContext'
 import { useQuestionTypes } from '@/app/hooks/useQuestionTypes'
 import { QuestionTagSelector } from '../../../components/QuestionTagElement'
 import { API } from '@/app/api'
 import { getErrorMessage } from '@/app/utils/generalUtils'
-import { asyncQuestionStatus } from '@koh/common'
+import { asyncQuestionStatus, ChatbotQueryTypeEnum } from '@koh/common'
 import { QuestionCircleOutlined } from '@ant-design/icons'
 import { useCourseFeatures } from '@/app/hooks/useCourseFeatures'
 import { ChatbotQToConvertToAnytimeQ } from '@/app/typings/chatbot'
@@ -65,7 +65,7 @@ const ConvertChatbotQToAnytimeQModal: React.FC<
             courseId,
             {
               query: questionText,
-              type: 'abstract',
+              type: ChatbotQueryTypeEnum.ABSTRACT,
             },
           )
 
@@ -110,7 +110,7 @@ const ConvertChatbotQToAnytimeQModal: React.FC<
           courseId,
           data,
         )
-        return response.chatbotRepoVersion.answer
+        return response.answer
       } else {
         return 'All AI uses have been used up for today. Please try again tomorrow.'
       }
@@ -172,6 +172,7 @@ const ConvertChatbotQToAnytimeQModal: React.FC<
 
   return (
     <Modal
+      centered
       open={open}
       title={
         <span>
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/ConvertQueueQToAnytimeQModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/ConvertQueueQToAnytimeQModal.tsx
index 9f6df329a..da38b301e 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/ConvertQueueQToAnytimeQModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/ConvertQueueQToAnytimeQModal.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react'
 import { Form, Input, message, Modal, Spin, Tooltip } from 'antd'
-import { useUserInfo } from '@/app/contexts/userContext'
 import { useQuestionTypes } from '@/app/hooks/useQuestionTypes'
 import { QuestionTagSelector } from '../../../components/QuestionTagElement'
 import { API } from '@/app/api'
@@ -8,10 +7,10 @@ import { getErrorMessage } from '@/app/utils/generalUtils'
 import {
   AlertType,
   asyncQuestionStatus,
+  ChatbotQueryTypeEnum,
   ClosedQuestionStatus,
 } from '@koh/common'
 import { QuestionCircleOutlined } from '@ant-design/icons'
-import { useCourseFeatures } from '@/app/hooks/useCourseFeatures'
 
 interface FormValues {
   QuestionAbstract: string
@@ -39,8 +38,6 @@ const ConvertQueueQToAnytimeQModal: React.FC<
   onCancel,
   onCreateOrUpdateQuestion,
 }) => {
-  const { userInfo } = useUserInfo()
-  const courseFeatures = useCourseFeatures(courseId)
   const [form] = Form.useForm()
   const [isLoading, setIsLoading] = useState(false)
   const [initialLoading, setInitialLoading] = useState(false)
@@ -95,7 +92,7 @@ const ConvertQueueQToAnytimeQModal: React.FC<
               courseId,
               {
                 query: myQuestion.text,
-                type: 'abstract',
+                type: ChatbotQueryTypeEnum.ABSTRACT,
               },
             )
 
@@ -184,6 +181,7 @@ const ConvertQueueQToAnytimeQModal: React.FC<
 
   return (
     <Modal
+      centered
       open={open}
       title={
         <span>
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/CreateAsyncQuestionModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/CreateAsyncQuestionModal.tsx
index 22d8ee232..17fd94565 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/CreateAsyncQuestionModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/CreateAsyncQuestionModal.tsx
@@ -15,7 +15,11 @@ import { useQuestionTypes } from '@/app/hooks/useQuestionTypes'
 import { QuestionTagSelector } from '../../../components/QuestionTagElement'
 import { API } from '@/app/api'
 import { getErrorMessage } from '@/app/utils/generalUtils'
-import { AsyncQuestion, asyncQuestionStatus } from '@koh/common'
+import {
+  AsyncQuestion,
+  asyncQuestionStatus,
+  ChatbotQueryTypeEnum,
+} from '@koh/common'
 import { DeleteOutlined } from '@ant-design/icons'
 import {
   deleteAsyncQuestion,
@@ -80,7 +84,7 @@ const CreateAsyncQuestionModal: React.FC<CreateAsyncQuestionModalProps> = ({
         courseId,
         {
           query: questionText,
-          type: 'abstract',
+          type: ChatbotQueryTypeEnum.ABSTRACT,
         },
       )
 
@@ -117,7 +121,7 @@ const CreateAsyncQuestionModal: React.FC<CreateAsyncQuestionModalProps> = ({
           courseId,
           data,
         )
-        return response.chatbotRepoVersion.answer
+        return response.answer
       } else {
         return 'All AI uses have been used up for today. Please try again tomorrow.'
       }
@@ -228,6 +232,7 @@ const CreateAsyncQuestionModal: React.FC<CreateAsyncQuestionModalProps> = ({
 
   return (
     <Modal
+      centered
       open={open}
       title={question ? 'Edit Question' : 'What do you need help with?'}
       okText="Finish"
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/EditAsyncCentreModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/EditAsyncCentreModal.tsx
index ec01653fa..789a5c452 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/EditAsyncCentreModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/EditAsyncCentreModal.tsx
@@ -1,11 +1,11 @@
 import Modal from 'antd/lib/modal/Modal'
 import {
-  Input,
-  Form,
   Button,
-  message,
-  GetProp,
   ColorPickerProps,
+  Form,
+  GetProp,
+  Input,
+  message,
   Space,
 } from 'antd'
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons'
@@ -133,6 +133,7 @@ const EditAsyncCentreModal: React.FC<EditAsyncCentreModalProps> = ({
 
   return (
     <Modal
+      centered
       open={open}
       title="Edit Queue Details"
       okText="Save Changes"
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/PostResponseModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/PostResponseModal.tsx
index 9f17bb1a3..613ec3e78 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/PostResponseModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/async_centre/components/modals/PostResponseModal.tsx
@@ -108,6 +108,7 @@ const PostResponseModal: React.FC<PostResponseModalProps> = ({
 
   return (
     <Modal
+      centered
       open={open}
       title="Post/Edit response to Student question"
       okText="Finish"
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/components/CheckInModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/components/CheckInModal.tsx
index 11b6a22b9..77f672acc 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/components/CheckInModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/components/CheckInModal.tsx
@@ -22,6 +22,7 @@ const CheckInModal: React.FC<CheckInModalProps> = ({
 
   return (
     <Modal
+      centered
       title="Check into a queue"
       open={visible}
       onCancel={() => {
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/components/CreateQueueModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/components/CreateQueueModal.tsx
index a058d220c..822505d88 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/components/CreateQueueModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/components/CreateQueueModal.tsx
@@ -102,6 +102,7 @@ const CreateQueueModal: React.FC<CreateQueueModalProps> = ({
 
   return (
     <Modal
+      centered
       open={open}
       title="Create a new queue"
       okText="Create"
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/Chatbot.tsx b/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/Chatbot.tsx
index 5f6bfc015..0c5987727 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/Chatbot.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/Chatbot.tsx
@@ -35,26 +35,28 @@ import MarkdownCustom from '@/app/components/Markdown'
 import Link from 'next/link'
 import { usePathname } from 'next/navigation'
 import {
-  Message,
+  Citation,
+  HelpMeChatMessage,
   parseThinkBlock,
-  PreDeterminedQuestion,
   Role,
+  SuggestedQuestionResponse,
 } from '@koh/common'
 import { Bot } from 'lucide-react'
+import ChatbotCitation from '@/app/(dashboard)/course/[cid]/components/chatbot/ChatbotCitation'
 
 const { TextArea } = Input
 
 interface ChatbotProps {
   cid: number
   variant?: 'small' | 'big' | 'huge'
-  preDeterminedQuestions: PreDeterminedQuestion[]
-  setPreDeterminedQuestions: React.Dispatch<
-    React.SetStateAction<PreDeterminedQuestion[]>
+  suggestedQuestions: SuggestedQuestionResponse[]
+  setSuggestedQuestions: React.Dispatch<
+    React.SetStateAction<SuggestedQuestionResponse[]>
   >
   questionsLeft: number
   setQuestionsLeft: React.Dispatch<React.SetStateAction<number>>
-  messages: Message[]
-  setMessages: React.Dispatch<React.SetStateAction<Message[]>>
+  messages: HelpMeChatMessage[]
+  setMessages: React.Dispatch<React.SetStateAction<HelpMeChatMessage[]>>
   isOpen: boolean
   setIsOpen: React.Dispatch<React.SetStateAction<boolean>>
   interactionId?: number
@@ -70,8 +72,8 @@ interface ChatbotProps {
 const Chatbot: React.FC<ChatbotProps> = ({
   cid,
   variant = 'small',
-  preDeterminedQuestions,
-  setPreDeterminedQuestions,
+  suggestedQuestions,
+  setSuggestedQuestions,
   questionsLeft,
   setQuestionsLeft,
   messages,
@@ -89,7 +91,13 @@ const Chatbot: React.FC<ChatbotProps> = ({
   const { userInfo, setUserInfo } = useUserInfo()
   const [isLoading, setIsLoading] = useState(false)
   const courseFeatures = useCourseFeatures(cid)
+  const [scrollToLastMessage, setScrollToLastMessage] = useState(false)
+  const [showScroll, setShowScroll] = useState(false)
+
+  const messagesRef = useRef<HTMLDivElement>(null)
   const messagesEndRef = useRef<HTMLDivElement>(null)
+  const lastMessageRef = useRef<HTMLDivElement>(null)
+
   const hasAskedQuestion = useRef(false) // to track if the user has asked a question
   const pathname = usePathname()
   const currentPageTitle = convertPathnameToPageName(pathname)
@@ -104,13 +112,36 @@ const Chatbot: React.FC<ChatbotProps> = ({
       ? Number(process.env.NEXT_PUBLIC_HELPME_COURSE_ID) || -1
       : cid
 
+  useEffect(() => {
+    const messagesElement = messagesRef.current
+    if (messagesElement) {
+      const interval = setInterval(() => {
+        if (!messagesElement) return
+        const needsIndicator =
+          (messagesElement.scrollTop + messagesElement.clientHeight) /
+            messagesElement.scrollHeight <
+          0.95
+        if (showScroll == needsIndicator) return
+        setShowScroll(needsIndicator)
+      }, 1000)
+      return () => clearInterval(interval)
+    }
+  }, [showScroll])
+
+  useEffect(() => {
+    if (scrollToLastMessage) {
+      scrollToLast()
+      setScrollToLastMessage(false)
+    }
+  }, [scrollToLastMessage])
+
   useEffect(() => {
     if (messages.length === 1) {
-      setPreDeterminedQuestions([])
+      setSuggestedQuestions([])
       API.chatbot.studentsOrStaff
         .getSuggestedQuestions(courseIdToUse)
         .then((questions) => {
-          setPreDeterminedQuestions(questions)
+          setSuggestedQuestions(questions)
         })
         .catch((err) => {
           console.error(err)
@@ -122,15 +153,36 @@ const Chatbot: React.FC<ChatbotProps> = ({
   }, [
     userInfo,
     courseIdToUse,
-    setPreDeterminedQuestions,
+    setSuggestedQuestions,
     messages.length,
     setQuestionsLeft,
   ])
 
+  const scrollToEnd = () => {
+    if (messagesEndRef.current) {
+      messagesEndRef.current.scrollIntoView({
+        behavior: 'smooth',
+        block: 'nearest',
+        inline: 'start',
+      })
+      setShowScroll(false)
+    }
+  }
+
+  const scrollToLast = () => {
+    if (lastMessageRef.current) {
+      lastMessageRef.current.scrollIntoView({
+        behavior: 'smooth',
+        block: 'nearest',
+        inline: 'start',
+      })
+    }
+  }
+
   const handleAsk = async () => {
     if (!hasAskedQuestion.current) {
       hasAskedQuestion.current = true
-      setPreDeterminedQuestions([]) // clear predetermined questions upon the first question
+      setSuggestedQuestions([]) // clear predetermined questions upon the first question
     }
 
     setIsLoading(true)
@@ -149,38 +201,37 @@ const Chatbot: React.FC<ChatbotProps> = ({
     await API.chatbot.studentsOrStaff
       .askQuestion(courseIdToUse, data)
       .then((chatbotResponse) => {
-        const answer = chatbotResponse.chatbotRepoVersion.answer
+        const answer = chatbotResponse.answer
         const { thinkText, cleanAnswer } = parseThinkBlock(answer)
-        const sourceDocuments =
-          chatbotResponse.chatbotRepoVersion.sourceDocuments ?? []
-        setMessages((prevMessages: Message[]) => [
+        const citations = chatbotResponse.citations ?? []
+        setMessages((prevMessages: HelpMeChatMessage[]) => [
           ...prevMessages,
           { type: 'userMessage', message: input },
           {
             type: 'apiMessage',
             message: thinkText ? cleanAnswer : answer,
-            verified: chatbotResponse.chatbotRepoVersion.verified,
-            sourceDocuments: sourceDocuments ? sourceDocuments : [],
-            questionId: chatbotResponse.chatbotRepoVersion.questionId,
+            verified: chatbotResponse.verified,
+            citations: citations,
+            questionId: chatbotResponse.questionId,
             thinkText: thinkText,
           },
         ])
-        setHelpmeQuestionId(chatbotResponse?.helpmeRepoVersion?.id)
-        setInteractionId(chatbotResponse?.helpmeRepoVersion?.interactionId)
+        setHelpmeQuestionId(chatbotResponse?.internal?.id)
+        setInteractionId(chatbotResponse?.internal?.interactionId)
       })
       .catch((err) => {
         console.error(err)
         const answer = "Sorry, I couldn't find the answer"
-        setMessages((prevMessages: Message[]) => [
+        setMessages((prevMessages: HelpMeChatMessage[]) => [
           ...prevMessages,
           { type: 'userMessage', message: input },
           {
             type: 'apiMessage',
             message: answer,
             verified: false,
-            sourceDocuments: [],
+            citations: [],
             questionId: undefined,
-            thinkText: null,
+            thinkText: undefined,
           },
         ])
       })
@@ -195,34 +246,33 @@ const Chatbot: React.FC<ChatbotProps> = ({
             },
           })
         }
+        setScrollToLastMessage(true)
         setIsLoading(false)
         setInput('')
       })
   }
 
   const answerPreDeterminedQuestion = async (
-    question: PreDeterminedQuestion,
+    question: SuggestedQuestionResponse,
   ) => {
-    const { thinkText, cleanAnswer } = parseThinkBlock(question.metadata.answer)
+    const { thinkText, cleanAnswer } = parseThinkBlock(question.answer)
     setMessages((prevMessages) => [
       ...prevMessages,
-      { type: 'userMessage', message: question.pageContent },
+      { type: 'userMessage', message: question.question },
       {
         type: 'apiMessage',
-        message: thinkText ? cleanAnswer : question.metadata.answer,
-        verified: question.metadata.verified,
-        sourceDocuments: question.metadata.sourceDocuments,
+        message: thinkText ? cleanAnswer : question.answer,
+        verified: question.verified,
+        citations: question.citations,
         questionId: question.id,
         thinkText: thinkText,
       },
     ])
-    setPreDeterminedQuestions([])
+    setSuggestedQuestions([])
 
     const helpmeQuestion =
       await API.chatbot.studentsOrStaff.askSuggestedQuestion(courseIdToUse, {
         vectorStoreId: question.id,
-        question: question.pageContent,
-        responseText: question.metadata.answer, // store full question (including think text) in db
       })
     setHelpmeQuestionId(helpmeQuestion.id)
     setInteractionId(helpmeQuestion.interactionId)
@@ -254,33 +304,34 @@ const Chatbot: React.FC<ChatbotProps> = ({
       <div
         className={cn(
           variant === 'small'
-            ? 'fixed bottom-0 z-50 max-h-[90vh] w-screen md:bottom-1 md:right-1 md:max-w-[400px]'
+            ? 'fixed bottom-0 z-50 max-h-[70vh] min-w-[25vw] md:bottom-1 md:right-1'
             : variant === 'big'
-              ? 'flex h-[80vh] w-screen flex-col overflow-auto md:w-[90%]'
+              ? 'flex max-h-[80vh] w-screen flex-col md:w-full'
               : variant === 'huge'
-                ? 'flex h-[90vh] w-screen flex-col overflow-auto md:w-[90%]'
+                ? 'flex max-h-[90vh] w-screen flex-col md:w-full'
                 : '',
+          'overflow-y-hidden',
         )}
         style={{ zIndex: 1050 }}
       >
         <Card
           title="Chatbot"
           classNames={{
-            header: 'pr-3',
+            header: 'pr-3 h-12',
             body: cn(
-              'px-4 pb-4',
+              'p-1',
               variant === 'big' || variant === 'huge'
                 ? 'flex flex-col flex-auto'
-                : '',
+                : 'w-full',
             ),
           }}
           className={cn(
             variant === 'big' || variant === 'huge'
-              ? 'flex w-full flex-auto flex-col overflow-y-auto'
-              : '',
+              ? 'flex w-full flex-auto flex-col'
+              : 'w-full',
           )}
           extra={
-            <>
+            <span>
               {Number(process.env.NEXT_PUBLIC_HELPME_COURSE_ID) &&
               messages.length > 1 ? (
                 <Popconfirm
@@ -352,7 +403,7 @@ const Chatbot: React.FC<ChatbotProps> = ({
                   icon={<CloseOutlined />}
                 />
               )}
-            </>
+            </span>
           }
         >
           <div
@@ -363,16 +414,29 @@ const Chatbot: React.FC<ChatbotProps> = ({
             )}
           >
             <div
+              ref={messagesRef}
               className={cn(
-                'overflow-y-auto',
-                variant === 'small' ? 'max-h-[70vh]' : 'grow-1',
+                variant === 'small'
+                  ? 'flex max-h-[calc(70vh-112px)] w-full flex-col'
+                  : variant === 'big'
+                    ? 'flex max-h-[calc(80vh-112px)] w-full flex-col'
+                    : variant === 'huge'
+                      ? 'flex max-h-[calc(90vh-112px)] w-full flex-col'
+                      : '',
+                variant === 'small' ? '' : 'grow-1',
+                'w-full overflow-y-auto',
               )}
             >
               {messages &&
                 messages.map((item, index) => (
                   <Fragment key={index}>
                     {item.type === 'userMessage' ? (
-                      <div className="align-items-start m-1 mb-3 flex justify-end">
+                      <div
+                        className="align-items-start m-1 mb-3 flex justify-end"
+                        ref={
+                          index == messages.length - 1 ? lastMessageRef : null
+                        }
+                      >
                         <div
                           className={cn(
                             'childrenMarkdownFormatted mr-2 rounded-xl bg-blue-900 px-3 py-2 text-white',
@@ -392,7 +456,12 @@ const Chatbot: React.FC<ChatbotProps> = ({
                         />
                       </div>
                     ) : (
-                      <div className="group mb-3 flex flex-grow items-start">
+                      <div
+                        className="group mb-3 flex items-start"
+                        ref={
+                          index == messages.length - 1 ? lastMessageRef : null
+                        }
+                      >
                         {item.thinkText ? (
                           <Tooltip
                             title={'Chatbot thoughts: ' + item.thinkText}
@@ -418,8 +487,25 @@ const Chatbot: React.FC<ChatbotProps> = ({
                             icon={<RobotOutlined />}
                           />
                         )}
-                        <div className="ml-2 flex flex-col gap-1">
-                          <div className="flex items-start gap-2">
+                        <div
+                          className={cn(
+                            'ml-2 flex flex-col gap-1',
+                            variant === 'small'
+                              ? 'max-w-[280px]'
+                              : 'max-w-[90%]',
+                          )}
+                          ref={
+                            index == messages.length - 1 ? lastMessageRef : null
+                          }
+                        >
+                          <div
+                            className={cn(
+                              'flex items-start gap-2',
+                              variant === 'small'
+                                ? 'max-w-[280px]'
+                                : 'max-w-[90%]',
+                            )}
+                          >
                             <div
                               className={cn(
                                 'childrenMarkdownFormatted rounded-xl px-3 py-2',
@@ -445,68 +531,33 @@ const Chatbot: React.FC<ChatbotProps> = ({
                               )}
                             </div>
                           </div>
-                          <div className="flex flex-col gap-1">
-                            {item.sourceDocuments &&
+                          <div
+                            className={cn(
+                              'flex flex-row flex-wrap gap-1',
+                              variant === 'small'
+                                ? 'max-w-[280px]'
+                                : 'max-w-[90%]',
+                            )}
+                          >
+                            {item.citations &&
                             chatbotQuestionType === 'System' ? (
-                              <div className="align-items-start flex h-fit w-fit max-w-[280px] flex-wrap justify-start gap-x-2 rounded-xl bg-slate-100 p-1 font-semibold">
-                                <p className="truncate px-2 py-1">User Guide</p>
-                                <SourceLinkButton
-                                  docName="User Guide"
-                                  sourceLink="https://github.com/ubco-db/helpme/blob/main/packages/frontend/public/userguide.md"
-                                />
-                              </div>
+                              <ChatbotCitation
+                                citation={
+                                  {
+                                    docName: 'User Guide',
+                                    sourceLink:
+                                      'https://github.com/ubco-db/helpme/blob/main/packages/frontend/public/userguide.md',
+                                  } as Citation
+                                }
+                              />
                             ) : (
-                              item.sourceDocuments &&
-                              item.sourceDocuments.map(
-                                (sourceDocument, idx) => (
-                                  <Tooltip
-                                    title={
-                                      sourceDocument.type &&
-                                      sourceDocument.type !=
-                                        'inserted_lms_document'
-                                        ? sourceDocument.content
-                                        : ''
-                                    }
-                                    key={idx}
-                                  >
-                                    <div className="align-items-start flex h-fit w-fit max-w-[280px] flex-wrap justify-start gap-x-2 rounded-xl bg-slate-100 p-1 font-semibold">
-                                      <p className="truncate px-2 py-1">
-                                        {sourceDocument.docName}
-                                      </p>
-                                      {sourceDocument.type ==
-                                        'inserted_lms_document' &&
-                                        sourceDocument.sourceLink && (
-                                          <SourceLinkButton
-                                            docName={sourceDocument.docName}
-                                            sourceLink={
-                                              sourceDocument.sourceLink
-                                            }
-                                            part={0}
-                                          />
-                                        )}
-                                      {
-                                        // for some reason pageNumbers isn't always an array. This might be worth investigating.
-                                        sourceDocument.pageNumbers &&
-                                          Array.isArray(
-                                            sourceDocument.pageNumbers,
-                                          ) &&
-                                          sourceDocument.pageNumbers.map(
-                                            (part) => (
-                                              <SourceLinkButton
-                                                key={`${sourceDocument.docName}-${part}`}
-                                                docName={sourceDocument.docName}
-                                                sourceLink={
-                                                  sourceDocument.sourceLink
-                                                }
-                                                part={part}
-                                              />
-                                            ),
-                                          )
-                                      }
-                                    </div>
-                                  </Tooltip>
-                                ),
-                              )
+                              item.citations &&
+                              item.citations.map((citation) => (
+                                <ChatbotCitation
+                                  key={`citation-${citation.questionId}-${citation.documentId}`}
+                                  citation={citation}
+                                />
+                              ))
                             )}
                           </div>
                           {item.type === 'apiMessage' &&
@@ -522,18 +573,18 @@ const Chatbot: React.FC<ChatbotProps> = ({
                     )}
                   </Fragment>
                 ))}
-              {preDeterminedQuestions &&
+              {suggestedQuestions &&
                 !isLoading &&
-                preDeterminedQuestions.map((question) => (
+                suggestedQuestions.map((question) => (
                   <div
                     className="align-items-start m-1 mb-1 flex justify-end"
-                    key={question.id || question.pageContent}
+                    key={question.id}
                   >
                     <div
                       onClick={() => answerPreDeterminedQuestion(question)}
                       className="mr-2 max-w-[300px] cursor-pointer rounded-xl border-2 border-blue-900 bg-transparent px-3 py-2 text-blue-900 transition hover:bg-blue-900 hover:text-white"
                     >
-                      {question.pageContent}
+                      {question.question}
                     </div>
                   </div>
                 ))}
@@ -545,7 +596,6 @@ const Chatbot: React.FC<ChatbotProps> = ({
                   }}
                 />
               )}
-              <div ref={messagesEndRef} />
               {courseFeatures.asyncQueueEnabled &&
                 chatbotQuestionType === 'Course' &&
                 messages.length > 1 && (
@@ -561,44 +611,65 @@ const Chatbot: React.FC<ChatbotProps> = ({
                     </Link>
                   </div>
                 )}
+              <div ref={messagesEndRef} />
             </div>
-            <div>
-              <Space.Compact block size="large">
-                <TextArea
-                  id="chatbot-input"
-                  autoSize={{ minRows: 1.22, maxRows: 20 }}
-                  value={input}
-                  onChange={(e) => setInput(e.target.value)}
-                  className="rounded-r-none text-sm"
-                  placeholder="Ask something... (Shift+Enter for new line)"
-                  onKeyDown={(e) => {
-                    if (e.key === 'Enter' && !e.shiftKey) {
-                      e.preventDefault()
-                      if (input.trim().length > 0 && !isLoading) {
-                        handleAsk()
-                      }
+          </div>
+          <div
+            className={
+              'sticky bottom-0 h-12 border-t-2 border-t-slate-50 bg-white p-1'
+            }
+          >
+            <Space.Compact block size="large">
+              <TextArea
+                id="chatbot-input"
+                autoSize={{ minRows: 1.22, maxRows: 20 }}
+                value={input}
+                onChange={(e) => setInput(e.target.value)}
+                className="rounded-r-none text-sm"
+                placeholder="Ask something... (Shift+Enter for new line)"
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter' && !e.shiftKey) {
+                    e.preventDefault()
+                    if (input.trim().length > 0 && !isLoading) {
+                      handleAsk()
                     }
-                  }}
-                />
-                <Button
-                  type="primary"
-                  onClick={handleAsk}
-                  disabled={input.trim().length === 0 || isLoading}
-                >
-                  Ask
-                </Button>
-              </Space.Compact>
-              {userInfo.chat_token && questionsLeft < 100 && (
-                <Card.Meta
-                  description={`You can ask the chatbot ${questionsLeft} more question${
-                    questionsLeft > 1 ? 's' : ''
-                  } today`}
-                  className="mt-3"
-                />
-              )}
-            </div>
+                  }
+                }}
+              />
+              <Button
+                type="primary"
+                onClick={handleAsk}
+                disabled={input.trim().length === 0 || isLoading}
+              >
+                Ask
+              </Button>
+            </Space.Compact>
+            {userInfo.chat_token && questionsLeft < 100 && (
+              <Card.Meta
+                description={`You can ask the chatbot ${questionsLeft} more question${
+                  questionsLeft > 1 ? 's' : ''
+                } today`}
+                className="mt-3"
+              />
+            )}
           </div>
         </Card>
+        <div className={'sticky bottom-14 w-full text-center'}>
+          <div
+            className={cn(
+              'flex w-full items-center justify-center transition-opacity',
+              showScroll ? 'opacity-100' : 'opacity-0',
+            )}
+          >
+            <Button
+              className={'rounded-md bg-white text-sm shadow-md'}
+              type={'link'}
+              onClick={() => scrollToEnd()}
+            >
+              Scroll to most recent message
+            </Button>
+          </div>
+        </div>
       </div>
     ) : (
       <div
@@ -627,36 +698,3 @@ const Chatbot: React.FC<ChatbotProps> = ({
 }
 
 export default Chatbot
-
-const SourceLinkButton: React.FC<{
-  docName: string
-  sourceLink?: string
-  part?: number
-}> = ({ docName, sourceLink, part }) => {
-  if (!sourceLink) {
-    return null
-  }
-  const pageNumber = part && !isNaN(part) ? Number(part) : undefined
-
-  return (
-    <a
-      className={`flex items-center justify-center rounded-lg bg-blue-100 px-3 py-2 font-semibold transition ${
-        sourceLink && 'hover:bg-black-300 cursor-pointer hover:text-white'
-      }`}
-      key={`${docName}-${part}`}
-      href={
-        sourceLink +
-        (pageNumber && sourceLink.startsWith('/api/v1/chatbot/document/')
-          ? `#page=${pageNumber}`
-          : '')
-      }
-      rel="noopener noreferrer"
-      // open in new tab
-      target="_blank"
-    >
-      <p className="h-fit w-fit text-xs leading-4">
-        {part ? `p. ${part}` : 'Source'}
-      </p>
-    </a>
-  )
-}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/ChatbotCitation.tsx b/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/ChatbotCitation.tsx
new file mode 100644
index 000000000..e66cff970
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/ChatbotCitation.tsx
@@ -0,0 +1,150 @@
+import { Citation } from '@koh/common'
+import { Progress, Tooltip } from 'antd'
+import { cn, lerpColor } from '@/app/utils/generalUtils'
+import { useMemo } from 'react'
+import { CheckCircleOutlined } from '@ant-design/icons'
+
+type ChatbotCitationProps = {
+  citation: Citation
+  tooltipContent?: React.ReactNode
+  variant?: 'bordered' | 'none'
+  listMode?: boolean
+}
+
+const ChatbotCitation: React.FC<ChatbotCitationProps> = ({
+  citation,
+  tooltipContent,
+}) => {
+  return (
+    <Tooltip title={tooltipContent}>
+      <div
+        className={cn(
+          'align-items-start flex h-fit w-fit max-w-full flex-wrap justify-start gap-x-1 gap-y-1 rounded-xl bg-slate-100 p-1 font-semibold',
+        )}
+      >
+        <Tooltip title={citation.docName}>
+          <p className={'truncate px-2 py-1'}>{citation.docName}</p>
+        </Tooltip>
+        {citation.sourceLink &&
+          (citation.pageNumbers != undefined ? (
+            citation.pageNumbers.map((part) => (
+              <SourceLinkButton
+                key={`${citation.docName}-${part}`}
+                title={citation.docName}
+                sourceLink={citation.sourceLink}
+                part={part}
+                confidence={citation.confidences?.[part]}
+              />
+            ))
+          ) : (
+            <SourceLinkButton
+              title={citation.docName}
+              sourceLink={citation.sourceLink}
+              confidence={citation.confidences?.[0]}
+            />
+          ))}
+      </div>
+    </Tooltip>
+  )
+}
+
+export default ChatbotCitation
+
+export const SourceLinkButton: React.FC<{
+  title: string
+  sourceLink?: string
+  part?: number
+  variant?: 'fill' | 'none'
+  lines?: { to: number; from: number }
+  linkTitle?: string
+  size?: 'default' | 'small'
+  confidence?: number
+}> = ({
+  title,
+  sourceLink,
+  part,
+  variant = 'fill',
+  lines,
+  linkTitle,
+  size = 'default',
+  confidence,
+}) => {
+  const confidenceColor = useMemo(
+    () =>
+      confidence != undefined
+        ? lerpColor(
+            lerpColor('#a30d0d', '#e8e231', Math.min(confidence + 0.5, 1)),
+            '#1fa356',
+            confidence >= 0.5 ? (confidence - 0.5) * 2 : 0,
+          )
+        : undefined,
+    [confidence],
+  )
+  if (!sourceLink) {
+    return null
+  }
+  const pageNumber = part && !isNaN(part) ? Number(part) : undefined
+
+  return (
+    <div
+      className={cn(
+        variant == 'fill'
+          ? confidence != undefined && confidence >= 1
+            ? 'rounded-lg bg-green-100 px-3 py-2'
+            : 'rounded-lg bg-blue-100 px-3 py-2'
+          : '',
+        'flex items-center justify-center gap-1 font-semibold transition',
+      )}
+    >
+      <a
+        className={cn(
+          sourceLink
+            ? 'hover:bg-black-300 cursor-pointer hover:text-white'
+            : '',
+          confidence != undefined && confidence >= 1 ? 'text-green-600' : '',
+        )}
+        key={`${title}-${part}`}
+        href={
+          sourceLink +
+          (pageNumber && sourceLink.startsWith('/api/v1/chatbot/document/')
+            ? `#page=${pageNumber}`
+            : '')
+        }
+        rel="noopener noreferrer"
+        // open in new tab
+        target="_blank"
+        onClick={(e) => e.stopPropagation()}
+      >
+        <p
+          className={cn(
+            'h-fit w-fit leading-4',
+            size == 'small' ? 'text-[8px]' : 'text-xs',
+          )}
+        >
+          {pageNumber != undefined ? `p. ${pageNumber}` : (linkTitle ?? 'Link')}
+          {pageNumber != undefined && lines != undefined
+            ? `, lines ${lines.from}-${lines.to}`
+            : ''}
+        </p>
+      </a>
+      {confidence != undefined && (
+        <Tooltip title={`Confidence: ${Math.round(confidence * 100)}%`}>
+          <div className={'flex items-center justify-center'}>
+            {confidence >= 1 ? (
+              <CheckCircleOutlined style={{ color: confidenceColor }} />
+            ) : (
+              <Progress
+                format={() => null}
+                showInfo={false}
+                type={'circle'}
+                percent={Math.round(confidence * 100)}
+                size={15}
+                strokeColor={confidenceColor}
+              />
+            )}
+          </div>
+        </Tooltip>
+      )}
+    </div>
+  )
+}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/ChatbotProvider.tsx b/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/ChatbotProvider.tsx
index 9039a7f99..573e92a04 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/ChatbotProvider.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/components/chatbot/ChatbotProvider.tsx
@@ -1,5 +1,5 @@
 'use client'
-/* eslint-disable @typescript-eslint/no-empty-function */
+
 import {
   createContext,
   ReactNode,
@@ -9,23 +9,23 @@ import {
 } from 'react'
 import Chatbot from './Chatbot'
 import {
-  chatbotStartingMessageCourse,
   ChatbotQuestionType,
+  chatbotStartingMessageCourse,
 } from '@/app/typings/chatbot'
-import { Message, PreDeterminedQuestion } from '@koh/common'
+import { HelpMeChatMessage, SuggestedQuestionResponse } from '@koh/common'
 
 interface ChatbotContextType {
   setCid: React.Dispatch<React.SetStateAction<number | null>>
   renderSmallChatbot: boolean
   setRenderSmallChatbot: React.Dispatch<React.SetStateAction<boolean>>
-  preDeterminedQuestions: PreDeterminedQuestion[]
-  setPreDeterminedQuestions: React.Dispatch<
-    React.SetStateAction<PreDeterminedQuestion[]>
+  suggestedQuestions: SuggestedQuestionResponse[]
+  setSuggestedQuestions: React.Dispatch<
+    React.SetStateAction<SuggestedQuestionResponse[]>
   >
   questionsLeft: number
   setQuestionsLeft: React.Dispatch<React.SetStateAction<number>>
-  messages: Message[]
-  setMessages: React.Dispatch<React.SetStateAction<Message[]>>
+  messages: HelpMeChatMessage[]
+  setMessages: React.Dispatch<React.SetStateAction<HelpMeChatMessage[]>>
   isOpen: boolean
   setIsOpen: React.Dispatch<React.SetStateAction<boolean>>
   interactionId: number | undefined
@@ -42,8 +42,8 @@ const chatbotContext = createContext<ChatbotContextType>({
   setCid: () => {},
   renderSmallChatbot: false,
   setRenderSmallChatbot: () => {},
-  preDeterminedQuestions: [],
-  setPreDeterminedQuestions: () => {},
+  suggestedQuestions: [],
+  setSuggestedQuestions: () => {},
   questionsLeft: 0,
   setQuestionsLeft: () => {},
   messages: [
@@ -82,11 +82,11 @@ const ChatbotContextProvider: React.FC<ChatbotContextProviderProps> = ({
   const [renderSmallChatbot, setRenderSmallChatbot] = useState(false)
 
   // Chatbot states
-  const [preDeterminedQuestions, setPreDeterminedQuestions] = useState<
-    PreDeterminedQuestion[]
+  const [suggestedQuestions, setSuggestedQuestions] = useState<
+    SuggestedQuestionResponse[]
   >([])
   const [questionsLeft, setQuestionsLeft] = useState<number>(0)
-  const [messages, setMessages] = useState<Message[]>([
+  const [messages, setMessages] = useState<HelpMeChatMessage[]>([
     {
       type: 'apiMessage',
       message: chatbotStartingMessageCourse,
@@ -103,7 +103,7 @@ const ChatbotContextProvider: React.FC<ChatbotContextProviderProps> = ({
     useState<ChatbotQuestionType>('Course')
   useEffect(() => {
     // reset chatbot states when course changes
-    setPreDeterminedQuestions([])
+    setSuggestedQuestions([])
     setMessages([
       {
         type: 'apiMessage',
@@ -120,8 +120,8 @@ const ChatbotContextProvider: React.FC<ChatbotContextProviderProps> = ({
     setCid,
     renderSmallChatbot,
     setRenderSmallChatbot,
-    preDeterminedQuestions,
-    setPreDeterminedQuestions,
+    suggestedQuestions,
+    setSuggestedQuestions,
     questionsLeft,
     setQuestionsLeft,
     messages,
@@ -143,8 +143,8 @@ const ChatbotContextProvider: React.FC<ChatbotContextProviderProps> = ({
           key={cid}
           cid={cid}
           variant="small"
-          preDeterminedQuestions={preDeterminedQuestions}
-          setPreDeterminedQuestions={setPreDeterminedQuestions}
+          suggestedQuestions={suggestedQuestions}
+          setSuggestedQuestions={setSuggestedQuestions}
           questionsLeft={questionsLeft}
           setQuestionsLeft={setQuestionsLeft}
           messages={messages}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/page.tsx
index 66df1bee3..e080241d4 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/page.tsx
@@ -1,8 +1,8 @@
 'use client'
 
 import { Role } from '@koh/common'
-import { Col, Row, Button } from 'antd'
-import { ReactElement, useEffect, useMemo, useState, use } from 'react'
+import { Button, Col, Row } from 'antd'
+import { ReactElement, use, useEffect, useMemo, useState } from 'react'
 import QueueCard from './components/QueueCard'
 import { useCourseFeatures } from '@/app/hooks/useCourseFeatures'
 import { useUserInfo } from '@/app/contexts/userContext'
@@ -44,8 +44,8 @@ export default function CoursePage(props: CoursePageProps): ReactElement {
   const {
     setCid,
     setRenderSmallChatbot,
-    preDeterminedQuestions,
-    setPreDeterminedQuestions,
+    suggestedQuestions,
+    setSuggestedQuestions,
     questionsLeft,
     setQuestionsLeft,
     messages,
@@ -201,8 +201,8 @@ export default function CoursePage(props: CoursePageProps): ReactElement {
                       key={cid}
                       cid={cid}
                       variant="big"
-                      preDeterminedQuestions={preDeterminedQuestions}
-                      setPreDeterminedQuestions={setPreDeterminedQuestions}
+                      suggestedQuestions={suggestedQuestions}
+                      setSuggestedQuestions={setSuggestedQuestions}
                       questionsLeft={questionsLeft}
                       setQuestionsLeft={setQuestionsLeft}
                       messages={messages}
@@ -228,8 +228,8 @@ export default function CoursePage(props: CoursePageProps): ReactElement {
               key={cid}
               cid={cid}
               variant="huge"
-              preDeterminedQuestions={preDeterminedQuestions}
-              setPreDeterminedQuestions={setPreDeterminedQuestions}
+              suggestedQuestions={suggestedQuestions}
+              setSuggestedQuestions={setSuggestedQuestions}
               questionsLeft={questionsLeft}
               setQuestionsLeft={setQuestionsLeft}
               messages={messages}
@@ -241,7 +241,6 @@ export default function CoursePage(props: CoursePageProps): ReactElement {
               helpmeQuestionId={helpmeQuestionId}
               chatbotQuestionType={chatbotQuestionType}
               setChatbotQuestionType={setChatbotQuestionType}
-              /* eslint-disable-next-line @typescript-eslint/no-empty-function */
               setIsOpen={() => {}}
             />
           </div>
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/AddStudentsToQueueModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/AddStudentsToQueueModal.tsx
index f584f85c1..6afb51979 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/AddStudentsToQueueModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/AddStudentsToQueueModal.tsx
@@ -1,7 +1,6 @@
-import { useCallback } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import Modal from 'antd/lib/modal/Modal'
-import { Form, message, Checkbox, Input, Select, Segmented } from 'antd'
-import { useEffect, useState } from 'react'
+import { Checkbox, Form, Input, message, Segmented, Select } from 'antd'
 import {
   ConfigTasks,
   OpenQuestionStatus,
@@ -140,6 +139,7 @@ const AddStudentsToQueueModal: React.FC<AddStudentsToQueueModalProps> = ({
 
   return (
     <Modal
+      centered
       open={open}
       title={
         <div className="flex flex-wrap gap-x-4 gap-y-2">
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/AssignmentReportModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/AssignmentReportModal.tsx
index 1379f92c8..01c6c807a 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/AssignmentReportModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/AssignmentReportModal.tsx
@@ -1,5 +1,5 @@
 import Modal from 'antd/lib/modal/Modal'
-import { Button, message, Card, Col, Row, Segmented } from 'antd'
+import { Button, Card, Col, message, Row, Segmented } from 'antd'
 import {
   AllStudentAssignmentProgress,
   AssignmentProgressWithUser,
@@ -100,6 +100,7 @@ const AssignmentReportModal: React.FC<AssignmentReportModalProps> = ({
   }
   return (
     <Modal
+      centered
       title={
         <div className="flex flex-wrap gap-x-4 gap-y-2">
           <div className="flex items-center justify-center">
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CantFindModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CantFindModal.tsx
index bec018179..842e75458 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CantFindModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CantFindModal.tsx
@@ -14,6 +14,7 @@ const CantFindModal: React.FC<CantFindModalProps> = ({
 }) => {
   return (
     <Modal
+      centered
       open={open}
       footer={[
         <Button key="leave" danger onClick={leaveQueue}>
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CreateDemoModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CreateDemoModal.tsx
index 7cd8f8c6c..a7c815ba7 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CreateDemoModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CreateDemoModal.tsx
@@ -73,6 +73,7 @@ const CreateDemoModal: React.FC<CreateDemoModalProps> = ({
 
   return (
     <Modal
+      centered
       open={open}
       title={drafting ? 'Create Demo' : 'Edit Your Demo'}
       okText={drafting ? 'Finish' : 'Save Changes'}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CreateQuestionModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CreateQuestionModal.tsx
index b41255c60..b7474b816 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CreateQuestionModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/CreateQuestionModal.tsx
@@ -90,6 +90,7 @@ const CreateQuestionModal: React.FC<CreateQuestionModalProps> = ({
 
   return (
     <Modal
+      centered
       open={open}
       title={drafting ? 'Describe your question' : 'Edit your question'}
       okText={drafting ? 'Finish' : 'Save Changes'}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EditQueueModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EditQueueModal.tsx
index bf35b9014..eb52d2b3d 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EditQueueModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EditQueueModal.tsx
@@ -1,23 +1,23 @@
 'use client'
 
-import { useRef, useEffect, useState, useCallback } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import Modal from 'antd/lib/modal/Modal'
 import {
-  Input,
-  Form,
   Button,
-  message,
-  Popconfirm,
-  Switch,
-  Tooltip,
+  Checkbox,
   Collapse,
-  Space,
   ColorPickerProps,
-  GetProp,
   Dropdown,
+  Form,
+  GetProp,
+  Input,
+  message,
+  Popconfirm,
   Segmented,
-  Checkbox,
   Select,
+  Space,
+  Switch,
+  Tooltip,
 } from 'antd'
 import {
   ConfigTasks,
@@ -42,12 +42,12 @@ import { useQuestionTypes } from '@/app/hooks/useQuestionTypes'
 import { useQueue } from '@/app/hooks/useQueue'
 import QueueConfigHelp from '../../../../components/QueueConfigHelp'
 import {
-  DisableQueueButton,
   ClearQueueButton,
+  DisableQueueButton,
 } from '../../../../components/QueueInfoColumnButton'
 import {
-  confirmDisable,
   clearQueue,
+  confirmDisable,
 } from '../../../../utils/commonCourseFunctions'
 import {
   EditedQuestionTag,
@@ -111,7 +111,7 @@ const EditQueueModal: React.FC<EditQueueModalProps> = ({
   const { queue, mutateQueue } = useQueue(queueId)
   const [form] = Form.useForm()
   const [saveChangesLoading, setSaveChangesLoading] = useState(false)
-  const { course, mutateCourse } = useCourse(courseId)
+  const { course } = useCourse(courseId)
   const [questionTypes, mutateQuestionTypes] = useQuestionTypes(
     courseId,
     queueId,
@@ -402,6 +402,7 @@ const EditQueueModal: React.FC<EditQueueModalProps> = ({
 
   return (
     <Modal
+      centered
       open={open}
       title="Edit Queue Details"
       okText="Save Changes"
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EventEndedCheckoutStaffModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EventEndedCheckoutStaffModal.tsx
index f7bf3618b..5ff94e43b 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EventEndedCheckoutStaffModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/EventEndedCheckoutStaffModal.tsx
@@ -15,6 +15,7 @@ const EventEndedCheckoutStaffModal: React.FC<
 
   return (
     <Modal
+      centered
       open={true}
       footer={[
         <Button
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/JoinZoomNowModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/JoinZoomNowModal.tsx
index 324b91f6e..b8fcafc72 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/JoinZoomNowModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/JoinZoomNowModal.tsx
@@ -41,6 +41,7 @@ const JoinZoomNowModal: React.FC<JoinZoomNowModalProps> = ({
 
   return (
     <Modal
+      centered
       open={isClosable ? localOpen : open}
       footer={[]}
       style={{ top: '30%' }}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/PromptStudentToLeaveQueueModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/PromptStudentToLeaveQueueModal.tsx
index 2be25efa6..c612b1af5 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/PromptStudentToLeaveQueueModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/PromptStudentToLeaveQueueModal.tsx
@@ -1,6 +1,6 @@
 import { Button, message, Tooltip } from 'antd'
 import Modal from 'antd/lib/modal/Modal'
-import { useState, useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import { ArrowRightLeft, DoorOpen, PersonStanding } from 'lucide-react'
 import { API } from '@/app/api'
 import { getErrorMessage } from '@/app/utils/generalUtils'
@@ -122,6 +122,7 @@ const PromptStudentToLeaveQueueModal: React.FC<
 
   return (
     <Modal
+      centered
       open={true}
       width={650}
       classNames={{
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/StudentRemovedFromQueueModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/StudentRemovedFromQueueModal.tsx
index 8fa98311d..34269a3d4 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/StudentRemovedFromQueueModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/StudentRemovedFromQueueModal.tsx
@@ -29,6 +29,7 @@ const StudentRemovedFromQueueModal: React.FC<
   }, [question])
   return (
     <Modal
+      centered
       open={question?.status === LimboQuestionStatus.TADeleted}
       classNames={{
         footer: 'flex justify-center',
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/StudentRephraseModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/StudentRephraseModal.tsx
index d0525dc60..956541806 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/StudentRephraseModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/queue/[qid]/components/modals/StudentRephraseModal.tsx
@@ -12,6 +12,7 @@ const StudentRephraseModal: React.FC<StudentRephraseModalProps> = ({
 }) => {
   return (
     <Modal
+      centered
       open={true}
       footer={[
         <Button
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/schedule/components/CreateEventModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/schedule/components/CreateEventModal.tsx
index d9c72a499..9cd0c3bcd 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/schedule/components/CreateEventModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/schedule/components/CreateEventModal.tsx
@@ -1,15 +1,15 @@
 import {
-  Modal,
+  Checkbox,
+  ColorPickerProps,
+  DatePicker,
   Form,
+  GetProp,
   Input,
-  DatePicker,
-  Checkbox,
-  Radio,
   message,
-  TimePicker,
+  Modal,
+  Radio,
   Select,
-  ColorPickerProps,
-  GetProp,
+  TimePicker,
 } from 'antd'
 import { useEffect, useState } from 'react'
 import { API } from '@/app/api'
@@ -156,6 +156,7 @@ const CreateEventModal: React.FC<CreateEventModalProps> = ({
 
   return (
     <Modal
+      centered
       open={visible}
       title="Create a new event"
       okText="Create"
@@ -184,7 +185,7 @@ const CreateEventModal: React.FC<CreateEventModalProps> = ({
               ? dayjs(lastSetEndDate)
               : dayjs(event?.start).add(4, 'month'),
           }}
-          onValuesChange={(changedValues, allValues) => {
+          onValuesChange={(changedValues) => {
             if (changedValues.endDate) {
               setLastSetEndDate(changedValues.endDate)
             }
@@ -220,29 +221,31 @@ const CreateEventModal: React.FC<CreateEventModalProps> = ({
         />
       </Form.Item>
 
-      <Form.Item
-        label="Date"
-        name="date"
-        rules={[
-          { required: true, message: 'Please select the date of the event' },
-        ]}
-      >
-        <DatePicker />
-      </Form.Item>
-      <Form.Item
-        label="Time"
-        name="time"
-        rules={[
-          { required: true, message: 'Please select the times of the event' },
-        ]}
-      >
-        <RangePicker
-          // Don't show seconds, also show minutes in intervals of 5
-          minuteStep={5}
-          format="HH:mm"
-          className="w-36"
-        />
-      </Form.Item>
+      <div className={'grid w-full grid-cols-2'}>
+        <Form.Item
+          label="Date"
+          name="date"
+          rules={[
+            { required: true, message: 'Please select the date of the event' },
+          ]}
+        >
+          <DatePicker />
+        </Form.Item>
+        <Form.Item
+          label="Time"
+          name="time"
+          rules={[
+            { required: true, message: 'Please select the times of the event' },
+          ]}
+        >
+          <RangePicker
+            // Don't show seconds, also show minutes in intervals of 5
+            minuteStep={5}
+            format="HH:mm"
+            className="w-36"
+          />
+        </Form.Item>
+      </div>
       <Form.Item
         label="Staff"
         name="staffIds"
@@ -297,7 +300,7 @@ const CreateEventModal: React.FC<CreateEventModalProps> = ({
       </Form.Item>
 
       {isRepeating && (
-        <>
+        <div className={'grid w-full grid-cols-2'}>
           <Form.Item
             label="Start Date"
             name="startDate"
@@ -351,6 +354,7 @@ const CreateEventModal: React.FC<CreateEventModalProps> = ({
             <DatePicker picker="date" />
           </Form.Item>
           <Form.Item
+            className={'col-span-2'}
             label="Repeat on"
             name="daysOfWeek"
             rules={[
@@ -368,7 +372,7 @@ const CreateEventModal: React.FC<CreateEventModalProps> = ({
               ))}
             </Checkbox.Group>
           </Form.Item>
-        </>
+        </div>
       )}
 
       <Form.Item
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/schedule/components/EditEventModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/schedule/components/EditEventModal.tsx
index 7fb03deb8..7f2d785cc 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/schedule/components/EditEventModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/schedule/components/EditEventModal.tsx
@@ -1,24 +1,23 @@
 import {
-  Modal,
+  Button,
+  Checkbox,
+  ColorPickerProps,
+  DatePicker,
   Form,
+  GetProp,
   Input,
-  DatePicker,
-  TimePicker,
-  Checkbox,
-  Radio,
   message,
-  Button,
+  Modal,
   Popconfirm,
-  ColorPickerProps,
-  GetProp,
+  Radio,
   Select,
+  TimePicker,
 } from 'antd'
 import { useCallback, useEffect, useState } from 'react'
 import dayjs from 'dayjs'
 import { API } from '@/app/api'
-import { Event } from '@/app/typings/types'
+import { dayToIntMapping, Event } from '@/app/typings/types'
 import { Calendar, calendarEventLocationType } from '@koh/common'
-import { dayToIntMapping } from '@/app/typings/types'
 import { getErrorMessage } from '@/app/utils/generalUtils'
 import { DeleteOutlined } from '@ant-design/icons'
 import ColorPickerWithPresets from '@/app/components/ColorPickerWithPresets'
@@ -175,6 +174,7 @@ const EditEventModal: React.FC<EditEventModalProps> = ({
 
   return (
     <Modal
+      centered
       open={visible}
       title="Edit Event"
       okText="Save Changes"
@@ -261,21 +261,23 @@ const EditEventModal: React.FC<EditEventModalProps> = ({
         />
       </Form.Item>
 
-      <Form.Item
-        label="Start Time"
-        name="startTime"
-        rules={[{ required: true, message: 'Please select the start time!' }]}
-      >
-        <TimePicker format="HH:mm" minuteStep={5} />
-      </Form.Item>
+      <div className={'grid w-full grid-cols-2'}>
+        <Form.Item
+          label="Start Time"
+          name="startTime"
+          rules={[{ required: true, message: 'Please select the start time!' }]}
+        >
+          <TimePicker format="HH:mm" minuteStep={5} />
+        </Form.Item>
 
-      <Form.Item
-        label="End Time"
-        name="endTime"
-        rules={[{ required: true, message: 'Please select the end time!' }]}
-      >
-        <TimePicker format="HH:mm" minuteStep={5} />
-      </Form.Item>
+        <Form.Item
+          label="End Time"
+          name="endTime"
+          rules={[{ required: true, message: 'Please select the end time!' }]}
+        >
+          <TimePicker format="HH:mm" minuteStep={5} />
+        </Form.Item>
+      </div>
       <Form.Item
         label="Staff"
         name="staffIds"
@@ -331,7 +333,7 @@ const EditEventModal: React.FC<EditEventModalProps> = ({
       </Form.Item>
 
       {isRepeating && (
-        <>
+        <div className={'grid w-full grid-cols-2'}>
           <Form.Item
             label="Start Date"
             name="startDate"
@@ -379,6 +381,7 @@ const EditEventModal: React.FC<EditEventModalProps> = ({
             <DatePicker />
           </Form.Item>
           <Form.Item
+            className={'col-span-2'}
             label="Repeat on"
             name="daysOfWeek"
             rules={[
@@ -396,7 +399,7 @@ const EditEventModal: React.FC<EditEventModalProps> = ({
               ))}
             </Checkbox.Group>
           </Form.Item>
-        </>
+        </div>
       )}
 
       <Form.Item
diff --git a/packages/frontend/app/(dashboard)/organization/ai/components/AddModelModal.tsx b/packages/frontend/app/(dashboard)/organization/ai/components/AddModelModal.tsx
index e009e7934..724c1888b 100644
--- a/packages/frontend/app/(dashboard)/organization/ai/components/AddModelModal.tsx
+++ b/packages/frontend/app/(dashboard)/organization/ai/components/AddModelModal.tsx
@@ -2,10 +2,7 @@ import { useEffect, useMemo, useState } from 'react'
 import {
   ChatbotAllowedHeaders,
   ChatbotServiceProvider,
-  ChatbotServiceType,
   LLMType,
-  OllamaLLMType,
-  OpenAILLMType,
 } from '@koh/common'
 import { API } from '@/app/api'
 import { Button, Divider, List, message, Modal, Tooltip } from 'antd'
@@ -90,7 +87,7 @@ const AddModelModal = <T extends LLMType>({
         .then((response) => {
           setAvailableModels(response)
         })
-        .catch((_err) => {
+        .catch(() => {
           if (calledFromRetry) {
             message.error(
               `Failed to retrieve provider's model list from ${providerTypeName} service`,
@@ -145,6 +142,7 @@ const AddModelModal = <T extends LLMType>({
 
   return (
     <Modal
+      centered
       title={'Add Models'}
       open={open}
       onCancel={onClose}
diff --git a/packages/frontend/app/(dashboard)/organization/components/BatchCourseCloneModal.tsx b/packages/frontend/app/(dashboard)/organization/components/BatchCourseCloneModal.tsx
index 79a220e2d..f0ffade2f 100644
--- a/packages/frontend/app/(dashboard)/organization/components/BatchCourseCloneModal.tsx
+++ b/packages/frontend/app/(dashboard)/organization/components/BatchCourseCloneModal.tsx
@@ -5,7 +5,6 @@ import {
   CourseResponse,
   defaultCourseCloneAttributes,
   GetOrganizationResponse,
-  OrganizationProfessor,
 } from '@koh/common'
 import { Button, Form, message, Modal } from 'antd'
 import React, { useEffect, useState } from 'react'
@@ -36,7 +35,6 @@ const BatchCourseCloneModal: React.FC<BatchCourseCloneModalProps> = ({
   organization,
 }) => {
   const [courses, setCourses] = useState<CourseResponse[]>([])
-  const [professors, setProfessors] = useState<OrganizationProfessor[]>([])
   const [defaultCloneSettings, setDefaultCloneSettings] =
     useState<CourseCloneAttributes>({
       ...defaultCourseCloneAttributes,
@@ -51,25 +49,19 @@ const BatchCourseCloneModal: React.FC<BatchCourseCloneModalProps> = ({
   const [defaultSettingsForm] = Form.useForm<CourseCloneAttributes>()
 
   useEffect(() => {
-    const fetchProfessors = async () => {
-      API.organizations.getProfessors(organization.id).then((professors) => {
-        setProfessors(professors)
-      })
-    }
     // have to fetch all courses (without pagination) since need to allow for admin to "clone all courses" if they wanted to
     const fetchCourses = async () => {
       API.organizations.getCourses(organization.id).then((courses) => {
         setCourses(courses)
       })
     }
-    fetchProfessors()
     fetchCourses()
   }, [organization.id])
 
   const handleBatchClone = async () => {
     API.organizations
       .batchCloneCourses(organization.id, customCloneSettings)
-      .then((res) => {
+      .then(() => {
         message.success('Course cloning job scheduled successfully!')
         setCurrentStep(CloneSteps.SelectCourses)
         setSelectedCourseIds([])
@@ -243,6 +235,7 @@ const BatchCourseCloneModal: React.FC<BatchCourseCloneModalProps> = ({
 
   return courses ? (
     <Modal
+      centered
       title={getModalTitle()}
       open={open}
       onCancel={onClose}
diff --git a/packages/frontend/app/(dashboard)/organization/lms_integrations/page.tsx b/packages/frontend/app/(dashboard)/organization/lms_integrations/page.tsx
index 54ca4bc25..de3416c57 100644
--- a/packages/frontend/app/(dashboard)/organization/lms_integrations/page.tsx
+++ b/packages/frontend/app/(dashboard)/organization/lms_integrations/page.tsx
@@ -258,6 +258,7 @@ export default function LMSIntegrationsPage(): ReactElement {
         </div>
       </div>
       <Modal
+        centered
         open={modalOpen}
         onCancel={modalCleanup}
         onOk={() =>
@@ -302,6 +303,7 @@ export default function LMSIntegrationsPage(): ReactElement {
         </div>
       </Modal>
       <Modal
+        centered
         title={'Are you sure you want to delete this LMS integration?'}
         open={delModalOpen}
         onOk={() => deleteIntegration()}
diff --git a/packages/frontend/app/(dashboard)/organization/settings/components/DeleteConfirmationModal.tsx b/packages/frontend/app/(dashboard)/organization/settings/components/DeleteConfirmationModal.tsx
index 86b1558e7..ff2dd6561 100644
--- a/packages/frontend/app/(dashboard)/organization/settings/components/DeleteConfirmationModal.tsx
+++ b/packages/frontend/app/(dashboard)/organization/settings/components/DeleteConfirmationModal.tsx
@@ -1,5 +1,5 @@
-import React, { useState, useEffect } from 'react'
-import { Modal, Input, Button } from 'antd'
+import React, { useEffect, useState } from 'react'
+import { Button, Input, Modal } from 'antd'
 
 interface DeleteConfirmationProps {
   isOpen: boolean
@@ -24,6 +24,7 @@ const DeleteConfirmationModal: React.FC<DeleteConfirmationProps> = ({
 
   return (
     <Modal
+      centered
       title="Confirm Delete Semester"
       className="text-center"
       open={visible}
diff --git a/packages/frontend/app/(dashboard)/organization/settings/components/SemesterModal.tsx b/packages/frontend/app/(dashboard)/organization/settings/components/SemesterModal.tsx
index 1ac8b7157..7e7ea1c84 100644
--- a/packages/frontend/app/(dashboard)/organization/settings/components/SemesterModal.tsx
+++ b/packages/frontend/app/(dashboard)/organization/settings/components/SemesterModal.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { Modal, Form, Input, DatePicker, FormInstance, Select, Tag } from 'antd'
+import { DatePicker, Form, FormInstance, Input, Modal, Select, Tag } from 'antd'
 import { antdTagColor } from '@koh/common'
 
 const { TextArea } = Input
@@ -27,6 +27,7 @@ export const SemesterModal: React.FC<SemesterModalProps> = ({
 
   return (
     <Modal
+      centered
       title={`${creatingSemester ? 'Add New' : 'Edit'} Semester`}
       open={isSemesterModalOpen}
       onCancel={handleCloseModal}
diff --git a/packages/frontend/app/(dashboard)/profile/components/UserChatbotHistory.tsx b/packages/frontend/app/(dashboard)/profile/components/UserChatbotHistory.tsx
index d34da10cf..13fe27f26 100644
--- a/packages/frontend/app/(dashboard)/profile/components/UserChatbotHistory.tsx
+++ b/packages/frontend/app/(dashboard)/profile/components/UserChatbotHistory.tsx
@@ -1,24 +1,17 @@
 'use client'
 
-import { Collapse, Typography, Card, Space, CollapseProps } from 'antd'
+import { Card, Collapse, CollapseProps, Space, Tooltip, Typography } from 'antd'
 import { useEffect, useMemo, useState } from 'react'
 import { API } from '@/app/api'
 import { useUserInfo } from '@/app/contexts/userContext'
 import { formatDateAndTimeForExcel } from '@/app/utils/timeFormatUtils'
-import {
-  GetChatbotHistoryResponse,
-  InteractionResponse,
-  ChatbotQuestionResponseHelpMeDB,
-} from '@koh/common'
+import { HelpMeChatbotQuestionResponse, InteractionResponse } from '@koh/common'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
-import { Tooltip } from 'antd'
 import CenteredSpinner from '@/app/components/CenteredSpinner'
 import { getErrorMessage } from '@/app/utils/generalUtils'
 
 dayjs.extend(relativeTime)
-
-const { Panel } = Collapse
 const { Text, Paragraph } = Typography
 
 const UserChatbotHistory: React.FC = () => {
@@ -33,8 +26,8 @@ const UserChatbotHistory: React.FC = () => {
     setError(null)
     API.chatbot.studentsOrStaff
       .getChatHistory()
-      .then((res: GetChatbotHistoryResponse) => {
-        setHistory(res.history)
+      .then((res: InteractionResponse[]) => {
+        setHistory(res)
       })
       .catch((err) => {
         if (err?.response?.status === 403) {
@@ -54,7 +47,8 @@ const UserChatbotHistory: React.FC = () => {
 
   const collapseItems: CollapseProps['items'] = sortedHistory.map(
     (interaction) => {
-      const firstQuestionText = interaction.questions?.[0]?.questionText
+      const firstQuestionText =
+        interaction.questions?.[0]?.chatbotQuestion?.question
       return {
         key: interaction.id,
         label: (
@@ -73,7 +67,7 @@ const UserChatbotHistory: React.FC = () => {
         children: (
           <Space direction="vertical" style={{ width: '100%' }}>
             {(interaction.questions ?? []).map(
-              (q: ChatbotQuestionResponseHelpMeDB) => (
+              (q: HelpMeChatbotQuestionResponse) => (
                 <Card
                   key={q.id}
                   size="small"
@@ -82,18 +76,20 @@ const UserChatbotHistory: React.FC = () => {
                 >
                   <Text strong>Q:</Text>{' '}
                   <Paragraph style={{ display: 'inline' }}>
-                    {q.questionText}
+                    {q.chatbotQuestion?.question}
                   </Paragraph>
                   <br />
                   <Text strong>A:</Text>{' '}
                   <Paragraph style={{ display: 'inline' }}>
-                    {q.responseText}
+                    {q.chatbotQuestion?.answer}
                   </Paragraph>
                   <br />
                   <Text type="secondary" style={{ fontSize: 12 }}>
                     Asked at:{' '}
                     <Tooltip
-                      title={formatDateAndTimeForExcel(new Date(q.timestamp))}
+                      title={formatDateAndTimeForExcel(
+                        new Date(q?.timestamp ?? -1),
+                      )}
                     >
                       {dayjs(q.timestamp).fromNow()}
                     </Tooltip>
diff --git a/packages/frontend/app/api/index.ts b/packages/frontend/app/api/index.ts
index 28031576f..bbe987994 100644
--- a/packages/frontend/app/api/index.ts
+++ b/packages/frontend/app/api/index.ts
@@ -1,6 +1,4 @@
 import {
-  AddChatbotQuestionParams,
-  AddDocumentChunkParams,
   AllStudentAssignmentProgress,
   AsyncQuestion,
   AsyncQuestionComment,
@@ -8,17 +6,17 @@ import {
   AsyncQuestionParams,
   BatchCourseCloneAttributes,
   Calendar,
-  ChatbotAskParams,
-  ChatbotAskResponse,
-  ChatbotAskSuggestedParams,
-  ChatbotQueryParams,
+  ChatbotAskBody,
+  ChatbotAskSuggestedBody,
+  ChatbotCourseSettingsResponse,
+  ChatbotDocumentAggregateResponse,
+  ChatbotDocumentListResponse,
+  ChatbotDocumentResponse,
   ChatbotProvider,
-  ChatbotQuestionResponseChatbotDB,
-  ChatbotQuestionResponseHelpMeDB,
+  ChatbotQueryBody,
+  ChatbotQuestionResponse,
   ChatbotServiceProvider,
   ChatbotServiceType,
-  ChatbotSettings,
-  ChatbotSettingsUpdateParams,
   CourseChatbotSettings,
   CourseChatbotSettingsForm,
   CourseCloneAttributes,
@@ -28,8 +26,10 @@ import {
   CreateAlertResponse,
   CreateAsyncQuestions,
   CreateChatbotProviderBody,
+  CreateDocumentChunkBody,
   CreateLLMTypeBody,
   CreateOrganizationChatbotSettingsBody,
+  CreateQuestionBody,
   CreateQuestionParams,
   CreateQuestionResponse,
   CronJob,
@@ -38,20 +38,22 @@ import {
   EditCourseInfoParams,
   GetAlertsResponse,
   GetAvailableModelsBody,
-  GetChatbotHistoryResponse,
   GetCourseResponse,
   GetCourseUserInfoResponse,
   GetInsightOutputResponse,
-  GetInteractionsAndQuestionsResponse,
   GetLimitedCourseResponse,
   GetOrganizationUserResponse,
   GetProfileResponse,
   GetQueueChatResponse,
   GetQueueChatsResponse,
   GetQueueResponse,
+  HelpMeChatbotAskResponse,
+  HelpMeChatbotQuestionResponse,
+  HelpMeChatbotQuestionTableResponse,
   InsightDashboardPartial,
   InsightDetail,
   InsightParamsType,
+  InteractionResponse,
   ListInsightsResponse,
   ListQuestionsResponse,
   LLMType,
@@ -65,8 +67,8 @@ import {
   LMSPage,
   LMSQuiz,
   LMSQuizAccessLevel,
+  LMSSyncDocumentsResult,
   MailServiceWithSubscription,
-  OllamaLLMType,
   OrganizationChatbotSettings,
   OrganizationChatbotSettingsDefaults,
   OrganizationCourseResponse,
@@ -77,7 +79,7 @@ import {
   OrganizationSettingsResponse,
   OrganizationStatsResponse,
   OrgUser,
-  PreDeterminedQuestion,
+  PaginatedResponse,
   PublicQueueInvite,
   questions,
   QuestionType,
@@ -92,9 +94,9 @@ import {
   Role,
   SemesterPartial,
   setQueueConfigResponse,
-  SourceDocument,
   StudentAssignmentProgress,
   StudentTaskProgressWithUser,
+  SuggestedQuestionResponse,
   TACheckinTimesResponse,
   TACheckoutResponse,
   TAUpdateStatusResponse,
@@ -102,14 +104,16 @@ import {
   UBCOuserParam,
   UnreadAsyncQuestionResponse,
   UpdateAsyncQuestions,
+  UpdateChatbotCourseSettingsBody,
   UpdateChatbotProviderBody,
-  UpdateChatbotQuestionParams,
-  UpdateDocumentChunkParams,
+  UpdateDocumentAggregateBody,
+  UpdateDocumentChunkBody,
   UpdateLLMTypeBody,
   UpdateOrganizationCourseDetailsParams,
   UpdateOrganizationDetailsParams,
   UpdateOrganizationUserRole,
   UpdateProfileParams,
+  UpdateQuestionBody,
   UpdateQuestionParams,
   UpdateQuestionResponse,
   UpdateQueueParams,
@@ -117,7 +121,6 @@ import {
   UpsertLMSCourseParams,
   UpsertLMSOrganizationParams,
   UserMailSubscription,
-  LMSSyncDocumentsResult,
 } from '@koh/common'
 import Axios, { AxiosInstance, Method } from 'axios'
 import { plainToClass } from 'class-transformer'
@@ -126,24 +129,6 @@ import { ClassType } from 'class-transformer/ClassTransformer'
 // Return type of array item, if T is an array
 type ItemIfArray<T> = T extends (infer I)[] ? I : T
 
-export interface ChatQuestion {
-  id: string
-  question: string
-  answer: string
-  user: string
-  sourceDocuments: {
-    name: string
-    type: string
-    parts: string[]
-  }[]
-  suggested: boolean
-}
-
-export interface ChatQuestionResponse {
-  chatQuestions: ChatQuestion[]
-  total: number
-}
-
 class APIClient {
   private axios: AxiosInstance
 
@@ -196,142 +181,179 @@ class APIClient {
       // these endpoints are the main endpoints that students and staff use
       queryChatbot: async (
         courseId: number,
-        body: ChatbotQueryParams,
+        body: ChatbotQueryBody,
       ): Promise<string> =>
-        this.req('POST', `/api/v1/chatbot/query/${courseId}`, undefined, body),
+        this.req('POST', `/api/v1/chatbot/${courseId}/query`, undefined, body),
       askQuestion: async (
         courseId: number,
-        body: ChatbotAskParams,
-      ): Promise<ChatbotAskResponse> =>
-        this.req('POST', `/api/v1/chatbot/ask/${courseId}`, undefined, body),
+        body: ChatbotAskBody,
+      ): Promise<HelpMeChatbotAskResponse> =>
+        this.req('POST', `/api/v1/chatbot/${courseId}/ask`, undefined, body),
       askSuggestedQuestion: async (
         courseId: number,
-        body: ChatbotAskSuggestedParams,
-      ): Promise<ChatbotQuestionResponseHelpMeDB> =>
+        body: ChatbotAskSuggestedBody,
+      ): Promise<HelpMeChatbotQuestionResponse> =>
         this.req(
           'POST',
-          `/api/v1/chatbot/askSuggested/${courseId}`,
+          `/api/v1/chatbot/${courseId}/ask/suggested`,
           undefined,
           body,
         ),
       getSuggestedQuestions: async (
         courseId: number,
-      ): Promise<PreDeterminedQuestion[]> =>
-        this.req('GET', `/api/v1/chatbot/question/suggested/${courseId}`),
+      ): Promise<SuggestedQuestionResponse[]> =>
+        this.req('GET', `/api/v1/chatbot/${courseId}/question/suggested/`),
       updateUserScore: async (
         courseId: number,
         questionId: number,
         userScore: number,
-      ): Promise<ChatbotQuestionResponseHelpMeDB> =>
+      ): Promise<HelpMeChatbotQuestionResponse> =>
         this.req(
           'PATCH',
-          `/api/v1/chatbot/questionScore/${courseId}/${questionId}`,
+          `/api/v1/chatbot/${courseId}/question/${questionId}/score`,
           undefined,
           { userScore },
         ),
-      getChatHistory: async (): Promise<GetChatbotHistoryResponse> =>
+      getChatHistory: async (): Promise<InteractionResponse[]> =>
         this.req('GET', `/api/v1/chatbot/history`),
     },
     staffOnly: {
       // these endpoints are more for management of chatbot questions
       getInteractionsAndQuestions: async (
         courseId: number,
-      ): Promise<GetInteractionsAndQuestionsResponse> =>
-        this.req('GET', `/api/v1/chatbot/question/all/${courseId}`),
+      ): Promise<HelpMeChatbotQuestionTableResponse[]> =>
+        this.req('GET', `/api/v1/chatbot/${courseId}/question`),
       addQuestion: async (
         courseId: number,
-        questionData: AddChatbotQuestionParams,
-      ): Promise<ChatbotQuestionResponseHelpMeDB> =>
+        questionData: CreateQuestionBody,
+      ): Promise<ChatbotQuestionResponse> =>
         this.req(
           'POST',
-          `/api/v1/chatbot/question/${courseId}`,
+          `/api/v1/chatbot/${courseId}/question`,
           undefined,
           questionData,
         ),
       updateQuestion: async (
         courseId: number,
-        body: UpdateChatbotQuestionParams,
-      ): Promise<ChatbotQuestionResponseChatbotDB> =>
+        questionId: string,
+        body: UpdateQuestionBody,
+      ): Promise<ChatbotQuestionResponse> =>
         this.req(
           'PATCH',
-          `/api/v1/chatbot/question/${courseId}`,
+          `/api/v1/chatbot/${courseId}/question/${questionId}`,
           undefined,
           body,
         ),
       deleteQuestion: async (
         courseId: number,
-        vectorStoreId: string,
-      ): Promise<{ success: boolean }> =>
+        questionId: string,
+      ): Promise<void> =>
         this.req(
           'DELETE',
-          `/api/v1/chatbot/question/${courseId}/${vectorStoreId}`,
+          `/api/v1/chatbot/${courseId}/question/${questionId}`,
         ),
-      // deleteAllQuestions: async (courseId: number): Promise<{ success: boolean }> =>
-      //   this.req('DELETE', `/api/v1/chatbot/question/all/${courseId}`), Unused
-      // resetCourse: async (courseId: number): Promise<{ success: boolean }> =>
-      //   this.req('DELETE', `/api/v1/chatbot/resetCourse/${courseId}`), Unused, resets all chatbot data for the course
+      // deleteAllQuestions: async (courseId: number): Promise<void> =>
+      //   this.req('DELETE', `/api/v1/chatbot/${courseId}/question`), Unused
+      // resetCourse: async (courseId: number): Promise<void> =>
+      //   this.req('DELETE', `/api/v1/chatbot/${courseId}/reset`), Unused, resets all chatbot data for the course
       getAllAggregateDocuments: async (
         courseId: number,
-      ): Promise<SourceDocument[]> =>
-        this.req('GET', `/api/v1/chatbot/aggregateDocuments/${courseId}`),
+        page: number,
+        pageSize?: number,
+        search?: string,
+      ): Promise<PaginatedResponse<ChatbotDocumentAggregateResponse>> =>
+        this.req(
+          'GET',
+          `/api/v1/chatbot/${courseId}/aggregate/${page}`,
+          undefined,
+          undefined,
+          { pageSize, search },
+        ),
       getAllDocumentChunks: async (
         courseId: number,
-      ): Promise<SourceDocument[]> =>
-        this.req('GET', `/api/v1/chatbot/documentChunks/${courseId}`),
+        page: number,
+        pageSize?: number,
+        search?: string,
+      ): Promise<PaginatedResponse<ChatbotDocumentResponse>> =>
+        this.req(
+          'GET',
+          `/api/v1/chatbot/${courseId}/document/${page}`,
+          undefined,
+          undefined,
+          { pageSize, search },
+        ),
+      getListDocuments: async (
+        courseId: number,
+        page: number,
+        pageSize?: number,
+        search?: string,
+      ): Promise<PaginatedResponse<ChatbotDocumentListResponse>> =>
+        this.req(
+          'GET',
+          `/api/v1/chatbot/${courseId}/document/list/${page}`,
+          undefined,
+          undefined,
+          { pageSize, search },
+        ),
       addDocumentChunk: async (
         courseId: number,
-        body: AddDocumentChunkParams,
-      ): Promise<SourceDocument[]> =>
+        body: CreateDocumentChunkBody,
+      ): Promise<ChatbotDocumentResponse[]> =>
         this.req(
           'POST',
-          `/api/v1/chatbot/documentChunks/${courseId}`,
+          `/api/v1/chatbot/${courseId}/document`,
           undefined,
           body,
         ),
       updateDocumentChunk: async (
         courseId: number,
         docId: string,
-        body: UpdateDocumentChunkParams,
-      ): Promise<SourceDocument[]> =>
+        body: UpdateDocumentChunkBody,
+      ): Promise<ChatbotDocumentResponse[]> =>
         this.req(
           'PATCH',
-          `/api/v1/chatbot/documentChunks/${courseId}/${docId}`,
+          `/api/v1/chatbot/${courseId}/document/${docId}`,
           undefined,
           body,
         ),
       deleteDocumentChunk: async (
         courseId: number,
         docId: string,
-      ): Promise<{ success: boolean }> =>
-        this.req(
-          'DELETE',
-          `/api/v1/chatbot/documentChunks/${courseId}/${docId}`,
-        ),
-      deleteDocument: async (
-        courseId: number,
-        docId: string,
-      ): Promise<{ success: boolean }> =>
-        this.req('DELETE', `/api/v1/chatbot/document/${courseId}/${docId}`),
+      ): Promise<void> =>
+        this.req('DELETE', `/api/v1/chatbot/${courseId}/document/${docId}`),
+      deleteDocument: async (courseId: number, docId: string): Promise<void> =>
+        this.req('DELETE', `/api/v1/chatbot/${courseId}/aggregate/${docId}`),
       uploadDocument: async (
         courseId: number,
         body: FormData,
-      ): Promise<{ success: boolean; documentId?: string }> =>
+      ): Promise<ChatbotDocumentAggregateResponse> =>
         this.req(
           'POST',
-          `/api/v1/chatbot/document/${courseId}/upload`,
+          `/api/v1/chatbot/${courseId}/aggregate/file`,
           undefined,
           body,
         ),
-      addDocumentFromGithub: async (
+      addDocumentFromURL: async (
         courseId: number,
         url: string,
-      ): Promise<{ success: boolean; documentId?: string }> =>
+      ): Promise<ChatbotDocumentAggregateResponse> =>
         this.req(
           'POST',
-          `/api/v1/chatbot/document/${courseId}/github`,
+          `/api/v1/chatbot/document/${courseId}/aggregate/url`,
           undefined,
           { url },
         ),
+      updateDocument: async (
+        courseId: number,
+        id: string,
+        body: UpdateDocumentAggregateBody,
+      ): Promise<ChatbotDocumentAggregateResponse> =>
+        this.req(
+          'PATCH',
+          `/api/v1/chatbot/${courseId}/aggregate/${id}`,
+          undefined,
+          body,
+        ),
       getCourseOrganizationProviders: async (
         courseId: number,
       ): Promise<ChatbotProvider[]> =>
@@ -365,21 +387,21 @@ class APIClient {
       legacy: {
         getModels: async (courseId: number): Promise<Record<string, string>> =>
           this.req('GET', `/api/v1/chatbot/models/${courseId}`),
-        getSettings: async (courseId: number): Promise<ChatbotSettings> =>
+        getSettings: async (
+          courseId: number,
+        ): Promise<ChatbotCourseSettingsResponse> =>
           this.req('GET', `/api/v1/chatbot/settings/${courseId}`),
         updateSettings: async (
           courseId: number,
-          settings: ChatbotSettingsUpdateParams,
-        ): Promise<{ success: boolean }> =>
+          settings: UpdateChatbotCourseSettingsBody,
+        ): Promise<ChatbotCourseSettingsResponse> =>
           this.req(
             'PATCH',
             `/api/v1/chatbot/settings/${courseId}`,
             undefined,
             settings,
           ),
-        resetSettings: async (
-          courseId: number,
-        ): Promise<{ success: boolean }> =>
+        resetSettings: async (courseId: number): Promise<void> =>
           this.req('PATCH', `/api/v1/chatbot/settings/${courseId}/reset`),
       },
     },
diff --git a/packages/frontend/app/components/ChangeLogModal.tsx b/packages/frontend/app/components/ChangeLogModal.tsx
index 13b8fa0ec..20dcbbe55 100644
--- a/packages/frontend/app/components/ChangeLogModal.tsx
+++ b/packages/frontend/app/components/ChangeLogModal.tsx
@@ -2,7 +2,7 @@ import { Modal } from 'antd'
 import { useEffect, useState } from 'react'
 import MarkdownCustom from './Markdown'
 import { useUserInfo } from '../contexts/userContext'
-import { OrganizationRole, Role } from '@koh/common'
+import { OrganizationRole } from '@koh/common'
 import CenteredSpinner from './CenteredSpinner'
 
 interface ChangeLogModalProps {
@@ -47,6 +47,7 @@ const ChangeLogModal: React.FC<ChangeLogModalProps> = ({
 
   return (
     <Modal
+      centered
       title={<h1>What&apos;s New?</h1>}
       open={isOpen}
       closable
@@ -66,9 +67,9 @@ const ChangeLogModal: React.FC<ChangeLogModalProps> = ({
       classNames={{
         header: 'flex items-center justify-center',
       }}
-      className="box-border flex flex-col items-center justify-center"
+      className="box-border"
     >
-      <div className="childrenMarkdownFormatted box-border h-[60vh] w-full overflow-y-auto px-4 md:h-[75vh]">
+      <div className="childrenMarkdownFormatted flex w-full flex-col justify-center px-4">
         {currentChangeLog === '' ? (
           <CenteredSpinner tip="Fetching Changelog..." />
         ) : (
diff --git a/packages/frontend/app/globals.css b/packages/frontend/app/globals.css
index 2be35533d..5399bfe76 100644
--- a/packages/frontend/app/globals.css
+++ b/packages/frontend/app/globals.css
@@ -233,16 +233,16 @@ h1, h2, h3, h4, h5, h6 {
 
 .queueCard, .asyncCentreCard {
   /* Tailwind shadows don't look great in this scenario so went with custom */
-  box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
   transition: box-shadow 0.3s ease;
 }
 .queueCard:hover, .queueCard:focus, .asyncCentreCard:hover, .asyncCentreCard:focus {
-  box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.45);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.45);
 }
 @media (max-width: 650px) {
   /* make the box shadow more pronounced on mobile to make it look more tap-able */
   .queueCard, .asyncCentreCard {
-    box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
   }
 }
 .queueCard:hover .ant-card-head, a:focus .queueCard .ant-card-head {
@@ -270,6 +270,41 @@ Here's the issue on antd's github: https://github.com/ant-design/ant-design/issu
   padding: 0.25rem 0 0 0 !important;
 }
 
+/*
+Making modals scrollable
+*/
+
+.ant-modal-content {
+    padding: 1rem 0 1rem 0 !important;
+}
+
+.ant-modal-header {
+    padding: 0 1rem !important;
+}
+
+.ant-modal-footer {
+    padding: 0 1rem !important;
+}
+
+.ant-modal-body {
+    padding: 0 0.1rem 0 1rem !important;
+    overflow-y: auto;
+    scrollbar-gutter: stable;
+    scrollbar-width: thin;
+}
+
+@media (width <= 40rem) {
+    .ant-modal-body {
+        max-height: 60vh;
+    }
+}
+
+@media (width >= 48rem) {
+    .ant-modal-body {
+        max-height: 80vh;
+    }
+}
+
 /*
 These childrenMarkdownFormatted styles are to format all children of this component in a particular way.
 It is used for displaying markdown nicely inside any <Markdown> components
@@ -327,8 +362,8 @@ It is used for displaying markdown nicely inside any <Markdown> components
 }
 .no-scrollbar::-webkit-scrollbar {
   display: none;
-  width: 0px;
-  height: 0px;
+  width: 0;
+  height: 0;
 }
 
 /* SHADCN Charts */
diff --git a/packages/frontend/app/typings/chatbot.ts b/packages/frontend/app/typings/chatbot.ts
index ebb498ad5..a0f2ae687 100644
--- a/packages/frontend/app/typings/chatbot.ts
+++ b/packages/frontend/app/typings/chatbot.ts
@@ -1,7 +1,7 @@
-import { Message } from '@koh/common'
+import { HelpMeChatMessage } from '@koh/common'
 
 export interface ChatbotQToConvertToAnytimeQ {
-  messages: Message[]
+  messages: HelpMeChatMessage[]
 }
 
 export const chatbotStartingMessageCourse =
diff --git a/packages/frontend/app/utils/generalUtils.ts b/packages/frontend/app/utils/generalUtils.ts
index 263d61d50..d94f180c0 100644
--- a/packages/frontend/app/utils/generalUtils.ts
+++ b/packages/frontend/app/utils/generalUtils.ts
@@ -363,3 +363,32 @@ export function getModelSpeedAndQualityEstimate<T extends LLMType>(model: T) {
   }
   return { speed, quality, notes }
 }
+
+export function hexToRgb(hex: string) {
+  const r = parseInt(hex.substring(1, 3), 16)
+  const g = parseInt(hex.substring(3, 5), 16)
+  const b = parseInt(hex.substring(5, 7), 16)
+  return { r, g, b }
+}
+
+export function rgbToHex(r: number, g: number, b: number) {
+  const componentToHex = (c: number) => {
+    const hex = c.toString(16)
+    return hex.length === 1 ? '0' + hex : hex
+  }
+  return `#${componentToHex(r)}${componentToHex(g)}${componentToHex(b)}`
+}
+
+export function lerpColor(color1: string, color2: string, amount: number) {
+  // Ensure amount is between 0 and 1
+  amount = Math.max(0, Math.min(1, amount))
+
+  const rgb1 = hexToRgb(color1)
+  const rgb2 = hexToRgb(color2)
+
+  const r = Math.round(rgb1.r + (rgb2.r - rgb1.r) * amount)
+  const g = Math.round(rgb1.g + (rgb2.g - rgb1.g) * amount)
+  const b = Math.round(rgb1.b + (rgb2.b - rgb1.b) * amount)
+
+  return rgbToHex(r, g, b)
+}
diff --git a/packages/server/ormconfig.ts b/packages/server/ormconfig.ts
index 3e5d8daa7..8c6839b9e 100644
--- a/packages/server/ormconfig.ts
+++ b/packages/server/ormconfig.ts
@@ -15,9 +15,8 @@ import { QueueModel } from './src/queue/queue.entity';
 import { AlertModel } from './src/alerts/alerts.entity';
 import { QuestionTypeModel } from './src/questionType/question-type.entity';
 import { AsyncQuestionModel } from './src/asyncQuestion/asyncQuestion.entity';
-import { ChatbotQuestionModel } from './src/chatbot/question.entity';
+import { ChatbotQuestionModel } from './src/chatbot/chatbot-question.entity';
 import { InteractionModel } from './src/chatbot/interaction.entity';
-import { QuestionDocumentModel } from './src/chatbot/questionDocument.entity';
 import { CalendarModel } from './src/calendar/calendar.entity';
 import { CalendarStaffModel } from './src/calendar/calendar-staff.entity';
 import { OrganizationUserModel } from './src/organization/organization-user.entity';
@@ -100,7 +99,6 @@ const typeorm: DataSourceOptions = {
     AlertModel,
     CalendarModel,
     CalendarStaffModel,
-    QuestionDocumentModel,
     OrganizationUserModel,
     OrganizationModel,
     OrganizationCourseModel,
diff --git a/packages/server/src/chatbot/chatbot-api.service.ts b/packages/server/src/chatbot/chatbot-api.service.ts
index 6f979e866..163b5f788 100644
--- a/packages/server/src/chatbot/chatbot-api.service.ts
+++ b/packages/server/src/chatbot/chatbot-api.service.ts
@@ -1,17 +1,48 @@
-import {
-  AddChatbotQuestionParams,
-  AddDocumentAggregateParams,
-  AddDocumentChunkParams,
-  ChatbotQuestionResponseChatbotDB,
-  ChatbotSettings,
-  ChatbotSettingsMetadata,
-  ChatbotSettingsUpdateParams,
-  UpdateChatbotQuestionParams,
-  UpdateDocumentAggregateParams,
-  UpdateDocumentChunkParams,
-} from '@koh/common';
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
+import { ClassType } from 'class-transformer/ClassTransformer';
+import { plainToClass } from 'class-transformer';
+import {
+  ChatbotAskBody,
+  ChatbotAskResponse,
+  ChatbotCourseSettingsResponse,
+  ChatbotDocumentAggregateResponse,
+  ChatbotDocumentListResponse,
+  ChatbotDocumentResponse,
+  ChatbotQueryBody,
+  ChatbotQueryTypeEnum,
+  ChatbotQuestionResponse,
+  ChatMessage,
+  CloneCourseDocumentsBody,
+  CreateChatbotCourseSettingsBody,
+  CreateDocumentAggregateBody,
+  CreateDocumentChunkBody,
+  CreateQuestionBody,
+  PaginatedResponse,
+  SuggestedQuestionResponse,
+  UpdateChatbotCourseSettingsBody,
+  UpdateDocumentAggregateBody,
+  UpdateDocumentChunkBody,
+  UpdateQuestionBody,
+  UploadDocumentAggregateBody,
+  UploadURLDocumentAggregateBody,
+} from '@koh/common';
+import { isObject } from '@nestjs/common/utils/shared.utils';
+
+type ChatbotRequestInit<TBody> = {
+  userToken?: string;
+  data?: TBody;
+  params?: Record<string, any>;
+  timeoutMs?: number;
+};
+
+type PaginationProperties = {
+  page?: number;
+  pageSize?: number;
+  search?: string;
+};
+
+type ElementType<T> = T extends (infer E)[] ? E : T;
 
 @Injectable()
 /* This is a list of all endpoints from the chatbot repo.
@@ -36,20 +67,28 @@ export class ChatbotApiService {
    * Makes an authenticated request to the chatbot service
    * @param method HTTP method
    * @param endpoint Endpoint path (without leading slash)
-   * @param data Request body data
-   * @param params Query parameters
-   * @param userToken user's API token for user-specific endpoints
+   * @param request Properties for the request
+   * @param request.userToken User token to be used to access protected routes
+   * @param request.data Data to be passed in the JSON body
+   * @param request.params Data to be passed in the query parameters
+   * @param request.timeoutMs How long until the request should be considered failed by timeout
+   * @param responseClass Class to map the response to
    * @returns Response from the chatbot service
    */
-  private async request(
+  private async request<TResponse, TBody = void>(
     method: 'GET' | 'POST' | 'PATCH' | 'DELETE',
     endpoint: string,
-    userToken: string,
-    data?: any,
-    params?: any,
-    timeoutMs?: number,
-  ) {
+    request?: ChatbotRequestInit<TBody>,
+    responseClass?: ClassType<ElementType<TResponse>>,
+  ): Promise<TResponse>;
+  private async request<TResponse, TBody = void>(
+    method: 'GET' | 'POST' | 'PATCH' | 'DELETE',
+    endpoint: string,
+    request: ChatbotRequestInit<TBody> = {},
+    responseClass?: ClassType<TResponse>,
+  ): Promise<TResponse> {
     try {
+      const { userToken, data, params, timeoutMs } = request;
       const url = new URL(`${this.chatbotApiUrl}/${endpoint}`);
 
       if (params) {
@@ -61,25 +100,44 @@ export class ChatbotApiService {
       const headers: Record<string, string> = {
         'Content-Type': 'application/json',
         'HMS-API-KEY': this.chatbotApiKey,
-        HMS_API_TOKEN: userToken,
       };
+      if (userToken) {
+        headers['HMS_API_TOKEN'] = userToken;
+      }
+
+      let body: BodyInit;
+      if (data instanceof FormData) {
+        body = data;
+      } else if (data != undefined && isObject(data)) {
+        body = JSON.stringify(data);
+      } else {
+        body = data as any;
+      }
 
       const response = await fetch(url, {
         method,
         headers,
-        body: data ? JSON.stringify(data) : undefined,
+        body,
         signal: timeoutMs ? AbortSignal.timeout(timeoutMs) : undefined, // abort signal is available as of node 17
       });
 
       if (!response.ok) {
         const error = await response.json();
         throw new HttpException(
-          error.error || 'Error from chatbot service',
+          error.message ?? error.error ?? 'Error from chatbot service',
           response.status,
         );
       }
 
-      return await response.json();
+      if (
+        response.headers.has('content-length') &&
+        response.headers.get('content-length') === '0'
+      ) {
+        return;
+      }
+
+      const plain = await response.json();
+      return responseClass ? plainToClass(responseClass, plain) : plain;
     } catch (error) {
       if (error instanceof HttpException) {
         throw error;
@@ -91,188 +149,262 @@ export class ChatbotApiService {
     }
   }
 
+  private async getPaginated<TResponse = any, TBody = void>(
+    endpoint: string,
+    pagination: PaginationProperties,
+    request: ChatbotRequestInit<TBody> = {},
+    responseClass?: ClassType<TResponse>,
+  ): Promise<PaginatedResponse<TResponse>> {
+    const { page, pageSize, search } = pagination;
+
+    if (page != undefined && page >= 1) {
+      endpoint = `${endpoint}/${page}`;
+    }
+    const result = await this.request<PaginatedResponse<TResponse>>(
+      'GET',
+      endpoint,
+      {
+        ...(request as any),
+        params: { ...request.params, pageSize, search },
+      },
+    );
+    result.items = responseClass
+      ? plainToClass(responseClass, result.items)
+      : result.items;
+    return plainToClass(PaginatedResponse<TResponse>, result);
+  }
+
   // Chatbot endpoints
   async askQuestion(
     question: string,
-    history: any,
+    history: ChatMessage[],
     userToken: string,
     courseId: number,
   ) {
-    return this.request('POST', `chatbot/${courseId}/ask`, userToken, {
-      question,
-      history,
-    });
+    return this.request(
+      'POST',
+      `chatbot/${courseId}/ask`,
+      {
+        userToken,
+        data: {
+          question,
+          history,
+        } satisfies ChatbotAskBody,
+      },
+      ChatbotAskResponse,
+    );
   }
 
-  async queryChatbot(
-    query: string,
-    userToken: string, // Passing UserToken to the chatbot, but should be ignored for this endpoint.
-    type: 'default' | 'abstract' = 'default',
-  ): Promise<string> {
-    const resp: { answer: string } = await this.request(
+  async queryChatbot(params: ChatbotQueryBody): Promise<string> {
+    return await this.request<string, ChatbotQueryBody>(
       'POST',
       `chatbot/query`,
-      userToken,
       {
-        query,
-        type,
+        data: params,
+        timeoutMs:
+          params.type === ChatbotQueryTypeEnum.ABSTRACT ? 5000 : undefined, // 5s timeout for abstract queries
       },
-      undefined,
-      type === 'abstract' ? 5000 : undefined, // 5s timeout for abstract queries
     );
-    return resp.answer;
   }
 
-  async getModels(userToken: string) {
-    return this.request('GET', `chatbot/models`, userToken);
+  async getModels(): Promise<Record<string, string>> {
+    return this.request<Record<string, string>>('GET', `chatbot/models`);
   }
 
   // Question endpoints
 
+  async getQuestion(questionId: string): Promise<ChatbotQuestionResponse> {
+    return this.request('GET', `question/single/${questionId}`);
+  }
+
   async addQuestion(
-    questionData: AddChatbotQuestionParams,
+    data: CreateQuestionBody,
     courseId: number,
-    userToken: string,
-  ) {
-    return this.request(
-      'POST',
-      `question/${courseId}`,
-      userToken,
-      questionData,
-    );
+  ): Promise<ChatbotQuestionResponse> {
+    return this.request('POST', `question/${courseId}`, {
+      data,
+    });
   }
 
   async updateQuestion(
-    questionData: UpdateChatbotQuestionParams,
+    questionId: string,
+    data: UpdateQuestionBody,
     courseId: number,
-    userToken: string,
-  ): Promise<ChatbotQuestionResponseChatbotDB> {
-    return this.request(
-      'PATCH',
-      `question/${courseId}/${questionData.id}`,
-      userToken,
-      questionData,
-    );
+  ): Promise<ChatbotQuestionResponse> {
+    return this.request('PATCH', `question/${courseId}/${questionId}`, {
+      data,
+    });
   }
 
-  async deleteQuestion(id: string, courseId: number, userToken: string) {
-    return this.request('DELETE', `question/${courseId}/${id}`, userToken);
+  async deleteQuestion(id: string, courseId: number): Promise<void> {
+    return this.request('DELETE', `question/${courseId}/${id}`);
   }
 
-  async getSuggestedQuestions(courseId: number, userToken: string) {
-    return this.request('GET', `question/${courseId}/suggested`, userToken);
+  async getSuggestedQuestions(
+    courseId: number,
+  ): Promise<SuggestedQuestionResponse[]> {
+    return this.request('GET', `question/${courseId}/suggested`);
   }
 
-  async getAllQuestions(courseId: number, userToken: string) {
-    return this.request('GET', `question/${courseId}/all`, userToken);
+  async getAllQuestions(courseId: number): Promise<ChatbotQuestionResponse[]> {
+    return this.request('GET', `question/${courseId}/all`);
   }
 
-  async deleteAllQuestions(courseId: number, userToken: string) {
+  async deleteAllQuestions(courseId: number): Promise<void> {
     // Unused
-    return this.request('DELETE', `question/${courseId}/all`, userToken);
+    return this.request('DELETE', `question/${courseId}/all`);
   }
 
   // Chatbot settings endpoints
   async getChatbotSettings(
     courseId: number,
-    userToken: string,
-  ): Promise<ChatbotSettings> {
-    return this.request('GET', `course-setting/${courseId}`, userToken);
+  ): Promise<ChatbotCourseSettingsResponse> {
+    return this.request(
+      'GET',
+      `course-setting/${courseId}`,
+      undefined,
+      ChatbotCourseSettingsResponse,
+    );
   }
 
   async createChatbotSettings(
-    settings: ChatbotSettingsMetadata,
+    settings: CreateChatbotCourseSettingsBody,
     courseId: number,
-    userToken: string,
-  ) {
+  ): Promise<ChatbotCourseSettingsResponse> {
     return this.request(
       'POST',
       `course-setting/${courseId}`,
-      userToken,
-      settings,
+      {
+        data: settings,
+      },
+      ChatbotCourseSettingsResponse,
     );
   }
 
   async updateChatbotSettings(
-    settings: ChatbotSettingsUpdateParams,
+    settings: UpdateChatbotCourseSettingsBody,
     courseId: number,
-    userToken: string,
-  ) {
+  ): Promise<ChatbotCourseSettingsResponse> {
     return this.request(
       'PATCH',
       `course-setting/${courseId}`,
-      userToken,
-      settings,
+      {
+        data: settings,
+      },
+      ChatbotCourseSettingsResponse,
     );
   }
 
-  async resetChatbotSettings(courseId: number, userToken: string) {
-    return this.request('PATCH', `course-setting/${courseId}/reset`, userToken);
+  async resetChatbotSettings(
+    courseId: number,
+  ): Promise<ChatbotCourseSettingsResponse> {
+    return this.request('PATCH', `course-setting/${courseId}/reset`);
   }
 
-  async deleteChatbotSettings(courseId: number, userToken: string) {
-    return this.request('DELETE', `course-setting/${courseId}`, userToken);
+  async deleteChatbotSettings(courseId: number): Promise<void> {
+    return this.request('DELETE', `course-setting/${courseId}`);
   }
 
   // Document endpoints
 
-  async getAllDocumentChunks(courseId: number, userToken: string) {
-    return this.request('GET', `document/${courseId}`, userToken);
+  async getDocumentChunk(documentId: string): Promise<ChatbotDocumentResponse> {
+    return this.request('GET', `document/single/${documentId}`);
+  }
+
+  async getDocumentAggregate(
+    documentId: string,
+  ): Promise<ChatbotDocumentAggregateResponse> {
+    return this.request('GET', `document/single/aggregate/${documentId}`);
   }
 
-  async getAllAggregateDocuments(courseId: number, userToken: string) {
-    return this.request('GET', `document/aggregate/${courseId}`, userToken);
+  async getAllDocumentChunks(
+    courseId: number,
+    page?: number,
+    pageSize?: number,
+    search?: string,
+  ): Promise<PaginatedResponse<ChatbotDocumentResponse>> {
+    return this.getPaginated(`document/${courseId}`, {
+      page,
+      pageSize,
+      search,
+    });
+  }
+
+  async getAllAggregateDocuments(
+    courseId: number,
+    page?: number,
+    pageSize?: number,
+    search?: string,
+  ): Promise<PaginatedResponse<ChatbotDocumentAggregateResponse>> {
+    return this.getPaginated(`document/aggregate/${courseId}`, {
+      page,
+      pageSize,
+      search,
+    });
+  }
+
+  async getListDocuments(
+    courseId: number,
+    page?: number,
+    pageSize?: number,
+    search?: string,
+  ): Promise<PaginatedResponse<ChatbotDocumentListResponse>> {
+    return this.getPaginated(`document/${courseId}/list`, {
+      page,
+      pageSize,
+      search,
+    });
   }
 
   async addDocumentChunk(
-    body: AddDocumentChunkParams,
+    data: CreateDocumentChunkBody,
     courseId: number,
-    userToken: string,
-  ) {
-    return this.request('POST', `document/${courseId}`, userToken, body);
+  ): Promise<ChatbotDocumentResponse[]> {
+    return this.request<ChatbotDocumentResponse[], CreateDocumentChunkBody>(
+      'POST',
+      `document/${courseId}`,
+      {
+        data,
+      },
+      ChatbotDocumentResponse,
+    );
   }
 
   async updateDocumentChunk(
     docId: string,
-    body: UpdateDocumentChunkParams,
+    data: UpdateDocumentChunkBody,
     courseId: number,
-    userToken: string,
-  ) {
-    return this.request(
+  ): Promise<ChatbotDocumentResponse[]> {
+    return this.request<ChatbotDocumentResponse[], UpdateDocumentChunkBody>(
       'PATCH',
       `document/${courseId}/${docId}`,
-      userToken,
-      body,
+      {
+        data,
+      },
+      ChatbotDocumentResponse,
     );
   }
 
-  async deleteDocumentChunk(
-    docId: string,
-    courseId: number,
-    userToken: string,
-  ) {
-    return this.request('DELETE', `document/${courseId}/${docId}`, userToken);
+  async deleteDocumentChunk(docId: string, courseId: number): Promise<void> {
+    return this.request('DELETE', `document/${courseId}/${docId}`);
   }
 
-  async deleteDocument(docId: string, courseId: number, userToken: string) {
-    return this.request(
-      'DELETE',
-      `document/aggregate/${courseId}/${docId}`,
-      userToken,
-    );
+  async deleteDocument(docId: string, courseId: number): Promise<void> {
+    return this.request('DELETE', `document/aggregate/${courseId}/${docId}`);
   }
 
   // Creates a document aggregate from raw text - generally only used for LMS documents
   async addDocument(
     courseId: number,
-    userToken: string,
-    body: AddDocumentAggregateParams,
-  ): Promise<{ id: string }> {
+    data: CreateDocumentAggregateBody,
+  ): Promise<ChatbotDocumentAggregateResponse> {
     return this.request(
       'POST',
       `document/aggregate/${courseId}`,
-      userToken,
-      body,
+      {
+        data,
+      },
+      ChatbotDocumentAggregateResponse,
     );
   }
 
@@ -281,176 +413,91 @@ export class ChatbotApiService {
   async updateDocument(
     docId: string,
     courseId: number,
-    userToken: string,
-    body: UpdateDocumentAggregateParams,
-  ): Promise<{ message: string }> {
+    data: UpdateDocumentAggregateBody,
+  ): Promise<ChatbotDocumentAggregateResponse> {
     return this.request(
       'PATCH',
       `document/aggregate/${courseId}/${docId}`,
-      userToken,
-      body,
+      {
+        data,
+      },
+      ChatbotDocumentAggregateResponse,
     );
   }
 
   async uploadDocument(
     file: Express.Multer.File,
-    source: string,
-    parseAsPng: boolean,
+    params: UploadDocumentAggregateBody,
     courseId: number,
-    userToken: string,
-  ): Promise<{ docId: string }> {
+  ): Promise<ChatbotDocumentAggregateResponse> {
     try {
       // re-upload the file to the chatbot server while the file is still in memory here
       const formData = new FormData();
-
       // Add the main file with fieldname "file"
       formData.append(
         'file',
         new Blob([file.buffer.buffer as ArrayBuffer], {
-          type: 'application/pdf',
+          type:
+            params.lmsDocumentId != undefined
+              ? file.mimetype
+              : 'application/pdf',
         }), // it's always going to be pdf
-        file.originalname.replace(/\.[^/.]+$/, '.pdf'), // Replace original extension with .pdf
+        params.lmsDocumentId != undefined
+          ? file.originalname
+          : file.originalname.replace(/\.[^/.]+$/, '.pdf'), // Replace original extension with .pdf
       );
-
       // Add the JSON data as a separate file with fieldname "source"
-      formData.append('source', source);
-      formData.append('parseAsPng', String(parseAsPng));
-
-      // Make sure the request method handles FormData correctly
-      const url = new URL(`${this.chatbotApiUrl}/document/${courseId}/file`);
-
-      const headers: Record<string, string> = {
-        'HMS-API-KEY': this.chatbotApiKey,
-        HMS_API_TOKEN: userToken,
-      };
-
-      // does not use the this.request function because it doesn't handle FormData correctly
-      const response = await fetch(url, {
-        method: 'POST',
-        headers,
-        body: formData,
+      Object.keys(params).forEach((k) => {
+        if (params[k] != undefined) {
+          formData.append(k, params[k]);
+        }
       });
 
-      if (!response.ok) {
-        const error = await response.json();
-        throw new HttpException(
-          error.error || 'Error from chatbot service',
-          response.status,
-        );
-      }
-
-      return await response.json();
-    } catch (error) {
-      if (error instanceof HttpException) {
-        throw error;
-      }
-      throw new HttpException(
-        'Failed to upload document',
-        HttpStatus.INTERNAL_SERVER_ERROR,
+      return await this.request(
+        'POST',
+        `document/${courseId}/file`,
+        {
+          data: formData,
+        },
+        ChatbotDocumentAggregateResponse,
       );
-    }
-  }
-
-  async uploadURLDocument(url: string, courseId: number, userToken: string) {
-    return this.request('POST', `document/${courseId}/url`, userToken, {
-      url,
-    });
-  }
-
-  // Uploads an LMS file from buffer - specifically for LMS integration file uploads
-  async uploadLMSFileFromBuffer(
-    file: Express.Multer.File,
-    courseId: number,
-    userToken: string,
-    options: {
-      source?: string;
-      metadata?: any;
-      parseAsPng?: boolean;
-    } = {},
-  ): Promise<{ docId: string }> {
-    try {
-      const formData = new FormData();
-
-      formData.append(
-        'file',
-        new Blob([file.buffer.buffer as ArrayBuffer], { type: file.mimetype }),
-        file.originalname,
-      );
-
-      formData.append('source', options.source || 'LMS Integration');
-
-      if (options.source) {
-        formData.append('prefix', options.source);
-      }
-      if (options.metadata) {
-        formData.append('metadata', JSON.stringify(options.metadata));
-      }
-      formData.append('parseAsPng', String(options.parseAsPng || false));
-
-      const url = new URL(`${this.chatbotApiUrl}/document/${courseId}/file`);
-
-      const headers: Record<string, string> = {
-        'HMS-API-KEY': this.chatbotApiKey,
-        HMS_API_TOKEN: userToken,
-      };
-
-      const response = await fetch(url, {
-        method: 'POST',
-        headers,
-        body: formData,
-      });
-
-      if (!response.ok) {
-        const error = await response.json();
-        console.error('Error for url', url);
-        console.error(response);
-        throw new HttpException(
-          error.error || 'Failed to upload LMS file buffer',
-          response.status,
-        );
-      }
-
-      return await response.json();
     } catch (error) {
       if (error instanceof HttpException) {
         throw error;
       }
       throw new HttpException(
-        'Failed to upload LMS file from buffer',
+        'Failed to upload document',
         HttpStatus.INTERNAL_SERVER_ERROR,
       );
     }
   }
 
-  async cloneCourseDocuments(
+  async uploadURLDocument(
+    params: UploadURLDocumentAggregateBody,
     courseId: number,
-    userToken: string,
-    cloneCourseId: number,
-    includeDocuments: boolean,
-    includeInsertedQuestions: boolean,
-    includeInsertedLMSChatbotData: boolean,
-    manuallyCreatedChunks: boolean,
-    docIdMap?: Record<string, string>,
-  ): Promise<{
-    message: string;
-    newAggregateHelpmePDFIdMap?: Record<string, string>;
-  }> {
+  ): Promise<ChatbotDocumentAggregateResponse> {
     return this.request(
       'POST',
-      `document/${courseId}/clone/${cloneCourseId}`,
-      userToken,
+      `document/${courseId}/url`,
       {
-        includeDocuments,
-        includeInsertedQuestions,
-        includeInsertedLMSChatbotData,
-        manuallyCreatedChunks,
-        docIdMap,
+        data: params,
       },
+      ChatbotDocumentAggregateResponse,
     );
   }
 
-  async resetCourse(courseId: number, userToken: string) {
+  async cloneCourseDocuments(
+    courseId: number,
+    newCourseId: number,
+    params: CloneCourseDocumentsBody,
+  ): Promise<Record<string, string>> {
+    return this.request('POST', `document/${courseId}/clone/${newCourseId}`, {
+      data: params,
+    });
+  }
+
+  async resetCourse(courseId: number): Promise<void> {
     // apparently resets all chatbot data for the course. Unused right now
-    return this.request('PATCH', `document/${courseId}/reset`, userToken);
+    return this.request('PATCH', `document/${courseId}/reset`);
   }
 }
diff --git a/packages/server/src/chatbot/chatbot-infrastructure-models/chatbot-provider.entity.ts b/packages/server/src/chatbot/chatbot-infrastructure-models/chatbot-provider.entity.ts
index 2f535111d..a9c2b8ded 100644
--- a/packages/server/src/chatbot/chatbot-infrastructure-models/chatbot-provider.entity.ts
+++ b/packages/server/src/chatbot/chatbot-infrastructure-models/chatbot-provider.entity.ts
@@ -7,14 +7,13 @@ import {
   OneToMany,
   OneToOne,
   PrimaryGeneratedColumn,
-  VirtualColumn,
 } from 'typeorm';
 import { OrganizationChatbotSettingsModel } from './organization-chatbot-settings.entity';
 import { LLMTypeModel } from './llm-type.entity';
 import {
   ChatbotAllowedHeaders,
+  ChatbotProviderResponse,
   ChatbotServiceProvider,
-  ProviderMetadata,
 } from '@koh/common';
 import { Exclude } from 'class-transformer';
 
@@ -82,8 +81,8 @@ export class ChatbotProviderModel extends BaseEntity {
   @Column({ type: 'text', array: true, nullable: false, default: [] })
   additionalNotes: string[] = [];
 
-  getMetadata(): ProviderMetadata {
-    return {
+  getMetadata(): ChatbotProviderResponse {
+    return <any>{
       type: this.providerType,
       baseUrl: this.baseUrl,
       apiKey: this.apiKey,
diff --git a/packages/server/src/chatbot/chatbot-infrastructure-models/chatbot-settings.subscriber.ts b/packages/server/src/chatbot/chatbot-infrastructure-models/chatbot-settings.subscriber.ts
index 55df5a263..6322723d8 100644
--- a/packages/server/src/chatbot/chatbot-infrastructure-models/chatbot-settings.subscriber.ts
+++ b/packages/server/src/chatbot/chatbot-infrastructure-models/chatbot-settings.subscriber.ts
@@ -328,7 +328,6 @@ export class ChatbotSettingsSubscriber implements EntitySubscriberInterface {
               await this.chatbotApiService.createChatbotSettings(
                 metadata,
                 entity.courseId,
-                '',
               );
               return;
             } catch (exception) {
@@ -338,8 +337,19 @@ export class ChatbotSettingsSubscriber implements EntitySubscriberInterface {
               ) {
                 // Chatbot server failed to connect or had an error, do what we gotta do
                 await qry.query(
-                  'INSERT INTO course_setting ("pageContent","metadata") VALUES ($1,$2)',
-                  [String(entity.courseId), JSON.stringify(metadata)],
+                  `INSERT INTO course_settings_model ("courseId","model","organizationSettings","modelName","prompt","temperature","topK","similarityThresholdDocuments","similarityThresholdQuestions") 
+                   VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9)`,
+                  [
+                    entity.courseId,
+                    metadata.model,
+                    metadata.organizationSettings,
+                    metadata.modelName,
+                    metadata.prompt,
+                    metadata.temperature,
+                    metadata.topK,
+                    metadata.similarityThresholdDocuments,
+                    metadata.similarityThresholdQuestions,
+                  ],
                 );
               }
             }
@@ -351,7 +361,6 @@ export class ChatbotSettingsSubscriber implements EntitySubscriberInterface {
               await this.chatbotApiService.updateChatbotSettings(
                 metadata,
                 entity.courseId,
-                '',
               );
               return;
             } catch (exception) {
@@ -361,8 +370,29 @@ export class ChatbotSettingsSubscriber implements EntitySubscriberInterface {
               ) {
                 // Chatbot server failed to connect or had an error, do what we gotta do
                 await qry.query(
-                  'UPDATE course_setting SET "metadata" = $1 WHERE "pageContent" = $2',
-                  [JSON.stringify(metadata), String(entity.courseId)],
+                  `
+                  UPDATE course_settings_model SET 
+                      "model" = $1,
+                      "organizationSettings" = $2,
+                      "modelName" = $3,
+                      "prompt" = $4,
+                      "temperature" = $5,
+                      "topK" = $6,
+                      "similarityThresholdDocuments" = $7,
+                      "similarityThresholdQuestions" = $8
+                  WHERE "courseId" = $9
+                  `,
+                  [
+                    metadata.model,
+                    metadata.organizationSettings,
+                    metadata.modelName,
+                    metadata.prompt,
+                    metadata.temperature,
+                    metadata.topK,
+                    metadata.similarityThresholdDocuments,
+                    metadata.similarityThresholdQuestions,
+                    entity.courseId,
+                  ],
                 );
               }
               return;
@@ -371,7 +401,6 @@ export class ChatbotSettingsSubscriber implements EntitySubscriberInterface {
             try {
               await this.chatbotApiService.deleteChatbotSettings(
                 entity.courseId,
-                '',
               );
               return;
             } catch (exception) {
@@ -381,8 +410,8 @@ export class ChatbotSettingsSubscriber implements EntitySubscriberInterface {
               ) {
                 // Chatbot server failed to connect or had an error, do what we gotta do
                 await qry.query(
-                  'DELETE FROM course_setting WHERE "pageContent" = $1',
-                  [String(entity.courseId)],
+                  'DELETE FROM course_settings_model WHERE "courseId" = $1',
+                  [entity.courseId],
                 );
               }
               return;
@@ -403,8 +432,8 @@ export class ChatbotSettingsSubscriber implements EntitySubscriberInterface {
     try {
       return (
         await qry.query(
-          'SELECT * FROM course_setting WHERE "pageContent" = $1',
-          [String(courseId)],
+          'SELECT * FROM course_settings_model WHERE "courseId" = $1',
+          [courseId],
         )
       )[0];
     } catch (err) {
diff --git a/packages/server/src/chatbot/chatbot-infrastructure-models/course-chatbot-settings.entity.ts b/packages/server/src/chatbot/chatbot-infrastructure-models/course-chatbot-settings.entity.ts
index 12c7e5ab1..c18b9423b 100644
--- a/packages/server/src/chatbot/chatbot-infrastructure-models/course-chatbot-settings.entity.ts
+++ b/packages/server/src/chatbot/chatbot-infrastructure-models/course-chatbot-settings.entity.ts
@@ -11,7 +11,7 @@ import {
 import { CourseModel } from '../../course/course.entity';
 import { OrganizationChatbotSettingsModel } from './organization-chatbot-settings.entity';
 import { LLMTypeModel } from './llm-type.entity';
-import { ChatbotSettingsMetadata, dropUndefined } from '@koh/common';
+import { ChatbotCourseSettingsProperties, dropUndefined } from '@koh/common';
 import { pick } from 'lodash';
 
 @Entity('course_chatbot_settings_model')
@@ -105,7 +105,7 @@ export class CourseChatbotSettingsModel extends BaseEntity {
   })
   usingDefaultSimilarityThresholdQuestions: boolean;
 
-  getMetadata(): ChatbotSettingsMetadata {
+  getMetadata(): ChatbotCourseSettingsProperties {
     const defaults = pick(
       this.organizationSettings.transformDefaults(),
       'default_prompt',
diff --git a/packages/server/src/chatbot/chatbot-infrastructure-models/llm-type.entity.ts b/packages/server/src/chatbot/chatbot-infrastructure-models/llm-type.entity.ts
index b974b14d8..ae80d809c 100644
--- a/packages/server/src/chatbot/chatbot-infrastructure-models/llm-type.entity.ts
+++ b/packages/server/src/chatbot/chatbot-infrastructure-models/llm-type.entity.ts
@@ -10,7 +10,7 @@ import {
 } from 'typeorm';
 import { CourseChatbotSettingsModel } from './course-chatbot-settings.entity';
 import { ChatbotProviderModel } from './chatbot-provider.entity';
-import { ModelMetadata } from '@koh/common';
+import { ChatbotModelResponse } from '@koh/common';
 
 @Entity('llm_type_model')
 export class LLMTypeModel extends BaseEntity {
@@ -57,7 +57,7 @@ export class LLMTypeModel extends BaseEntity {
   })
   providerNotes: string[] = [];
 
-  getMetadata(): ModelMetadata {
+  getMetadata(): ChatbotModelResponse {
     return {
       provider: this.provider.getMetadata(),
       modelName: this.modelName,
diff --git a/packages/server/src/chatbot/chatbot-infrastructure-models/organization-chatbot-settings.entity.ts b/packages/server/src/chatbot/chatbot-infrastructure-models/organization-chatbot-settings.entity.ts
index bbdea3ff9..52b39bc52 100644
--- a/packages/server/src/chatbot/chatbot-infrastructure-models/organization-chatbot-settings.entity.ts
+++ b/packages/server/src/chatbot/chatbot-infrastructure-models/organization-chatbot-settings.entity.ts
@@ -11,7 +11,7 @@ import { ChatbotProviderModel } from './chatbot-provider.entity';
 import { OrganizationModel } from '../../organization/organization.entity';
 import { CourseChatbotSettingsModel } from './course-chatbot-settings.entity';
 import { pick } from 'lodash';
-import { OrganizationChatbotSettingsMetadata } from '@koh/common';
+import { ChatbotOrganizationSettings } from '@koh/common';
 
 @Entity('organization_chatbot_settings_model')
 export class OrganizationChatbotSettingsModel extends BaseEntity {
@@ -89,7 +89,7 @@ export class OrganizationChatbotSettingsModel extends BaseEntity {
     return mappedDefaultProps;
   }
 
-  getMetadata(): OrganizationChatbotSettingsMetadata {
+  getMetadata(): ChatbotOrganizationSettings {
     return {
       defaultProvider: this.defaultProvider?.getMetadata(),
     };
diff --git a/packages/server/src/chatbot/question.entity.ts b/packages/server/src/chatbot/chatbot-question.entity.ts
similarity index 62%
rename from packages/server/src/chatbot/question.entity.ts
rename to packages/server/src/chatbot/chatbot-question.entity.ts
index 6c05ba750..0d65e2fdc 100644
--- a/packages/server/src/chatbot/question.entity.ts
+++ b/packages/server/src/chatbot/chatbot-question.entity.ts
@@ -1,40 +1,36 @@
 import {
   BaseEntity,
   Column,
+  CreateDateColumn,
   Entity,
-  PrimaryGeneratedColumn,
-  ManyToOne,
   JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
 } from 'typeorm';
 import { InteractionModel } from './interaction.entity';
+
 // each chatbot_question links to one interaction
 @Entity('chatbot_questions_model')
 export class ChatbotQuestionModel extends BaseEntity {
   @PrimaryGeneratedColumn()
-  public id: number;
+  id: number;
 
-  @Column()
+  @Column({ type: 'text' })
   vectorStoreId: string;
 
-  @ManyToOne(() => InteractionModel)
-  @JoinColumn({ name: 'interaction' })
-  interaction: InteractionModel;
+  @Column({ type: 'integer', default: 0 })
+  userScore: number;
 
-  @Column()
-  questionText: string;
+  @Column({ type: 'boolean', default: false })
+  isPreviousQuestion: boolean;
 
-  @Column()
-  responseText: string;
+  @Column({ type: 'integer' })
+  interactionId: number;
 
-  @Column({ default: () => 'CURRENT_TIMESTAMP' })
+  @CreateDateColumn({ type: 'timestamp with time zone' })
   timestamp: Date;
 
-  @Column({ default: 0 })
-  userScore: number;
-
-  @Column({ default: false })
-  isPreviousQuestion: boolean;
-
-  @Column({ default: false })
-  suggested: boolean;
+  @ManyToOne(() => InteractionModel)
+  @JoinColumn({ name: 'interactionId' })
+  interaction: InteractionModel;
 }
diff --git a/packages/server/src/chatbot/chatbot.controller.ts b/packages/server/src/chatbot/chatbot.controller.ts
index 0b727fa33..899148fe8 100644
--- a/packages/server/src/chatbot/chatbot.controller.ts
+++ b/packages/server/src/chatbot/chatbot.controller.ts
@@ -2,6 +2,7 @@ import {
   BadRequestException,
   Body,
   Controller,
+  DefaultValuePipe,
   Delete,
   Get,
   HttpException,
@@ -12,6 +13,7 @@ import {
   ParseIntPipe,
   Patch,
   Post,
+  Query,
   Req,
   Res,
   UploadedFile,
@@ -22,28 +24,29 @@ import { ChatbotService } from './chatbot.service';
 import { JwtAuthGuard } from '../guards/jwt-auth.guard';
 import { EmailVerifiedGuard } from 'guards/email-verified.guard';
 import {
-  AddChatbotQuestionParams,
-  AddDocumentChunkParams,
-  ChatbotAskParams,
-  ChatbotAskResponse,
-  ChatbotAskSuggestedParams,
+  ChatbotAskSuggestedBody,
+  ChatbotCourseSettingsResponse,
+  ChatbotDocumentAggregateResponse,
+  ChatbotDocumentListResponse,
+  ChatbotDocumentResponse,
   ChatbotProvider,
-  ChatbotQueryParams,
-  ChatbotQuestionResponseChatbotDB,
-  ChatbotQuestionResponseHelpMeDB,
+  ChatbotQueryBody,
+  ChatbotQuestionResponse,
   ChatbotServiceProvider,
   ChatbotServiceType,
-  ChatbotSettings,
-  ChatbotSettingsUpdateParams,
   CourseChatbotSettings,
   CourseChatbotSettingsForm,
   CreateChatbotProviderBody,
+  CreateDocumentChunkBody,
   CreateLLMTypeBody,
   CreateOrganizationChatbotSettingsBody,
+  CreateQuestionBody,
   ERROR_MESSAGES,
   GetAvailableModelsBody,
-  GetChatbotHistoryResponse,
-  GetInteractionsAndQuestionsResponse,
+  HelpMeChatbotAskBody,
+  HelpMeChatbotAskResponse,
+  HelpMeChatbotQuestionResponse,
+  HelpMeChatbotQuestionTableResponse,
   InteractionResponse,
   LLMType,
   OllamaLLMType,
@@ -51,11 +54,17 @@ import {
   OrganizationChatbotSettings,
   OrganizationChatbotSettingsDefaults,
   OrganizationRole,
+  PaginatedResponse,
   Role,
+  SuggestedQuestionResponse,
+  UpdateChatbotCourseSettingsBody,
   UpdateChatbotProviderBody,
-  UpdateChatbotQuestionParams,
-  UpdateDocumentChunkParams,
+  UpdateDocumentAggregateBody,
+  UpdateDocumentChunkBody,
   UpdateLLMTypeBody,
+  UpdateQuestionBody,
+  UploadDocumentAggregateBody,
+  UploadURLDocumentAggregateBody,
   UpsertCourseChatbotSettings,
 } from '@koh/common';
 import { CourseRolesGuard } from 'guards/course-roles.guard';
@@ -87,6 +96,7 @@ import {
   IgnoreableClassSerializerInterceptor,
   IgnoreSerializer,
 } from '../interceptors/IgnoreableClassSerializerInterceptor';
+import { plainToClass } from 'class-transformer';
 
 @Controller('chatbot')
 @UseGuards(JwtAuthGuard, EmailVerifiedGuard)
@@ -101,41 +111,39 @@ export class ChatbotController {
   // Endpoints for both students and staff
   //
 
-  @Post('query/:courseId')
+  @Post(':courseId/query')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.STUDENT, Role.TA, Role.PROFESSOR)
   async queryChatbot(
-    @Body() { query, type }: ChatbotQueryParams,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
-
-    return await this.chatbotApiService.queryChatbot(
-      query,
-      user.chat_token.token,
-      type,
-    );
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Body() params: ChatbotQueryBody,
+  ): Promise<string> {
+    return await this.chatbotApiService.queryChatbot({
+      ...params,
+      courseId,
+    });
   }
 
-  @Post('ask/:courseId')
+  @Post(':courseId/ask')
   @UseGuards(CourseRolesBypassHelpMeCourseGuard)
   @Roles(Role.STUDENT, Role.TA, Role.PROFESSOR)
   async askQuestion(
     @Param('courseId', ParseIntPipe) courseId: number,
     @Body()
-    { question, history, interactionId, onlySaveInChatbotDB }: ChatbotAskParams,
+    { question, history, interactionId, save }: HelpMeChatbotAskBody,
     @User({ chat_token: true }) user: UserModel,
-  ): Promise<ChatbotAskResponse> {
+  ): Promise<HelpMeChatbotAskResponse> {
     handleChatbotTokenCheck(user);
 
-    const ChatbotDBResponse = await this.chatbotApiService.askQuestion(
+    save ??= true;
+    const response = await this.chatbotApiService.askQuestion(
       question,
       history,
       user.chat_token.token,
       courseId,
     );
 
-    if (!onlySaveInChatbotDB) {
+    if (save) {
       // if there's no interactionId (it's the first question), create a new interaction
       if (!interactionId) {
         const interaction = await this.chatbotService.createInteraction(
@@ -144,81 +152,55 @@ export class ChatbotController {
         );
         interactionId = interaction.id;
       }
-      const HelpMeDBResponse = await this.chatbotService.createQuestion({
-        questionText: question,
-        responseText: ChatbotDBResponse.answer,
-        vectorStoreId: ChatbotDBResponse.questionId,
-        suggested: false,
-        isPreviousQuestion: ChatbotDBResponse.isPreviousQuestion ?? false,
-        interactionId: interactionId,
+      const question = await this.chatbotService.createQuestion(interactionId, {
+        vectorStoreId: response.questionId,
+        isPreviousQuestion: response.isPreviousQuestion ?? false,
       });
 
-      return {
-        chatbotRepoVersion: ChatbotDBResponse,
-        helpmeRepoVersion: {
-          ...HelpMeDBResponse,
-          interactionId: interactionId,
-        },
-      };
-    } else {
-      return {
-        chatbotRepoVersion: ChatbotDBResponse,
-        helpmeRepoVersion: null,
-      };
+      return plainToClass(HelpMeChatbotAskResponse, {
+        ...response,
+        internal: question,
+      });
     }
+
+    return plainToClass(HelpMeChatbotAskResponse, response);
   }
 
-  @Post('askSuggested/:courseId')
+  @Post(':courseId/ask/suggested')
   @UseGuards(CourseRolesBypassHelpMeCourseGuard)
   @Roles(Role.STUDENT, Role.TA, Role.PROFESSOR)
   async askSuggestedQuestion(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @Body()
-    { question, responseText, vectorStoreId }: ChatbotAskSuggestedParams,
+    @Body() { vectorStoreId }: ChatbotAskSuggestedBody,
     @UserId() userId: number,
-  ): Promise<ChatbotQuestionResponseHelpMeDB> {
+  ): Promise<HelpMeChatbotQuestionResponse> {
     const interaction = await this.chatbotService.createInteraction(
       courseId,
       userId,
     );
 
-    const HelpMeDBResponse = await this.chatbotService.createQuestion({
-      questionText: question,
-      responseText: responseText,
+    return await this.chatbotService.createQuestion(interaction.id, {
       vectorStoreId: vectorStoreId,
-      suggested: true,
       isPreviousQuestion: true,
-      interactionId: interaction.id,
     });
-
-    return {
-      ...HelpMeDBResponse,
-      interactionId: interaction.id,
-    };
   }
 
-  @Get('question/suggested/:courseId')
+  @Get(':courseId/question/suggested')
   @UseGuards(CourseRolesBypassHelpMeCourseGuard)
   @Roles(Role.PROFESSOR, Role.TA, Role.STUDENT)
   async getSuggestedQuestions(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
-    return await this.chatbotApiService.getSuggestedQuestions(
-      courseId,
-      user.chat_token.token,
-    );
+  ): Promise<SuggestedQuestionResponse[]> {
+    return await this.chatbotApiService.getSuggestedQuestions(courseId);
   }
 
-  @Patch('questionScore/:courseId/:questionId')
+  @Patch(':courseId/question/:questionId/score')
   @UseGuards(CourseRolesBypassHelpMeCourseGuard)
   @Roles(Role.PROFESSOR, Role.TA, Role.STUDENT)
   async updateChatbotUserScore(
-    @Param('courseId', ParseIntPipe) courseId: number,
     @Param('questionId') questionId: number, // helpme question id
     @Body() { userScore }: { userScore: number },
-  ) {
+  ): Promise<HelpMeChatbotQuestionResponse> {
     return await this.chatbotService.updateQuestionUserScore(
       questionId,
       userScore,
@@ -228,11 +210,8 @@ export class ChatbotController {
   @Get('history')
   async getChatbotHistory(
     @UserId() userId: number,
-  ): Promise<GetChatbotHistoryResponse> {
-    const history = await this.chatbotService.getAllInteractionsForUser(userId);
-    return {
-      history: history as unknown as InteractionResponse[],
-    };
+  ): Promise<InteractionResponse[]> {
+    return await this.chatbotService.getAllInteractionsForUser(userId);
   }
 
   //
@@ -240,254 +219,280 @@ export class ChatbotController {
   //
 
   // Settings endpoints
-  @Get('settings/:courseId')
+  @Get(':courseId/settings')
   @UseGuards(CourseRolesGuard, ChatbotLegacyEndpointGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async getChatbotSettings(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @User({ chat_token: true }) user: UserModel,
-  ): Promise<ChatbotSettings> {
-    handleChatbotTokenCheck(user);
-    return await this.chatbotApiService.getChatbotSettings(
-      courseId,
-      user.chat_token.token,
-    );
+  ): Promise<ChatbotCourseSettingsResponse> {
+    return await this.chatbotApiService.getChatbotSettings(courseId);
   }
 
-  @Patch('settings/:courseId')
+  @Patch(':courseId/settings')
   @UseGuards(CourseRolesGuard, ChatbotLegacyEndpointGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async updateChatbotSettings(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @Body() settings: ChatbotSettingsUpdateParams,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
+    @Body() settings: UpdateChatbotCourseSettingsBody,
+  ): Promise<ChatbotCourseSettingsResponse> {
     return await this.chatbotApiService.updateChatbotSettings(
       settings,
       courseId,
-      user.chat_token.token,
     );
   }
 
-  @Patch('settings/:courseId/reset')
+  @Patch(':courseId/settings/reset')
   @UseGuards(CourseRolesGuard, ChatbotLegacyEndpointGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async resetChatbotSettings(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
-    return await this.chatbotApiService.resetChatbotSettings(
-      courseId,
-      user.chat_token.token,
-    );
+  ): Promise<ChatbotCourseSettingsResponse> {
+    return await this.chatbotApiService.resetChatbotSettings(courseId);
   }
 
   // Question endpoints
-  @Get('question/all/:courseId')
+  @Get(':courseId/question')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async getInteractionsAndQuestions(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @User({ chat_token: true }) user: UserModel,
-  ): Promise<GetInteractionsAndQuestionsResponse> {
-    handleChatbotTokenCheck(user);
-    // Fire off both requests simultaneously.
-    const [interactions, allChatbotDBQuestions] = await Promise.all([
-      this.chatbotService.getInteractionsAndQuestions(courseId), // helpme db
-      this.chatbotApiService.getAllQuestions(courseId, user.chat_token.token), // chatbot db
-    ]);
-    return {
-      helpmeDB: interactions as unknown as InteractionResponse[], // interactions is of type InteractionModel[] which is basically the same
-      chatbotDB: allChatbotDBQuestions,
-    };
+  ): Promise<HelpMeChatbotQuestionTableResponse[]> {
+    return await this.chatbotService.getCombinedInteractionsAndQuestions(
+      courseId,
+    );
   }
 
-  @Post('question/:courseId')
+  @Post(':courseId/question')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async addChatbotQuestion(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @Body() questionData: AddChatbotQuestionParams,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
+    @Body() questionData: CreateQuestionBody,
+  ): Promise<ChatbotQuestionResponse> {
     // NOTE that this endpoint does NOT add the question to the helpme database
     // (since the helpme database only hold questions that were actually asked)
-    return await this.chatbotApiService.addQuestion(
-      questionData,
-      courseId,
-      user.chat_token.token,
-    );
+    return await this.chatbotApiService.addQuestion(questionData, courseId);
   }
 
-  @Patch('question/:courseId')
+  @Patch(':courseId/question/:questionId')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async updateChatbotQuestion(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @Body() questionData: UpdateChatbotQuestionParams,
-    @User({ chat_token: true }) user: UserModel,
-  ): Promise<ChatbotQuestionResponseChatbotDB> {
-    handleChatbotTokenCheck(user);
+    @Param('questionId') questionId: string,
+    @Body() questionData: UpdateQuestionBody,
+  ): Promise<ChatbotQuestionResponse> {
     return await this.chatbotApiService.updateQuestion(
+      questionId,
       questionData,
       courseId,
-      user.chat_token.token,
     );
   }
 
-  @Delete('question/:courseId/:questionId')
+  @Delete(':courseId/question/:questionId')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async deleteChatbotQuestion(
     @Param('courseId', ParseIntPipe) courseId: number,
     @Param('questionId') questionId: string,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
-    return await this.chatbotApiService.deleteQuestion(
-      questionId,
+  ): Promise<void> {
+    await this.chatbotService.deleteQuestionByVectorStoreId(
       courseId,
-      user.chat_token.token,
+      questionId,
     );
   }
 
-  @Get('models/:courseId')
+  @Get(':courseId/models')
   @UseGuards(CourseRolesGuard, ChatbotLegacyEndpointGuard)
   @Roles(Role.PROFESSOR, Role.TA)
-  async getModels(
-    @Param('courseId', ParseIntPipe) _courseId: number,
-    @User({ chat_token: true }) user: UserModel,
-  ): Promise<ChatbotSettings> {
-    handleChatbotTokenCheck(user);
-    return await this.chatbotApiService.getModels(user.chat_token.token);
+  async getModels(): Promise<Record<string, string>> {
+    return await this.chatbotApiService.getModels();
   }
 
-  // Unused
-  // @Delete('question/all/:courseId')
+  // // Unused
+  // @Delete(':courseId/question')
   // @UseGuards(CourseRolesGuard)
   // @Roles(Role.PROFESSOR, Role.TA)
   // async deleteAllQuestions(
-  //   @Param('courseId', ParseIntPipe) courseId: number,
-  //   @User(['chat_token']) user: UserModel,
-  // ) {
-  //   handleChatbotTokenCheck(user);
-  //   return await this.chatbotApiService.deleteAllQuestions(courseId, user.chat_token.token);
+  //   @Param('courseId', ParseIntPipe) courseId: number
+  // ): Promise<void> {
+  //   return await this.chatbotApiService.deleteAllQuestions(courseId);
   // }
-
-  // resets all chatbot data for the course. Unused
-  // @Get('resetCourse/:courseId')
+  //
+  // // resets all chatbot data for the course. Unused
+  // @Get(':courseId/reset')
   // @UseGuards(CourseRolesGuard)
   // @Roles(Role.PROFESSOR, Role.TA)
   // async resetCourse(
-  //   @Param('courseId', ParseIntPipe) courseId: number,
-  //   @User(['chat_token']) user: UserModel,
-  // ) {
-  //   handleChatbotTokenCheck(user)
-  //   return await this.chatbotApiService.resetCourse(courseId, user.chat_token.token);
+  //   @Param('courseId', ParseIntPipe) courseId: number
+  // ): Promise<void> {
+  //   return await this.chatbotApiService.resetCourse(courseId);
   // }
 
   // Document endpoints
-  @Get('aggregateDocuments/:courseId')
+  @Get(':courseId/aggregate{/:page}')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async getAllAggregateDocuments(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
+    @Param(
+      'page',
+      new DefaultValuePipe(-1),
+      new ParseIntPipe({ optional: true }),
+    )
+    page?: number,
+    @Query(
+      'pageSize',
+      new DefaultValuePipe(-1),
+      new ParseIntPipe({ optional: true }),
+    )
+    pageSize?: number,
+    @Query('search') search?: string,
+  ): Promise<PaginatedResponse<ChatbotDocumentAggregateResponse>> {
+    page = page == undefined || page < 1 ? undefined : page;
+    pageSize =
+      page == undefined || pageSize == undefined || pageSize < 1
+        ? undefined
+        : pageSize;
+
     // this gets the full chatbot documents (rather than just the chunks)
     return await this.chatbotApiService.getAllAggregateDocuments(
       courseId,
-      user.chat_token.token,
+      page,
+      pageSize,
+      search,
     );
   }
 
-  @Get('documentChunks/:courseId')
+  @Get(':courseId/document{/:page}')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async getAllDocumentChunks(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
+    @Param(
+      'page',
+      new DefaultValuePipe(-1),
+      new ParseIntPipe({ optional: true }),
+    )
+    page?: number,
+    @Query(
+      'pageSize',
+      new DefaultValuePipe(-1),
+      new ParseIntPipe({ optional: true }),
+    )
+    pageSize?: number,
+    @Query('search') search?: string,
+  ): Promise<PaginatedResponse<ChatbotDocumentResponse>> {
+    page = page == undefined || page < 1 ? undefined : page;
+    pageSize =
+      page == undefined || pageSize == undefined || pageSize < 1
+        ? undefined
+        : pageSize;
+
     return await this.chatbotApiService.getAllDocumentChunks(
       courseId,
-      user.chat_token.token,
+      page,
+      pageSize,
+      search,
     );
   }
 
-  @Post('documentChunks/:courseId')
+  @Get(':courseId/document/list{/:page}')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
-  async addDocumentChunk(
+  async getListDocuments(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @Body() body: AddDocumentChunkParams,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
-    return await this.chatbotApiService.addDocumentChunk(
-      body,
+    @Param(
+      'page',
+      new DefaultValuePipe(-1),
+      new ParseIntPipe({ optional: true }),
+    )
+    page?: number,
+    @Query(
+      'pageSize',
+      new DefaultValuePipe(-1),
+      new ParseIntPipe({ optional: true }),
+    )
+    pageSize?: number,
+    @Query('search') search?: string,
+  ): Promise<PaginatedResponse<ChatbotDocumentListResponse>> {
+    page = page == undefined || page < 1 ? undefined : page;
+    pageSize =
+      page == undefined || pageSize == undefined || pageSize < 1
+        ? undefined
+        : pageSize;
+
+    return await this.chatbotApiService.getListDocuments(
       courseId,
-      user.chat_token.token,
+      page,
+      pageSize,
+      search,
     );
   }
 
-  @Patch('documentChunks/:courseId/:docId')
+  @Post(':courseId/document')
+  @UseGuards(CourseRolesGuard)
+  @Roles(Role.PROFESSOR, Role.TA)
+  async addDocumentChunk(
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Body() body: CreateDocumentChunkBody,
+  ): Promise<ChatbotDocumentResponse[]> {
+    return await this.chatbotApiService.addDocumentChunk(body, courseId);
+  }
+
+  @Patch(':courseId/document/:docId')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async updateDocumentChunk(
     @Param('courseId', ParseIntPipe) courseId: number,
     @Param('docId') docId: string,
-    @Body() body: UpdateDocumentChunkParams,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
+    @Body() body: UpdateDocumentChunkBody,
+  ): Promise<ChatbotDocumentResponse[]> {
     return await this.chatbotApiService.updateDocumentChunk(
       docId,
       body,
       courseId,
-      user.chat_token.token,
     );
   }
 
-  @Delete('documentChunks/:courseId/:docId')
+  @Delete(':courseId/document/:docId')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async deleteDocumentChunk(
     @Param('courseId', ParseIntPipe) courseId: number,
     @Param('docId') docId: string,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
-    return await this.chatbotApiService.deleteDocumentChunk(
-      docId,
-      courseId,
-      user.chat_token.token,
-    );
+  ): Promise<void> {
+    return await this.chatbotApiService.deleteDocumentChunk(docId, courseId);
   }
 
-  @Delete('document/:courseId/:docId')
+  @Patch(':courseId/aggregate/:docId')
+  @UseGuards(CourseRolesGuard)
+  @Roles(Role.PROFESSOR, Role.TA)
+  async updateDocument(
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Param('docId') docId: string,
+    @Body() body: UpdateDocumentAggregateBody,
+  ): Promise<ChatbotDocumentAggregateResponse> {
+    // Delete disallowed update parameters
+    delete body.documentText;
+    delete body.lmsDocumentId;
+    delete body.prefix;
+
+    return await this.chatbotApiService.updateDocument(docId, courseId, body);
+  }
+
+  @Delete(':courseId/aggregate/:docId')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async deleteDocument(
     @Param('courseId', ParseIntPipe) courseId: number,
     @Param('docId') docId: string,
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
-    const chatbotDeleteResponse = await this.chatbotApiService.deleteDocument(
-      docId,
-      courseId,
-      user.chat_token.token,
-    );
+  ): Promise<void> {
+    await this.chatbotApiService.deleteDocument(docId, courseId);
     // if that succeeded (an error would have been thrown if it didn't), then delete the document from database
     await ChatbotDocPdfModel.delete({
       docIdChatbotDB: docId,
     });
-    return chatbotDeleteResponse;
   }
 
   // TODO: eventually add tests for this I guess
@@ -497,11 +502,10 @@ export class ChatbotController {
   @IgnoreSerializer()
   @Roles(Role.PROFESSOR, Role.TA, Role.STUDENT)
   async getChatbotDocument(
-    @Param('courseId', ParseIntPipe) courseId: number,
     @Param('docId') docId: number,
     @Req() req: Request,
     @Res() res: Response,
-  ) {
+  ): Promise<Response | void> {
     try {
       // First check if document exists and get its metadata
       const docInfo = await ChatbotDocPdfModel.createQueryBuilder('doc')
@@ -615,7 +619,7 @@ export class ChatbotController {
   }
 
   // TODO: eventually add tests for this I guess
-  @Post('document/:courseId/upload')
+  @Post(':courseId/aggregate/file')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   @UseInterceptors(
@@ -628,10 +632,11 @@ export class ChatbotController {
   async uploadDocument(
     @Param('courseId', ParseIntPipe) courseId: number,
     @UploadedFile() file: Express.Multer.File,
-    @Body() { parseAsPng }: { parseAsPng: boolean | string },
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
+    @Body() params: Partial<UploadDocumentAggregateBody>,
+    @User() user: UserModel,
+  ): Promise<ChatbotDocumentAggregateResponse> {
+    let { parseAsPng } = params;
+
     if (!file) {
       throw new BadRequestException('No file uploaded');
     }
@@ -645,21 +650,13 @@ export class ChatbotController {
     ) {
       if (file.size > 1024 * 2048) {
         throw new BadRequestException(
-          'Text-only files (.txt, .csv, .md) must be less than 2MB (2MB of text is a lot)',
+          ERROR_MESSAGES.chatbotController.textFileTooBig,
         );
       }
     }
 
-    if (parseAsPng === 'true') {
-      parseAsPng = true;
-    } else {
-      parseAsPng = false;
-    }
-
-    // if it's an image, make parseAsPng true
-    if (file.mimetype.startsWith('image/')) {
-      parseAsPng = true;
-    }
+    parseAsPng =
+      String(parseAsPng) === 'true' || file.mimetype.startsWith('image/');
 
     // get the course name (for pdf metadata)
     const course = await CourseModel.findOne({
@@ -691,19 +688,16 @@ export class ChatbotController {
 
       // NOTE: Gotenberg's markdown converter is outdated and seems to convert markdown to pdf with weird lists and line breaks. TODO: make an issue on their github for this (use userguide and changelog as evidence)
       const markdownConverter = new MarkdownConverter();
-      const buffer = await markdownConverter.convert({
+      file.buffer = await markdownConverter.convert({
         html: htmlBuffer,
         markdown: file.buffer,
         pdfUA: true,
       });
-      file.buffer = buffer;
       // if it's a supported file type for libreoffice conversion, use LibreOfficeConverter
     } else if (
-      supportedFileExtensionsForLibreOfficeConversion.includes(
-        fileExtension as FileExtension,
-      )
+      LibreOfficeSupportedExtensions.includes(fileExtension as FileExtension)
     ) {
-      const buffer = await LibreOffice.convert({
+      file.buffer = await LibreOffice.convert({
         files: [{ data: file.buffer, ext: fileExtension as FileExtension }],
         // All config options here: https://github.com/cherfia/chromiumly
         pdfUA: true, // enables Universal Access (for improved accessibility)
@@ -721,7 +715,6 @@ export class ChatbotController {
         maxImageResolution: 150, // apparently 150dpi is good for presentations, with at least 72 being good for web usage
         flatten: true, // flatten the pdf to remove any annotations
       });
-      file.buffer = buffer;
     } else {
       // if it's not a supported file type for conversion, throw an error
       throw new BadRequestException(
@@ -747,10 +740,11 @@ export class ChatbotController {
       chatbotDocPdf.save(),
       this.chatbotApiService.uploadDocument(
         file,
-        docUrl,
-        parseAsPng,
+        {
+          source: docUrl,
+          parseAsPng,
+        },
         courseId,
-        user.chat_token.token,
       ),
     ]);
 
@@ -768,9 +762,8 @@ export class ChatbotController {
     ) {
       // If upload succeeded but DB save failed, clean up the uploaded document
       await this.chatbotApiService.deleteDocument(
-        uploadResult.value.docId,
+        uploadResult.value.id,
         courseId,
-        user.chat_token.token,
       );
       throw savedDocPdf.reason;
     } else if (
@@ -786,7 +779,7 @@ export class ChatbotController {
       uploadResult.status === 'fulfilled'
     ) {
       // if both succeed, then save the docId to the database
-      chatbotDocPdf.docIdChatbotDB = uploadResult.value.docId;
+      chatbotDocPdf.docIdChatbotDB = uploadResult.value.id;
       await chatbotDocPdf.save();
 
       const endTime2 = Date.now();
@@ -801,20 +794,14 @@ export class ChatbotController {
     }
   }
 
-  @Post('document/:courseId/github')
+  @Post(':courseId/aggregate/url')
   @UseGuards(CourseRolesGuard)
   @Roles(Role.PROFESSOR, Role.TA)
   async addDocumentFromGithub(
     @Param('courseId', ParseIntPipe) courseId: number,
-    @Body() { url }: { url: string },
-    @User({ chat_token: true }) user: UserModel,
-  ) {
-    handleChatbotTokenCheck(user);
-    return await this.chatbotApiService.uploadURLDocument(
-      url,
-      courseId,
-      user.chat_token.token,
-    );
+    @Body() params: UploadURLDocumentAggregateBody,
+  ): Promise<ChatbotDocumentAggregateResponse> {
+    return await this.chatbotApiService.uploadURLDocument(params, courseId);
   }
 
   @Get('organization/:oid')
@@ -896,7 +883,6 @@ export class ChatbotController {
   @Roles(OrganizationRole.ADMIN)
   async deleteOrganizationSettings(
     @Param('oid', ParseIntPipe) organizationId: number,
-    @User({ chat_token: true }) user: UserModel,
   ): Promise<void> {
     const original = await OrganizationChatbotSettingsModel.findOne({
       where: { organizationId },
@@ -906,7 +892,6 @@ export class ChatbotController {
         ERROR_MESSAGES.chatbotController.organizationSettingsNotFound,
       );
     }
-    handleChatbotTokenCheck(user);
     const applicableCourses = await CourseChatbotSettingsModel.find({
       where: {
         organizationSettings: {
@@ -944,15 +929,11 @@ export class ChatbotController {
       });
 
       // Reset to defaults
-      await this.chatbotApiService.resetChatbotSettings(
-        course.courseId,
-        user.chat_token.token,
-      );
+      await this.chatbotApiService.resetChatbotSettings(course.courseId);
       // Update with any modified values
       await this.chatbotApiService.updateChatbotSettings(
         params,
         course.courseId,
-        user.chat_token.token,
       );
     }
   }
@@ -1302,7 +1283,7 @@ function handleChatbotTokenCheck(user: UserModel) {
   }
 }
 
-const supportedFileExtensionsForLibreOfficeConversion: FileExtension[] = [
+const LibreOfficeSupportedExtensions: FileExtension[] = [
   'doc',
   'docx',
   'xls',
diff --git a/packages/server/src/chatbot/chatbot.service.spec.ts b/packages/server/src/chatbot/chatbot.service.spec.ts
index 9140becbe..c8003eef8 100644
--- a/packages/server/src/chatbot/chatbot.service.spec.ts
+++ b/packages/server/src/chatbot/chatbot.service.spec.ts
@@ -18,7 +18,7 @@ import {
   OrganizationFactory,
   UserFactory,
 } from '../../test/util/factories';
-import { ChatbotQuestionModel } from './question.entity';
+import { ChatbotQuestionModel } from './chatbot-question.entity';
 import { FactoryModule } from 'factory/factory.module';
 import { FactoryService } from 'factory/factory.service';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
@@ -292,58 +292,46 @@ describe('ChatbotService', () => {
     it('should create a question with valid properties', async () => {
       const interaction = await InteractionFactory.create();
       const questionParams = {
-        interactionId: interaction.id,
         questionText: "What's the meaning of life?",
         responseText: "It's a philosophical question.",
         suggested: true,
         isPreviousQuestion: false,
         vectorStoreId: '1',
       };
-      const createdQuestion = await service.createQuestion(questionParams);
+      const createdQuestion = await service.createQuestion(
+        interaction.id,
+        questionParams,
+      );
       expect(createdQuestion).toBeDefined();
-      expect(createdQuestion.questionText).toEqual(questionParams.questionText);
-      expect(createdQuestion.responseText).toEqual(questionParams.responseText);
     });
   });
 
   describe('editQuestion', () => {
     it('should throw an error if question is not found', async () => {
-      await expect(
-        service.editQuestion({ id: 999, userScore: 5 }),
-      ).rejects.toThrow('Question not found based on the provided ID.');
+      await expect(service.editQuestion(999, { userScore: 5 })).rejects.toThrow(
+        'Question not found based on the provided ID.',
+      );
     });
 
     it('should successfully edit an existing question', async () => {
       const interaction = await InteractionFactory.create();
-      const originalQuestion = await service.createQuestion({
-        interactionId: interaction.id,
-        questionText: 'Original question',
-        responseText: 'Original response',
-        suggested: true,
+      const originalQuestion = await service.createQuestion(interaction.id, {
         vectorStoreId: '1',
         isPreviousQuestion: false,
       });
 
       const updatedQuestionData = {
-        id: originalQuestion.id,
-        questionText: 'Updated question',
-        responseText: 'Updated response',
-        suggested: false,
         isPreviousQuestion: true,
         vectorStoreId: '2',
       };
 
-      const updatedQuestion = await service.editQuestion(updatedQuestionData);
+      const updatedQuestion = await service.editQuestion(
+        originalQuestion.id,
+        updatedQuestionData,
+      );
 
       expect(updatedQuestion).toBeDefined();
       expect(updatedQuestion.id).toEqual(originalQuestion.id);
-      expect(updatedQuestion.questionText).toEqual(
-        updatedQuestionData.questionText,
-      );
-      expect(updatedQuestion.responseText).toEqual(
-        updatedQuestionData.responseText,
-      );
-      expect(updatedQuestion.suggested).toEqual(updatedQuestionData.suggested);
       expect(updatedQuestion.isPreviousQuestion).toEqual(
         updatedQuestionData.isPreviousQuestion,
       );
@@ -354,31 +342,25 @@ describe('ChatbotService', () => {
 
     it('should only update provided fields', async () => {
       const interaction = await InteractionFactory.create();
-      const originalQuestion = await service.createQuestion({
-        interactionId: interaction.id,
-        questionText: 'Original question',
-        responseText: 'Original response',
-        suggested: true,
+      const originalQuestion = await service.createQuestion(interaction.id, {
         vectorStoreId: '1',
         isPreviousQuestion: false,
       });
 
       const updatedQuestionData = {
-        id: originalQuestion.id,
-        questionText: 'Updated question',
+        isPreviousQuestion: true,
       };
 
-      const updatedQuestion = await service.editQuestion(updatedQuestionData);
+      const updatedQuestion = await service.editQuestion(
+        originalQuestion.id,
+        updatedQuestionData,
+      );
 
       expect(updatedQuestion).toBeDefined();
       expect(updatedQuestion.id).toEqual(originalQuestion.id);
-      expect(updatedQuestion.questionText).toEqual(
-        updatedQuestionData.questionText,
-      );
-      expect(updatedQuestion.responseText).toEqual(
-        originalQuestion.responseText,
+      expect(updatedQuestion.isPreviousQuestion).toEqual(
+        updatedQuestionData.isPreviousQuestion,
       );
-      expect(updatedQuestion.suggested).toEqual(originalQuestion.suggested);
       expect(updatedQuestion.vectorStoreId).toEqual(
         originalQuestion.vectorStoreId,
       );
@@ -387,21 +369,16 @@ describe('ChatbotService', () => {
     it('should allow updating the interactionId', async () => {
       const interaction1 = await InteractionFactory.create();
       const interaction2 = await InteractionFactory.create();
-      const originalQuestion = await service.createQuestion({
-        interactionId: interaction1.id,
+      const originalQuestion = await service.createQuestion(interaction1.id, {
         vectorStoreId: '1',
-        questionText: 'Original question',
-        responseText: 'Original response',
-        suggested: true,
         isPreviousQuestion: false,
       });
 
       const updatedQuestionData = {
-        id: originalQuestion.id,
         interactionId: interaction2.id,
       };
 
-      await service.editQuestion(updatedQuestionData);
+      await service.editQuestion(originalQuestion.id, updatedQuestionData);
 
       const updatedQuestion = await ChatbotQuestionModel.findOne({
         where: {
@@ -626,14 +603,14 @@ describe('ChatbotService', () => {
           await chatbotDataSourceService.getDataSource();
         const chatbotSide = await chatbotDataSource.query(
           `
-          SELECT "pageContent", metadata FROM course_setting WHERE "pageContent" = $1;
+          SELECT * FROM course_settings_model WHERE "courseId" = $1;
         `,
-          [String(course.id)],
+          [course.id],
         );
         expect(chatbotSide).toEqual([
           {
-            pageContent: `${course.id}`,
-            metadata: courseSetting.getMetadata(),
+            ...courseSetting.getMetadata(),
+            courseId: course.id,
           },
         ]);
       }
@@ -1189,9 +1166,9 @@ describe('ChatbotService', () => {
       const chatbotDataSource = await chatbotDataSourceService.getDataSource();
       const chatbotSide = await chatbotDataSource.query(
         `
-          SELECT "pageContent", metadata FROM course_setting WHERE "pageContent" = $1;
+          SELECT * FROM course_settings_model WHERE "courseId" = $1;
         `,
-        [String(course0.id)],
+        [course0.id],
       );
       result.organizationSettings =
         await OrganizationChatbotSettingsModel.findOne({
@@ -1205,8 +1182,8 @@ describe('ChatbotService', () => {
         });
       expect(chatbotSide).toEqual([
         {
-          pageContent: `${course0.id}`,
-          metadata: result.getMetadata(),
+          courseId: course0.id,
+          ...result.getMetadata(),
         },
       ]);
 
@@ -1304,14 +1281,14 @@ describe('ChatbotService', () => {
       const chatbotDataSource = await chatbotDataSourceService.getDataSource();
       const chatbotSide = await chatbotDataSource.query(
         `
-          SELECT "pageContent", metadata FROM course_setting WHERE "pageContent" = $1;
+        SELECT * FROM course_settings_model WHERE "courseId" = $1;
         `,
-        [String(course0.id)],
+        [course0.id],
       );
       expect(chatbotSide).toEqual([
         {
-          pageContent: `${course0.id}`,
-          metadata: result.getMetadata(),
+          courseId: course0.id,
+          ...result.getMetadata(),
         },
       ]);
 
@@ -1397,14 +1374,14 @@ describe('ChatbotService', () => {
       const chatbotDataSource = await chatbotDataSourceService.getDataSource();
       let chatbotSide = await chatbotDataSource.query(
         `
-          SELECT "pageContent", metadata FROM course_setting WHERE "pageContent" = $1;
+            SELECT * FROM course_settings_model WHERE "courseId" = $1;
         `,
-        [String(course0.id)],
+        [course0.id],
       );
       expect(chatbotSide).toEqual([
         {
-          pageContent: `${course0.id}`,
-          metadata: createResult.getMetadata(),
+          courseId: course0.id,
+          ...createResult.getMetadata(),
         },
       ]);
 
@@ -1464,14 +1441,14 @@ describe('ChatbotService', () => {
         });
       chatbotSide = await chatbotDataSource.query(
         `
-          SELECT "pageContent", metadata FROM course_setting WHERE "pageContent" = $1;
+            SELECT * FROM course_settings_model WHERE "courseId" = $1;
         `,
-        [String(course0.id)],
+        [course0.id],
       );
       expect(chatbotSide).toEqual([
         {
-          pageContent: `${course0.id}`,
-          metadata: updateResult.getMetadata(),
+          courseId: course0.id,
+          ...updateResult.getMetadata(),
         },
       ]);
     });
@@ -1565,14 +1542,14 @@ describe('ChatbotService', () => {
       const chatbotDataSource = await chatbotDataSourceService.getDataSource();
       const chatbotSide = await chatbotDataSource.query(
         `
-          SELECT "pageContent", metadata FROM course_setting WHERE "pageContent" = $1;
+            SELECT * FROM course_settings_model WHERE "courseId" = $1;
         `,
-        [String(course0.id)],
+        [course0.id],
       );
       expect(chatbotSide).toEqual([
         {
-          pageContent: `${course0.id}`,
-          metadata: result.getMetadata(),
+          courseId: course0.id,
+          ...result.getMetadata(),
         },
       ]);
     });
diff --git a/packages/server/src/chatbot/chatbot.service.ts b/packages/server/src/chatbot/chatbot.service.ts
index d5a971567..785ecd7af 100644
--- a/packages/server/src/chatbot/chatbot.service.ts
+++ b/packages/server/src/chatbot/chatbot.service.ts
@@ -7,20 +7,22 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { InteractionModel } from './interaction.entity';
-import { ChatbotQuestionModel } from './question.entity';
+import { ChatbotQuestionModel } from './chatbot-question.entity';
 import { CourseModel } from '../course/course.entity';
 import { UserModel } from '../profile/user.entity';
 import { OrganizationChatbotSettingsModel } from './chatbot-infrastructure-models/organization-chatbot-settings.entity';
 import {
   ChatbotAllowedHeaders,
-  ChatbotSettings,
-  ChatbotSettingsMetadata,
+  ChatbotCourseSettingsResponse,
+  ChatbotQuestionResponse,
   CourseChatbotSettingsForm,
   CreateChatbotProviderBody,
   CreateLLMTypeBody,
   CreateOrganizationChatbotSettingsBody,
   dropUndefined,
   ERROR_MESSAGES,
+  HelpMeChatbotQuestionTableResponse,
+  InteractionResponse,
   OllamaLLMType,
   OllamaModelDescription,
   OpenAILLMType,
@@ -39,6 +41,7 @@ import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { Cache } from 'cache-manager';
 import { ChatbotApiService } from './chatbot-api.service';
 import { ChatbotDataSourceService } from './chatbot-datasource/chatbot-datasource.service';
+import { plainToClass } from 'class-transformer';
 
 // OpenAI makes it really annoying to scrape any data related
 // to the model capabilities (text, image processing) (selfish, much?)
@@ -177,58 +180,46 @@ export class ChatbotService {
     return await interaction.save();
   }
 
-  async createQuestion(data: {
-    questionText: string;
-    responseText: string;
-    vectorStoreId: string;
-    suggested: boolean;
-    isPreviousQuestion: boolean;
-    interactionId: number;
-  }): Promise<ChatbotQuestionModel> {
-    if (!data.questionText || !data.responseText || !data.vectorStoreId) {
-      const missingFields = [];
-      if (!data.questionText) missingFields.push('questionText');
-      if (!data.responseText) missingFields.push('responseText');
-      if (!data.vectorStoreId) missingFields.push('vectorStoreId');
-
+  async createQuestion(
+    interactionId: number,
+    data: DeepPartial<ChatbotQuestionModel>,
+  ): Promise<ChatbotQuestionModel> {
+    if (!data.vectorStoreId) {
       throw new HttpException(
-        `Missing required question properties: ${missingFields.join(', ')}`,
+        ERROR_MESSAGES.chatbotService.missingVectorStoreId,
         HttpStatus.BAD_REQUEST,
       );
     }
 
     const interaction = await InteractionModel.findOne({
       where: {
-        id: data.interactionId,
+        id: interactionId,
       },
     });
     if (!interaction) {
       throw new HttpException(
-        'Interaction not found based on the provided ID.',
+        ERROR_MESSAGES.chatbotService.interactionNotFound,
         HttpStatus.NOT_FOUND,
       );
     }
 
     const question = ChatbotQuestionModel.create({
       interaction,
-      questionText: data.questionText,
-      responseText: data.responseText,
-      suggested: data.suggested,
-      timestamp: new Date(),
       vectorStoreId: data.vectorStoreId,
       isPreviousQuestion: data.isPreviousQuestion,
     });
 
-    await question.save();
-
-    return question;
+    return await question.save();
   }
 
   // Unused, but going to leave here since it's not unlikely it will be used again in the future
-  async editQuestion(data: any): Promise<ChatbotQuestionModel> {
+  async editQuestion(
+    questionId: number,
+    data: DeepPartial<ChatbotQuestionModel>,
+  ): Promise<ChatbotQuestionModel> {
     const question = await ChatbotQuestionModel.findOne({
       where: {
-        id: data.id,
+        id: questionId,
       },
     });
     if (!question) {
@@ -256,7 +247,32 @@ export class ChatbotService {
     return question;
   }
 
-  async deleteQuestion(questionId: number) {
+  async deleteQuestionByVectorStoreId(
+    courseId: number,
+    vectorStoreId: string,
+  ): Promise<void> {
+    const queryRunner = this.dataSource.createQueryRunner();
+    await queryRunner.connect();
+    await queryRunner.startTransaction();
+    try {
+      const em = queryRunner.manager;
+      const questionRepo = em.getRepository(ChatbotQuestionModel);
+      await questionRepo.delete({
+        vectorStoreId,
+      });
+      await this.chatbotApiService.deleteQuestion(vectorStoreId, courseId);
+      await queryRunner.commitTransaction();
+    } catch (err) {
+      if (queryRunner.isTransactionActive && !queryRunner.isReleased) {
+        await queryRunner.rollbackTransaction();
+      }
+      throw err;
+    } finally {
+      await queryRunner.release();
+    }
+  }
+
+  async deleteQuestion(questionId: number): Promise<void> {
     const chatQuestion = await ChatbotQuestionModel.findOne({
       where: {
         id: questionId,
@@ -270,36 +286,307 @@ export class ChatbotService {
       );
     }
 
-    return await chatQuestion.remove();
+    await chatQuestion.remove();
   }
 
   async getInteractionsAndQuestions(
     courseId: number,
   ): Promise<InteractionModel[]> {
-    const course = await CourseModel.findOne({
-      // i hate how i have to do this (for some reason I can't just query interactions with courseId because the join relation wasn't really set up correctly in the InteractionModel entity)
-      where: {
-        id: courseId,
-      },
-    });
     return await InteractionModel.find({
-      where: { course: course },
+      where: { courseId },
       relations: {
         questions: true,
       },
     });
   }
 
-  async getAllInteractionsForUser(userId: number): Promise<InteractionModel[]> {
-    return await InteractionModel.find({
+  async getCombinedInteractionsAndQuestions(
+    courseId: number,
+  ): Promise<HelpMeChatbotQuestionTableResponse[]> {
+    function mergeChatbotQuestions(
+      helpMeQuestion: ChatbotQuestionModel,
+      chatbotQuestion: ChatbotQuestionResponse,
+      timesAsked?: number,
+      children?: HelpMeChatbotQuestionTableResponse[],
+      isChild?: boolean,
+      userScore?: number,
+    ): HelpMeChatbotQuestionTableResponse {
+      return {
+        ...helpMeQuestion,
+        chatbotQuestion,
+        timestamp: helpMeQuestion?.timestamp
+          ? new Date(
+              helpMeQuestion.timestamp, // prioritize the helpme database for this one (since it stores duplicates n stuff)
+            )
+          : chatbotQuestion?.askedAt
+            ? new Date(chatbotQuestion.askedAt)
+            : undefined,
+        userScore,
+        timesAsked,
+        children,
+        isChild,
+      };
+    }
+
+    function timeCompare(a: { timestamp?: Date }, b: { timestamp?: Date }) {
+      a.timestamp =
+        a.timestamp != undefined ? new Date(a.timestamp) : undefined;
+      b.timestamp =
+        b.timestamp != undefined ? new Date(b.timestamp) : undefined;
+      return (a.timestamp?.getTime() ?? 0) - (b.timestamp?.getTime() ?? 0);
+    }
+
+    const [interactions, chatbotQuestions] = await Promise.all([
+      this.getInteractionsAndQuestions(courseId), // helpme db
+      this.chatbotApiService.getAllQuestions(courseId), // chatbot db
+    ]);
+
+    //
+    // The Join
+    //
+    // We need to process and merge the questions from chatbot and helpme db (in unfortunately O(n^2) time, since we basically need to manually join each chatbot question with helpme question via vectorStoreId)
+    // (there are basically 0 to many helpme db questions for each chatbot db question)
+    const processedQuestions: HelpMeChatbotQuestionTableResponse[] = [];
+    const chatbotQuestionMap: Record<
+      string,
+      {
+        chatbotQuestion: ChatbotQuestionResponse;
+        mostRecent: ChatbotQuestionModel;
+        interactedWith: InteractionModel[];
+        timesAsked: number;
+        totalScore: number;
+      }
+    > = {};
+
+    // For easy mapping (avoid cost of 'find' function with O(1) average access time)
+    for (const chatbotQuestion of chatbotQuestions) {
+      let mostRecent: ChatbotQuestionModel | undefined = undefined;
+      let timesAsked = 0;
+      let totalScore = 0;
+
+      const interactedWith: InteractionModel[] = interactions.filter(
+        (interaction) =>
+          interaction.questions.some(
+            (question) => question.vectorStoreId === chatbotQuestion.id,
+          ),
+      );
+      const questionsWith: ChatbotQuestionModel[] = interactedWith
+        .map((i) => i.questions)
+        .reduce((p, c) => [...p, ...c], [])
+        .filter((q) => q.vectorStoreId == chatbotQuestion.id);
+
+      questionsWith.forEach((question: ChatbotQuestionModel) => {
+        if (
+          mostRecent == undefined ||
+          question.timestamp.getTime() > mostRecent.timestamp.getTime()
+        ) {
+          mostRecent = question;
+        }
+        timesAsked++;
+        totalScore += question.userScore;
+      });
+
+      chatbotQuestionMap[chatbotQuestion.id] = {
+        chatbotQuestion,
+        mostRecent,
+        interactedWith,
+        timesAsked,
+        totalScore,
+      };
+    }
+
+    const ids = Object.keys(chatbotQuestionMap);
+    // Filter interactions to only allow questions which have a corresponding question from the vector store
+    interactions.forEach(
+      (interaction) =>
+        (interaction.questions = interaction.questions.filter((q) =>
+          ids.includes(q.vectorStoreId),
+        )),
+    );
+
+    //
+    // Formatting the data nicely for the antd table
+    //
+    // this is something like O(n) time since it's just looping over the processed chatbot questions and all of their interactions
+    for (const id of ids) {
+      const {
+        chatbotQuestion,
+        interactedWith,
+        mostRecent,
+        totalScore,
+        timesAsked,
+      } = chatbotQuestionMap[id];
+
+      if (interactedWith.length === 0) {
+        // if there was no corresponding interaction found (e.g. it was a manually added question or anytime question), return what we can
+        processedQuestions.push({
+          id: -1,
+          interactionId: -1,
+          vectorStoreId: chatbotQuestion.id,
+          chatbotQuestion: chatbotQuestion,
+          timestamp: chatbotQuestion.askedAt,
+          userScore: 0,
+          isPreviousQuestion: false,
+          timesAsked,
+        });
+      }
+
+      // Now for the children (if you give an antd table item a list of children, it will auto-create sub rows for them):
+      // - if if there are more than 1 interaction for this chatbot question, it will first show the chatbot question and then its children will be all the interactions (children) and their children will be all the questions (grandchildren)
+      // - if there is only 1 interaction for this chatbot question, it will be the first question and its children will be all the other questions in the interaction
+
+      if (interactedWith.length >= 1) {
+        const children = [];
+        for (const interaction of interactedWith) {
+          if (interactedWith.length == 1) {
+            if (
+              interaction.questions.length === 0 ||
+              interaction.questions[0].vectorStoreId !== chatbotQuestion.id
+              // don't show the interaction if it doesn't have the chatbot db question as the first question (to avoid duplicates)
+            ) {
+              break;
+            }
+          } else {
+            if (interaction.questions.length <= 1) {
+              continue;
+            }
+          }
+
+          const grandchildren = [];
+          for (const childQuestion of interaction.questions.slice(1)) {
+            const corresponding =
+              chatbotQuestionMap[childQuestion.vectorStoreId];
+            grandchildren.push(
+              mergeChatbotQuestions(
+                childQuestion,
+                corresponding.chatbotQuestion,
+                null, // timesAsked is null since its not really helpful information to show in this case
+                undefined,
+                true,
+                // If there's only one interaction, just apply the total score regardless
+                interactedWith.length == 1 ||
+                  chatbotQuestion != corresponding.chatbotQuestion
+                  ? corresponding.totalScore
+                  : undefined,
+              ),
+            );
+          }
+          grandchildren.sort(timeCompare);
+          const firstChild = interaction.questions[0];
+
+          /*
+          If there's only one interaction with this question, return early with 'grandchildren' as the children.
+          */
+          if (interactedWith.length == 1) {
+            processedQuestions.push(
+              mergeChatbotQuestions(
+                firstChild,
+                chatbotQuestion,
+                timesAsked,
+                grandchildren.length > 0 ? grandchildren : undefined,
+                false,
+                totalScore,
+              ),
+            );
+            break;
+          }
+
+          /*
+          For each child, they are the first question in an interaction
+          and all of their children are the rest of the questions in the interaction
+           */
+          const corresponding = chatbotQuestionMap[firstChild.vectorStoreId];
+          children.push(
+            mergeChatbotQuestions(
+              firstChild,
+              corresponding.chatbotQuestion,
+              null,
+              grandchildren.length > 0 ? grandchildren : undefined,
+              true,
+              chatbotQuestion != corresponding.chatbotQuestion
+                ? corresponding.totalScore
+                : undefined,
+            ),
+          );
+        }
+        // If there's multiple interactions, the 'children' array is populated.
+        // Merge the top-level chatbot question with the most recent question and add its aggregate properties.
+        if (interactedWith.length > 1) {
+          children.sort((a, b) => timeCompare(b, a)); // Descending
+
+          // finally add on the question and all of its children
+          processedQuestions.push(
+            mergeChatbotQuestions(
+              mostRecent, // the mostRecentlyAskedHelpMeVersion is just to grab the createdAt date for it
+              chatbotQuestion,
+              timesAsked,
+              children.length > 0 ? children : undefined,
+              false,
+              totalScore,
+            ),
+          );
+        }
+      }
+    }
+
+    return plainToClass(HelpMeChatbotQuestionTableResponse, processedQuestions);
+  }
+
+  async getAllInteractionsForUser(
+    userId: number,
+  ): Promise<InteractionResponse[]> {
+    const interactions = await InteractionModel.find({
       where: { user: { id: userId } },
       relations: {
         questions: true,
       },
     });
+    const uniqueVectorStoreIds: string[] = interactions
+      .map((v) => v.questions.map((v) => v.vectorStoreId))
+      .reduce((p, c) => [...p, ...c], [])
+      .filter((v, i, a) => a.indexOf(v) == i);
+    const questionMap: Record<string, ChatbotQuestionResponse> = {};
+    for (const questionId of uniqueVectorStoreIds) {
+      try {
+        questionMap[questionId] =
+          await this.chatbotApiService.getQuestion(questionId);
+      } catch (err) {
+        questionMap[questionId] = {
+          id: questionId,
+          courseId: -1,
+          question: 'N/A',
+          answer: 'N/A',
+          askedAt: new Date(),
+          inserted: false,
+          suggested: false,
+          verified: false,
+          insertedDocuments: [],
+          citations: [],
+        } satisfies ChatbotQuestionResponse;
+      }
+    }
+    Object.keys(questionMap).forEach((k) => {
+      delete questionMap[k].insertedDocuments;
+      delete questionMap[k].citations;
+    });
+
+    return interactions.map((v) => {
+      const questions = v.questions.map((q) => ({
+        ...q,
+        chatbotQuestion: questionMap[q.vectorStoreId],
+      }));
+      return {
+        id: v.id,
+        timestamp: v.timestamp,
+        questions,
+      };
+    });
   }
 
-  async updateQuestionUserScore(questionId: number, userScore: number) {
+  async updateQuestionUserScore(
+    questionId: number,
+    userScore: number,
+  ): Promise<ChatbotQuestionModel> {
     const question = await ChatbotQuestionModel.findOne({
       where: {
         id: questionId,
@@ -445,7 +732,7 @@ export class ChatbotService {
 
   private async backfillCourseSettings(
     orgChatbotSettings: OrganizationChatbotSettingsModel,
-  ) {
+  ): Promise<void> {
     const hasNoCourseSetting = await CourseModel.find({
       where: {
         organizationCourse: {
@@ -456,21 +743,21 @@ export class ChatbotService {
     });
 
     for (const course of hasNoCourseSetting) {
-      let existingSetting: ChatbotSettings;
+      let existingSetting: ChatbotCourseSettingsResponse;
       try {
         existingSetting = await this.chatbotApiService.getChatbotSettings(
           course.id,
-          '',
         );
-      } catch (err) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      } catch (_err) {
         try {
           const dataSource = await this.chatbotDataSource.getDataSource();
           const qry = dataSource.createQueryRunner();
           await qry.connect();
           existingSetting = (
             await qry.query(
-              'SELECT * FROM course_setting WHERE "pageContent" = $1',
-              [String(course.id)],
+              'SELECT * FROM course_settings_model WHERE "courseId" = $1',
+              [course.id],
             )
           )[0];
         } catch (_err) {}
@@ -482,7 +769,7 @@ export class ChatbotService {
       }
 
       const originals = dropUndefined(
-        pick((existingSetting?.metadata ?? {}) as ChatbotSettingsMetadata, [
+        pick((existingSetting ?? {}) as ChatbotCourseSettingsResponse, [
           'prompt',
           'temperature',
           'topK',
@@ -497,18 +784,14 @@ export class ChatbotService {
 
       let matchingModel: LLMTypeModel;
       if (
-        existingSetting?.metadata?.modelName != undefined ||
-        existingSetting?.metadata?.model?.modelName != undefined
+        existingSetting?.modelName != undefined ||
+        existingSetting?.model?.modelName != undefined
       ) {
         for (const provider of orgChatbotSettings.providers) {
-          console.log(
-            existingSetting.metadata.modelName,
-            existingSetting.metadata.model?.modelName,
-          );
           matchingModel = provider.availableModels.find(
             (m) =>
-              (m.modelName == existingSetting.metadata.modelName ||
-                m.modelName == existingSetting.metadata.model?.modelName) &&
+              (m.modelName == existingSetting?.modelName ||
+                m.modelName == existingSetting.model?.modelName) &&
               m.isText,
           );
           if (matchingModel) {
diff --git a/packages/server/src/chatbot/interaction.entity.ts b/packages/server/src/chatbot/interaction.entity.ts
index 3970f4521..3583d57f3 100644
--- a/packages/server/src/chatbot/interaction.entity.ts
+++ b/packages/server/src/chatbot/interaction.entity.ts
@@ -2,14 +2,14 @@ import {
   BaseEntity,
   Column,
   Entity,
-  PrimaryGeneratedColumn,
-  ManyToOne,
   JoinColumn,
+  ManyToOne,
   OneToMany,
+  PrimaryGeneratedColumn,
 } from 'typeorm';
 import { CourseModel } from '../course/course.entity';
 import { UserModel } from '../profile/user.entity';
-import { ChatbotQuestionModel } from './question.entity';
+import { ChatbotQuestionModel } from './chatbot-question.entity';
 
 // A chatbot interaction is basically a conversation between a user and the chatbot.
 @Entity('chatbot_interactions_model')
@@ -20,12 +20,18 @@ export class InteractionModel extends BaseEntity {
   @Column()
   timestamp: Date;
 
+  @Column({ type: 'integer' })
+  courseId: number;
+
   @ManyToOne(() => CourseModel)
-  @JoinColumn({ name: 'course' })
+  @JoinColumn({ name: 'courseId' })
   course: CourseModel;
 
+  @Column({ type: 'integer' })
+  userId: number;
+
   @ManyToOne(() => UserModel)
-  @JoinColumn({ name: 'user' })
+  @JoinColumn({ name: 'userId' })
   user: UserModel;
 
   @OneToMany((type) => ChatbotQuestionModel, (question) => question.interaction)
diff --git a/packages/server/src/chatbot/questionDocument.entity.ts b/packages/server/src/chatbot/questionDocument.entity.ts
deleted file mode 100644
index 8a0c5921d..000000000
--- a/packages/server/src/chatbot/questionDocument.entity.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import {
-  BaseEntity,
-  Column,
-  Entity,
-  JoinColumn,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-} from 'typeorm';
-import { ChatbotQuestionModel } from './question.entity';
-
-@Entity('question_document_model')
-export class QuestionDocumentModel extends BaseEntity {
-  @PrimaryGeneratedColumn()
-  public id: number;
-
-  @Column()
-  questionId: number;
-
-  @Column()
-  name: string;
-
-  @Column()
-  type: string;
-
-  @Column('text', { array: true })
-  parts: string[];
-}
diff --git a/packages/server/src/course/course.service.spec.ts b/packages/server/src/course/course.service.spec.ts
index dd19114dd..1dad972cc 100644
--- a/packages/server/src/course/course.service.spec.ts
+++ b/packages/server/src/course/course.service.spec.ts
@@ -827,9 +827,8 @@ describe('CourseService', () => {
           queueInvites: true,
           chatbot: {
             documents: true,
-            manuallyCreatedChunks: true,
+            insertedDocuments: true,
             insertedQuestions: true,
-            insertedLMSData: true,
           },
         },
       };
@@ -865,9 +864,8 @@ describe('CourseService', () => {
           queueInvites: true,
           chatbot: {
             documents: true,
-            manuallyCreatedChunks: true,
+            insertedDocuments: true,
             insertedQuestions: true,
-            insertedLMSData: true,
           },
         },
       };
diff --git a/packages/server/src/course/course.service.ts b/packages/server/src/course/course.service.ts
index 1cfeab4b1..ba14b962d 100644
--- a/packages/server/src/course/course.service.ts
+++ b/packages/server/src/course/course.service.ts
@@ -629,7 +629,7 @@ export class CourseService {
       // since it will automatically create a chatbot service when you call an endpoint with a courseId that does not exist
       if (cloneData.toClone.chatbot?.settings) {
         const oldChatbotSettings = await this.chatbotApiService
-          .getChatbotSettings(courseId, chatToken)
+          .getChatbotSettings(courseId)
           .catch((err) => {
             console.error(
               `Failed to get current course chatbot data in chatbot service:`,
@@ -641,11 +641,7 @@ export class CourseService {
           });
 
         await this.chatbotApiService
-          .updateChatbotSettings(
-            oldChatbotSettings.metadata,
-            clonedCourse.id,
-            chatToken,
-          )
+          .updateChatbotSettings(oldChatbotSettings, clonedCourse.id)
           .catch((err) => {
             console.error(
               `Failed to set cloned chatbot data in chatbot service:`,
@@ -659,19 +655,17 @@ export class CourseService {
       if (
         cloneData.toClone.chatbot?.documents ||
         cloneData.toClone.chatbot?.insertedQuestions ||
-        cloneData.toClone.chatbot?.insertedLMSData
+        cloneData.toClone.chatbot?.insertedDocuments
       ) {
         const result = await this.chatbotApiService
-          .cloneCourseDocuments(
-            courseId,
-            chatToken,
-            clonedCourse.id,
-            cloneData.toClone.chatbot?.documents === true,
-            cloneData.toClone.chatbot?.insertedQuestions === true,
-            cloneData.toClone.chatbot?.insertedLMSData === true,
-            cloneData.toClone.chatbot?.manuallyCreatedChunks === true,
+          .cloneCourseDocuments(courseId, clonedCourse.id, {
+            includeDocuments: cloneData.toClone.chatbot?.documents === true,
+            includeInsertedQuestions:
+              cloneData.toClone.chatbot?.insertedQuestions === true,
+            includeInsertedDocuments:
+              cloneData.toClone.chatbot?.insertedDocuments === true,
             docIdMap,
-          )
+          })
           .catch((err) => {
             console.error(
               `Failed to clone chatbot documents from original course in chatbot service:`,
diff --git a/packages/server/src/insights/insight-objects.ts b/packages/server/src/insights/insight-objects.ts
index 04f3845c4..669f7033b 100644
--- a/packages/server/src/insights/insight-objects.ts
+++ b/packages/server/src/insights/insight-objects.ts
@@ -139,7 +139,7 @@ const APPLY_FILTER_MAP = {
   },
   InteractionModel: {
     courseId: ({ query, filter }: ApplyFilterParams) => {
-      query.andWhere('"InteractionModel"."course" = :courseId', {
+      query.andWhere('"InteractionModel"."courseId" = :courseId', {
         courseId: filter.courseId,
       });
     },
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.service.ts b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
index d25fd1cdc..4363f1e4f 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.service.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
@@ -18,8 +18,8 @@ import {
   LMSQuiz,
   LMSQuizAccessLevel,
   LMSResourceType,
-  SupportedLMSFileTypes,
   LMSSyncDocumentsResult,
+  SupportedLMSFileTypes,
 } from '@koh/common';
 import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
@@ -29,12 +29,8 @@ import { LMSAnnouncementModel } from './lmsAnnouncement.entity';
 import { LMSPageModel } from './lmsPage.entity';
 import { LMSFileModel } from './lmsFile.entity';
 import { LMSQuizModel } from './lmsQuiz.entity';
-import { ChatTokenModel } from '../chatbot/chat-token.entity';
-import { UserModel } from '../profile/user.entity';
 import { Cron, CronExpression } from '@nestjs/schedule';
-import { v4 } from 'uuid';
 import * as Sentry from '@sentry/browser';
-import { ConfigService } from '@nestjs/config';
 import { convert } from 'html-to-text';
 import { ChatbotApiService } from '../chatbot/chatbot-api.service';
 import { Cache } from 'cache-manager';
@@ -72,8 +68,6 @@ export class LMSIntegrationService {
   constructor(
     @Inject(LMSIntegrationAdapter)
     private integrationAdapter: LMSIntegrationAdapter,
-    @Inject(ConfigService)
-    private configService: ConfigService,
     @Inject(ChatbotApiService)
     private chatbotApiService: ChatbotApiService,
     @Inject(CACHE_MANAGER) private cacheManager: Cache,
@@ -260,7 +254,7 @@ export class LMSIntegrationService {
         );
         for (let idx = 0; idx < assignments.length; idx++) {
           const found = items.find(
-            (i) => i.id == assignments[idx].id,
+            (i: LMSAssignmentModel) => i.id == assignments[idx].id,
           ) as unknown as LMSAssignmentModel;
           if (found) {
             assignments[idx] = {
@@ -286,7 +280,7 @@ export class LMSIntegrationService {
         );
         for (let idx = 0; idx < announcements.length; idx++) {
           const found = items.find(
-            (i) => i.id == announcements[idx].id,
+            (i: LMSAnnouncementModel) => i.id == announcements[idx].id,
           ) as unknown as LMSAnnouncementModel;
           if (found) {
             announcements[idx] = {
@@ -318,7 +312,7 @@ export class LMSIntegrationService {
         );
         for (let idx = 0; idx < pages.length; idx++) {
           const found = items.find(
-            (i) => i.id == pages[idx].id,
+            (i: LMSPageModel) => i.id == pages[idx].id,
           ) as unknown as LMSPageModel;
           if (found) {
             pages[idx] = {
@@ -345,7 +339,7 @@ export class LMSIntegrationService {
         );
         for (let idx = 0; idx < files.length; idx++) {
           const found = items.find(
-            (i) => i.id == files[idx].id,
+            (i: LMSFileModel) => i.id == files[idx].id,
           ) as unknown as LMSFileModel;
           if (found) {
             files[idx] = {
@@ -372,7 +366,7 @@ export class LMSIntegrationService {
         );
         for (let idx = 0; idx < quizzes.length; idx++) {
           const found = items.find(
-            (i) => i.id == quizzes[idx].id,
+            (i: LMSQuizModel) => i.id == quizzes[idx].id,
           ) as unknown as LMSQuizModel;
           if (found) {
             quizzes[idx] = {
@@ -640,21 +634,11 @@ export class LMSIntegrationService {
 
       if (items.length == 0) continue;
 
-      const tempUser = await UserModel.create({
-        email: 'tempemail@example.com',
-      }).save();
-      const token = await ChatTokenModel.create({
-        user: tempUser,
-        token: v4(),
-        max_uses: items.length,
-      }).save();
-
       const statuses: LMSFileUploadResponse[] = [];
       for (const item of items) {
         const uploadDocumentResponse = await this.uploadDocument(
           courseId,
           item,
-          token,
           type,
           adapter,
         );
@@ -664,9 +648,6 @@ export class LMSIntegrationService {
         else syncDocumentsResult.errors++;
       }
 
-      await ChatTokenModel.remove(token);
-      await UserModel.remove(tempUser);
-
       const validIds = statuses.filter((u) => u.success).map((u) => u.id);
       const toSave = items.filter((u) => validIds.includes(u.id));
 
@@ -842,30 +823,17 @@ export class LMSIntegrationService {
   ) {
     let numClearedDocuments = 0;
 
-    const tempUser = await UserModel.create({
-      email: 'tempemail@example.com',
-    }).save();
-    const token = await ChatTokenModel.create({
-      user: tempUser,
-      token: v4(),
-      max_uses: items.length,
-    }).save();
-
     const statuses: LMSFileUploadResponse[] = [];
     for (const item of items) {
       const deleteResponse: LMSFileUploadResponse = await this.deleteDocument(
         courseId,
         item,
-        token,
       );
       statuses.push(deleteResponse);
 
       if (deleteResponse.success) numClearedDocuments++;
     }
 
-    await ChatTokenModel.remove(token);
-    await UserModel.remove(tempUser);
-
     const successfulIds = statuses.filter((s) => s.success).map((s) => s.id);
     await model.remove(items.filter((i) => successfulIds.includes(i.id)));
 
@@ -911,22 +879,7 @@ export class LMSIntegrationService {
 
     const model = await this.getDocumentModel(type);
 
-    const tempUser = await UserModel.create({
-      email: 'tempemail@example.com',
-    }).save();
-    const token = await ChatTokenModel.create({
-      user: tempUser,
-      token: v4(),
-      max_uses: 1,
-    }).save();
-
-    const status = await this.uploadDocument(
-      courseId,
-      item,
-      token,
-      type,
-      adapter,
-    );
+    const status = await this.uploadDocument(courseId, item, type, adapter);
 
     if (status.success) {
       item.chatbotDocumentId = item.chatbotDocumentId ?? status.documentId;
@@ -935,9 +888,6 @@ export class LMSIntegrationService {
       await (model as any).upsert(item, ['id', 'courseId']);
     }
 
-    await ChatTokenModel.remove(token);
-    await UserModel.remove(tempUser);
-
     return status.success;
   }
 
@@ -953,16 +903,7 @@ export class LMSIntegrationService {
   ) {
     const model = await this.getDocumentModel(type);
 
-    const tempUser = await UserModel.create({
-      email: 'tempemail@example.com',
-    }).save();
-    const token = await ChatTokenModel.create({
-      user: tempUser,
-      token: v4(),
-      max_uses: 1,
-    }).save();
-
-    const status = await this.deleteDocument(courseId, item, token);
+    const status = await this.deleteDocument(courseId, item);
 
     if (status.success) {
       item.chatbotDocumentId = null;
@@ -971,9 +912,6 @@ export class LMSIntegrationService {
       await (model as any).upsert(item, ['id', 'courseId']);
     }
 
-    await ChatTokenModel.remove(token);
-    await UserModel.remove(tempUser);
-
     return status.success;
   }
 
@@ -1007,7 +945,6 @@ export class LMSIntegrationService {
       | LMSFileModel
       | LMSQuiz
       | LMSQuizModel,
-    token: ChatTokenModel,
     type: LMSUpload,
     adapter: AbstractLMSAdapter,
   ): Promise<LMSFileUploadResponse> {
@@ -1068,24 +1005,6 @@ export class LMSIntegrationService {
               prefix += `\nURL: ${f.url}`;
             }
 
-            const isUpdate =
-              'chatbotDocumentId' in f && f.chatbotDocumentId != undefined;
-
-            if (isUpdate) {
-              try {
-                await this.chatbotApiService.deleteDocument(
-                  f.chatbotDocumentId as string,
-                  courseId,
-                  token.token,
-                );
-              } catch (error) {
-                console.warn(
-                  `Failed to delete old LMS file document ${f.chatbotDocumentId}, proceeding with new upload:`,
-                  error,
-                );
-              }
-            }
-
             const fileBuffer = await this.downloadFileAsBuffer(f.url, adapter);
 
             // mock file object
@@ -1103,29 +1022,21 @@ export class LMSIntegrationService {
             } as Express.Multer.File;
 
             const computedDocLink = adapter.getDocumentLink(item.id, type);
-            const sourceWithPrefix = `${prefix}${computedDocLink ? `\nPage Link: ${computedDocLink}` : ''}`;
-
-            const uploadResult =
-              await this.chatbotApiService.uploadLMSFileFromBuffer(
-                mockLMSFile,
-                courseId,
-                token.token,
-                {
-                  source: sourceWithPrefix,
-                  metadata: {
-                    type: 'inserted_lms_document',
-                    apiDocId: f.id,
-                    platform: adapter.getPlatform(),
-                    source: computedDocLink,
-                  },
-                  parseAsPng: false,
-                },
-              );
+
+            const uploadResult = await this.chatbotApiService.uploadDocument(
+              mockLMSFile,
+              {
+                source: computedDocLink,
+                lmsDocumentId: String(f.id),
+                parseAsPng: false,
+              },
+              courseId,
+            );
 
             return {
               id: item.id,
               success: true,
-              documentId: uploadResult.docId,
+              documentId: uploadResult.id,
             } as LMSFileUploadResponse;
           } catch (error) {
             console.error(
@@ -1183,19 +1094,17 @@ export class LMSIntegrationService {
     }
 
     const docName = `${adapter.getPlatform()} ${this.getTypeName(type)}${name ? `: ${name}` : ''}`;
-    const metadata: any = {
-      type: 'inserted_lms_document',
-      apiDocId: item.id,
-    };
 
     const isUpdate =
       'chatbotDocumentId' in item && item.chatbotDocumentId != undefined;
 
     if (isUpdate) {
       return await this.chatbotApiService
-        .updateDocument(item.chatbotDocumentId, courseId, token.token, {
+        .updateDocument(item.chatbotDocumentId, courseId, {
           documentText,
-          metadata,
+          title: docName,
+          source: computedDocLink,
+          lmsDocumentId: String(item.id),
           prefix,
         })
         .then((): LMSFileUploadResponse => {
@@ -1214,12 +1123,12 @@ export class LMSIntegrationService {
         });
     } else {
       return await this.chatbotApiService
-        .addDocument(courseId, token.token, {
+        .addDocument(courseId, {
           documentText,
-          metadata,
-          name: docName,
-          prefix,
+          title: docName,
           source: computedDocLink,
+          lmsDocumentId: String(item.id),
+          prefix,
         })
         .then((body): LMSFileUploadResponse => {
           return {
@@ -1246,7 +1155,6 @@ export class LMSIntegrationService {
       | LMSPageModel
       | LMSFileModel
       | LMSQuizModel,
-    token: ChatTokenModel,
   ) {
     // Already deleted in this case
     if (!item.chatbotDocumentId) {
@@ -1256,7 +1164,7 @@ export class LMSIntegrationService {
       };
     }
     return await this.chatbotApiService
-      .deleteDocument(item.chatbotDocumentId, courseId, token.token)
+      .deleteDocument(item.chatbotDocumentId, courseId)
       .then(
         (): LMSFileUploadResponse => ({
           id: item.id,
diff --git a/packages/server/src/seed/seed.controller.ts b/packages/server/src/seed/seed.controller.ts
index cf7583b81..bb37f741b 100644
--- a/packages/server/src/seed/seed.controller.ts
+++ b/packages/server/src/seed/seed.controller.ts
@@ -25,7 +25,7 @@ import { OrganizationUserModel } from 'organization/organization-user.entity';
 import { CourseSettingsModel } from '../course/course_settings.entity';
 import { QuestionTypeModel } from 'questionType/question-type.entity';
 import { InteractionModel } from 'chatbot/interaction.entity';
-import { ChatbotQuestionModel } from 'chatbot/question.entity';
+import { ChatbotQuestionModel } from 'chatbot/chatbot-question.entity';
 import { ChatTokenModel } from 'chatbot/chat-token.entity';
 import { MailServiceModel } from 'mail/mail-services.entity';
 import { UserSubscriptionModel } from 'mail/user-subscriptions.entity';
diff --git a/packages/server/test/chatbot.integration.ts b/packages/server/test/chatbot.integration.ts
index b6f89c132..17617bdd9 100644
--- a/packages/server/test/chatbot.integration.ts
+++ b/packages/server/test/chatbot.integration.ts
@@ -1,6 +1,6 @@
 import { ChatbotModule } from 'chatbot/chatbot.module';
 import {
-  ChatbotAskSuggestedParams,
+  ChatbotAskSuggestedBody,
   ChatbotServiceProvider,
   ChatbotServiceType,
   CreateChatbotProviderBody,
@@ -26,7 +26,7 @@ import {
   UserFactory,
 } from './util/factories';
 import { setupIntegrationTest } from './util/testUtils';
-import { ChatbotQuestionModel } from 'chatbot/question.entity';
+import { ChatbotQuestionModel } from 'chatbot/chatbot-question.entity';
 import { OrganizationModel } from '../src/organization/organization.entity';
 import { CourseModel } from '../src/course/course.entity';
 import { OrganizationCourseModel } from '../src/organization/organization-course.entity';
@@ -115,9 +115,7 @@ describe('ChatbotController Integration', () => {
         role: Role.STUDENT,
       });
 
-      const body: ChatbotAskSuggestedParams = {
-        question: 'How does photosynthesis work?',
-        responseText: 'Photosynthesis is the process by which plants...',
+      const body: ChatbotAskSuggestedBody = {
         vectorStoreId: '123',
       };
 
@@ -126,8 +124,6 @@ describe('ChatbotController Integration', () => {
         .send(body)
         .expect(201);
       expect(response.body.id).toBeDefined();
-      expect(response.body.questionText).toEqual(body.question);
-      expect(response.body.responseText).toEqual(body.responseText);
       expect(response.body.vectorStoreId).toEqual(body.vectorStoreId);
       expect(response.body.interactionId).toBeDefined();
     });

From e9af904805067e2acc08032d6a09a8f6faba1307 Mon Sep 17 00:00:00 2001
From: bhunt02 <bridgette.hunt02@outlook.com>
Date: Mon, 15 Dec 2025 12:48:02 -0800
Subject: [PATCH 2/8] migration file that's been hanging for a bit

---
 .../1760481380025-chatbot-database-updates.ts | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 packages/server/migration/1760481380025-chatbot-database-updates.ts

diff --git a/packages/server/migration/1760481380025-chatbot-database-updates.ts b/packages/server/migration/1760481380025-chatbot-database-updates.ts
new file mode 100644
index 000000000..4dbc4955c
--- /dev/null
+++ b/packages/server/migration/1760481380025-chatbot-database-updates.ts
@@ -0,0 +1,101 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class ChatbotDatabaseUpdates1760481380025 implements MigrationInterface {
+  name = 'ChatbotDatabaseUpdates1760481380025';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" DROP CONSTRAINT "FK_cbae79b5aab51ebd086473b1aa7"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" DROP CONSTRAINT "FK_8db2901f8e702975574c1579bad"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" DROP CONSTRAINT "FK_7df3546203b677c555f27974c25"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" DROP COLUMN "suggested"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" DROP COLUMN "questionText"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" DROP COLUMN "responseText"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" RENAME COLUMN "course" TO "courseId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" RENAME COLUMN "user" TO "userId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" RENAME COLUMN "interaction" TO "interactionId"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ALTER COLUMN "vectorStoreId" TYPE TEXT`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ALTER COLUMN "timestamp" TYPE TIMESTAMP WITH TIME ZONE USING "timestamp" AT TIME ZONE 'UTC'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ALTER COLUMN "timestamp" SET DEFAULT now()`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ADD CONSTRAINT "FK_797cfec9399d72f1b554d7cb56c" FOREIGN KEY ("interactionId") REFERENCES "chatbot_interactions_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ADD CONSTRAINT "FK_2d37ae2602e60432a4bf0c3cb19" FOREIGN KEY ("courseId") REFERENCES "course_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ADD CONSTRAINT "FK_2b01cc936a843e5efc73f9acf49" FOREIGN KEY ("userId") REFERENCES "user_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" DROP CONSTRAINT "FK_2b01cc936a843e5efc73f9acf49"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" DROP CONSTRAINT "FK_2d37ae2602e60432a4bf0c3cb19"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" DROP CONSTRAINT "FK_797cfec9399d72f1b554d7cb56c"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ALTER COLUMN "timestamp" TYPE TIMESTAMP USING "timestamp"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ALTER COLUMN "timestamp" SET DEFAULT now()`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ALTER COLUMN "vectorStoreId" TYPE CHARACTER VARYING`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" RENAME COLUMN "userId" TO "user"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" RENAME COLUMN "courseId" TO "course"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" RENAME COLUMN "interactionId" TO "interaction"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ADD "responseText" TEXT NOT NULL DEFAULT ''`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ADD "questionText" TEXT NOT NULL DEFAULT ''`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ADD "suggested" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ADD CONSTRAINT "FK_7df3546203b677c555f27974c25" FOREIGN KEY ("course") REFERENCES "course_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ADD CONSTRAINT "FK_8db2901f8e702975574c1579bad" FOREIGN KEY ("user") REFERENCES "user_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ADD CONSTRAINT "FK_cbae79b5aab51ebd086473b1aa7" FOREIGN KEY ("interaction") REFERENCES "chatbot_interactions_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+  }
+}

From aebad3a2989e6f61c8a13035adbe7e1d870e007f Mon Sep 17 00:00:00 2001
From: bhunt02 <bridgette.hunt02@outlook.com>
Date: Fri, 2 Jan 2026 14:08:06 -0800
Subject: [PATCH 3/8] this is going to break every test but i'm implementing
 websockets now for chatbot ops because there's way more routes that are
 liable to timeout due to external API calls

---
 packages/common/chatbot-api-types.ts          |  11 +
 packages/common/index.ts                      |   9 +
 .../components/DocumentChunkRow.tsx           | 479 ++++++++++++++++
 .../settings/chatbot_knowledge_base/page.tsx  | 276 +++++----
 packages/frontend/app/api/index.ts            |  58 +-
 packages/server/package.json                  |   3 +
 .../server/src/chatbot/chatbot-api.service.ts | 143 ++++-
 .../server/src/chatbot/chatbot.controller.ts  | 223 ++++++--
 packages/server/src/chatbot/chatbot.module.ts |   9 +-
 .../chatbot-result.websocket.ts               | 137 +++++
 .../src/guards/chatbot-api-key.guard.ts       |  31 ++
 .../src/guards/websocket/websocket.guard.ts   |  22 +
 .../websocket/ws-chatbot-api-key.guard.ts     |  30 +
 .../src/guards/websocket/ws-jwt-auth.guard.ts | 102 ++++
 .../lmsIntegration/lmsIntegration.service.ts  | 524 +++++++++++-------
 packages/server/src/websocket/clientSocket.ts |  54 ++
 .../server/src/websocket/websocket.event.ts   |  83 +++
 .../src/websocket/websocket.exception.ts      |  35 ++
 .../src/websocket/websocket.template.ts       |  61 ++
 yarn.lock                                     | 140 ++++-
 20 files changed, 1971 insertions(+), 459 deletions(-)
 create mode 100644 packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow.tsx
 create mode 100644 packages/server/src/chatbot/intermediate-results/chatbot-result.websocket.ts
 create mode 100644 packages/server/src/guards/chatbot-api-key.guard.ts
 create mode 100644 packages/server/src/guards/websocket/websocket.guard.ts
 create mode 100644 packages/server/src/guards/websocket/ws-chatbot-api-key.guard.ts
 create mode 100644 packages/server/src/guards/websocket/ws-jwt-auth.guard.ts
 create mode 100644 packages/server/src/websocket/clientSocket.ts
 create mode 100644 packages/server/src/websocket/websocket.event.ts
 create mode 100644 packages/server/src/websocket/websocket.exception.ts
 create mode 100644 packages/server/src/websocket/websocket.template.ts

diff --git a/packages/common/chatbot-api-types.ts b/packages/common/chatbot-api-types.ts
index 5a191a660..d04b26dae 100644
--- a/packages/common/chatbot-api-types.ts
+++ b/packages/common/chatbot-api-types.ts
@@ -712,3 +712,14 @@ export class ChatbotDocumentListResponse {
   @ValidateNested({ each: true })
   documents!: ChatbotDocumentResponse[]
 }
+
+export class GenerateDocumentQueryBody {
+  @IsBoolean()
+  @IsOptional()
+  deleteOld?: boolean
+}
+
+export class UpsertDocumentQueryBody {
+  @IsString()
+  query!: string
+}
diff --git a/packages/common/index.ts b/packages/common/index.ts
index 70460a895..7980c5947 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -4201,4 +4201,13 @@ export const ERROR_MESSAGES = {
     notAllowedToDeleteSemester: (role: OrganizationRole) =>
       `Members with role ${role} are not allowed to delete semesters`,
   },
+  webSocket: {
+    jwt: {
+      userNotFound: 'User not found',
+      disallowedPattern: 'Not authorized to use this route',
+      missingAuthHeader: 'Authorization header missing',
+      malformedToken: 'Authorization token malformed',
+      invalidToken: 'Authorization token invalid',
+    },
+  },
 }
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow.tsx
new file mode 100644
index 000000000..71c7491f1
--- /dev/null
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow.tsx
@@ -0,0 +1,479 @@
+import {
+  ChatbotDocumentQueryResponse,
+  ChatbotDocumentResponse,
+  DocumentType,
+  DocumentTypeColorMap,
+  DocumentTypeDisplayMap,
+} from '@koh/common'
+import {
+  Badge,
+  Button,
+  Checkbox,
+  Col,
+  Collapse,
+  Input,
+  message,
+  Modal,
+  Row,
+  Tooltip,
+} from 'antd'
+import ExpandableText from '@/app/components/ExpandableText'
+import Link from 'next/link'
+import Highlighter from 'react-highlight-words'
+import { useEffect, useMemo, useState } from 'react'
+import {
+  CheckOutlined,
+  CloseOutlined,
+  DeleteOutlined,
+  EditOutlined,
+  InfoCircleFilled,
+  PlusOutlined,
+} from '@ant-design/icons'
+import { SparklesIcon } from 'lucide-react'
+
+export type DocumentChunkRowProps = {
+  documentChunk: ChatbotDocumentResponse
+  searchTerms: string[]
+
+  onEditChunk: (record: ChatbotDocumentResponse) => void
+  onDeleteChunk: (documentId: string) => void
+
+  generateQueries: (documentId: string, deleteOld: boolean) => Promise<boolean>
+  onCreateQuery: (documentId: string, content: string) => Promise<boolean>
+  onEditQuery: (queryId: string, content: string) => Promise<boolean>
+  onDeleteQuery: (queryId: string) => Promise<boolean>
+
+  isLoading: boolean
+}
+
+const DocumentChunkRow: React.FC<DocumentChunkRowProps> = ({
+  documentChunk,
+  searchTerms,
+
+  onEditChunk,
+  onDeleteChunk,
+
+  generateQueries,
+  onCreateQuery,
+  onEditQuery,
+  onDeleteQuery,
+}) => {
+  const [editingQueries, setEditingQueries] = useState<
+    { queryId: string; editingContent: string }[]
+  >([])
+  const [creatingQuery, setCreatingQuery] = useState(false)
+  const [isSaving, setIsSaving] = useState(false)
+  const [removeOld, setRemoveOld] = useState(false)
+
+  useEffect(() => {
+    const ids = documentChunk.queries.map((q) => q.id)
+    setEditingQueries((prev) => prev.filter((eq) => ids.includes(eq.queryId)))
+  }, [documentChunk.queries])
+
+  const toggleEditQuery = (record: ChatbotDocumentQueryResponse) => {
+    if (editingQueries.find((eq) => eq.queryId == record.id)) return
+    setEditingQueries((prev) => [
+      ...prev,
+      {
+        queryId: record.id,
+        editingContent: record.query,
+      },
+    ])
+  }
+
+  const onEditQueryInput = (queryId: string, text: string) => {
+    const index = editingQueries.findIndex((eq) => eq.queryId == queryId)
+    if (index < 0) {
+      message.warning('Edited query not found!')
+      return
+    }
+
+    setEditingQueries((prev) => {
+      prev[index] = {
+        queryId,
+        editingContent: text,
+      }
+      return prev
+    })
+  }
+
+  const cancelEditQuery = (record: ChatbotDocumentQueryResponse) => {
+    setEditingQueries((prev) => prev.filter((p) => p.queryId != record.id))
+  }
+
+  const toggleCreateQuery = () => {
+    setCreatingQuery(true)
+  }
+
+  const cancelCreateQuery = () => {
+    setCreatingQuery(false)
+  }
+
+  const submitCreateQuery = (text: string) => {
+    if (!text) {
+      message.warning('Document query cannot be empty!')
+      return
+    }
+    setIsSaving(true)
+    onCreateQuery(documentChunk.id, text)
+      .then((success) => {
+        if (success) {
+          setCreatingQuery(false)
+        }
+      })
+      .finally(() => setIsSaving(false))
+  }
+
+  const submitEditQuery = (queryId: string) => {
+    const entry = editingQueries.find((eq) => eq.queryId == queryId)
+    if (!entry) {
+      message.warning('Edited query not found!')
+      return
+    }
+
+    setIsSaving(true)
+    onEditQuery(queryId, entry.editingContent)
+      .then((success) => {
+        if (success) {
+          setEditingQueries((prev) => prev.filter((p) => p.queryId != queryId))
+        }
+      })
+      .finally(() => setIsSaving(false))
+  }
+
+  const submitDeleteQuery = (queryId: string) => {
+    setIsSaving(true)
+    onDeleteQuery(queryId).finally(() => setIsSaving(false))
+  }
+
+  const gridCell = 'p-2 flex items-center justify-center'
+
+  return (
+    <div
+      className={
+        'my-2 grid w-full grid-cols-1 rounded-md border-2 border-gray-300 bg-white p-2'
+      }
+    >
+      <Row wrap={false} className={'text-gray-500'}>
+        <Col span={6} className={gridCell}>
+          Title
+        </Col>
+        <Col span={13} className={gridCell}>
+          <span className={'w-full'}>Content</span>
+        </Col>
+        <Col span={1} className={gridCell}>
+          <span>{documentChunk.pageNumber ? 'Page Number' : ' '}</span>
+        </Col>
+        <Col span={2} className={gridCell}>
+          Type
+        </Col>
+        <Col span={2} className={gridCell}>
+          Actions
+        </Col>
+      </Row>
+      <Row wrap={false}>
+        <Col span={6} className={gridCell}>
+          <ExpandableText maxRows={4}>
+            <Link
+              href={documentChunk.source ?? ''}
+              target="_blank"
+              prefetch={false}
+              rel="noopener noreferrer"
+            >
+              {/*
+              In some environments, components which return Promises or arrays do not work.
+              This is due to some changes to react and @types/react, and the component
+              packages have not been updated to fix these issues.
+            */}
+              {/* @ts-expect-error Server Component */}
+              <Highlighter
+                highlightStyle={{ backgroundColor: '#ffc069', padding: 0 }}
+                searchWords={searchTerms}
+                autoEscape
+                textToHighlight={
+                  documentChunk.title ? documentChunk.title.toString() : ''
+                }
+              />
+            </Link>
+          </ExpandableText>
+        </Col>
+        <Col span={13} className={gridCell}>
+          {/*
+              In some environments, components which return Promises or arrays do not work.
+              This is due to some changes to react and @types/react, and the component
+              packages have not been updated to fix these issues.
+            */}
+          {/* @ts-expect-error Server Component */}
+          <Highlighter
+            highlightStyle={{ backgroundColor: '#ffc069', padding: 0 }}
+            searchWords={searchTerms}
+            autoEscape
+            textToHighlight={
+              documentChunk.content ? documentChunk.content.toString() : ''
+            }
+          />
+        </Col>
+        <Col span={1} className={gridCell}>
+          <span>{documentChunk.pageNumber ?? ''}</span>
+        </Col>
+        <Col span={2} className={gridCell}>
+          <Badge
+            count={
+              DocumentTypeDisplayMap[documentChunk.type] ??
+              (DocumentType as any)[documentChunk.type]
+            }
+            color={DocumentTypeColorMap[documentChunk.type] ?? '#7C7C7C'}
+          />
+        </Col>
+        <Col span={2} className={gridCell}>
+          <div className={'flex flex-col gap-1'}>
+            <Button
+              onClick={() => onEditChunk(documentChunk)}
+              variant={'outlined'}
+              color={'blue'}
+              icon={<EditOutlined />}
+            >
+              Edit
+            </Button>
+            <Button
+              danger
+              icon={<DeleteOutlined />}
+              onClick={() =>
+                Modal.confirm({
+                  title: 'Are you sure you want to delete this document chunk?',
+                  content:
+                    'Note that this will cascade to any citations which reference this chunk, and remove it from any parent question or documents. \n\nThis action cannot be undone.',
+                  okText: 'Yes',
+                  okType: 'danger',
+                  cancelText: 'No',
+                  onOk() {
+                    if (!documentChunk.id) {
+                      return
+                    }
+                    onDeleteChunk(documentChunk.id)
+                  },
+                })
+              }
+            >
+              Delete
+            </Button>
+          </div>
+        </Col>
+      </Row>
+      {!documentChunk.questionId && !documentChunk.asyncQuestionId && (
+        <Row wrap={false}>
+          <Collapse
+            bordered={false}
+            className={'w-full'}
+            destroyOnHidden={true}
+            items={[
+              {
+                key: 'document_queries',
+                label: (
+                  <Tooltip
+                    title={
+                      "Document queries are used to improve the retrieval algorithm when students ask questions in your course. These are synthetic (by default) questions, paired with the document chunk, that are checked for similarity with the student's own question."
+                    }
+                  >
+                    Document Queries <InfoCircleFilled />
+                  </Tooltip>
+                ),
+                children: (
+                  <>
+                    <Row className={'justify-end text-gray-500'}>
+                      <div className={'flex items-center justify-center gap-2'}>
+                        <Button
+                          color={'purple'}
+                          variant={'solid'}
+                          icon={<SparklesIcon size={16} />}
+                          loading={isSaving}
+                          onClick={() => {
+                            setIsSaving(true)
+                            generateQueries(
+                              documentChunk.id,
+                              removeOld,
+                            ).finally(() => setIsSaving(false))
+                          }}
+                        >
+                          Generate Document Queries
+                        </Button>
+                        <Checkbox
+                          onClick={() => setRemoveOld(!removeOld)}
+                          checked={removeOld}
+                        >
+                          Remove Existing?
+                        </Checkbox>
+                      </div>
+                    </Row>
+                    <Row className={'text-gray-500'}>
+                      <Col span={21} className="p-2">
+                        Query Content
+                      </Col>
+                      <Col span={3} className="p-2">
+                        Actions
+                      </Col>
+                    </Row>
+                    {documentChunk.queries.map((q, i) => (
+                      <DocumentQueryRow
+                        key={'query' + i}
+                        query={q}
+                        onEdit={toggleEditQuery}
+                        onDelete={submitDeleteQuery}
+                        onTextInput={onEditQueryInput}
+                        submitEdit={submitEditQuery}
+                        cancelEdit={cancelEditQuery}
+                        editingQueries={editingQueries}
+                        isSaving={isSaving}
+                        isAddRow={false}
+                        isAdding={false}
+                      />
+                    ))}
+                    <DocumentQueryRow
+                      query={{ id: '', query: '' } as any}
+                      isAddRow={true}
+                      isAdding={creatingQuery}
+                      cancelEdit={cancelCreateQuery}
+                      editingQueries={[]}
+                      isSaving={isSaving}
+                      onDelete={() => undefined}
+                      onEdit={toggleCreateQuery}
+                      onTextInput={() => undefined}
+                      submitEdit={submitCreateQuery}
+                    />
+                  </>
+                ),
+              },
+            ]}
+          />
+        </Row>
+      )}
+    </div>
+  )
+}
+
+export type DocumentQueryRowProps = {
+  query: ChatbotDocumentQueryResponse
+  editingQueries: { queryId: string; editingContent: string }[]
+  onTextInput: (queryId: string, text: string) => void
+
+  onDelete: (queryId: string) => void
+  submitEdit: (queryId: string) => void
+
+  onEdit: (record: ChatbotDocumentQueryResponse) => void
+  cancelEdit: (record: ChatbotDocumentQueryResponse) => void
+
+  isSaving: boolean
+  isAddRow: boolean
+  isAdding: boolean
+}
+const DocumentQueryRow: React.FC<DocumentQueryRowProps> = ({
+  query,
+  editingQueries,
+  onTextInput,
+  onEdit,
+  onDelete,
+  submitEdit,
+  cancelEdit,
+  isSaving,
+  isAddRow,
+  isAdding,
+}) => {
+  const [input, setInput] = useState<string>()
+  const editingRow = useMemo(
+    () => editingQueries.find((eq) => eq.queryId == query.id),
+    [query, editingQueries],
+  )
+
+  useEffect(() => {
+    if (!isAdding) {
+      setInput(undefined)
+    }
+  }, [isAdding])
+
+  return (
+    <Row>
+      <Col span={21} className="p-2">
+        <div className={'flex items-center justify-center'}>
+          {editingRow || (isAddRow && isAdding) ? (
+            <Input
+              type={'text'}
+              onChange={(event) => {
+                const val = event?.currentTarget?.value ?? ''
+                isAddRow ? setInput(val) : onTextInput(query.id, val)
+              }}
+            />
+          ) : isAddRow ? (
+            <span></span>
+          ) : (
+            <span>query.query</span>
+          )}
+        </div>
+      </Col>
+      <Col span={3} className="p-2">
+        <div className={'flex flex-col gap-1'}>
+          {editingRow || (isAddRow && isAdding) ? (
+            <>
+              <Button
+                onClick={() => submitEdit(isAddRow ? (input ?? '') : query.id)}
+                variant={'outlined'}
+                color={'blue'}
+                icon={<CheckOutlined />}
+                loading={isSaving}
+              >
+                {isAddRow ? 'Submit' : 'Save Changes'}
+              </Button>
+              <Button
+                icon={<CloseOutlined />}
+                onClick={() => {
+                  cancelEdit(query)
+                }}
+                loading={isSaving}
+              >
+                Cancel
+              </Button>
+            </>
+          ) : (
+            <>
+              <Button
+                onClick={() => onEdit(query)}
+                variant={'outlined'}
+                color={'blue'}
+                icon={isAddRow ? <PlusOutlined /> : <EditOutlined />}
+                loading={isSaving}
+              >
+                {isAddRow ? 'Create' : 'Edit'}
+              </Button>
+              {!isAddRow && (
+                <Button
+                  danger
+                  icon={<DeleteOutlined />}
+                  onClick={() =>
+                    Modal.confirm({
+                      title:
+                        'Are you sure you want to delete this document query?',
+                      content: 'This action cannot be undone.',
+                      okText: 'Yes',
+                      okType: 'danger',
+                      cancelText: 'No',
+                      onOk() {
+                        if (!query.id) {
+                          return
+                        }
+                        onDelete(query.id)
+                      },
+                    })
+                  }
+                  loading={isSaving}
+                >
+                  Delete
+                </Button>
+              )}
+            </>
+          )}
+        </div>
+      </Col>
+    </Row>
+  )
+}
+
+export default DocumentChunkRow
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx
index d9d511d1b..24ca19001 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx
@@ -1,33 +1,20 @@
 'use client'
 
-import { ReactElement, use, useEffect, useState } from 'react'
-import {
-  Badge,
-  Button,
-  Empty,
-  Input,
-  message,
-  Modal,
-  Pagination,
-  Table,
-} from 'antd'
+import { ReactElement, use, useEffect, useMemo, useState } from 'react'
+import { Button, Empty, Input, message, Pagination } from 'antd'
 import Link from 'next/link'
 import { getErrorMessage } from '@/app/utils/generalUtils'
-import Highlighter from 'react-highlight-words'
-import ExpandableText from '@/app/components/ExpandableText'
 import {
+  ChatbotDocumentQueryResponse,
   ChatbotDocumentResponse,
   CreateDocumentChunkBody,
-  DocumentType,
-  DocumentTypeColorMap,
-  DocumentTypeDisplayMap,
   UpdateDocumentChunkBody,
 } from '@koh/common'
 import { API } from '@/app/api'
 import ChatbotHelpTooltip from '../components/ChatbotHelpTooltip'
 import UpsertDocumentChunkModal from './components/UpsertDocumentChunkModal'
 import { getPaginatedChatbotDocuments } from '@/app/(dashboard)/course/[cid]/(settings)/settings/util'
-import { DeleteOutlined, EditOutlined } from '@ant-design/icons'
+import DocumentChunkRow from '@/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow'
 
 interface ChatbotDocumentsProps {
   params: Promise<{ cid: string }>
@@ -44,8 +31,10 @@ export default function ChatbotDocuments(
   const [page, setPage] = useState(1)
   const [pageSize, setPageSize] = useState(10)
   const [search, setSearch] = useState('')
+  const searchTerms = useMemo(() => search?.split(/\s/) ?? [], [search])
 
   const [editingChunk, setEditingChunk] = useState<ChatbotDocumentResponse>()
+  const [operatingOn, setOperatingOn] = useState<string[]>([])
   const [upsertModalOpen, setUpsertModalOpen] = useState(false)
 
   const addDocument = async (values: CreateDocumentChunkBody) => {
@@ -134,120 +123,79 @@ export default function ChatbotDocuments(
     }
   }, [courseId, page, pageSize])
 
-  const columns = [
-    {
-      title: 'Title',
-      dataIndex: 'title',
-      key: 'title',
-      width: 300,
-      render: (text: string, record: ChatbotDocumentResponse) => (
-        <ExpandableText maxRows={4}>
-          <Link
-            href={record.source ?? ''}
-            target="_blank"
-            prefetch={false}
-            rel="noopener noreferrer"
-          >
-            {/*
-              In some environments, components which return Promises or arrays do not work.
-              This is due to some changes to react and @types/react, and the component
-              packages have not been updated to fix these issues.
-            */}
-            {/* @ts-expect-error Server Component */}
-            <Highlighter
-              highlightStyle={{ backgroundColor: '#ffc069', padding: 0 }}
-              searchWords={[search]}
-              autoEscape
-              textToHighlight={text ? text.toString() : ''}
-            />
-          </Link>
-        </ExpandableText>
-      ),
-    },
-    {
-      title: 'Chunk Content',
-      dataIndex: 'content',
-      key: 'content',
-      render: (text: string) => (
-        <ExpandableText maxRows={4}>
-          {/*
-              In some environments, components which return Promises or arrays do not work.
-              This is due to some changes to react and @types/react, and the component
-              packages have not been updated to fix these issues.
-            */}
-          {/* @ts-expect-error Server Component */}
-          <Highlighter
-            highlightStyle={{ backgroundColor: '#ffc069', padding: 0 }}
-            searchWords={[search]}
-            autoEscape
-            textToHighlight={text ? text.toString() : ''}
-          />
-        </ExpandableText>
-      ),
-    },
-    {
-      title: 'Page #',
-      dataIndex: 'pageNumber',
-      key: 'pageNumber',
-      width: '5%',
-    },
-    {
-      title: 'Type',
-      dataIndex: 'type',
-      key: 'type',
-      width: '10%',
-      render: (type: DocumentType) => (
-        <Badge
-          count={DocumentTypeDisplayMap[type] ?? (DocumentType as any)[type]}
-          color={DocumentTypeColorMap[type] ?? '#7C7C7C'}
-        />
-      ),
-    },
-    {
-      title: 'Actions',
-      key: 'actions',
-      width: 100,
-      render: (_: any, record: ChatbotDocumentResponse) => (
-        <div className={'flex flex-col gap-1'}>
-          <Button
-            onClick={() => {
-              setEditingChunk(record)
-              setUpsertModalOpen(true)
-            }}
-            variant={'outlined'}
-            color={'blue'}
-            icon={<EditOutlined />}
-          >
-            Edit
-          </Button>
-          <Button
-            danger
-            icon={<DeleteOutlined />}
-            onClick={() => {
-              Modal.confirm({
-                title: 'Are you sure you want to delete this document chunk?',
-                content:
-                  'Note that this will cascade to any citations which reference this chunk, and remove it from any parent question or documents. \n\nThis action cannot be undone.',
-                okText: 'Yes',
-                okType: 'danger',
-                cancelText: 'No',
-                onOk() {
-                  if (!record.id) {
-                    return
-                  }
-                  deleteDocument(record.id)
-                },
-              })
-            }}
-          >
-            Delete
-          </Button>
-        </div>
-      ),
-    },
-  ]
+  const generateDocumentQueries = async (
+    documentId: string,
+    deleteOld: boolean,
+  ) => {
+    return await API.chatbot.staffOnly
+      .generateDocumentQueries(courseId, documentId, { deleteOld })
+      .then((queryResponse: ChatbotDocumentQueryResponse[]) => {
+        const doc = documents.find((d) => d.id == documentId)
+        if (doc) {
+          if (deleteOld) {
+            doc.queries = queryResponse
+          } else {
+            doc.queries = [...doc.queries, ...queryResponse]
+          }
+        }
+        message.success('Document queries generated successfully.')
+        return true
+      })
+      .catch((e) => {
+        const errorMessage = getErrorMessage(e)
+        message.error('Failed to generate document queries: ' + errorMessage)
+        return false
+      })
+  }
+
+  const createDocumentQuery = async (documentId: string, content: string) => {
+    return await API.chatbot.staffOnly
+      .addDocumentQuery(courseId, documentId, { query: content })
+      .then((queryResponse: ChatbotDocumentQueryResponse) => {
+        const doc = documents.find((d) => d.id == documentId)
+        if (doc) {
+          doc.queries.push(queryResponse)
+        }
+        message.success('Document query created successfully.')
+        return true
+      })
+      .catch((e) => {
+        const errorMessage = getErrorMessage(e)
+        message.error('Failed to create document query: ' + errorMessage)
+        return false
+      })
+  }
+
+  const editDocument = async (documentChunk: ChatbotDocumentResponse) => {
+    setEditingChunk(documentChunk)
+    setUpsertModalOpen(true)
+  }
+
+  const editDocumentQuery = async (queryId: string, content: string) => {
+    return await API.chatbot.staffOnly
+      .updateDocumentQuery(courseId, queryId, { query: content })
+      .then((queryResponse: ChatbotDocumentQueryResponse) => {
+        const doc = documents.find((d) =>
+          d.queries.some((q) => q.id == queryId),
+        )
+        if (doc) {
+          const idx = doc.queries.findIndex((q) => q.id == queryId)
+          if (idx >= 0) {
+            doc.queries[idx] = queryResponse
+          }
+        }
+        message.success('Document query updated successfully.')
+        return true
+      })
+      .catch((e) => {
+        const errorMessage = getErrorMessage(e)
+        message.error('Failed to update document query: ' + errorMessage)
+        return false
+      })
+  }
 
   const deleteDocument = async (documentId: string) => {
+    setOperatingOn((prev) => [...prev, documentId])
     await API.chatbot.staffOnly
       .deleteDocumentChunk(courseId, documentId)
       .then(() => {
@@ -266,6 +214,24 @@ export default function ChatbotDocuments(
         const errorMessage = getErrorMessage(e)
         message.error('Failed to delete document: ' + errorMessage)
       })
+      .finally(() =>
+        setOperatingOn((prev) => prev.filter((d) => d != documentId)),
+      )
+  }
+
+  const deleteDocumentQuery = async (queryId: string) => {
+    return await API.chatbot.staffOnly
+      .deleteDocumentQuery(courseId, queryId)
+      .then(() => {
+        documents.forEach((d) => d.queries.filter((q) => q.id !== queryId))
+        message.success('Document query deleted successfully.')
+        return true
+      })
+      .catch((e) => {
+        const errorMessage = getErrorMessage(e)
+        message.error('Failed to delete document query: ' + errorMessage)
+        return false
+      })
   }
 
   return (
@@ -339,29 +305,37 @@ export default function ChatbotDocuments(
           }}
         />
       </div>
-      <Table
-        columns={columns}
-        dataSource={documents}
-        size="small"
-        className="w-full"
-        pagination={false}
-        locale={{
-          emptyText: (
-            <Empty
-              description={
-                <div>
-                  No chunks added yet. <br /> Head to{' '}
-                  <Link href={`/course/${courseId}/settings/chatbot_settings`}>
-                    Chatbot Settings
-                  </Link>{' '}
-                  and add some course documents so your chatbot can start citing
-                  things!
-                </div>
-              }
+      {documents.length <= 0 ? (
+        <Empty
+          description={
+            <div>
+              No chunks added yet. <br /> Head to{' '}
+              <Link href={`/course/${courseId}/settings/chatbot_settings`}>
+                Chatbot Settings
+              </Link>{' '}
+              and add some course documents so your chatbot can start citing
+              things!
+            </div>
+          }
+        />
+      ) : (
+        <>
+          {documents.map((d, i) => (
+            <DocumentChunkRow
+              key={'document' + i}
+              documentChunk={d}
+              isLoading={!!operatingOn?.includes(d.id)}
+              onCreateQuery={createDocumentQuery}
+              onDeleteChunk={deleteDocument}
+              onDeleteQuery={deleteDocumentQuery}
+              onEditChunk={editDocument}
+              onEditQuery={editDocumentQuery}
+              generateQueries={generateDocumentQueries}
+              searchTerms={searchTerms}
             />
-          ),
-        }}
-      />
+          ))}
+        </>
+      )}
     </div>
   )
 }
diff --git a/packages/frontend/app/api/index.ts b/packages/frontend/app/api/index.ts
index f497695e3..05b24edc1 100644
--- a/packages/frontend/app/api/index.ts
+++ b/packages/frontend/app/api/index.ts
@@ -12,6 +12,7 @@ import {
   ChatbotCourseSettingsResponse,
   ChatbotDocumentAggregateResponse,
   ChatbotDocumentListResponse,
+  ChatbotDocumentQueryResponse,
   ChatbotDocumentResponse,
   ChatbotProvider,
   ChatbotQueryBody,
@@ -38,12 +39,15 @@ import {
   DesktopNotifBody,
   DesktopNotifPartial,
   EditCourseInfoParams,
+  ExtraTAStatus,
+  GenerateDocumentQueryBody,
   GetAlertsResponse,
   GetAvailableModelsBody,
   GetCourseResponse,
   GetCourseUserInfoResponse,
   GetInsightOutputResponse,
   GetLimitedCourseResponse,
+  GetOrganizationResponse,
   GetOrganizationUserResponse,
   GetProfileResponse,
   GetQueueChatResponse,
@@ -68,12 +72,12 @@ import {
   LMSIntegrationPlatform,
   LMSOrganizationIntegrationPartial,
   LMSPage,
+  LMSQuiz,
+  LMSQuizAccessLevel,
   LMSSyncDocumentsResult,
   LMSToken,
   LoginParam,
   LtiPlatform,
-  LMSQuiz,
-  LMSQuizAccessLevel,
   MailServiceWithSubscription,
   OrganizationChatbotSettings,
   OrganizationChatbotSettingsDefaults,
@@ -98,7 +102,6 @@ import {
   QueueInviteParams,
   QueuePartial,
   QueueTypes,
-  ExtraTAStatus,
   RemoveLMSOrganizationParams,
   Role,
   SemesterPartial,
@@ -128,10 +131,10 @@ import {
   UpdateQuestionResponse,
   UpdateQueueParams,
   UpsertCourseChatbotSettings,
+  UpsertDocumentQueryBody,
   UpsertLMSCourseParams,
   UpsertLMSOrganizationParams,
   UserMailSubscription,
-  GetOrganizationResponse,
 } from '@koh/common'
 import Axios, { AxiosError, AxiosInstance, AxiosResponse, Method } from 'axios'
 import { plainToClass } from 'class-transformer'
@@ -419,6 +422,53 @@ export class APIClient {
         docId: string,
       ): Promise<void> =>
         this.req('DELETE', `/api/v1/chatbot/${courseId}/document/${docId}`),
+      getDocumentQueries: async (
+        courseId: number,
+        documentId: string,
+      ): Promise<ChatbotDocumentQueryResponse[]> =>
+        this.req<ChatbotDocumentQueryResponse[]>(
+          'GET',
+          `/api/v1/chatbot/${courseId}/query/${documentId}`,
+          ChatbotDocumentQueryResponse,
+        ),
+      addDocumentQuery: async (
+        courseId: number,
+        documentId: string,
+        body: UpsertDocumentQueryBody,
+      ): Promise<ChatbotDocumentQueryResponse> =>
+        this.req(
+          'POST',
+          `/api/v1/chatbot/${courseId}/query/${documentId}`,
+          ChatbotDocumentQueryResponse,
+          body,
+        ),
+      generateDocumentQueries: async (
+        courseId: number,
+        documentId: string,
+        body: GenerateDocumentQueryBody,
+      ): Promise<ChatbotDocumentQueryResponse[]> =>
+        this.req<ChatbotDocumentQueryResponse[]>(
+          'POST',
+          `/api/v1/chatbot/${courseId}/query/${documentId}/generate`,
+          ChatbotDocumentQueryResponse,
+          body,
+        ),
+      updateDocumentQuery: async (
+        courseId: number,
+        queryId: string,
+        body: UpsertDocumentQueryBody,
+      ): Promise<ChatbotDocumentQueryResponse> =>
+        this.req(
+          'PATCH',
+          `/api/v1/chatbot/${courseId}/query/${queryId}`,
+          ChatbotDocumentQueryResponse,
+          body,
+        ),
+      deleteDocumentQuery: async (
+        courseId: number,
+        queryId: string,
+      ): Promise<void> =>
+        this.req('DELETE', `/api/v1/chatbot/${courseId}/query/${queryId}`),
       deleteDocument: async (courseId: number, docId: string): Promise<void> =>
         this.req('DELETE', `/api/v1/chatbot/${courseId}/aggregate/${docId}`),
       uploadDocument: async (
diff --git a/packages/server/package.json b/packages/server/package.json
index b468e58c6..b9b5d4a7d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -47,6 +47,7 @@
     "@nestjs/schedule": "^0.4.0",
     "@nestjs/throttler": "^6.4.0",
     "@nestjs/typeorm": "^11.0.0",
+    "@nestjs/websockets": "^11.1.11",
     "@sentry/cli": "^2.36.1",
     "@sentry/nestjs": "^9.3.0",
     "@sentry/profiling-node": "^9.3.0",
@@ -108,6 +109,8 @@
     "res": "^0.4.0",
     "rxjs": "^7.1.0",
     "sharp": "^0.33.5",
+    "socket.io": "^4.8.3",
+    "socket.io-client": "^4.8.3",
     "sonner": "^2.0.2",
     "source-map-support": "^0.5.19",
     "superagent": "^8.1.2",
diff --git a/packages/server/src/chatbot/chatbot-api.service.ts b/packages/server/src/chatbot/chatbot-api.service.ts
index 163b5f788..248af302e 100644
--- a/packages/server/src/chatbot/chatbot-api.service.ts
+++ b/packages/server/src/chatbot/chatbot-api.service.ts
@@ -8,6 +8,7 @@ import {
   ChatbotCourseSettingsResponse,
   ChatbotDocumentAggregateResponse,
   ChatbotDocumentListResponse,
+  ChatbotDocumentQueryResponse,
   ChatbotDocumentResponse,
   ChatbotQueryBody,
   ChatbotQueryTypeEnum,
@@ -18,6 +19,7 @@ import {
   CreateDocumentAggregateBody,
   CreateDocumentChunkBody,
   CreateQuestionBody,
+  GenerateDocumentQueryBody,
   PaginatedResponse,
   SuggestedQuestionResponse,
   UpdateChatbotCourseSettingsBody,
@@ -26,8 +28,15 @@ import {
   UpdateQuestionBody,
   UploadDocumentAggregateBody,
   UploadURLDocumentAggregateBody,
+  UpsertDocumentQueryBody,
 } from '@koh/common';
 import { isObject } from '@nestjs/common/utils/shared.utils';
+import {
+  ChatbotResultEventArgs,
+  ChatbotResultEventName,
+  ChatbotResultEvents,
+  ChatbotResultWebSocket,
+} from './intermediate-results/chatbot-result.websocket';
 
 type ChatbotRequestInit<TBody> = {
   userToken?: string;
@@ -57,7 +66,10 @@ export class ChatbotApiService {
   private readonly chatbotApiUrl: string;
   private readonly chatbotApiKey: string;
 
-  constructor(private configService: ConfigService) {
+  constructor(
+    private configService: ConfigService,
+    private chatbotResultWebSocket: ChatbotResultWebSocket,
+  ) {
     // this.chatbotApiUrl = this.configService.get<string>('CHATBOT_API_URL');
     this.chatbotApiUrl = 'http://localhost:3003/chat';
     this.chatbotApiKey = this.configService.get<string>('CHATBOT_API_KEY');
@@ -73,6 +85,7 @@ export class ChatbotApiService {
    * @param request.params Data to be passed in the query parameters
    * @param request.timeoutMs How long until the request should be considered failed by timeout
    * @param responseClass Class to map the response to
+   * @param webSocketEvent {ChatbotResultEventArgs} Arguments to configure a websocket for asynchronous results
    * @returns Response from the chatbot service
    */
   private async request<TResponse, TBody = void>(
@@ -80,12 +93,14 @@ export class ChatbotApiService {
     endpoint: string,
     request?: ChatbotRequestInit<TBody>,
     responseClass?: ClassType<ElementType<TResponse>>,
+    webSocketEvent?: ChatbotResultEventArgs,
   ): Promise<TResponse>;
   private async request<TResponse, TBody = void>(
     method: 'GET' | 'POST' | 'PATCH' | 'DELETE',
     endpoint: string,
     request: ChatbotRequestInit<TBody> = {},
     responseClass?: ClassType<TResponse>,
+    webSocketEvent?: ChatbotResultEventArgs,
   ): Promise<TResponse> {
     try {
       const { userToken, data, params, timeoutMs } = request;
@@ -114,6 +129,13 @@ export class ChatbotApiService {
         body = data as any;
       }
 
+      let id: string | undefined = undefined;
+      if (webSocketEvent) {
+        id = await this.chatbotResultWebSocket.getUniqueId();
+        webSocketEvent['resultId'] = id;
+        body['ws_info'] = webSocketEvent;
+      }
+
       const response = await fetch(url, {
         method,
         headers,
@@ -137,7 +159,11 @@ export class ChatbotApiService {
       }
 
       const plain = await response.json();
-      return responseClass ? plainToClass(responseClass, plain) : plain;
+      return id !== undefined
+        ? (id as any)
+        : responseClass
+          ? plainToClass(responseClass, plain)
+          : plain;
     } catch (error) {
       if (error instanceof HttpException) {
         throw error;
@@ -160,6 +186,7 @@ export class ChatbotApiService {
     if (page != undefined && page >= 1) {
       endpoint = `${endpoint}/${page}`;
     }
+
     const result = await this.request<PaginatedResponse<TResponse>>(
       'GET',
       endpoint,
@@ -359,14 +386,18 @@ export class ChatbotApiService {
   async addDocumentChunk(
     data: CreateDocumentChunkBody,
     courseId: number,
-  ): Promise<ChatbotDocumentResponse[]> {
-    return this.request<ChatbotDocumentResponse[], CreateDocumentChunkBody>(
+  ): Promise<string> {
+    return this.request<string, CreateDocumentChunkBody>(
       'POST',
       `document/${courseId}`,
       {
         data,
       },
-      ChatbotDocumentResponse,
+      undefined,
+      {
+        returnMessage: ChatbotResultEvents.POST_RESULT,
+        type: ChatbotResultEventName.ADD_CHUNK,
+      },
     );
   }
 
@@ -374,14 +405,18 @@ export class ChatbotApiService {
     docId: string,
     data: UpdateDocumentChunkBody,
     courseId: number,
-  ): Promise<ChatbotDocumentResponse[]> {
-    return this.request<ChatbotDocumentResponse[], UpdateDocumentChunkBody>(
+  ): Promise<string> {
+    return this.request<string, UpdateDocumentChunkBody>(
       'PATCH',
       `document/${courseId}/${docId}`,
       {
         data,
       },
-      ChatbotDocumentResponse,
+      undefined,
+      {
+        returnMessage: ChatbotResultEvents.POST_RESULT,
+        type: ChatbotResultEventName.UPDATE_CHUNK,
+      },
     );
   }
 
@@ -393,18 +428,82 @@ export class ChatbotApiService {
     return this.request('DELETE', `document/aggregate/${courseId}/${docId}`);
   }
 
+  async getDocumentChunkQueries(
+    documentId: string,
+    courseId: number,
+  ): Promise<ChatbotDocumentQueryResponse[]> {
+    return this.request('GET', `document/query/${courseId}/${documentId}`);
+  }
+
+  async addDocumentQuery(
+    documentId: string,
+    courseId: number,
+    data: UpsertDocumentQueryBody,
+  ): Promise<ChatbotDocumentQueryResponse> {
+    return this.request('POST', `document/query/${courseId}/${documentId}`, {
+      data,
+    });
+  }
+
+  async generateDocumentQueries(
+    documentId: string,
+    courseId: number,
+    data: GenerateDocumentQueryBody,
+  ): Promise<string> {
+    return this.request(
+      'POST',
+      `document/query/${courseId}/${documentId}/generate`,
+      {
+        data,
+      },
+      undefined,
+      {
+        returnMessage: ChatbotResultEvents.POST_RESULT,
+        type: ChatbotResultEventName.DOCUMENT_QUERIES,
+      },
+    );
+  }
+
+  async updateDocumentQuery(
+    documentQueryId: string,
+    courseId: number,
+    data: UpsertDocumentQueryBody,
+  ): Promise<ChatbotDocumentQueryResponse> {
+    return this.request(
+      'PATCH',
+      `document/query/${courseId}/${documentQueryId}`,
+      {
+        data,
+      },
+    );
+  }
+
+  async deleteDocumentQuery(
+    documentQueryId: string,
+    courseId: number,
+  ): Promise<void> {
+    return this.request(
+      'DELETE',
+      `document/query/${courseId}/${documentQueryId}`,
+    );
+  }
+
   // Creates a document aggregate from raw text - generally only used for LMS documents
   async addDocument(
     courseId: number,
     data: CreateDocumentAggregateBody,
-  ): Promise<ChatbotDocumentAggregateResponse> {
+  ): Promise<string> {
     return this.request(
       'POST',
       `document/aggregate/${courseId}`,
       {
         data,
       },
-      ChatbotDocumentAggregateResponse,
+      undefined,
+      {
+        returnMessage: ChatbotResultEvents.POST_RESULT,
+        type: ChatbotResultEventName.ADD_AGGREGATE,
+      },
     );
   }
 
@@ -414,14 +513,18 @@ export class ChatbotApiService {
     docId: string,
     courseId: number,
     data: UpdateDocumentAggregateBody,
-  ): Promise<ChatbotDocumentAggregateResponse> {
+  ): Promise<string> {
     return this.request(
       'PATCH',
       `document/aggregate/${courseId}/${docId}`,
       {
         data,
       },
-      ChatbotDocumentAggregateResponse,
+      undefined,
+      {
+        returnMessage: ChatbotResultEvents.POST_RESULT,
+        type: ChatbotResultEventName.UPDATE_AGGREGATE,
+      },
     );
   }
 
@@ -429,7 +532,7 @@ export class ChatbotApiService {
     file: Express.Multer.File,
     params: UploadDocumentAggregateBody,
     courseId: number,
-  ): Promise<ChatbotDocumentAggregateResponse> {
+  ): Promise<string> {
     try {
       // re-upload the file to the chatbot server while the file is still in memory here
       const formData = new FormData();
@@ -459,7 +562,11 @@ export class ChatbotApiService {
         {
           data: formData,
         },
-        ChatbotDocumentAggregateResponse,
+        undefined,
+        {
+          type: ChatbotResultEventName.ADD_AGGREGATE,
+          returnMessage: ChatbotResultEvents.POST_RESULT,
+        },
       );
     } catch (error) {
       if (error instanceof HttpException) {
@@ -475,14 +582,18 @@ export class ChatbotApiService {
   async uploadURLDocument(
     params: UploadURLDocumentAggregateBody,
     courseId: number,
-  ): Promise<ChatbotDocumentAggregateResponse> {
+  ): Promise<string> {
     return this.request(
       'POST',
       `document/${courseId}/url`,
       {
         data: params,
       },
-      ChatbotDocumentAggregateResponse,
+      undefined,
+      {
+        returnMessage: ChatbotResultEvents.POST_RESULT,
+        type: ChatbotResultEventName.ADD_AGGREGATE,
+      },
     );
   }
 
diff --git a/packages/server/src/chatbot/chatbot.controller.ts b/packages/server/src/chatbot/chatbot.controller.ts
index 899148fe8..12ef8c87f 100644
--- a/packages/server/src/chatbot/chatbot.controller.ts
+++ b/packages/server/src/chatbot/chatbot.controller.ts
@@ -7,7 +7,6 @@ import {
   Get,
   HttpException,
   HttpStatus,
-  InternalServerErrorException,
   NotFoundException,
   Param,
   ParseIntPipe,
@@ -23,11 +22,13 @@ import {
 import { ChatbotService } from './chatbot.service';
 import { JwtAuthGuard } from '../guards/jwt-auth.guard';
 import { EmailVerifiedGuard } from 'guards/email-verified.guard';
+import { io } from 'socket.io-client';
 import {
   ChatbotAskSuggestedBody,
   ChatbotCourseSettingsResponse,
   ChatbotDocumentAggregateResponse,
   ChatbotDocumentListResponse,
+  ChatbotDocumentQueryResponse,
   ChatbotDocumentResponse,
   ChatbotProvider,
   ChatbotQueryBody,
@@ -42,6 +43,7 @@ import {
   CreateOrganizationChatbotSettingsBody,
   CreateQuestionBody,
   ERROR_MESSAGES,
+  GenerateDocumentQueryBody,
   GetAvailableModelsBody,
   HelpMeChatbotAskBody,
   HelpMeChatbotAskResponse,
@@ -66,6 +68,7 @@ import {
   UploadDocumentAggregateBody,
   UploadURLDocumentAggregateBody,
   UpsertCourseChatbotSettings,
+  UpsertDocumentQueryBody,
 } from '@koh/common';
 import { CourseRolesGuard } from 'guards/course-roles.guard';
 import { Roles } from 'decorators/roles.decorator';
@@ -97,15 +100,26 @@ import {
   IgnoreSerializer,
 } from '../interceptors/IgnoreableClassSerializerInterceptor';
 import { plainToClass } from 'class-transformer';
+import {
+  ChatbotResultEventName,
+  ChatbotResultEvents,
+  ChatbotResultWebSocket,
+} from './intermediate-results/chatbot-result.websocket';
+import { ClientSocket } from '../websocket/clientSocket';
 
 @Controller('chatbot')
 @UseGuards(JwtAuthGuard, EmailVerifiedGuard)
 @UseInterceptors(IgnoreableClassSerializerInterceptor)
 export class ChatbotController {
+  private socket: ClientSocket;
   constructor(
     private readonly chatbotService: ChatbotService,
     private readonly chatbotApiService: ChatbotApiService,
-  ) {}
+    private readonly chatbotResultWebSocket: ChatbotResultWebSocket,
+  ) {
+    const socket = io();
+    this.socket = new ClientSocket(socket as any);
+  }
 
   //
   // Endpoints for both students and staff
@@ -436,7 +450,7 @@ export class ChatbotController {
   async addDocumentChunk(
     @Param('courseId', ParseIntPipe) courseId: number,
     @Body() body: CreateDocumentChunkBody,
-  ): Promise<ChatbotDocumentResponse[]> {
+  ): Promise<string> {
     return await this.chatbotApiService.addDocumentChunk(body, courseId);
   }
 
@@ -447,7 +461,7 @@ export class ChatbotController {
     @Param('courseId', ParseIntPipe) courseId: number,
     @Param('docId') docId: string,
     @Body() body: UpdateDocumentChunkBody,
-  ): Promise<ChatbotDocumentResponse[]> {
+  ): Promise<string> {
     return await this.chatbotApiService.updateDocumentChunk(
       docId,
       body,
@@ -472,7 +486,7 @@ export class ChatbotController {
     @Param('courseId', ParseIntPipe) courseId: number,
     @Param('docId') docId: string,
     @Body() body: UpdateDocumentAggregateBody,
-  ): Promise<ChatbotDocumentAggregateResponse> {
+  ): Promise<string> {
     // Delete disallowed update parameters
     delete body.documentText;
     delete body.lmsDocumentId;
@@ -495,6 +509,74 @@ export class ChatbotController {
     });
   }
 
+  @Get(':courseId/query/:documentId')
+  @UseGuards(CourseRolesGuard)
+  @Roles(Role.PROFESSOR, Role.TA)
+  async getDocumentChunkQueries(
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Param('documentId') documentId: string,
+  ): Promise<ChatbotDocumentQueryResponse[]> {
+    return await this.chatbotApiService.getDocumentChunkQueries(
+      documentId,
+      courseId,
+    );
+  }
+
+  @Post(':courseId/query/:documentId')
+  @UseGuards(CourseRolesGuard)
+  @Roles(Role.PROFESSOR, Role.TA)
+  async addDocumentQuery(
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Param('documentId') documentId: string,
+    @Body() body: UpsertDocumentQueryBody,
+  ): Promise<ChatbotDocumentQueryResponse> {
+    return await this.chatbotApiService.addDocumentQuery(
+      documentId,
+      courseId,
+      body,
+    );
+  }
+
+  @Post(':courseId/query/:documentId/generate')
+  @UseGuards(CourseRolesGuard)
+  @Roles(Role.PROFESSOR, Role.TA)
+  async generateDocumentQueries(
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Param('documentId') documentId: string,
+    @Body() body: GenerateDocumentQueryBody,
+  ): Promise<string> {
+    return await this.chatbotApiService.generateDocumentQueries(
+      documentId,
+      courseId,
+      body,
+    );
+  }
+
+  @Patch(':courseId/query/:queryId')
+  @UseGuards(CourseRolesGuard)
+  @Roles(Role.PROFESSOR, Role.TA)
+  async updateDocumentQuery(
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Param('queryId') queryId: string,
+    @Body() body: UpsertDocumentQueryBody,
+  ): Promise<ChatbotDocumentQueryResponse> {
+    return await this.chatbotApiService.updateDocumentQuery(
+      queryId,
+      courseId,
+      body,
+    );
+  }
+
+  @Delete(':courseId/query/:queryId')
+  @UseGuards(CourseRolesGuard)
+  @Roles(Role.PROFESSOR, Role.TA)
+  async deleteDocumentQuery(
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Param('queryId') queryId: string,
+  ): Promise<void> {
+    await this.chatbotApiService.deleteDocumentQuery(queryId, courseId);
+  }
+
   // TODO: eventually add tests for this I guess
   // note that there is no corresponding endpoint for this one on the frontend as you are supposed to make links to it
   @Get('document/:courseId/:docId')
@@ -634,7 +716,7 @@ export class ChatbotController {
     @UploadedFile() file: Express.Multer.File,
     @Body() params: Partial<UploadDocumentAggregateBody>,
     @User() user: UserModel,
-  ): Promise<ChatbotDocumentAggregateResponse> {
+  ): Promise<string> {
     let { parseAsPng } = params;
 
     if (!file) {
@@ -736,62 +818,71 @@ export class ChatbotController {
       '/api/v1/chatbot/document/' + courseId + '/' + chatbotDocPdf.idHelpMeDB;
     chatbotDocPdf.docData = file.buffer;
     // Save file to database and upload to chatbot service in parallel with error handling
-    const [savedDocPdf, uploadResult] = await Promise.allSettled([
-      chatbotDocPdf.save(),
-      this.chatbotApiService.uploadDocument(
-        file,
-        {
-          source: docUrl,
-          parseAsPng,
-        },
-        courseId,
-      ),
-    ]);
+    const resultId = await this.chatbotApiService.uploadDocument(
+      file,
+      {
+        source: docUrl,
+        parseAsPng,
+      },
+      courseId,
+    );
 
-    // Check if either promise rejected
-    if (
-      savedDocPdf.status === 'fulfilled' &&
-      uploadResult.status === 'rejected'
-    ) {
-      // If DB save succeeded but upload failed, clean up the DB entry
-      await ChatbotDocPdfModel.remove(savedDocPdf.value);
-      throw uploadResult.reason;
-    } else if (
-      savedDocPdf.status === 'rejected' &&
-      uploadResult.status === 'fulfilled'
-    ) {
-      // If upload succeeded but DB save failed, clean up the uploaded document
-      await this.chatbotApiService.deleteDocument(
-        uploadResult.value.id,
-        courseId,
-      );
-      throw savedDocPdf.reason;
-    } else if (
-      savedDocPdf.status === 'rejected' &&
-      uploadResult.status === 'rejected'
-    ) {
-      // Both failed, throw combined error (i'm doing a 500 level error since that's usually what would happen if both fail)
-      throw new InternalServerErrorException(
-        `Failed to save document: ${savedDocPdf.reason}.\n Failed to upload: ${uploadResult.reason}`,
-      );
-    } else if (
-      savedDocPdf.status === 'fulfilled' &&
-      uploadResult.status === 'fulfilled'
-    ) {
-      // if both succeed, then save the docId to the database
-      chatbotDocPdf.docIdChatbotDB = uploadResult.value.id;
-      await chatbotDocPdf.save();
+    const uploadResultId = await this.chatbotResultWebSocket.getUniqueId();
+
+    this.socket.registerListener(
+      {
+        event: ChatbotResultEvents.POST_RESULT,
+        callback: async (data: ChatbotDocumentAggregateResponse) => {
+          try {
+            if (data instanceof Error) {
+              this.socket.emit(ChatbotResultEvents.POST_RESULT, {
+                uploadResultId,
+                type: ChatbotResultEventName.ADD_AGGREGATE,
+                resultBody: data,
+              });
+              return;
+            }
 
-      const endTime2 = Date.now();
-      console.log(
-        `${file.originalname} (${file.mimetype}) upload chatbot service and save in db completed in ${endTime2 - endTime}ms for a total processing time of ${endTime2 - startTime}ms`,
-      );
-      return uploadResult.value;
-    } else {
-      throw new InternalServerErrorException(
-        "Unexpected error. Somehow both the upload and save didn't fulfill nor reject",
-      );
-    }
+            if (chatbotDocPdf) {
+              chatbotDocPdf.docIdChatbotDB = data.id;
+              chatbotDocPdf = await chatbotDocPdf.save();
+            }
+
+            const endTime2 = Date.now();
+            console.log(
+              `${file.originalname} (${file.mimetype}) upload chatbot service and save in db completed in ${endTime2 - endTime}ms for a total processing time of ${endTime2 - startTime}ms`,
+            );
+
+            this.socket.emit(ChatbotResultEvents.POST_RESULT, {
+              uploadResultId,
+              type: ChatbotResultEventName.ADD_AGGREGATE,
+              resultBody: data,
+            });
+          } catch (err) {
+            if (!(data instanceof Error)) {
+              await this.deleteDocument(courseId, data.id);
+            }
+            if (chatbotDocPdf && chatbotDocPdf.idHelpMeDB) {
+              await ChatbotDocPdfModel.remove(chatbotDocPdf);
+            }
+            this.socket.emit(ChatbotResultEvents.POST_RESULT, {
+              uploadResultId,
+              type: ChatbotResultEventName.ADD_AGGREGATE,
+              resultBody: err,
+            });
+          }
+        },
+      },
+      {
+        event: ChatbotResultEvents.GET_RESULT,
+        args: {
+          resultId,
+          type: ChatbotResultEventName.ADD_AGGREGATE,
+        },
+      },
+    );
+
+    return uploadResultId;
   }
 
   @Post(':courseId/aggregate/url')
@@ -800,7 +891,7 @@ export class ChatbotController {
   async addDocumentFromGithub(
     @Param('courseId', ParseIntPipe) courseId: number,
     @Body() params: UploadURLDocumentAggregateBody,
-  ): Promise<ChatbotDocumentAggregateResponse> {
+  ): Promise<string> {
     return await this.chatbotApiService.uploadURLDocument(params, courseId);
   }
 
@@ -1274,6 +1365,16 @@ export class ChatbotController {
         );
     }
   }
+
+  // This method allows the chatbot to post asynchronous results back to the HelpMe repository
+  // @Post('post/:resultType/:resultId')
+  // @UseGuards(ChatbotApiKeyGuard)
+  // async postResult(
+  //   @Param('resultType', new ParseEnumPipe()) resultType: any,
+  //   @Param('resultId', ParseIntPipe) resultId: number,
+  // ) {
+  //
+  // }
 }
 
 function handleChatbotTokenCheck(user: UserModel) {
diff --git a/packages/server/src/chatbot/chatbot.module.ts b/packages/server/src/chatbot/chatbot.module.ts
index ee640d5ce..095cc91eb 100644
--- a/packages/server/src/chatbot/chatbot.module.ts
+++ b/packages/server/src/chatbot/chatbot.module.ts
@@ -4,9 +4,9 @@ import { ChatbotController } from './chatbot.controller';
 import { ChatbotApiService } from './chatbot-api.service';
 import { ChatbotSettingsSubscriber } from './chatbot-infrastructure-models/chatbot-settings.subscriber';
 import { CacheModule } from '@nestjs/cache-manager';
-import { ChatbotDataSourceService } from './chatbot-datasource/chatbot-datasource.service';
 import { ChatbotDataSourceModule } from './chatbot-datasource/chatbot-datasource.module';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
+import { ChatbotResultWebSocket } from './intermediate-results/chatbot-result.websocket';
 
 @Module({
   controllers: [ChatbotController],
@@ -21,7 +21,12 @@ export class ChatbotModule {
         CacheModule.register(),
         ChatbotDataSourceModule.forRoot(connectionOptions),
       ],
-      providers: [ChatbotService, ChatbotApiService, ChatbotSettingsSubscriber],
+      providers: [
+        ChatbotService,
+        ChatbotApiService,
+        ChatbotSettingsSubscriber,
+        ChatbotResultWebSocket,
+      ],
     };
   }
 }
diff --git a/packages/server/src/chatbot/intermediate-results/chatbot-result.websocket.ts b/packages/server/src/chatbot/intermediate-results/chatbot-result.websocket.ts
new file mode 100644
index 000000000..71f11d562
--- /dev/null
+++ b/packages/server/src/chatbot/intermediate-results/chatbot-result.websocket.ts
@@ -0,0 +1,137 @@
+import {
+  HttpException,
+  HttpStatus,
+  Inject,
+  Injectable,
+  ParseEnumPipe,
+  UseGuards,
+} from '@nestjs/common';
+import {
+  ConnectedSocket,
+  MessageBody,
+  SubscribeMessage,
+  WebSocketGateway,
+} from '@nestjs/websockets';
+import { Server, Socket } from 'socket.io';
+import { WsJwtAuthGuard } from '../../guards/websocket/ws-jwt-auth.guard';
+import { WsChatbotApiKeyGuard } from '../../guards/websocket/ws-chatbot-api-key.guard';
+import { WebSocketEvent } from '../../websocket/websocket.event';
+import {
+  WebSocketException,
+  WsNotFoundException,
+} from '../../websocket/websocket.exception';
+import { Cache } from 'cache-manager';
+import { WebSocketTemplate } from '../../websocket/websocket.template';
+
+export enum ChatbotResultEvents {
+  GET_RESULT = 'chatbot/get_result',
+  POST_RESULT = 'chatbot/post_result',
+  RESULT_RECEIVED = 'chatbot/received_result',
+}
+
+export enum ChatbotResultEventName {
+  ADD_AGGREGATE = 'add_aggregate_complete',
+  UPDATE_AGGREGATE = 'update_aggregate_complete',
+  ADD_CHUNK = 'add_chunk_complete',
+  UPDATE_CHUNK = 'update_chunk_complete',
+  DOCUMENT_QUERIES = 'query_generation_complete',
+}
+
+export type ChatbotResultEventArgs = {
+  returnMessage: ChatbotResultEvents;
+  type: ChatbotResultEventName;
+};
+
+export type ChatbotEventParams = {
+  type: ChatbotResultEventName;
+  resultId: string;
+};
+
+@Injectable()
+@WebSocketGateway({
+  cors: {
+    origin: '*',
+  },
+})
+export class ChatbotResultWebSocket extends WebSocketTemplate {
+  constructor(@Inject() protected cacheManager: Cache) {
+    super(cacheManager);
+  }
+
+  afterInit(server: Server): any {
+    super.afterInit(server);
+    this.events[ChatbotResultEvents.GET_RESULT] = new WebSocketEvent<
+      ChatbotEventParams,
+      any
+    >(this.server, ChatbotResultEvents.POST_RESULT);
+  }
+
+  handleDisconnect(client: Socket): any {
+    super.handleDisconnect(client);
+  }
+
+  @UseGuards(WsJwtAuthGuard)
+  @SubscribeMessage(ChatbotResultEvents.GET_RESULT)
+  async subscribeResultEvent(
+    @ConnectedSocket() client: Socket,
+    @MessageBody('id') resultId: number,
+    @MessageBody('type', new ParseEnumPipe(ChatbotResultEventName))
+    type: ChatbotResultEventName,
+  ): Promise<boolean> {
+    if (!this.events[ChatbotResultEvents.GET_RESULT]) {
+      throw new WsNotFoundException();
+    }
+    this.events[ChatbotResultEvents.GET_RESULT].subscribe(client.id, {
+      type,
+      resultId,
+    });
+    return true;
+  }
+
+  @UseGuards(WsJwtAuthGuard)
+  @SubscribeMessage(ChatbotResultEvents.GET_RESULT + '/unsubscribe')
+  async unsubscribeResultEvent(
+    @ConnectedSocket() client: Socket,
+    @MessageBody('id') resultId: number,
+    @MessageBody('type', new ParseEnumPipe(ChatbotResultEventName))
+    type: ChatbotResultEventName,
+  ): Promise<boolean> {
+    if (!this.events[ChatbotResultEvents.GET_RESULT]) {
+      throw new WsNotFoundException();
+    }
+    this.events[ChatbotResultEvents.GET_RESULT].unsubscribe(client.id, {
+      resultId,
+      type,
+    });
+    return true;
+  }
+
+  @UseGuards(WsChatbotApiKeyGuard)
+  @SubscribeMessage(ChatbotResultEvents.POST_RESULT)
+  async handlePostResultEvent(
+    @MessageBody('id') resultId: number,
+    @MessageBody('type', new ParseEnumPipe(ChatbotResultEventName))
+    type: ChatbotResultEventName,
+    @MessageBody('resultBody') resultBody: any,
+  ): Promise<any> {
+    if (!this.events[ChatbotResultEvents.GET_RESULT]) {
+      throw new WsNotFoundException();
+    }
+    try {
+      this.events[ChatbotResultEvents.GET_RESULT].post(
+        { type, resultId },
+        resultBody,
+      );
+      return true;
+    } catch (error) {
+      if (error instanceof HttpException) {
+        throw new WebSocketException(error.getStatus(), error.message);
+      } else {
+        throw new WebSocketException(
+          HttpStatus.INTERNAL_SERVER_ERROR,
+          error.message,
+        );
+      }
+    }
+  }
+}
diff --git a/packages/server/src/guards/chatbot-api-key.guard.ts b/packages/server/src/guards/chatbot-api-key.guard.ts
new file mode 100644
index 000000000..da1a97c29
--- /dev/null
+++ b/packages/server/src/guards/chatbot-api-key.guard.ts
@@ -0,0 +1,31 @@
+import { Request } from 'express';
+import {
+  CanActivate,
+  ExecutionContext,
+  HttpException,
+  HttpStatus,
+  Injectable,
+} from '@nestjs/common';
+
+@Injectable()
+export class ChatbotApiKeyGuard implements CanActivate {
+  constructor() {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    return await this.checkToken(context.switchToHttp().getRequest());
+  }
+
+  async checkToken(req: Request) {
+    const apiKey = req.headers['hms-api-key'];
+    const validApiKey = process.env.CHATBOT_API_KEY;
+
+    if (!apiKey || apiKey !== validApiKey) {
+      throw new HttpException(
+        'Invalid or missing API key',
+        HttpStatus.UNAUTHORIZED,
+      );
+    }
+
+    return true;
+  }
+}
diff --git a/packages/server/src/guards/websocket/websocket.guard.ts b/packages/server/src/guards/websocket/websocket.guard.ts
new file mode 100644
index 000000000..5027061aa
--- /dev/null
+++ b/packages/server/src/guards/websocket/websocket.guard.ts
@@ -0,0 +1,22 @@
+import { CanActivate, ExecutionContext } from '@nestjs/common';
+import { Observable } from 'rxjs';
+import { Socket } from 'socket.io';
+
+export abstract class WebSocketGuard<TData = any> implements CanActivate {
+  canActivate(
+    context: ExecutionContext,
+  ): boolean | Promise<boolean> | Observable<boolean> {
+    const ws = context.switchToWs();
+    return this.handleRequest(
+      ws.getClient<Socket>(),
+      ws.getData<TData>(),
+      ws.getPattern(),
+    );
+  }
+
+  abstract handleRequest(
+    client: Socket,
+    data: TData,
+    pattern: string,
+  ): boolean | Promise<boolean> | Observable<boolean>;
+}
diff --git a/packages/server/src/guards/websocket/ws-chatbot-api-key.guard.ts b/packages/server/src/guards/websocket/ws-chatbot-api-key.guard.ts
new file mode 100644
index 000000000..f1bc42428
--- /dev/null
+++ b/packages/server/src/guards/websocket/ws-chatbot-api-key.guard.ts
@@ -0,0 +1,30 @@
+import { ExecutionContext, Injectable } from '@nestjs/common';
+import { WebSocketGuard } from './websocket.guard';
+import { Observable } from 'rxjs';
+import { Socket } from 'socket.io';
+import { WsUnauthorizedException } from '../../websocket/websocket.exception';
+
+@Injectable()
+export class WsChatbotApiKeyGuard extends WebSocketGuard {
+  constructor() {
+    super();
+  }
+
+  canActivate(
+    context: ExecutionContext,
+  ): boolean | Promise<boolean> | Observable<boolean> {
+    return super.canActivate(context);
+  }
+
+  handleRequest(client: Socket): boolean {
+    const handshake = client.handshake;
+    const apiKey = handshake.headers['hms-api-key'];
+    const validApiKey = process.env.CHATBOT_API_KEY;
+
+    if (!apiKey || apiKey !== validApiKey) {
+      throw new WsUnauthorizedException('Invalid or missing API key');
+    }
+
+    return true;
+  }
+}
diff --git a/packages/server/src/guards/websocket/ws-jwt-auth.guard.ts b/packages/server/src/guards/websocket/ws-jwt-auth.guard.ts
new file mode 100644
index 000000000..121b9cabc
--- /dev/null
+++ b/packages/server/src/guards/websocket/ws-jwt-auth.guard.ts
@@ -0,0 +1,102 @@
+import { ExecutionContext, Injectable } from '@nestjs/common';
+import { Observable } from 'rxjs';
+import { Socket } from 'socket.io';
+import { JwtService } from '@nestjs/jwt';
+import { WebSocketGuard } from './websocket.guard';
+import { ERROR_MESSAGES } from '@koh/common';
+import {
+  WsForbiddenException,
+  WsUnauthorizedException,
+} from '../../websocket/websocket.exception';
+
+@Injectable()
+export class WsJwtAuthGuard extends WebSocketGuard {
+  constructor(private jwtService: JwtService) {
+    super();
+  }
+
+  canActivate(
+    context: ExecutionContext,
+  ): boolean | Promise<boolean> | Observable<boolean> {
+    return super.canActivate(context);
+  }
+
+  handleRequest(client: Socket, _: any, pattern: string): boolean {
+    // Check if token is limited to specific endpoints
+    const user = this.precheck(client);
+    if (!user) {
+      throw new WsUnauthorizedException(
+        ERROR_MESSAGES.webSocket.jwt.userNotFound,
+      );
+    }
+    const pathOrPaths: string | string[] = user.restrictPaths;
+    if (!pathOrPaths) {
+      return user;
+    }
+
+    let isAllowedOnPath: boolean;
+    if (Array.isArray(pathOrPaths)) {
+      isAllowedOnPath = false;
+      for (const path of pathOrPaths) {
+        if (path.startsWith('r')) {
+          const regex = new RegExp(path.substring(1), 'i');
+          if (regex.test(pattern)) {
+            isAllowedOnPath = true;
+            break;
+          }
+        } else {
+          if (pattern == path) {
+            isAllowedOnPath = true;
+            break;
+          }
+        }
+      }
+    } else {
+      if (pathOrPaths.startsWith('r')) {
+        const regex = new RegExp(pathOrPaths.substring(1), 'i');
+        isAllowedOnPath = regex.test(pattern);
+      } else {
+        isAllowedOnPath = pattern == (pathOrPaths as string);
+      }
+    }
+
+    if (!isAllowedOnPath) {
+      throw new WsForbiddenException(
+        ERROR_MESSAGES.webSocket.jwt.disallowedPattern,
+      );
+    }
+
+    return user;
+  }
+
+  precheck(client: Socket): any {
+    const handshake = client.handshake;
+    const authHeader = handshake.headers.authorization;
+
+    if (!authHeader) {
+      throw new WsUnauthorizedException(
+        ERROR_MESSAGES.webSocket.jwt.missingAuthHeader,
+      );
+    }
+
+    // Extract the token part (remove "Bearer ")
+    const token = authHeader.split(' ')[1];
+
+    if (!token) {
+      throw new WsUnauthorizedException(
+        ERROR_MESSAGES.webSocket.jwt.malformedToken,
+      );
+    }
+
+    try {
+      client['user'] = this.jwtService.verify(token);
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    } catch (_err) {
+      throw new WsUnauthorizedException(
+        ERROR_MESSAGES.webSocket.jwt.invalidToken,
+      );
+    }
+
+    return client['user'];
+  }
+}
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.service.ts b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
index 35f98cb6d..b81b52a5b 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.service.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
@@ -4,6 +4,7 @@ import {
   LMSIntegrationAdapter,
 } from './lmsIntegration.adapter';
 import {
+  ChatbotDocumentAggregateResponse,
   CoursePartial,
   dropUndefined,
   ERROR_MESSAGES,
@@ -42,6 +43,14 @@ import { Cache } from 'cache-manager';
 import { LMSAccessTokenModel } from './lms-access-token.entity';
 import { pick } from 'lodash';
 import { LMSAuthStateModel } from './lms-auth-state.entity';
+import { UserModel } from '../profile/user.entity';
+import { io } from 'socket.io-client';
+import {
+  ChatbotResultEventName,
+  ChatbotResultEvents,
+  ChatbotResultWebSocket,
+} from '../chatbot/intermediate-results/chatbot-result.websocket';
+import { ClientSocket } from '../websocket/clientSocket';
 
 export enum LMSGet {
   Course,
@@ -73,13 +82,18 @@ type ExtendedLMSItem = (
 
 @Injectable()
 export class LMSIntegrationService {
+  private socket: ClientSocket;
   constructor(
     @Inject(LMSIntegrationAdapter)
     private integrationAdapter: LMSIntegrationAdapter,
     @Inject(ChatbotApiService)
     private chatbotApiService: ChatbotApiService,
+    private chatbotResultWebSocket: ChatbotResultWebSocket,
     @Inject(CACHE_MANAGER) private cacheManager: Cache,
-  ) {}
+  ) {
+    const socket = io();
+    this.socket = new ClientSocket(socket as any);
+  }
 
   @Cron(CronExpression.EVERY_DAY_AT_MIDNIGHT, { name: 'CLEAR_LMS_AUTH_STATES' })
   async clearLMSAuthStates() {
@@ -732,153 +746,18 @@ export class LMSIntegrationService {
 
       if (items.length == 0) continue;
 
-      const statuses: LMSFileUploadResponse[] = [];
       for (const item of items) {
-        const uploadDocumentResponse = await this.uploadDocument(
+        const response = await this.uploadDocument(
           courseId,
           item,
           type,
           adapter,
+          model,
         );
-        statuses.push(uploadDocumentResponse);
-
-        if (uploadDocumentResponse.success) syncDocumentsResult.itemsSynced++;
+        if (!!response) syncDocumentsResult.itemsSynced++;
         else syncDocumentsResult.errors++;
       }
-
-      const validIds = statuses.filter((u) => u.success).map((u) => u.id);
-      const toSave = items.filter((u) => validIds.includes(u.id));
-
-      const entities = toSave
-        .map((i) => {
-          const chatbotDocumentId =
-            'chatbotDocumentId' in i && i.chatbotDocumentId != undefined
-              ? i.chatbotDocumentId
-              : statuses.find((u) => u.id == i.id)?.documentId;
-
-          switch (type) {
-            case LMSUpload.Announcements:
-              const ann = i as LMSAnnouncement;
-              return (model as typeof LMSAnnouncementModel).create({
-                id: ann.id,
-                title: ann.title,
-                message: ann.message ?? '',
-                posted: ann.posted,
-                chatbotDocumentId,
-                uploaded: new Date(),
-                modified:
-                  ann.modified != undefined
-                    ? new Date(ann.modified)
-                    : new Date(),
-                courseId: courseId,
-                lmsSource: adapter.getPlatform(),
-              }) as LMSAnnouncementModel;
-            case LMSUpload.Assignments:
-              const asg = i as LMSAssignment;
-              return (model as typeof LMSAssignmentModel).create({
-                id: asg.id,
-                name: asg.name,
-                description: asg.description ?? '',
-                due: asg.due,
-                chatbotDocumentId,
-                uploaded: new Date(),
-                courseId: courseId,
-                modified:
-                  asg.modified != undefined
-                    ? new Date(asg.modified)
-                    : new Date(),
-                lmsSource: adapter.getPlatform(),
-              }) as LMSAssignmentModel;
-            case LMSUpload.Pages:
-              const page = i as LMSPage;
-              return (model as typeof LMSPageModel).create({
-                id: page.id,
-                title: page.title,
-                body: page.body,
-                url: page.url,
-                frontPage: page.frontPage,
-                chatbotDocumentId: chatbotDocumentId,
-                uploaded: new Date(),
-                courseId: courseId,
-                modified:
-                  page.modified != undefined
-                    ? new Date(page.modified)
-                    : new Date(),
-                lmsSource: adapter.getPlatform(),
-              }) as LMSPageModel;
-            case LMSUpload.Files:
-              const file = i as LMSFile;
-              return (model as typeof LMSFileModel).create({
-                id: file.id,
-                name: file.name,
-                url: file.url,
-                contentType: file.contentType,
-                size: file.size,
-                chatbotDocumentId: chatbotDocumentId,
-                uploaded: new Date(),
-                courseId: courseId,
-                modified:
-                  file.modified != undefined
-                    ? new Date(file.modified)
-                    : new Date(),
-                lmsSource: adapter.getPlatform(),
-              }) as LMSFileModel;
-            case LMSUpload.Quizzes:
-              const quiz = i as LMSQuiz;
-              return (model as typeof LMSQuizModel).create({
-                id: quiz.id,
-                title: quiz.title,
-                description: quiz.description,
-                due: quiz.due,
-                unlock: quiz.unlock,
-                lock: quiz.lock,
-                timeLimit: quiz.timeLimit,
-                allowedAttempts: quiz.allowedAttempts,
-                questions: quiz.questions,
-                accessLevel: LMSQuizAccessLevel.LOGISTICS_ONLY, // Default access level
-                chatbotDocumentId: chatbotDocumentId,
-                uploaded: new Date(),
-                courseId: courseId,
-                modified:
-                  quiz.modified != undefined
-                    ? new Date(quiz.modified)
-                    : new Date(),
-                lmsSource: adapter.getPlatform(),
-              }) as LMSQuizModel;
-            default:
-              return undefined;
-          }
-        })
-        .filter((e) => e != undefined) as
-        | LMSAssignmentModel[]
-        | LMSAnnouncementModel[]
-        | LMSPageModel[]
-        | LMSFileModel[]
-        | LMSQuizModel[];
-
-      switch (type) {
-        case LMSUpload.Announcements:
-          await (model as typeof LMSAnnouncementModel).save(
-            entities as LMSAnnouncementModel[],
-          );
-          break;
-        case LMSUpload.Assignments:
-          await (model as typeof LMSAssignmentModel).save(
-            entities as LMSAssignmentModel[],
-          );
-          break;
-        case LMSUpload.Pages:
-          await (model as typeof LMSPageModel).save(entities as LMSPageModel[]);
-          break;
-        case LMSUpload.Files:
-          await (model as typeof LMSFileModel).save(entities as LMSFileModel[]);
-          break;
-        case LMSUpload.Quizzes:
-          await (model as typeof LMSQuizModel).save(entities as LMSQuizModel[]);
-          break;
-      }
     }
-
     return syncDocumentsResult;
   }
 
@@ -976,17 +855,7 @@ export class LMSIntegrationService {
     }
 
     const model = await this.getDocumentModel(type);
-
-    const status = await this.uploadDocument(courseId, item, type, adapter);
-
-    if (status.success) {
-      item.chatbotDocumentId = item.chatbotDocumentId ?? status.documentId;
-      item.uploaded = new Date();
-      item.syncEnabled = true;
-      await (model as any).upsert(item, ['id', 'courseId']);
-    }
-
-    return status.success;
+    return await this.uploadDocument(courseId, item, type, adapter, model);
   }
 
   private async clearDocument(
@@ -1045,7 +914,8 @@ export class LMSIntegrationService {
       | LMSQuizModel,
     type: LMSUpload,
     adapter: AbstractLMSAdapter,
-  ): Promise<LMSFileUploadResponse> {
+    model: any,
+  ): Promise<string | boolean> {
     if (
       'chatbotDocumentId' in item &&
       item.chatbotDocumentId != undefined &&
@@ -1053,11 +923,7 @@ export class LMSIntegrationService {
       item.modified != undefined &&
       new Date(item.modified).getTime() <= new Date(item.uploaded).getTime()
     ) {
-      return {
-        id: item.id,
-        success: true,
-        documentId: item.chatbotDocumentId,
-      };
+      return true;
     }
 
     let documentText = '';
@@ -1121,37 +987,41 @@ export class LMSIntegrationService {
 
             const computedDocLink = adapter.getDocumentLink(item.id, type);
 
-            const uploadResult = await this.chatbotApiService.uploadDocument(
-              mockLMSFile,
-              {
-                source: computedDocLink,
-                lmsDocumentId: String(f.id),
-                parseAsPng: false,
-              },
+            const result: string | false = await this.chatbotApiService
+              .uploadDocument(
+                mockLMSFile,
+                {
+                  source: computedDocLink,
+                  lmsDocumentId: String(f.id),
+                  parseAsPng: false,
+                },
+                courseId,
+              )
+              .then((body) => body)
+              .catch((_) => false);
+            if (!result) {
+              return false;
+            }
+
+            return await this.afterUploadCallback(
+              result,
               courseId,
+              item,
+              type,
+              model,
+              adapter,
+              ChatbotResultEventName.ADD_AGGREGATE,
             );
-
-            return {
-              id: item.id,
-              success: true,
-              documentId: uploadResult.id,
-            } as LMSFileUploadResponse;
           } catch (error) {
             console.error(
               `Failed to upload LMS file ${f.name} to chatbot:`,
               error,
             );
-            return {
-              id: item.id,
-              success: false,
-            } as LMSFileUploadResponse;
+            return false;
           }
         } else {
           // Skip unsupported file types for now
-          return {
-            id: item.id,
-            success: false,
-          } as LMSFileUploadResponse;
+          return false;
         }
       }
       case LMSUpload.Quizzes: {
@@ -1162,10 +1032,7 @@ export class LMSIntegrationService {
         break;
       }
       default:
-        return {
-          id: item.id,
-          success: false,
-        } as LMSFileUploadResponse;
+        return false;
     }
 
     let textIsPrefix = false;
@@ -1176,10 +1043,7 @@ export class LMSIntegrationService {
     }
 
     if (!documentText) {
-      return {
-        id: item.id,
-        success: false,
-      };
+      return false;
     }
 
     const computedDocLink = adapter.getDocumentLink(item.id, type);
@@ -1197,7 +1061,7 @@ export class LMSIntegrationService {
       'chatbotDocumentId' in item && item.chatbotDocumentId != undefined;
 
     if (isUpdate) {
-      return await this.chatbotApiService
+      const result: string | false = await this.chatbotApiService
         .updateDocument(item.chatbotDocumentId, courseId, {
           documentText,
           title: docName,
@@ -1205,22 +1069,26 @@ export class LMSIntegrationService {
           lmsDocumentId: String(item.id),
           prefix,
         })
-        .then((): LMSFileUploadResponse => {
-          return {
-            id: item.id,
-            success: true,
-            documentId: item.chatbotDocumentId,
-          };
-        })
-        .catch((error): LMSFileUploadResponse => {
+        .then((body): string => body)
+        .catch((error): false => {
           console.error(error);
-          return {
-            id: item.id,
-            success: false,
-          } as LMSFileUploadResponse;
+          return false;
         });
+      if (!result) {
+        return false;
+      }
+
+      return await this.afterUploadCallback(
+        result,
+        courseId,
+        item,
+        type,
+        model,
+        adapter,
+        ChatbotResultEventName.UPDATE_AGGREGATE,
+      );
     } else {
-      return await this.chatbotApiService
+      const result: string | false = await this.chatbotApiService
         .addDocument(courseId, {
           documentText,
           title: docName,
@@ -1228,21 +1096,92 @@ export class LMSIntegrationService {
           lmsDocumentId: String(item.id),
           prefix,
         })
-        .then((body): LMSFileUploadResponse => {
-          return {
-            id: item.id,
-            success: true,
-            documentId: body.id,
-          };
+        .then((body): string => {
+          return body;
         })
-        .catch((error): LMSFileUploadResponse => {
+        .catch((error): false => {
           console.error(error);
-          return {
-            id: item.id,
-            success: false,
-          } as LMSFileUploadResponse;
+          return false;
         });
+      return await this.afterUploadCallback(
+        result,
+        courseId,
+        item,
+        type,
+        model,
+        adapter,
+        ChatbotResultEventName.ADD_AGGREGATE,
+      );
+    }
+  }
+
+  private async afterUploadCallback(
+    result: string | false,
+    courseId: number,
+    item:
+      | LMSAnnouncement
+      | LMSAssignment
+      | LMSAssignmentModel
+      | LMSAnnouncementModel
+      | LMSPage
+      | LMSPageModel
+      | LMSFile
+      | LMSFileModel
+      | LMSQuiz
+      | LMSQuizModel,
+    type: LMSUpload,
+    model: typeof LMSAnnouncementModel,
+    adapter: AbstractLMSAdapter,
+    eventType: ChatbotResultEventName,
+  ): Promise<string | false> {
+    if (!result) {
+      return false;
     }
+
+    let uploadId = '';
+    uploadId = await this.chatbotResultWebSocket.getUniqueId();
+
+    this.socket.registerListener(
+      {
+        event: ChatbotResultEvents.POST_RESULT,
+        callback: async (data: ChatbotDocumentAggregateResponse | Error) => {
+          if (data instanceof Error) {
+            this.socket.emit(ChatbotResultEvents.POST_RESULT, {
+              uploadId,
+              type: eventType,
+              resultBody: {
+                success: false,
+                id: item?.id,
+              } as LMSFileUploadResponse,
+            });
+            return;
+          }
+          const document = await this.uploadCallback(
+            courseId,
+            item,
+            type,
+            data.id,
+            adapter,
+            model,
+          );
+          this.socket.emit(ChatbotResultEvents.POST_RESULT, {
+            uploadId,
+            type: eventType,
+            resultBody: {
+              success: !!document,
+              id: document?.id,
+              documentId: document.chatbotDocumentId,
+            } as LMSFileUploadResponse,
+          });
+        },
+      },
+      {
+        event: ChatbotResultEvents.GET_RESULT,
+        args: { result, type: eventType },
+      },
+    );
+
+    return uploadId;
   }
 
   private async deleteDocument(
@@ -1285,6 +1224,171 @@ export class LMSIntegrationService {
       });
   }
 
+  private createCallbacks = {
+    [LMSUpload.Announcements]: async (
+      item: LMSAnnouncement | LMSAnnouncementModel,
+      model: typeof LMSAnnouncementModel,
+      adapter: AbstractLMSAdapter,
+      courseId: number,
+      chatbotDocumentId?: string,
+    ) => {
+      const ann = item as LMSAnnouncement;
+      return (await model
+        .create({
+          id: ann.id,
+          title: ann.title,
+          message: ann.message ?? '',
+          posted: ann.posted,
+          chatbotDocumentId,
+          uploaded: new Date(),
+          syncEnabled: true,
+          modified:
+            ann.modified != undefined ? new Date(ann.modified) : new Date(),
+          courseId: courseId,
+          lmsSource: adapter.getPlatform(),
+        })
+        .save()) as LMSAnnouncementModel;
+    },
+    [LMSUpload.Assignments]: async (
+      item: LMSAssignment | LMSAssignmentModel,
+      model: typeof LMSAssignmentModel,
+      adapter: AbstractLMSAdapter,
+      courseId: number,
+      chatbotDocumentId?: string,
+    ) => {
+      const asg = item as LMSAssignment;
+      return (await model
+        .create({
+          id: asg.id,
+          name: asg.name,
+          description: asg.description ?? '',
+          due: asg.due,
+          chatbotDocumentId,
+          uploaded: new Date(),
+          courseId: courseId,
+          syncEnabled: true,
+          modified:
+            asg.modified != undefined ? new Date(asg.modified) : new Date(),
+          lmsSource: adapter.getPlatform(),
+        })
+        .save()) as LMSAssignmentModel;
+    },
+    [LMSUpload.Pages]: async (
+      item: LMSPage | LMSPageModel,
+      model: typeof LMSPageModel,
+      adapter: AbstractLMSAdapter,
+      courseId: number,
+      chatbotDocumentId?: string,
+    ) => {
+      const page = item as LMSPage;
+      return (await model
+        .create({
+          id: page.id,
+          title: page.title,
+          body: page.body,
+          url: page.url,
+          frontPage: page.frontPage,
+          chatbotDocumentId: chatbotDocumentId,
+          uploaded: new Date(),
+          courseId: courseId,
+          syncEnabled: true,
+          modified:
+            page.modified != undefined ? new Date(page.modified) : new Date(),
+          lmsSource: adapter.getPlatform(),
+        })
+        .save()) as LMSPageModel;
+    },
+    [LMSUpload.Files]: async (
+      item: LMSFile | LMSFileModel,
+      model: typeof LMSFileModel,
+      adapter: AbstractLMSAdapter,
+      courseId: number,
+      chatbotDocumentId?: string,
+    ) => {
+      const file = item as LMSFile;
+      return (await model
+        .create({
+          id: file.id,
+          name: file.name,
+          url: file.url,
+          contentType: file.contentType,
+          size: file.size,
+          chatbotDocumentId: chatbotDocumentId,
+          uploaded: new Date(),
+          courseId: courseId,
+          syncEnabled: true,
+          modified:
+            file.modified != undefined ? new Date(file.modified) : new Date(),
+          lmsSource: adapter.getPlatform(),
+        })
+        .save()) as LMSFileModel;
+    },
+    [LMSUpload.Quizzes]: async (
+      item: LMSQuiz | LMSQuizModel,
+      model: typeof LMSQuizModel,
+      adapter: AbstractLMSAdapter,
+      courseId: number,
+      chatbotDocumentId?: string,
+    ) => {
+      const quiz = item as LMSQuiz;
+      return (await model
+        .create({
+          id: quiz.id,
+          title: quiz.title,
+          description: quiz.description,
+          due: quiz.due,
+          unlock: quiz.unlock,
+          lock: quiz.lock,
+          timeLimit: quiz.timeLimit,
+          allowedAttempts: quiz.allowedAttempts,
+          questions: quiz.questions,
+          accessLevel: LMSQuizAccessLevel.LOGISTICS_ONLY, // Default access level
+          chatbotDocumentId: chatbotDocumentId,
+          uploaded: new Date(),
+          syncEnabled: true,
+          courseId: courseId,
+          modified:
+            quiz.modified != undefined ? new Date(quiz.modified) : new Date(),
+          lmsSource: adapter.getPlatform(),
+        })
+        .save()) as LMSQuizModel;
+    },
+  };
+
+  private async uploadCallback(
+    courseId: number,
+    item:
+      | LMSAnnouncement
+      | LMSAssignment
+      | LMSAssignmentModel
+      | LMSAnnouncementModel
+      | LMSPage
+      | LMSPageModel
+      | LMSFile
+      | LMSFileModel
+      | LMSQuiz
+      | LMSQuizModel,
+    type: LMSUpload,
+    chatbotDocumentId: string,
+    adapter: AbstractLMSAdapter,
+    model: any,
+  ): Promise<any> {
+    chatbotDocumentId ??=
+      'chatbotDocumentId' in item && item.chatbotDocumentId != undefined
+        ? item.chatbotDocumentId
+        : chatbotDocumentId;
+
+    if (this.createCallbacks[type]) {
+      return await this.createCallbacks[type](
+        item as any,
+        model as any,
+        adapter,
+        courseId,
+        chatbotDocumentId,
+      );
+    }
+  }
+
   getPartialOrgLmsIntegration(
     lmsIntegration: LMSOrganizationIntegrationModel,
   ): LMSOrganizationIntegrationPartial {
diff --git a/packages/server/src/websocket/clientSocket.ts b/packages/server/src/websocket/clientSocket.ts
new file mode 100644
index 000000000..91108c8a5
--- /dev/null
+++ b/packages/server/src/websocket/clientSocket.ts
@@ -0,0 +1,54 @@
+import { DefaultEventsMap, Socket } from 'socket.io';
+
+export class ClientSocket {
+  constructor(private socket: Socket<DefaultEventsMap, DefaultEventsMap>) {}
+
+  private activeListeners: {
+    [key: string]: ((data: any) => void | Promise<void>)[];
+  } = {};
+
+  registerListener<TData>(
+    listener: {
+      event: string;
+      callback: (data: TData) => void | Promise<void>;
+    },
+    subscription?: { event: string; args: object },
+  ) {
+    if (!this.activeListeners[listener.event]) {
+      this.activeListeners[listener.event] = [];
+    }
+    const listen = async (data: TData) => {
+      try {
+        await listener.callback(data);
+      } finally {
+        this.cleanupListener(
+          listener,
+          this.activeListeners[listener.event].find((l) => l == listen),
+          subscription,
+        );
+      }
+    };
+    this.activeListeners[listener.event].push(listen);
+    this.socket.on(listener.event, listen);
+    if (subscription) {
+      this.socket.emit(subscription.event, subscription.args);
+    }
+  }
+
+  cleanupListener(
+    listener: { event: string },
+    listenerFunction: (data: any) => any,
+    subscription?: { event: string; args: object },
+  ): void {
+    if (subscription) {
+      this.socket.emit(subscription.event + '/unsubscribe', subscription.args);
+    }
+    if (listener) {
+      this.socket.off(listener.event, listenerFunction);
+    }
+  }
+
+  emit(event: string, args?: any): any {
+    return this.socket.emit(event, args);
+  }
+}
diff --git a/packages/server/src/websocket/websocket.event.ts b/packages/server/src/websocket/websocket.event.ts
new file mode 100644
index 000000000..902b0b651
--- /dev/null
+++ b/packages/server/src/websocket/websocket.event.ts
@@ -0,0 +1,83 @@
+import { Server } from 'socket.io';
+
+export class WebSocketSubscriber<TParams extends object = object> {
+  constructor(
+    public socketId: string,
+    public params: TParams,
+  ) {}
+
+  checkMatch(params: Partial<TParams>): boolean {
+    for (const k in this.params) {
+      if (!(k in params) || this.params[k] !== params[k]) {
+        return false;
+      }
+    }
+    return true;
+  }
+}
+
+export class WebSocketEvent<TParams extends object = object, TData = any> {
+  private subscribers: WebSocketSubscriber[] = [];
+
+  constructor(
+    private server: Server,
+    private postEvent: string,
+  ) {}
+
+  subscribe(clientId: string, params: TParams) {
+    const existsIndex = this.subscribers.findIndex(
+      (s) => s.socketId === clientId,
+    );
+    if (existsIndex >= 0) {
+      this.subscribers[existsIndex].params = params;
+      return;
+    }
+    this.subscribers = [
+      ...this.subscribers,
+      new WebSocketSubscriber(clientId, params),
+    ];
+  }
+
+  unsubscribe(clientId: string, params?: Partial<TParams>) {
+    this.subscribers = this.subscribers.filter((subscriber) => {
+      const isNotSub = subscriber.socketId !== clientId;
+      if (isNotSub) {
+        return isNotSub;
+      }
+      if (!subscriber.params || !params || Object.keys(params).length === 0) {
+        return false;
+      }
+      let matchParams = true;
+      for (const k in params) {
+        if ((subscriber.params as any)[k] !== params[k]) {
+          matchParams = false;
+          break;
+        }
+      }
+      return !matchParams;
+    });
+  }
+
+  filterSubscribers(include: string[]) {
+    this.subscribers = this.subscribers.filter((subscriber) =>
+      include.includes(subscriber.socketId),
+    );
+  }
+
+  getSubscribers(): WebSocketSubscriber[] {
+    return this.subscribers;
+  }
+
+  post(params: Partial<TParams>, data: TData) {
+    this.server.sockets.fetchSockets().then((sockets) => {
+      sockets.forEach((socket) => {
+        const subscriber = this.subscribers.find(
+          (s) => s.socketId === socket.id,
+        );
+        const match = subscriber.checkMatch(params);
+        if (!match) return;
+        socket.emit(this.postEvent, data);
+      });
+    });
+  }
+}
diff --git a/packages/server/src/websocket/websocket.exception.ts b/packages/server/src/websocket/websocket.exception.ts
new file mode 100644
index 000000000..e4f6a5b6e
--- /dev/null
+++ b/packages/server/src/websocket/websocket.exception.ts
@@ -0,0 +1,35 @@
+import { WsException } from '@nestjs/websockets';
+import { HttpStatus } from '@nestjs/common';
+
+export class WebSocketException extends WsException {
+  constructor(status: HttpStatus, message?: string) {
+    super({
+      status,
+      message: message ?? HttpStatus[status] ?? 'Unknown Error',
+    });
+  }
+}
+
+export class WsUnauthorizedException extends WebSocketException {
+  constructor(message?: string) {
+    super(HttpStatus.UNAUTHORIZED, message);
+  }
+}
+
+export class WsForbiddenException extends WebSocketException {
+  constructor(message?: string) {
+    super(HttpStatus.FORBIDDEN, message);
+  }
+}
+
+export class WsBadRequestException extends WebSocketException {
+  constructor(message?: string) {
+    super(HttpStatus.BAD_REQUEST, message);
+  }
+}
+
+export class WsNotFoundException extends WebSocketException {
+  constructor(message?: string) {
+    super(HttpStatus.NOT_FOUND, message);
+  }
+}
diff --git a/packages/server/src/websocket/websocket.template.ts b/packages/server/src/websocket/websocket.template.ts
new file mode 100644
index 000000000..3e2abeb93
--- /dev/null
+++ b/packages/server/src/websocket/websocket.template.ts
@@ -0,0 +1,61 @@
+import { Inject, Injectable } from '@nestjs/common';
+import {
+  OnGatewayDisconnect,
+  OnGatewayInit,
+  WebSocketGateway,
+  WebSocketServer,
+} from '@nestjs/websockets';
+import { Server, Socket } from 'socket.io';
+import { WebSocketEvent } from 'websocket/websocket.event';
+import { Cron, CronExpression } from '@nestjs/schedule';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { Cache } from 'cache-manager';
+import crypto from 'crypto';
+
+@Injectable()
+@WebSocketGateway({
+  cors: {
+    origin: '*',
+  },
+})
+export class WebSocketTemplate implements OnGatewayInit, OnGatewayDisconnect {
+  constructor(
+    @Inject(CACHE_MANAGER)
+    protected cacheManager: Cache,
+  ) {}
+
+  @WebSocketServer()
+  protected server: Server;
+  protected events: { [key: string]: WebSocketEvent } = {};
+
+  @Cron(CronExpression.EVERY_30_MINUTES, { name: 'CLEAR_SUBSCRIBERS' })
+  async removeHangingSubscribers() {
+    const ids = await this.server
+      .fetchSockets()
+      .then((sockets) =>
+        sockets.map((s) => s.id).reduce((p, c) => [...p, c], []),
+      );
+    for (const event of Object.values(this.events)) {
+      event.filterSubscribers(ids);
+    }
+  }
+
+  afterInit(server: Server): any {
+    this.server = server;
+  }
+
+  handleDisconnect(client: Socket): any {
+    for (const event of Object.values(this.events)) {
+      event.unsubscribe(client.id);
+    }
+  }
+
+  async getUniqueId(): Promise<string> {
+    let id: string | undefined = undefined;
+    do {
+      id = crypto.randomBytes(32).toString('hex');
+    } while (await this.cacheManager.get(id));
+    await this.cacheManager.set(id, true, 30 * 60 * 1000); // persist for 30 min
+    return id;
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index ee1705444..904bc9e4d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2209,6 +2209,15 @@
   resolved "https://registry.yarnpkg.com/@nestjs/typeorm/-/typeorm-11.0.0.tgz#b0f45d6902396db89e0ac1f4e738c2ff3407b794"
   integrity sha512-SOeUQl70Lb2OfhGkvnh4KXWlsd+zA08RuuQgT7kKbzivngxzSo1Oc7Usu5VxCxACQC9wc2l9esOHILSJeK7rJA==
 
+"@nestjs/websockets@^11.1.11":
+  version "11.1.11"
+  resolved "https://registry.yarnpkg.com/@nestjs/websockets/-/websockets-11.1.11.tgz#9a239b766d0ab34c91a22f09f8594ec44a38217c"
+  integrity sha512-apuP7C/gtMBIYNgA8IWt75GTZeWya5JQCnrLZFcOu+IZt00j9Xd/Bm7hbj/Qr/JVoM/7q6c/4p4oOZtBGx4aeA==
+  dependencies:
+    iterare "1.2.1"
+    object-hash "3.0.0"
+    tslib "2.8.1"
+
 "@next/env@15.5.7":
   version "15.5.7"
   resolved "https://registry.yarnpkg.com/@next/env/-/env-15.5.7.tgz#4168db34ae3bc9fd9ad3b951d327f4cfc38d4362"
@@ -3479,6 +3488,11 @@
   dependencies:
     "@sinonjs/commons" "^3.0.1"
 
+"@socket.io/component-emitter@~3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2"
+  integrity sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==
+
 "@sqltools/formatter@^1.2.5":
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/@sqltools/formatter/-/formatter-1.2.5.tgz#3abc203c79b8c3e90fd6c156a0c62d5403520e12"
@@ -3605,6 +3619,13 @@
   resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.5.tgz#14a3e83fa641beb169a2dd8422d91c3c345a9a78"
   integrity sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==
 
+"@types/cors@^2.8.12":
+  version "2.8.19"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.19.tgz#d93ea2673fd8c9f697367f5eeefc2bbfa94f0342"
+  integrity sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/d3-array@3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.0.3.tgz#87d990bf504d14ad6b16766979d04e943c046dac"
@@ -3955,6 +3976,13 @@
   dependencies:
     undici-types "~7.10.0"
 
+"@types/node@>=10.0.0":
+  version "25.0.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-25.0.3.tgz#79b9ac8318f373fbfaaf6e2784893efa9701f269"
+  integrity sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==
+  dependencies:
+    undici-types "~7.16.0"
+
 "@types/node@^18.11.18":
   version "18.19.122"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.122.tgz#e7358f8df7cc3f14e860198e1ca4dc2ed9a7de06"
@@ -4712,7 +4740,7 @@ accepts@^2.0.0:
     mime-types "^3.0.0"
     negotiator "^1.0.0"
 
-accepts@~1.3.8:
+accepts@~1.3.4, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -5194,15 +5222,6 @@ axios@^1.11.0, axios@^1.7.9:
     form-data "^4.0.4"
     proxy-from-env "^1.1.0"
 
-axios@^1.12.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.2.tgz#9ada120b7b5ab24509553ec3e40123521117f687"
-  integrity sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==
-  dependencies:
-    follow-redirects "^1.15.6"
-    form-data "^4.0.4"
-    proxy-from-env "^1.1.0"
-
 axobject-query@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
@@ -5321,6 +5340,11 @@ base64-js@^1.3.0, base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+base64id@2.0.0, base64id@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+
 basic-auth@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
@@ -6107,7 +6131,7 @@ cookie-signature@^1.2.1:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.2.2.tgz#57c7fc3cc293acab9fec54d73e15690ebe4a1793"
   integrity sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==
 
-cookie@0.7.2, cookie@^0.7.1, cookie@~0.7.1:
+cookie@0.7.2, cookie@^0.7.1, cookie@~0.7.1, cookie@~0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
   integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
@@ -6136,7 +6160,7 @@ core-util-is@^1.0.3, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cors@2.8.5, cors@^2.8.5:
+cors@2.8.5, cors@^2.8.5, cors@~2.8.5:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
   integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
@@ -6435,6 +6459,13 @@ debug@~4.3.1:
   dependencies:
     ms "^2.1.3"
 
+debug@~4.4.1:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
+  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
+  dependencies:
+    ms "^2.1.3"
+
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -6746,6 +6777,37 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+engine.io-client@~6.6.1:
+  version "6.6.4"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.6.4.tgz#a04998787dd342b543eec5d4452da7bb540e7ff8"
+  integrity sha512-+kjUJnZGwzewFDw951CDWcwj35vMNf2fcj7xQWOctq1F2i1jkDdVvdFG9kM/BEChymCH36KgjnW0NsL58JYRxw==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.4.1"
+    engine.io-parser "~5.2.1"
+    ws "~8.18.3"
+    xmlhttprequest-ssl "~2.1.1"
+
+engine.io-parser@~5.2.1:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f"
+  integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==
+
+engine.io@~6.6.0:
+  version "6.6.5"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.6.5.tgz#a009522f5d5628109781b46722014349859269d2"
+  integrity sha512-2RZdgEbXmp5+dVbRm0P7HQUImZpICccJy7rN7Tv+SFa55pH+lxnuw6/K1ZxxBfHoYpSkHLAO92oa8O4SwFXA2A==
+  dependencies:
+    "@types/cors" "^2.8.12"
+    "@types/node" ">=10.0.0"
+    accepts "~1.3.4"
+    base64id "2.0.0"
+    cookie "~0.7.2"
+    cors "~2.8.5"
+    debug "~4.4.1"
+    engine.io-parser "~5.2.1"
+    ws "~8.18.3"
+
 enhanced-resolve@^5.0.0, enhanced-resolve@^5.17.1, enhanced-resolve@^5.7.0:
   version "5.18.3"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"
@@ -10077,7 +10139,6 @@ lru-cache@^7.14.1:
   version "0.1.0"
   resolved "https://codeload.github.com/bhunt02/lti-typescript/tar.gz/c450a985b74fcf4c0069543402cae6b3961082e9"
   dependencies:
-    axios "^1.12.2"
     body-parser "^1.20.2"
     cookie-parser "^1.4.7"
     cors "^2.8.5"
@@ -11104,7 +11165,7 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-hash@^3.0.0:
+object-hash@3.0.0, object-hash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
@@ -13643,6 +13704,45 @@ smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
+socket.io-adapter@~2.5.2:
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.6.tgz#c697f609d36a676a46749782274607d8df52c1d8"
+  integrity sha512-DkkO/dz7MGln0dHn5bmN3pPy+JmywNICWrJqVWiVOyvXjWQFIv9c2h24JrQLLFJ2aQVQf/Cvl1vblnd4r2apLQ==
+  dependencies:
+    debug "~4.4.1"
+    ws "~8.18.3"
+
+socket.io-client@^4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.8.3.tgz#62717edd46a318c918125b57e92dc7f8bb71c34c"
+  integrity sha512-uP0bpjWrjQmUt5DTHq9RuoCBdFJF10cdX9X+a368j/Ft0wmaVgxlrjvK3kjvgCODOMMOz9lcaRzxmso0bTWZ/g==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.4.1"
+    engine.io-client "~6.6.1"
+    socket.io-parser "~4.2.4"
+
+socket.io-parser@~4.2.4:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.5.tgz#3f41b8d369129a93268f2abecba94b5292850099"
+  integrity sha512-bPMmpy/5WWKHea5Y/jYAP6k74A+hvmRCQaJuJB6I/ML5JZq/KfNieUVo/3Mh7SAqn7TyFdIo6wqYHInG1MU1bQ==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.4.1"
+
+socket.io@^4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.3.tgz#ca6ba1431c69532e1e0a6f496deebeb601dbc4df"
+  integrity sha512-2Dd78bqzzjE6KPkD5fHZmDAKRNe3J15q+YHDrIsy9WEkqttc7GY+kT9OBLSMaPbQaEd0x1BjcmtMtXkfpc+T5A==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "~2.0.0"
+    cors "~2.8.5"
+    debug "~4.4.1"
+    engine.io "~6.6.0"
+    socket.io-adapter "~2.5.2"
+    socket.io-parser "~4.2.4"
+
 socks-proxy-agent@^8.0.2, socks-proxy-agent@^8.0.5:
   version "8.0.5"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz#b9cdb4e7e998509d7659d689ce7697ac21645bee"
@@ -14724,6 +14824,11 @@ undici-types@~7.10.0:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.10.0.tgz#4ac2e058ce56b462b056e629cc6a02393d3ff350"
   integrity sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==
 
+undici-types@~7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
+  integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
+
 undici@^7.12.0:
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/undici/-/undici-7.13.0.tgz#9331f99fc42970dcbdf54199e6604755ba54433a"
@@ -15326,7 +15431,7 @@ ws@^7.0.0, ws@~7.5.10:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
-ws@^8.18.0:
+ws@^8.18.0, ws@~8.18.3:
   version "8.18.3"
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
   integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
@@ -15376,6 +15481,11 @@ xmlchars@^2.2.0:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
+xmlhttprequest-ssl@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz#e9e8023b3f29ef34b97a859f584c5e6c61418e23"
+  integrity sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==
+
 xpath@0.0.32:
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af"

From 90aff5d61e2628ec0fce7ff52c86fc8506daec5d Mon Sep 17 00:00:00 2001
From: bhunt02 <bridgette.hunt02@outlook.com>
Date: Mon, 5 Jan 2026 15:13:48 -0800
Subject: [PATCH 4/8] beefy commit; bulk of work done for subscribers,
 verification of their functionality (and verifying the frontend works with
 the new impl) added 'delete all queries' and further worked on new doc chunk
 list interface next: fix aggregate uploads & test them

---
 package.json                                  |    3 +-
 packages/common/chatbot-api-types.ts          |   26 +
 packages/common/index.ts                      |    2 +
 packages/frontend/.gitignore                  |    1 +
 .../components/DocumentChunkRow.tsx           |  390 +-
 .../settings/chatbot_knowledge_base/page.tsx  |  331 +-
 .../components/AddChatbotDocumentModal.tsx    |  289 +-
 .../settings/chatbot_settings/page.tsx        |  151 +-
 .../admin/components/SidebarNavigation.tsx    |    8 +-
 packages/frontend/app/admin/debug/page.tsx    |  137 +
 packages/frontend/app/api/index.ts            |   28 +-
 .../app/contexts/WebSocketContext.tsx         |  292 +
 .../frontend/app/hooks/useSharedWorker.ts     |   16 +
 packages/frontend/app/layout.tsx              |    3 +-
 .../frontend/app/utils/webSocketEventUtils.ts |   17 +
 packages/frontend/app/utils/workerUtils.ts    |   28 +
 packages/frontend/eslint.config.js            |    1 +
 packages/frontend/middleware.ts               |    4 +-
 packages/frontend/next.config.mjs             |   14 +-
 packages/frontend/package.json                |    8 +-
 packages/frontend/tsconfig.json               |    8 +-
 packages/frontend/tsconfig.workers.json       |   15 +
 .../frontend/webworkers/client_websocket.ts   |  399 ++
 packages/server/package.json                  |    2 +
 packages/server/src/app.module.ts             |    2 +
 packages/server/src/auth/auth.module.ts       |    4 +-
 .../server/src/chatbot/chatbot-api.service.ts |   50 +-
 .../server/src/chatbot/chatbot.controller.ts  |   30 +-
 packages/server/src/chatbot/chatbot.module.ts |   39 +-
 packages/server/src/course/course.module.ts   |    6 +-
 .../generic-ws-exception.filter.ts            |   83 +
 ...t-api-key.guard.ts => ws-api-key.guard.ts} |   10 +-
 .../src/guards/websocket/ws-general.guard.ts  |   59 +
 .../src/guards/websocket/ws-jwt-auth.guard.ts |   34 +-
 .../lmsIntegration/lmsIntegration.module.ts   |    8 +-
 .../lmsIntegration/lmsIntegration.service.ts  |   31 +-
 packages/server/src/login/login.module.ts     |   11 +-
 packages/server/src/lti/lti.controller.ts     |    2 +
 packages/server/src/lti/lti.middleware.ts     |    2 +
 .../src/organization/organization.module.ts   |   10 +-
 ...ientSocket.ts => client-socket.service.ts} |   18 +-
 .../server/src/websocket/websocket.event.ts   |   56 +-
 .../server/src/websocket/websocket.gateway.ts |  127 +
 .../server/src/websocket/websocket.module.ts  |    8 +
 .../src/websocket/websocket.template.ts       |   61 -
 yarn.lock                                     | 4686 ++++++++++-------
 46 files changed, 5137 insertions(+), 2373 deletions(-)
 create mode 100644 packages/frontend/app/admin/debug/page.tsx
 create mode 100644 packages/frontend/app/contexts/WebSocketContext.tsx
 create mode 100644 packages/frontend/app/hooks/useSharedWorker.ts
 create mode 100644 packages/frontend/app/utils/webSocketEventUtils.ts
 create mode 100644 packages/frontend/app/utils/workerUtils.ts
 create mode 100644 packages/frontend/tsconfig.workers.json
 create mode 100644 packages/frontend/webworkers/client_websocket.ts
 create mode 100644 packages/server/src/exception_filters/generic-ws-exception.filter.ts
 rename packages/server/src/guards/websocket/{ws-chatbot-api-key.guard.ts => ws-api-key.guard.ts} (67%)
 create mode 100644 packages/server/src/guards/websocket/ws-general.guard.ts
 rename packages/server/src/websocket/{clientSocket.ts => client-socket.service.ts} (74%)
 create mode 100644 packages/server/src/websocket/websocket.gateway.ts
 create mode 100644 packages/server/src/websocket/websocket.module.ts
 delete mode 100644 packages/server/src/websocket/websocket.template.ts

diff --git a/package.json b/package.json
index 9b407235a..5732161f5 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,9 @@
 {
-  "name": "node-fullstack-websocket",
+  "name": "helpme-server",
   "version": "0.1.0",
   "private": true,
   "scripts": {
+    "preinstall": "yarn workspace @koh/server remove lti-typescript && yarn workspace @koh/server add github:bhunt02/lti-typescript#release",
     "postinstall": "rimraf node_modules/@types/react-native",
     "cli": "yarn workspace @koh/server cli",
     "tsc": "yarn workspaces run tsc",
diff --git a/packages/common/chatbot-api-types.ts b/packages/common/chatbot-api-types.ts
index d04b26dae..a2c13ac1c 100644
--- a/packages/common/chatbot-api-types.ts
+++ b/packages/common/chatbot-api-types.ts
@@ -723,3 +723,29 @@ export class UpsertDocumentQueryBody {
   @IsString()
   query!: string
 }
+
+/* WEBSOCKET EVENTS */
+
+export enum ChatbotResultEvents {
+  GET_RESULT = 'chatbot/get_result',
+  POST_RESULT = 'chatbot/post_result',
+  RESULT_RECEIVED = 'chatbot/received_result',
+}
+
+export enum ChatbotResultEventName {
+  ADD_AGGREGATE = 'add_aggregate_complete',
+  UPDATE_AGGREGATE = 'update_aggregate_complete',
+  ADD_CHUNK = 'add_chunk_complete',
+  UPDATE_CHUNK = 'update_chunk_complete',
+  DOCUMENT_QUERIES = 'query_generation_complete',
+}
+
+export type ChatbotResultEventArgs = {
+  returnMessage: ChatbotResultEvents
+  type: ChatbotResultEventName
+}
+
+export type ChatbotEventParams = {
+  type: ChatbotResultEventName
+  resultId: string
+}
diff --git a/packages/common/index.ts b/packages/common/index.ts
index 7980c5947..345c445bc 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -1952,6 +1952,7 @@ export type LMSFileUploadResponse = {
 export type LMSSyncDocumentsResult = {
   itemsSynced: number
   itemsRemoved: number
+  resultIds: string[]
   errors: number
 }
 
@@ -4206,6 +4207,7 @@ export const ERROR_MESSAGES = {
       userNotFound: 'User not found',
       disallowedPattern: 'Not authorized to use this route',
       missingAuthHeader: 'Authorization header missing',
+      missingAuthToken: 'Authorization token missing',
       malformedToken: 'Authorization token malformed',
       invalidToken: 'Authorization token invalid',
     },
diff --git a/packages/frontend/.gitignore b/packages/frontend/.gitignore
index 7c6929bcf..1cffbb2dd 100644
--- a/packages/frontend/.gitignore
+++ b/packages/frontend/.gitignore
@@ -15,6 +15,7 @@
 
 # production
 /build
+public/workers
 
 # misc
 .DS_Store
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow.tsx
index 71c7491f1..550d5a132 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow.tsx
@@ -6,14 +6,15 @@ import {
   DocumentTypeDisplayMap,
 } from '@koh/common'
 import {
-  Badge,
   Button,
   Checkbox,
   Col,
   Collapse,
+  Divider,
   Input,
   message,
   Modal,
+  Pagination,
   Row,
   Tooltip,
 } from 'antd'
@@ -26,10 +27,12 @@ import {
   CloseOutlined,
   DeleteOutlined,
   EditOutlined,
-  InfoCircleFilled,
+  InfoCircleOutlined,
   PlusOutlined,
+  WarningOutlined,
 } from '@ant-design/icons'
 import { SparklesIcon } from 'lucide-react'
+import { cn } from '@/app/utils/generalUtils'
 
 export type DocumentChunkRowProps = {
   documentChunk: ChatbotDocumentResponse
@@ -38,10 +41,11 @@ export type DocumentChunkRowProps = {
   onEditChunk: (record: ChatbotDocumentResponse) => void
   onDeleteChunk: (documentId: string) => void
 
-  generateQueries: (documentId: string, deleteOld: boolean) => Promise<boolean>
+  generateQueries: (documentId: string, deleteOld: boolean) => Promise<void>
   onCreateQuery: (documentId: string, content: string) => Promise<boolean>
   onEditQuery: (queryId: string, content: string) => Promise<boolean>
-  onDeleteQuery: (queryId: string) => Promise<boolean>
+  onDeleteQuery: (queryId: string) => Promise<void>
+  onDeleteAllQueries: (documentId: string) => Promise<void>
 
   isLoading: boolean
 }
@@ -57,13 +61,19 @@ const DocumentChunkRow: React.FC<DocumentChunkRowProps> = ({
   onCreateQuery,
   onEditQuery,
   onDeleteQuery,
+  onDeleteAllQueries,
 }) => {
   const [editingQueries, setEditingQueries] = useState<
     { queryId: string; editingContent: string }[]
   >([])
+  const [creatingInput, setCreatingInput] = useState<string | undefined>()
   const [creatingQuery, setCreatingQuery] = useState(false)
   const [isSaving, setIsSaving] = useState(false)
   const [removeOld, setRemoveOld] = useState(false)
+  const [generateConfirmModalOpen, setGenerateConfirmModalOpen] =
+    useState(false)
+
+  const [page, setPage] = useState(1)
 
   useEffect(() => {
     const ids = documentChunk.queries.map((q) => q.id)
@@ -101,29 +111,6 @@ const DocumentChunkRow: React.FC<DocumentChunkRowProps> = ({
     setEditingQueries((prev) => prev.filter((p) => p.queryId != record.id))
   }
 
-  const toggleCreateQuery = () => {
-    setCreatingQuery(true)
-  }
-
-  const cancelCreateQuery = () => {
-    setCreatingQuery(false)
-  }
-
-  const submitCreateQuery = (text: string) => {
-    if (!text) {
-      message.warning('Document query cannot be empty!')
-      return
-    }
-    setIsSaving(true)
-    onCreateQuery(documentChunk.id, text)
-      .then((success) => {
-        if (success) {
-          setCreatingQuery(false)
-        }
-      })
-      .finally(() => setIsSaving(false))
-  }
-
   const submitEditQuery = (queryId: string) => {
     const entry = editingQueries.find((eq) => eq.queryId == queryId)
     if (!entry) {
@@ -216,14 +203,19 @@ const DocumentChunkRow: React.FC<DocumentChunkRowProps> = ({
         <Col span={1} className={gridCell}>
           <span>{documentChunk.pageNumber ?? ''}</span>
         </Col>
-        <Col span={2} className={gridCell}>
-          <Badge
-            count={
-              DocumentTypeDisplayMap[documentChunk.type] ??
-              (DocumentType as any)[documentChunk.type]
-            }
-            color={DocumentTypeColorMap[documentChunk.type] ?? '#7C7C7C'}
-          />
+        <Col span={2} className={cn(gridCell, 'p-3')}>
+          <div
+            className={cn(
+              'mx-1 flex h-fit items-center justify-center gap-1 rounded-lg px-1 py-0.5 text-center text-xs text-white',
+            )}
+            style={{
+              backgroundColor:
+                DocumentTypeColorMap[documentChunk.type] ?? '#7c7c7c',
+            }}
+          >
+            {DocumentTypeDisplayMap[documentChunk.type] ??
+              (DocumentType as any)[documentChunk.type]}
+          </div>
         </Col>
         <Col span={2} className={gridCell}>
           <div className={'flex flex-col gap-1'}>
@@ -260,6 +252,101 @@ const DocumentChunkRow: React.FC<DocumentChunkRowProps> = ({
           </div>
         </Col>
       </Row>
+      <Modal
+        title={'Create New Document Query'}
+        open={creatingQuery}
+        onCancel={() => setCreatingQuery(false)}
+        okButtonProps={{
+          loading: isSaving,
+        }}
+        onOk={() => {
+          if (!documentChunk.id) {
+            setCreatingQuery(false)
+            return
+          }
+          if (!creatingInput) {
+            message.warning('Cannot create an empty query!')
+            return
+          }
+          setIsSaving(true)
+          onCreateQuery(documentChunk.id, creatingInput)
+            .then(() => {
+              setCreatingQuery(false)
+              setCreatingInput(undefined)
+            })
+            .finally(() => setIsSaving(false))
+        }}
+        okText={'Create'}
+      >
+        <div className={'flex flex-col gap-2'}>
+          <p>
+            Document queries are used to improve the retrieval stage of the RAG
+            algorithm, by closer matching to the potential questions asked by
+            users.
+          </p>
+          <Input
+            placeholder={'A question about this document chunk?'}
+            value={creatingInput}
+            onInput={(evt) => setCreatingInput(evt.currentTarget?.value)}
+          />
+        </div>
+      </Modal>
+      <Modal
+        title={'Generate Queries'}
+        open={generateConfirmModalOpen}
+        onCancel={() => setGenerateConfirmModalOpen(false)}
+        footer={
+          <div className={'flex justify-end gap-2'}>
+            <Button onClick={() => setGenerateConfirmModalOpen(false)}>
+              Cancel
+            </Button>
+            <Button
+              variant={'solid'}
+              color={'purple'}
+              onClick={() => {
+                setGenerateConfirmModalOpen(false)
+                if (!documentChunk.id) {
+                  return
+                }
+                setIsSaving(true)
+                generateQueries(documentChunk.id, removeOld).finally(() =>
+                  setIsSaving(false),
+                )
+              }}
+            >
+              Generate Queries
+            </Button>
+          </div>
+        }
+      >
+        <div className={'flex flex-col justify-start gap-1'}>
+          <p>
+            This will generate a series of document queries that will match this
+            chunk, based on it and its surrounding chunks in the document.
+          </p>
+          <p>
+            Document queries are used to improve the retrieval stage of the RAG
+            algorithm, by closer matching to the potential questions asked by
+            users.
+          </p>
+          <p>You have the option to remove previously generated queries:</p>
+          <Checkbox
+            className={'self-center'}
+            onClick={() => setRemoveOld(!removeOld)}
+            checked={removeOld}
+          >
+            Remove Existing Queries
+          </Checkbox>
+          {removeOld && (
+            <span className={'flex gap-2 self-center text-yellow-300'}>
+              <WarningOutlined />
+              <span className={'text-yellow-500'}>
+                {documentChunk.queries.length} queries will be removed
+              </span>
+            </span>
+          )}
+        </div>
+      </Modal>
       {!documentChunk.questionId && !documentChunk.asyncQuestionId && (
         <Row wrap={false}>
           <Collapse
@@ -270,40 +357,89 @@ const DocumentChunkRow: React.FC<DocumentChunkRowProps> = ({
               {
                 key: 'document_queries',
                 label: (
-                  <Tooltip
-                    title={
-                      "Document queries are used to improve the retrieval algorithm when students ask questions in your course. These are synthetic (by default) questions, paired with the document chunk, that are checked for similarity with the student's own question."
-                    }
-                  >
-                    Document Queries <InfoCircleFilled />
-                  </Tooltip>
+                  <div className={'flex justify-between'}>
+                    <div>
+                      <Tooltip
+                        title={
+                          "Document queries are used to improve the retrieval algorithm when students ask questions in your course. These are synthetic (by default) questions, paired with the document chunk, that are checked for similarity with the student's own question."
+                        }
+                      >
+                        Document Queries{' '}
+                        {(documentChunk.queries?.length ?? []) > 0
+                          ? `(${documentChunk.queries.length})`
+                          : ''}{' '}
+                        <InfoCircleOutlined />
+                      </Tooltip>
+                    </div>
+                    <div className={'flex flex-row gap-2'}>
+                      <Button
+                        color={'purple'}
+                        variant={'solid'}
+                        icon={<SparklesIcon size={16} />}
+                        loading={isSaving}
+                        onClick={(evt) => {
+                          evt.stopPropagation()
+                          setGenerateConfirmModalOpen(true)
+                        }}
+                      >
+                        Generate
+                      </Button>
+                      <Button
+                        color={'primary'}
+                        variant={'solid'}
+                        icon={<PlusOutlined size={16} />}
+                        loading={isSaving}
+                        onClick={(evt) => {
+                          evt.stopPropagation()
+                          setCreatingQuery(true)
+                        }}
+                      >
+                        Create
+                      </Button>
+                      <Button
+                        danger={true}
+                        color={'red'}
+                        variant={'solid'}
+                        icon={<DeleteOutlined />}
+                        onClick={(evt) => {
+                          evt.stopPropagation()
+                          Modal.confirm({
+                            title:
+                              'Are you sure you want to delete all document queries for this chunk?',
+                            content: `${documentChunk.queries.length} queries will be deleted.\n\nThis action cannot be undone.`,
+                            okText: 'Yes',
+                            okType: 'danger',
+                            cancelText: 'No',
+                            onOk() {
+                              if (!documentChunk.id) {
+                                return
+                              }
+                              setIsSaving(true)
+                              onDeleteAllQueries(documentChunk.id).finally(() =>
+                                setIsSaving(false),
+                              )
+                            },
+                          })
+                        }}
+                      >
+                        Delete All
+                      </Button>
+                    </div>
+                  </div>
                 ),
                 children: (
                   <>
-                    <Row className={'justify-end text-gray-500'}>
-                      <div className={'flex items-center justify-center gap-2'}>
-                        <Button
-                          color={'purple'}
-                          variant={'solid'}
-                          icon={<SparklesIcon size={16} />}
-                          loading={isSaving}
-                          onClick={() => {
-                            setIsSaving(true)
-                            generateQueries(
-                              documentChunk.id,
-                              removeOld,
-                            ).finally(() => setIsSaving(false))
-                          }}
-                        >
-                          Generate Document Queries
-                        </Button>
-                        <Checkbox
-                          onClick={() => setRemoveOld(!removeOld)}
-                          checked={removeOld}
-                        >
-                          Remove Existing?
-                        </Checkbox>
-                      </div>
+                    <Row className={'flex justify-end'}>
+                      <Pagination
+                        style={{ float: 'right' }}
+                        total={documentChunk.queries.length}
+                        showSizeChanger={false}
+                        current={page}
+                        pageSize={10}
+                        onChange={(page) => {
+                          setPage(page)
+                        }}
+                      />
                     </Row>
                     <Row className={'text-gray-500'}>
                       <Col span={21} className="p-2">
@@ -313,33 +449,21 @@ const DocumentChunkRow: React.FC<DocumentChunkRowProps> = ({
                         Actions
                       </Col>
                     </Row>
-                    {documentChunk.queries.map((q, i) => (
-                      <DocumentQueryRow
-                        key={'query' + i}
-                        query={q}
-                        onEdit={toggleEditQuery}
-                        onDelete={submitDeleteQuery}
-                        onTextInput={onEditQueryInput}
-                        submitEdit={submitEditQuery}
-                        cancelEdit={cancelEditQuery}
-                        editingQueries={editingQueries}
-                        isSaving={isSaving}
-                        isAddRow={false}
-                        isAdding={false}
-                      />
-                    ))}
-                    <DocumentQueryRow
-                      query={{ id: '', query: '' } as any}
-                      isAddRow={true}
-                      isAdding={creatingQuery}
-                      cancelEdit={cancelCreateQuery}
-                      editingQueries={[]}
-                      isSaving={isSaving}
-                      onDelete={() => undefined}
-                      onEdit={toggleCreateQuery}
-                      onTextInput={() => undefined}
-                      submitEdit={submitCreateQuery}
-                    />
+                    {documentChunk.queries
+                      .slice((page - 1) * 10, page * 10)
+                      .map((q, i) => (
+                        <DocumentQueryRow
+                          key={'query' + i}
+                          query={q}
+                          onEdit={toggleEditQuery}
+                          onDelete={submitDeleteQuery}
+                          onTextInput={onEditQueryInput}
+                          submitEdit={submitEditQuery}
+                          cancelEdit={cancelEditQuery}
+                          editingQueries={editingQueries}
+                          isSaving={isSaving}
+                        />
+                      ))}
                   </>
                 ),
               },
@@ -363,8 +487,6 @@ export type DocumentQueryRowProps = {
   cancelEdit: (record: ChatbotDocumentQueryResponse) => void
 
   isSaving: boolean
-  isAddRow: boolean
-  isAdding: boolean
 }
 const DocumentQueryRow: React.FC<DocumentQueryRowProps> = ({
   query,
@@ -375,52 +497,43 @@ const DocumentQueryRow: React.FC<DocumentQueryRowProps> = ({
   submitEdit,
   cancelEdit,
   isSaving,
-  isAddRow,
-  isAdding,
 }) => {
-  const [input, setInput] = useState<string>()
   const editingRow = useMemo(
     () => editingQueries.find((eq) => eq.queryId == query.id),
     [query, editingQueries],
   )
 
-  useEffect(() => {
-    if (!isAdding) {
-      setInput(undefined)
-    }
-  }, [isAdding])
-
   return (
     <Row>
       <Col span={21} className="p-2">
         <div className={'flex items-center justify-center'}>
-          {editingRow || (isAddRow && isAdding) ? (
+          {editingRow ? (
             <Input
               type={'text'}
               onChange={(event) => {
                 const val = event?.currentTarget?.value ?? ''
-                isAddRow ? setInput(val) : onTextInput(query.id, val)
+                onTextInput(query.id, val)
               }}
             />
-          ) : isAddRow ? (
-            <span></span>
           ) : (
-            <span>query.query</span>
+            <span className={'flex w-full flex-col justify-center text-left'}>
+              {query.query}
+            </span>
           )}
         </div>
       </Col>
       <Col span={3} className="p-2">
         <div className={'flex flex-col gap-1'}>
-          {editingRow || (isAddRow && isAdding) ? (
+          {editingRow ? (
             <>
               <Button
-                onClick={() => submitEdit(isAddRow ? (input ?? '') : query.id)}
+                onClick={() => submitEdit(query.id)}
                 variant={'outlined'}
                 color={'blue'}
                 icon={<CheckOutlined />}
                 loading={isSaving}
               >
-                {isAddRow ? 'Submit' : 'Save Changes'}
+                {'Save Changes'}
               </Button>
               <Button
                 icon={<CloseOutlined />}
@@ -438,40 +551,39 @@ const DocumentQueryRow: React.FC<DocumentQueryRowProps> = ({
                 onClick={() => onEdit(query)}
                 variant={'outlined'}
                 color={'blue'}
-                icon={isAddRow ? <PlusOutlined /> : <EditOutlined />}
+                icon={<EditOutlined />}
                 loading={isSaving}
               >
-                {isAddRow ? 'Create' : 'Edit'}
+                {'Edit'}
+              </Button>
+              <Button
+                danger
+                icon={<DeleteOutlined />}
+                onClick={() =>
+                  Modal.confirm({
+                    title:
+                      'Are you sure you want to delete this document query?',
+                    content: 'This action cannot be undone.',
+                    okText: 'Yes',
+                    okType: 'danger',
+                    cancelText: 'No',
+                    onOk() {
+                      if (!query.id) {
+                        return
+                      }
+                      onDelete(query.id)
+                    },
+                  })
+                }
+                loading={isSaving}
+              >
+                Delete
               </Button>
-              {!isAddRow && (
-                <Button
-                  danger
-                  icon={<DeleteOutlined />}
-                  onClick={() =>
-                    Modal.confirm({
-                      title:
-                        'Are you sure you want to delete this document query?',
-                      content: 'This action cannot be undone.',
-                      okText: 'Yes',
-                      okType: 'danger',
-                      cancelText: 'No',
-                      onOk() {
-                        if (!query.id) {
-                          return
-                        }
-                        onDelete(query.id)
-                      },
-                    })
-                  }
-                  loading={isSaving}
-                >
-                  Delete
-                </Button>
-              )}
             </>
           )}
         </div>
       </Col>
+      <Divider />
     </Row>
   )
 }
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx
index 24ca19001..30ddff8ff 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/page.tsx
@@ -1,12 +1,21 @@
 'use client'
 
-import { ReactElement, use, useEffect, useMemo, useState } from 'react'
+import {
+  ReactElement,
+  use,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react'
 import { Button, Empty, Input, message, Pagination } from 'antd'
 import Link from 'next/link'
 import { getErrorMessage } from '@/app/utils/generalUtils'
 import {
   ChatbotDocumentQueryResponse,
   ChatbotDocumentResponse,
+  ChatbotResultEventName,
+  ChatbotResultEvents,
   CreateDocumentChunkBody,
   UpdateDocumentChunkBody,
 } from '@koh/common'
@@ -15,14 +24,28 @@ import ChatbotHelpTooltip from '../components/ChatbotHelpTooltip'
 import UpsertDocumentChunkModal from './components/UpsertDocumentChunkModal'
 import { getPaginatedChatbotDocuments } from '@/app/(dashboard)/course/[cid]/(settings)/settings/util'
 import DocumentChunkRow from '@/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_knowledge_base/components/DocumentChunkRow'
+import { useWebSocket } from '@/app/contexts/WebSocketContext'
 
 interface ChatbotDocumentsProps {
   params: Promise<{ cid: string }>
 }
 
+type BaseSocketExpected = {
+  params: { resultId: string; type: ChatbotResultEventName }
+}
+
+type DocumentReturn = {
+  data: ChatbotDocumentResponse[] | Error
+} & BaseSocketExpected
+type QueriesReturn = {
+  data: ChatbotDocumentQueryResponse[] | Error
+} & BaseSocketExpected
+
 export default function ChatbotDocuments(
   props: ChatbotDocumentsProps,
 ): ReactElement {
+  const webSocket = useWebSocket()
+
   const params = use(props.params)
   const courseId = Number(params.cid)
 
@@ -33,32 +56,165 @@ export default function ChatbotDocuments(
   const [search, setSearch] = useState('')
   const searchTerms = useMemo(() => search?.split(/\s/) ?? [], [search])
 
+  const [pendingQueryResults, setPendingQueryResults] = useState<
+    { resultId: string; documentId: string; deleteOld: boolean }[]
+  >([])
+  const [pendingUpdateResults, setPendingUpdateResults] = useState<
+    { resultId: string; documentId: string }[]
+  >([])
+
   const [editingChunk, setEditingChunk] = useState<ChatbotDocumentResponse>()
   const [operatingOn, setOperatingOn] = useState<string[]>([])
   const [upsertModalOpen, setUpsertModalOpen] = useState(false)
 
+  const documentQueriesListener = useCallback(
+    async (data: QueriesReturn) => {
+      if ('params' in data && 'resultId' in data.params) {
+        const { resultId } = data.params
+        const response = data.data
+
+        const match = pendingQueryResults.find((v) => v.resultId === resultId)
+        if (!match) {
+          return
+        }
+
+        if ('error' in response) {
+          // an error occurred and was transmitted down
+          message.error(
+            `Failed to generate document queries for document ${match.documentId}: ${response}`,
+          )
+        } else {
+          // success
+          const matchDoc = documents.find((d) => d.id === match.documentId)
+          setDocuments((prev) =>
+            prev.map((d) => {
+              if (d.id === match.documentId) {
+                const entry = {
+                  ...d,
+                  queries: match.deleteOld
+                    ? (response as any)
+                    : [...d.queries, ...(response as any)],
+                }
+                console.log(entry, d)
+                return entry
+              }
+              return d
+            }),
+          )
+          message.success(
+            `Successfully generated document queries for document${matchDoc ? ' ' + matchDoc.title + '.' : '.'}`,
+          )
+        }
+        setPendingQueryResults((prev) =>
+          prev.filter((v) => v.resultId !== resultId),
+        )
+      }
+    },
+    [documents, pendingQueryResults],
+  )
+
+  const chunkListener = useCallback(
+    async (data: DocumentReturn, isEdit: boolean) => {
+      if ('params' in data && 'resultId' in data.params) {
+        const { resultId } = data.params
+        const response = data.data
+
+        const match = pendingUpdateResults.find((v) => v.resultId === resultId)
+        if (!match && isEdit) {
+          return
+        }
+        const doc = documents.find((d) => d.id === match?.documentId)
+
+        if ('error' in response) {
+          // an error occurred and was transmitted down
+          message.error(
+            `Failed to ${isEdit ? 'update' : 'create'} document${doc ? ' ' + doc.title : ''}: ${response}`,
+          )
+        } else {
+          // success
+          const docs = response as ChatbotDocumentResponse[]
+          if (isEdit) {
+            message.success(
+              `Document${doc ? ' ' + doc.title : ''} updated successfully.`,
+            )
+            if (docs.length > 1) {
+              message.info(
+                `The text content was too large and it was split into ${docs.length} new document chunks.`,
+                6,
+              )
+            }
+            setEditingChunk(undefined)
+          } else {
+            message.success(
+              `Document${docs.length > 1 ? 's' : ''} added successfully.`,
+            )
+            if (docs.length > 1) {
+              message.info(
+                `Document was too large to fit into one chunk. It was split into ${docs.length} document chunks.`,
+                6,
+              )
+            }
+          }
+          setUpsertModalOpen(false)
+          await getPaginatedChatbotDocuments(
+            API.chatbot.staffOnly.getAllDocumentChunks,
+            courseId,
+            page,
+            pageSize,
+            setTotal,
+            setDocuments,
+            search,
+          )
+        }
+        setPendingUpdateResults((prev) =>
+          prev.filter((v) => v.resultId !== resultId),
+        )
+      }
+    },
+    [documents, pendingUpdateResults, courseId, page, pageSize],
+  )
+
+  const listener = useCallback(
+    async (data: BaseSocketExpected) => {
+      if (!('type' in data.params)) {
+        return
+      }
+      switch (data.params.type) {
+        case ChatbotResultEventName.ADD_CHUNK:
+          return await chunkListener(data as DocumentReturn, false)
+        case ChatbotResultEventName.UPDATE_CHUNK:
+          return await chunkListener(data as DocumentReturn, true)
+        case ChatbotResultEventName.DOCUMENT_QUERIES:
+          return await documentQueriesListener(data as QueriesReturn)
+      }
+    },
+    [chunkListener, documentQueriesListener],
+  )
+
+  useEffect(() => {
+    if (webSocket) {
+      webSocket.onMessageEvent.on(ChatbotResultEvents.POST_RESULT, listener)
+      return () => {
+        webSocket.onMessageEvent.off(ChatbotResultEvents.POST_RESULT, listener)
+      }
+    }
+  }, [listener, webSocket])
+
   const addDocument = async (values: CreateDocumentChunkBody) => {
     await API.chatbot.staffOnly
       .addDocumentChunk(courseId, values)
-      .then((addedDocs) => {
-        setUpsertModalOpen(false)
-        message.success(
-          `Document${addedDocs.length > 1 ? 's' : ''} added successfully.`,
-        )
-        if (addedDocs.length > 1) {
-          message.info(
-            `Document was too large to fit into one chunk. It was split into ${addedDocs.length} document chunks.`,
+      .then(async (resultId: string) => {
+        const res = await webSocket.subscribe(ChatbotResultEvents.GET_RESULT, {
+          type: ChatbotResultEventName.ADD_CHUNK,
+          resultId,
+        })
+        if (!res.success) {
+          message.success(
+            'Document creation successfully queued, but subscription to results failed.',
           )
+          return
         }
-        getPaginatedChatbotDocuments(
-          API.chatbot.staffOnly.getAllDocumentChunks,
-          courseId,
-          page,
-          pageSize,
-          setTotal,
-          setDocuments,
-          search,
-        )
+        message.success('Document creation successfully queued!')
       })
       .catch((e) => {
         const errorMessage = getErrorMessage(e)
@@ -83,25 +239,22 @@ export default function ChatbotDocuments(
     })
     await API.chatbot.staffOnly
       .updateDocumentChunk(courseId, id, values)
-      .then((updatedDocs) => {
-        message.success(`Document updated successfully.`)
-        if (updatedDocs.length > 1) {
-          message.info(
-            `The text content was too large and it was split into ${updatedDocs.length} new document chunks.`,
-            6,
+      .then(async (resultId: string) => {
+        const res = await webSocket.subscribe(ChatbotResultEvents.GET_RESULT, {
+          type: ChatbotResultEventName.UPDATE_CHUNK,
+          resultId,
+        })
+        if (!res.success) {
+          message.success(
+            'Document update successfully queued, but subscription to results failed.',
           )
+          return
         }
-        setEditingChunk(undefined)
-        setUpsertModalOpen(false)
-        getPaginatedChatbotDocuments(
-          API.chatbot.staffOnly.getAllDocumentChunks,
-          courseId,
-          page,
-          pageSize,
-          setTotal,
-          setDocuments,
-          search,
-        )
+        message.success('Document update successfully queued!')
+        setPendingUpdateResults((prev) => [
+          ...prev,
+          { resultId, documentId: id },
+        ])
       })
       .catch((e) => {
         const errorMessage = getErrorMessage(e)
@@ -127,24 +280,32 @@ export default function ChatbotDocuments(
     documentId: string,
     deleteOld: boolean,
   ) => {
-    return await API.chatbot.staffOnly
+    if (pendingQueryResults.some((q) => q.documentId === documentId)) {
+      message.warning('Already generating queries for this document!')
+      return
+    }
+    await API.chatbot.staffOnly
       .generateDocumentQueries(courseId, documentId, { deleteOld })
-      .then((queryResponse: ChatbotDocumentQueryResponse[]) => {
-        const doc = documents.find((d) => d.id == documentId)
-        if (doc) {
-          if (deleteOld) {
-            doc.queries = queryResponse
-          } else {
-            doc.queries = [...doc.queries, ...queryResponse]
-          }
+      .then(async (resultId: string) => {
+        const res = await webSocket.subscribe(ChatbotResultEvents.GET_RESULT, {
+          type: ChatbotResultEventName.DOCUMENT_QUERIES,
+          resultId,
+        })
+        if (!res.success) {
+          message.success(
+            'Document query generation successfully queued, but subscription to results failed.',
+          )
+          return
         }
-        message.success('Document queries generated successfully.')
-        return true
+        setPendingQueryResults((prev) => [
+          ...prev,
+          { documentId, resultId, deleteOld },
+        ])
+        message.success('Document query generation successfully queued.')
       })
       .catch((e) => {
         const errorMessage = getErrorMessage(e)
         message.error('Failed to generate document queries: ' + errorMessage)
-        return false
       })
   }
 
@@ -152,6 +313,13 @@ export default function ChatbotDocuments(
     return await API.chatbot.staffOnly
       .addDocumentQuery(courseId, documentId, { query: content })
       .then((queryResponse: ChatbotDocumentQueryResponse) => {
+        setDocuments((prev) =>
+          prev.map((d) =>
+            d.id === documentId
+              ? { ...d, queries: [...d.queries, queryResponse] }
+              : d,
+          ),
+        )
         const doc = documents.find((d) => d.id == documentId)
         if (doc) {
           doc.queries.push(queryResponse)
@@ -175,15 +343,14 @@ export default function ChatbotDocuments(
     return await API.chatbot.staffOnly
       .updateDocumentQuery(courseId, queryId, { query: content })
       .then((queryResponse: ChatbotDocumentQueryResponse) => {
-        const doc = documents.find((d) =>
-          d.queries.some((q) => q.id == queryId),
+        setDocuments((prev) =>
+          prev.map((d) => ({
+            ...d,
+            queries: d.queries.map((q) =>
+              q.id === queryId ? queryResponse : q,
+            ),
+          })),
         )
-        if (doc) {
-          const idx = doc.queries.findIndex((q) => q.id == queryId)
-          if (idx >= 0) {
-            doc.queries[idx] = queryResponse
-          }
-        }
         message.success('Document query updated successfully.')
         return true
       })
@@ -220,17 +387,35 @@ export default function ChatbotDocuments(
   }
 
   const deleteDocumentQuery = async (queryId: string) => {
-    return await API.chatbot.staffOnly
+    await API.chatbot.staffOnly
       .deleteDocumentQuery(courseId, queryId)
       .then(() => {
-        documents.forEach((d) => d.queries.filter((q) => q.id !== queryId))
+        setDocuments((prev) =>
+          prev.map((d) => ({
+            ...d,
+            queries: d.queries.filter((q) => q.id !== queryId),
+          })),
+        )
         message.success('Document query deleted successfully.')
-        return true
       })
       .catch((e) => {
         const errorMessage = getErrorMessage(e)
         message.error('Failed to delete document query: ' + errorMessage)
-        return false
+      })
+  }
+
+  const deleteAllDocumentQueries = async (documentId: string) => {
+    await API.chatbot.staffOnly
+      .deleteAllDocumentQueries(courseId, documentId)
+      .then(() => {
+        setDocuments((prev) =>
+          prev.map((d) => (d.id === documentId ? { ...d, queries: [] } : d)),
+        )
+        message.success('Document queries deleted successfully.')
+      })
+      .catch((e) => {
+        const errorMessage = getErrorMessage(e)
+        message.error('Failed to delete document queries: ' + errorMessage)
       })
   }
 
@@ -271,7 +456,7 @@ export default function ChatbotDocuments(
         </div>
       </div>
       <hr className="my-5 w-full"></hr>
-      <div className={'flex justify-between gap-1'}>
+      <div className={'flex justify-between gap-2'}>
         <Input
           placeholder={'Search chunk name or content and press enter...'}
           value={search}
@@ -292,18 +477,19 @@ export default function ChatbotDocuments(
             )
           }}
         />
-        <Pagination
-          style={{ float: 'right' }}
-          total={total}
-          pageSizeOptions={[10, 20, 30, 50]}
-          showSizeChanger
-          current={page}
-          pageSize={pageSize}
-          onChange={(page, pageSize) => {
-            setPage(page)
-            setPageSize(pageSize)
-          }}
-        />
+        <div className={'flex min-w-[25%] justify-end'}>
+          <Pagination
+            total={total}
+            showSizeChanger={false}
+            current={page}
+            pageSize={pageSize}
+            size={'small'}
+            onChange={(page, pageSize) => {
+              setPage(page)
+              setPageSize(pageSize)
+            }}
+          />
+        </div>
       </div>
       {documents.length <= 0 ? (
         <Empty
@@ -331,6 +517,7 @@ export default function ChatbotDocuments(
               onEditChunk={editDocument}
               onEditQuery={editDocumentQuery}
               generateQueries={generateDocumentQueries}
+              onDeleteAllQueries={deleteAllDocumentQueries}
               searchTerms={searchTerms}
             />
           ))}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
index 0e609e3b6..9f19a1a76 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
@@ -5,14 +5,29 @@ import {
   GithubOutlined,
   UploadOutlined,
 } from '@ant-design/icons'
-import { Form, Input, message, Modal, Segmented, Switch } from 'antd'
+import {
+  Form,
+  Input,
+  message,
+  Modal,
+  Segmented,
+  Switch,
+  UploadFile,
+} from 'antd'
 import Dragger from 'antd/es/upload/Dragger'
-import { useState } from 'react'
-import { RcFile } from 'antd/lib/upload'
+import { useCallback, useEffect, useState } from 'react'
 import { API } from '@/app/api'
 import { getErrorMessage } from '@/app/utils/generalUtils'
 import { useAsyncToaster } from '@/app/contexts/AsyncToasterContext'
 import ChatbotHelpTooltip from '../../components/ChatbotHelpTooltip'
+import { useWebSocket } from '@/app/contexts/WebSocketContext'
+import {
+  ChatbotDocumentAggregateResponse,
+  ChatbotResultEventName,
+  ChatbotResultEvents,
+} from '@koh/common'
+import { toast } from 'sonner'
+import { UploadChangeParam } from 'antd/es/upload'
 
 interface AddChatbotDocumentModalProps {
   courseId: number
@@ -21,17 +36,30 @@ interface AddChatbotDocumentModalProps {
   getDocumentsProxy: () => void
 }
 
+type SocketExpectedReturn = {
+  params: { resultId: string; type: ChatbotResultEventName }
+  data: ChatbotDocumentAggregateResponse | Error
+}
+
 const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
   courseId,
   open,
   onClose,
   getDocumentsProxy,
 }) => {
+  const webSocket = useWebSocket()
+
   const [documentType, setDocumentType] = useState('FILE')
   const [loading, setLoading] = useState(false)
   const [form] = Form.useForm()
   const [isSlideDeck, setIsSlideDeck] = useState(false)
-  const [fileList, setFileList] = useState<any[]>([])
+  const [fileList, setFileList] = useState<
+    (UploadFile & { resultId?: string })[]
+  >([])
+  const [selectedFiles, setSelectedFiles] = useState<UploadFile[]>([])
+  const [urlUpload, setUrlUpload] = useState<
+    { url: string; resultId?: string; status: 'queued' | 'uploading' }[]
+  >([])
   const { runAsyncToast } = useAsyncToaster()
 
   const addDocument = async () => {
@@ -42,23 +70,22 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
       if (documentType === 'URL') {
         await addUrl(formData.url)
       } else if (documentType === 'FILE') {
-        const files = fileList.map((file) => file.originFileObj)
-        await uploadFiles(files)
+        await uploadFiles()
       }
     } finally {
       setLoading(false)
     }
   }
 
-  const handleSuccess = () => {
-    setFileList([])
-    form.resetFields()
-    getDocumentsProxy()
-    onClose()
-  }
-
-  const uploadNextFile = async (i: number, files: RcFile[]) => {
-    const file = files[i]
+  const uploadNextFile = useCallback(async () => {
+    const i = fileList.findIndex(
+      (v) => v.status !== 'uploading' && v.status !== 'done',
+    )
+    if (i < 0) {
+      // no more pending documents = all done!
+      message.info('All file uploads have finished processing.')
+    }
+    const file = fileList[i]
     // if the file is already uploading or done, skip it and inform the user
     if (fileList.find((f) => f.uid === file.uid)?.status === 'uploading') {
       message.info(`${file.name} is still being processed.`)
@@ -69,7 +96,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
     }
 
     const formData = new FormData()
-    formData.append('file', file)
+    formData.append('file', file.originFileObj!)
     formData.append('parseAsPng', isSlideDeck.toString())
 
     setFileList((prevFileList) =>
@@ -80,7 +107,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
 
     runAsyncToast(
       () => API.chatbot.staffOnly.uploadDocument(courseId, formData),
-      (result, error) => {
+      (result: string, error) => {
         // handle the success/error
         if (error) {
           setFileList((prevFileList) =>
@@ -91,55 +118,198 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
             ),
           )
         } else {
-          // success
-          getDocumentsProxy()
-          // remove the file from the list
-          setFileList((prevFileList) =>
-            prevFileList.filter((f) => f.uid !== file.uid),
-          )
-          // if it's the last file (and there's more than 1 document being uploaded), say that all documents have finished
-          if (i >= files.length - 1 && files.length > 1) {
-            message.info(
-              `All ${files.length} uploaded chatbot documents have finished processing`,
-              3.5,
-            )
-          }
-        }
-        // queue up the next file (which is technically recursive, I guess)
-        if (i < files.length - 1) {
-          uploadNextFile(i + 1, files)
+          webSocket
+            .subscribe(ChatbotResultEvents.GET_RESULT, {
+              type: ChatbotResultEventName.ADD_AGGREGATE,
+              resultId: result,
+            })
+            .then((res) => {
+              if (!res.success) {
+                toast.info(
+                  `Queued processing for but failed to subscribe for ${file.name}'s results. Queueing next upload.`,
+                )
+                setFileList((prev) => prev.filter((f) => f.uid !== file.uid))
+                const hasRemainingFile = fileList.some(
+                  (v) => v.status !== 'uploading' && v.status !== 'done',
+                )
+                if (hasRemainingFile) {
+                  // arbitrarily prioritize files
+                  uploadNextFile().then()
+                }
+                return
+              }
+              setFileList((prev) =>
+                prev.map((f) =>
+                  f.uid === file.uid ? { ...f, resultId: result } : f,
+                ),
+              )
+            })
         }
       },
       {
-        successMsg: `${file.name} uploaded and processed!`,
-        errorMsg: `Failed to upload/process ${file.name}`,
+        successMsg: `${file.name} uploaded and queued for processing!`,
+        errorMsg: `Failed to upload and/or queue processing for ${file.name}`,
         appendApiError: true,
         successDuration: 3500,
       },
     )
-  }
+  }, [courseId, fileList, isSlideDeck, runAsyncToast, webSocket])
+
+  const uploadNextUrl = useCallback(async () => {
+    const next = urlUpload.find((v) => v.status === 'queued')
+    if (!next) {
+      message.info('All URL uploads have finished processing.')
+      return
+    }
+
+    runAsyncToast(
+      () => API.chatbot.staffOnly.addDocumentFromURL(courseId, next.url),
+      (result: string, error) => {
+        // handle the success/error
+        if (error) {
+          setUrlUpload((prev) => prev.filter((v) => v.url != next.url))
+        } else {
+          webSocket
+            .subscribe(ChatbotResultEvents.GET_RESULT, {
+              type: ChatbotResultEventName.ADD_AGGREGATE,
+              resultId: result,
+            })
+            .then((res) => {
+              if (!res.success) {
+                toast.info(
+                  `Queued processing for but failed to subscribe for results of URL "${next.url}".`,
+                )
+                setUrlUpload((prev) => prev.filter((v) => v.url !== next.url))
+
+                const hasRemainingUrl = urlUpload.some(
+                  (v) => v.status !== 'uploading',
+                )
 
-  const uploadFiles = async (files: RcFile[]) => {
-    uploadNextFile(0, files)
-    message.info(
-      `${files.length === 1 ? 'The document' : `All ${files.length} documents`} have been queued for processing. You will be notified of completion.`,
-      3.5,
+                if (hasRemainingUrl) {
+                  uploadNextUrl().then()
+                }
+                return
+              }
+              setUrlUpload((prev) =>
+                prev.map((v) =>
+                  v.url === next.url
+                    ? { ...v, status: 'uploading', resultId: result }
+                    : v,
+                ),
+              )
+            })
+        }
+      },
+      {
+        successMsg: `File at URL "${next.url}" queued for processing. You will be notified of completion.`,
+        errorMsg: `Failed to queue processing for URL "${next.url}". Please check the file type of the document at this URL.`,
+        appendApiError: true,
+        successDuration: 3500,
+      },
     )
+  }, [courseId, runAsyncToast, urlUpload, webSocket])
+
+  const listener = useCallback(
+    async (data: SocketExpectedReturn) => {
+      if ('params' in data && 'resultId' in data.params) {
+        const { resultId } = data.params
+        const response = data.data
+
+        const fileMatch = fileList.find((v) => v.resultId === resultId)
+        const urlMatch = urlUpload.find((v) => v.resultId === resultId)
+
+        if ('error' in response) {
+          // an error occurred and was transmitted down
+          toast.error(
+            `Failed to process ${fileMatch?.name ?? urlMatch?.url ?? 'document'} upload: ${response}`,
+          )
+        } else {
+          // success
+          getDocumentsProxy()
+          if (fileMatch) {
+            // file upload
+            toast.success(`${fileMatch.name} successfully processed.`)
+            // remove the file from the list
+            setFileList((prev) =>
+              prev.map((v) =>
+                v.resultId === resultId ? { ...v, status: 'done' } : v,
+              ),
+            )
+            // queue up the next file (which is technically recursive, I guess)
+          } else if (urlMatch) {
+            // url upload
+            toast.success(
+              `URL document at "${urlMatch.url}" successfully processed.`,
+            )
+            setUrlUpload((prev) => prev.filter((v) => v.resultId !== resultId))
+          }
+        }
+
+        const hasRemainingFile = fileList.some(
+          (v) => v.status !== 'uploading' && v.status !== 'done',
+        )
+        const hasRemainingUrl = urlUpload.some((v) => v.status !== 'uploading')
+
+        if (hasRemainingFile) {
+          // arbitrarily prioritize files
+          uploadNextFile().then()
+          return
+        }
+        if (hasRemainingUrl) {
+          uploadNextUrl().then()
+          return
+        }
+      }
+    },
+    [fileList, getDocumentsProxy, urlUpload, uploadNextUrl, uploadNextFile],
+  )
+
+  useEffect(() => {
+    if (webSocket) {
+      webSocket.onMessageEvent.on(
+        ChatbotResultEventName.ADD_AGGREGATE,
+        listener,
+      )
+      return () => {
+        webSocket.onMessageEvent.off(
+          ChatbotResultEventName.ADD_AGGREGATE,
+          listener,
+        )
+      }
+    }
+    return () => {}
+  }, [listener, webSocket])
+
+  const uploadFiles = async () => {
+    const uids = fileList.map((f) => f.uid)
+    const subset = selectedFiles.filter((s) => !uids.includes(s.uid))
+    setFileList((prev) => [...prev, ...subset])
+    if (!fileList.some((v) => v.status === 'uploading')) {
+      uploadNextFile().then()
+    } else {
+      message.info(
+        `There is already a file being uploaded, but the file${subset.length > 1 ? 's' : ''}: ${subset.map((v) => v.name).join(', ')} ha${subset.length > 1 ? 've' : 's'} been queued.`,
+      )
+    }
     onClose()
   }
 
   const addUrl = async (url: string) => {
-    await API.chatbot.staffOnly
-      .addDocumentFromURL(courseId, url)
-      .then(async () => {
-        message.success('File successfully uploaded')
-        handleSuccess()
-      })
-      .catch((e) => {
-        message.error(
-          `Failed to upload file (${getErrorMessage(e)}). Please check the file type of linked document`,
-        )
-      })
+    if (urlUpload.some((v) => v.url == url)) {
+      message.warning(
+        `The document at ${url} is already being used in an upload operation.`,
+      )
+      return
+    }
+    setUrlUpload((prev) => [...prev, { url, status: 'queued' }])
+    if (!urlUpload.some((v) => v.status === 'uploading')) {
+      uploadNextUrl().then()
+    } else {
+      message.info(
+        `There is already a URL being uploaded, but the URL "${url}" has been queued.`,
+      )
+    }
+    onClose()
   }
 
   return (
@@ -255,9 +425,16 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
                   name="file"
                   multiple={true}
                   accept=".docx,.pptx,.txt,.csv,.pdf,.md,.png,.jpg,.jpeg,.gif,.tiff,.xls,.xlsx,.doc,.rtf,.svg,.ppt,.odt,.ods,.odp,.epub,.vsd,.vsdx"
-                  fileList={fileList}
-                  onChange={(info: any) => {
-                    setFileList(info.fileList)
+                  fileList={selectedFiles}
+                  onChange={(info: UploadChangeParam<UploadFile<any>>) => {
+                    setSelectedFiles(info.fileList)
+                    const uids = info.fileList.map((f) => f.uid)
+                    setFileList((prev) =>
+                      prev.filter(
+                        (f) =>
+                          !(f.status !== 'uploading' && !uids.includes(f.uid)),
+                      ),
+                    )
                   }}
                   maxCount={10}
                   beforeUpload={() => false} // Prevent automatic upload
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
index a04b3fb68..3f51f0496 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
@@ -10,7 +10,14 @@ import {
   Table,
   Tooltip,
 } from 'antd'
-import { ReactElement, use, useEffect, useMemo, useState } from 'react'
+import {
+  ReactElement,
+  use,
+  useCallback,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react'
 import Link from 'next/link'
 import { TableRowSelection } from 'antd/es/table/interface'
 import LegacyChatbotSettingsModal from './components/LegacyChatbotSettingsModal'
@@ -18,6 +25,8 @@ import Highlighter from 'react-highlight-words'
 import AddChatbotDocumentModal from './components/AddChatbotDocumentModal'
 import {
   ChatbotDocumentAggregateResponse,
+  ChatbotResultEventName,
+  ChatbotResultEvents,
   ChatbotServiceType,
   DocumentType,
   DocumentTypeColorMap,
@@ -37,14 +46,24 @@ import { getErrorMessage } from '@/app/utils/generalUtils'
 import ChatbotSettingsModal from '@/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/ChatbotSettingsModal'
 import { getPaginatedChatbotDocuments } from '@/app/(dashboard)/course/[cid]/(settings)/settings/util'
 import EditChatbotDocumentModal from '@/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/EditChatbotDocumentModal'
+import { useWebSocket } from '@/app/contexts/WebSocketContext'
 
 interface ChatbotPanelProps {
   params: Promise<{ cid: string }>
 }
 
+type BaseSocketExpected = {
+  params: { resultId: string; type: ChatbotResultEventName }
+}
+
+type AggregateReturn = {
+  data: ChatbotDocumentAggregateResponse | Error
+} & BaseSocketExpected
+
 export default function ChatbotSettings(
   props: ChatbotPanelProps,
 ): ReactElement {
+  const webSocket = useWebSocket()
   const params = use(props.params)
   const { userInfo } = useUserInfo()
   const courseId = useMemo(() => Number(params.cid), [params.cid])
@@ -62,10 +81,74 @@ export default function ChatbotSettings(
   const [page, setPage] = useState(1)
   const [pageSize, setPageSize] = useState(10)
 
+  const [loading, setLoading] = useState<{ [key: string]: boolean }>({})
+  const [pendingAggregateUpdates, setPendingAggregateUpdates] = useState<
+    { resultId: string; aggregateId: string }[]
+  >([])
+
+  const socketListener = useCallback(
+    async (data: AggregateReturn) => {
+      if ('params' in data && 'resultId' in data.params) {
+        const { resultId } = data.params
+        const response = data.data
+
+        const match = pendingAggregateUpdates.find(
+          (v) => v.resultId === resultId,
+        )
+        if (!match) {
+          return
+        }
+        setPendingAggregateUpdates((prev) =>
+          prev.filter((v) => v.resultId !== resultId),
+        )
+        if ('error' in response) {
+          // an error occurred and was transmitted down
+          message.error(
+            `Failed to update aggregate ${match.aggregateId}: ${response}`,
+          )
+        } else {
+          // success
+          const matchDoc = chatbotDocuments.find(
+            (d) => d.id === match.aggregateId,
+          )
+          await getPaginatedChatbotDocuments(
+            API.chatbot.staffOnly.getAllAggregateDocuments,
+            courseId,
+            page,
+            pageSize,
+            setTotalAggregates,
+            setChatbotDocuments,
+            search,
+          )
+          message.success(
+            `Successfully updated document aggregate${matchDoc ? ' ' + matchDoc.title + '.' : '.'}`,
+          )
+        }
+      }
+    },
+    [
+      chatbotDocuments,
+      courseId,
+      page,
+      pageSize,
+      pendingAggregateUpdates,
+      search,
+    ],
+  )
+
+  useEffect(() => {
+    webSocket.onMessageEvent.on(ChatbotResultEvents.POST_RESULT, socketListener)
+    return () => {
+      webSocket.onMessageEvent.off(
+        ChatbotResultEvents.POST_RESULT,
+        socketListener,
+      )
+    }
+  }, [socketListener, webSocket])
+
   const [editingDocument, setEditingDocument] =
     useState<ChatbotDocumentAggregateResponse>()
 
-  const [loading, setLoading] = useState(false)
   const [countProcessed, setCountProcessed] = useState(0)
   const [courseServiceType, setCourseServiceType] =
     useState<ChatbotServiceType>()
@@ -95,8 +178,12 @@ export default function ChatbotSettings(
   }, [courseId])
 
   const handleDeleteSelectedDocuments = async () => {
+    const selectedKeys = [...selectedRowKeys]
     try {
-      for (const docId of selectedRowKeys) {
+      const entries: { [key: string]: boolean } = {}
+      selectedKeys.forEach((k) => (entries[k as string] = true))
+      setLoading((prev) => ({ ...prev, ...entries }))
+      for (const docId of selectedKeys) {
         await API.chatbot.staffOnly.deleteDocument(courseId, docId.toString())
         setCountProcessed(countProcessed + 1)
       }
@@ -115,7 +202,12 @@ export default function ChatbotSettings(
     } finally {
       setSelectViewEnabled(false)
       setSelectedRowKeys([])
-      setLoading(false)
+      setLoading((prev) => {
+        selectedKeys.forEach((k) => {
+          prev[k as string] = false
+        })
+        return prev
+      })
       setCountProcessed(0)
     }
   }
@@ -124,31 +216,39 @@ export default function ChatbotSettings(
     id: string,
     params: UpdateDocumentAggregateBody,
   ) => {
-    setLoading(true)
+    setLoading((prev) => ({ ...prev, [id]: true }))
+    let subscribed = false
     await API.chatbot.staffOnly
       .updateDocument(courseId, id, params)
-      .then(() => {
-        message.success('Document updated.')
-        getPaginatedChatbotDocuments(
-          API.chatbot.staffOnly.getAllAggregateDocuments,
-          courseId,
-          page,
-          pageSize,
-          setTotalAggregates,
-          setChatbotDocuments,
-          search,
+      .then(async (resultId: string) => {
+        const res = await webSocket.subscribe(ChatbotResultEvents.GET_RESULT, {
+          type: ChatbotResultEventName.UPDATE_AGGREGATE,
+          resultId,
+        })
+        setEditingDocument(undefined)
+        if (!res.success) {
+          message.warning(
+            'Document update request submitted, but failed to subscribe for its results.',
+          )
+          return
+        }
+        subscribed = true
+        setPendingAggregateUpdates((prev) => [
+          ...prev,
+          { resultId, aggregateId: id },
+        ])
+        message.success(
+          'Document update request submitted. You are subscribed for its results.',
         )
       })
       .catch(() => {
         message.error('Failed to update document.')
       })
-      .finally(() => {
-        setLoading(false)
-      })
+      .finally(() => setLoading((prev) => ({ ...prev, [id]: false })))
   }
 
   const handleDeleteDocument = async (id: string) => {
-    setLoading(true)
+    setLoading((prev) => ({ ...prev, [id]: true }))
     await API.chatbot.staffOnly
       .deleteDocument(courseId, id)
       .then(() => {
@@ -167,10 +267,11 @@ export default function ChatbotSettings(
         message.error('Failed to delete document.')
       })
       .finally(() => {
-        setLoading(false)
+        setLoading((prev) => ({ ...prev, [id]: false }))
       })
   }
 
+  const someSelectedLoading = selectedRowKeys.some((k) => loading[k as string])
   const columns = [
     {
       title: 'Name',
@@ -225,7 +326,7 @@ export default function ChatbotSettings(
       title: (
         <div className={'flex gap-1'}>
           <Button
-            disabled={loading}
+            disabled={someSelectedLoading}
             onClick={() => setSelectViewEnabled(!selectViewEnabled)}
           >
             {!selectViewEnabled ? 'Select' : 'Cancel'}
@@ -234,7 +335,7 @@ export default function ChatbotSettings(
           {hasSelected && selectViewEnabled && (
             <Button
               className="ml-2"
-              disabled={loading}
+              disabled={someSelectedLoading}
               onClick={() => handleDeleteSelectedDocuments()}
               danger
             >
@@ -264,7 +365,9 @@ export default function ChatbotSettings(
               }
             >
               <Button
-                disabled={loading || record.lmsDocumentId != undefined}
+                disabled={
+                  loading[record.id] || record.lmsDocumentId != undefined
+                }
                 icon={<EditOutlined />}
                 variant={'outlined'}
                 color={'blue'}
@@ -274,7 +377,7 @@ export default function ChatbotSettings(
               </Button>
             </Tooltip>
             <Button
-              disabled={loading}
+              disabled={loading[record.id]}
               icon={<DeleteOutlined />}
               onClick={() => handleDeleteDocument(record.id)}
               danger
diff --git a/packages/frontend/app/admin/components/SidebarNavigation.tsx b/packages/frontend/app/admin/components/SidebarNavigation.tsx
index f41147bf0..dabc245ba 100644
--- a/packages/frontend/app/admin/components/SidebarNavigation.tsx
+++ b/packages/frontend/app/admin/components/SidebarNavigation.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import React from 'react'
-import { BarChartOutlined } from '@ant-design/icons'
+import { BarChartOutlined, BugOutlined } from '@ant-design/icons'
 import { usePathname } from 'next/navigation'
 import Link from 'next/link'
 import { cn } from '@/app/utils/generalUtils'
@@ -28,6 +28,12 @@ const items = [
     ),
     url: '/admin/lti',
   },
+  {
+    key: 'debug',
+    label: 'Debug',
+    icon: <BugOutlined />,
+    url: '/admin/debug',
+  },
 ]
 
 const SidebarNavigation: React.FC = () => {
diff --git a/packages/frontend/app/admin/debug/page.tsx b/packages/frontend/app/admin/debug/page.tsx
new file mode 100644
index 000000000..f75f3599a
--- /dev/null
+++ b/packages/frontend/app/admin/debug/page.tsx
@@ -0,0 +1,137 @@
+'use client'
+
+import { ReactElement, useEffect, useState } from 'react'
+import { Badge, Button, Card, message, Table } from 'antd'
+import { useWebSocket } from '@/app/contexts/WebSocketContext'
+import { getErrorMessage } from '@/app/utils/generalUtils'
+import { ColumnProps } from 'antd/es/table'
+
+type DataReceived = { event: string; when: Date; data: any }
+function onDataReceived(
+  setDataReceived: React.Dispatch<React.SetStateAction<DataReceived[]>>,
+  event: string,
+  data: any,
+) {
+  setDataReceived((prev) => [
+    ...prev,
+    {
+      event: event,
+      when: new Date(),
+      data: JSON.stringify(data),
+    },
+  ])
+}
+const tableDateTimeFormat = new Intl.DateTimeFormat('en-US', {
+  hour: 'numeric',
+  minute: 'numeric',
+  second: 'numeric',
+  day: 'numeric',
+  month: 'numeric',
+  year: 'numeric',
+})
+const dataReceivedColumns: ColumnProps[] = [
+  {
+    key: 'event',
+    title: 'Event',
+    dataIndex: 'event',
+  },
+  {
+    key: 'when',
+    title: 'Received at',
+    dataIndex: 'when',
+    render: (date: Date) => tableDateTimeFormat.format(date),
+  },
+  {
+    key: 'data',
+    title: 'Data',
+    dataIndex: 'data',
+  },
+]
+export default function AdminDebugPage(): ReactElement {
+  const webSocket = useWebSocket()
+  const [healthCheck, setHealthCheck] = useState(false)
+  const [healthCheckUpdated, setHealthCheckUpdated] = useState(new Date())
+  const [dataReceived, setDataReceived] = useState<DataReceived[]>([])
+
+  useEffect(() => {
+    webSocket.onMessageEvent.on('healthcheck', function (value: boolean) {
+      setHealthCheck(value)
+      setHealthCheckUpdated(new Date())
+      onDataReceived(setDataReceived, 'healthcheck', value)
+    })
+  }, [webSocket.onMessageEvent])
+
+  const runFx = async (fxName: string) => {
+    try {
+      const result = await (webSocket as any)[fxName]()
+      if (result.success) {
+        if (fxName == 'connect') {
+          setHealthCheck(true)
+          setHealthCheckUpdated(new Date())
+        } else if (fxName == 'disconnect') {
+          setHealthCheck(false)
+          setHealthCheckUpdated(new Date())
+        }
+        message.success(result.message)
+      } else {
+        message.error(result.message)
+      }
+    } catch (err) {
+      message.error(getErrorMessage(err))
+    }
+  }
+
+  return (
+    <>
+      <div className={'flex w-full flex-grow flex-col gap-4'}>
+        <h1>Debug Tools</h1>
+        <h2>Client Web Socket</h2>
+        <Card classNames={{ header: 'hidden' }}>
+          <div
+            className={'flex w-full flex-col items-center justify-center gap-2'}
+          >
+            <div className={'flex justify-center gap-1'}>
+              <Button onClick={() => runFx('initialize')}>
+                Initialize Websocket
+              </Button>
+              <Button onClick={() => runFx('connect')}>
+                Connect Websocket
+              </Button>
+              <Button onClick={() => runFx('disconnect')}>
+                Disconnect Websocket
+              </Button>
+            </div>
+            <div className={'flex flex-col gap-1'}>
+              <span className={'w-full text-center font-semibold'}>
+                Connection Status
+              </span>
+              <div className={'flex gap-2'}>
+                <Badge
+                  showZero={true}
+                  count={
+                    healthCheck ? 'Websocket Stable' : 'Websocket Inactive'
+                  }
+                  color={healthCheck ? 'green' : 'red'}
+                />
+                <span className={'text-sm text-gray-400'}>
+                  Last updated at {healthCheckUpdated.toLocaleTimeString()}
+                </span>
+              </div>
+            </div>
+            <Table
+              dataSource={dataReceived}
+              columns={dataReceivedColumns}
+              pagination={{
+                position: ['topRight', 'bottomRight'],
+                pageSizeOptions: [],
+                showSizeChanger: false,
+                showQuickJumper: false,
+                size: 'small',
+              }}
+            />
+          </div>
+        </Card>
+      </div>
+    </>
+  )
+}
diff --git a/packages/frontend/app/api/index.ts b/packages/frontend/app/api/index.ts
index 05b24edc1..63a820e2b 100644
--- a/packages/frontend/app/api/index.ts
+++ b/packages/frontend/app/api/index.ts
@@ -137,7 +137,7 @@ import {
   UserMailSubscription,
 } from '@koh/common'
 import Axios, { AxiosError, AxiosInstance, AxiosResponse, Method } from 'axios'
-import { plainToClass } from 'class-transformer'
+import { plainToInstance } from 'class-transformer'
 import { ClassType } from 'class-transformer/ClassTransformer'
 import * as Sentry from '@sentry/nextjs'
 import { SetStateAction } from 'react'
@@ -183,7 +183,7 @@ export class APIClient {
     const res = (
       await this.axios.request({ method, url, data: body, params, headers })
     ).data
-    return responseClass ? plainToClass(responseClass, res) : res
+    return responseClass ? plainToInstance(responseClass, res) : res
   }
 
   /**
@@ -399,7 +399,7 @@ export class APIClient {
       addDocumentChunk: async (
         courseId: number,
         body: CreateDocumentChunkBody,
-      ): Promise<ChatbotDocumentResponse[]> =>
+      ): Promise<string> =>
         this.req(
           'POST',
           `/api/v1/chatbot/${courseId}/document`,
@@ -410,7 +410,7 @@ export class APIClient {
         courseId: number,
         docId: string,
         body: UpdateDocumentChunkBody,
-      ): Promise<ChatbotDocumentResponse[]> =>
+      ): Promise<string> =>
         this.req(
           'PATCH',
           `/api/v1/chatbot/${courseId}/document/${docId}`,
@@ -446,11 +446,11 @@ export class APIClient {
         courseId: number,
         documentId: string,
         body: GenerateDocumentQueryBody,
-      ): Promise<ChatbotDocumentQueryResponse[]> =>
-        this.req<ChatbotDocumentQueryResponse[]>(
+      ): Promise<string> =>
+        this.req(
           'POST',
           `/api/v1/chatbot/${courseId}/query/${documentId}/generate`,
-          ChatbotDocumentQueryResponse,
+          undefined,
           body,
         ),
       updateDocumentQuery: async (
@@ -469,12 +469,20 @@ export class APIClient {
         queryId: string,
       ): Promise<void> =>
         this.req('DELETE', `/api/v1/chatbot/${courseId}/query/${queryId}`),
+      deleteAllDocumentQueries: async (
+        courseId: number,
+        documentId: string,
+      ): Promise<void> =>
+        this.req(
+          'DELETE',
+          `/api/v1/chatbot/${courseId}/query/${documentId}/all`,
+        ),
       deleteDocument: async (courseId: number, docId: string): Promise<void> =>
         this.req('DELETE', `/api/v1/chatbot/${courseId}/aggregate/${docId}`),
       uploadDocument: async (
         courseId: number,
         body: FormData,
-      ): Promise<ChatbotDocumentAggregateResponse> =>
+      ): Promise<string> =>
         this.req(
           'POST',
           `/api/v1/chatbot/${courseId}/aggregate/file`,
@@ -484,7 +492,7 @@ export class APIClient {
       addDocumentFromURL: async (
         courseId: number,
         url: string,
-      ): Promise<ChatbotDocumentAggregateResponse> =>
+      ): Promise<string> =>
         this.req(
           'POST',
           `/api/v1/chatbot/document/${courseId}/aggregate/url`,
@@ -495,7 +503,7 @@ export class APIClient {
         courseId: number,
         id: string,
         body: UpdateDocumentAggregateBody,
-      ): Promise<ChatbotDocumentAggregateResponse> =>
+      ): Promise<string> =>
         this.req(
           'PATCH',
           `/api/v1/chatbot/${courseId}/aggregate/${id}`,
diff --git a/packages/frontend/app/contexts/WebSocketContext.tsx b/packages/frontend/app/contexts/WebSocketContext.tsx
new file mode 100644
index 000000000..691270235
--- /dev/null
+++ b/packages/frontend/app/contexts/WebSocketContext.tsx
@@ -0,0 +1,292 @@
+'use client'
+
+import React, {
+  createContext,
+  ReactNode,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+} from 'react'
+import * as crypto from 'crypto'
+import { EventEmitter } from 'events'
+import { useSharedWorker, WorkerTypes } from '@/app/hooks/useSharedWorker'
+
+enum WebSocketMessageType {
+  Initialize = 'socket_init',
+  Connect = 'connect',
+  Disconnect = 'disconnect',
+  Subscribe = 'subscribe',
+  Unsubscribe = 'unsubscribe',
+  setHeaders = 'setHeaders',
+  setAuth = 'setAuth',
+}
+
+type WSResponse = {
+  success: boolean
+  message: string
+}
+
+type WSContext = {
+  onMessageEvent: EventEmitter
+  initialize: () => Promise<WSResponse>
+  connect: () => Promise<WSResponse>
+  disconnect: () => Promise<WSResponse>
+  subscribe: (
+    event: string,
+    params?: { [p: string]: any },
+  ) => Promise<WSResponse>
+  unsubscribe: (
+    event?: string,
+    params?: { [p: string]: any },
+  ) => Promise<WSResponse>
+  setHeaders: (headers?: { [p: string]: string }) => Promise<WSResponse>
+  setAuth: (auth?: { [p: string]: any }) => Promise<WSResponse>
+}
+// Create context
+const WebSocketContext = createContext<WSContext | undefined | null>(undefined)
+
+interface WebSocketProviderProps {
+  children: ReactNode
+}
+
+type WebSocketMessage = {
+  type: 'ws_message'
+}
+
+type WebSocketData = {
+  external_event: string
+  data: any
+} & WebSocketMessage
+
+type WebSocketReply = {
+  success: boolean
+  message: string
+  replyTo: string
+} & WebSocketMessage
+
+function generateUniqueId() {
+  return crypto.randomBytes(32).toString('hex')
+}
+
+async function postMessage(
+  worker: SharedWorker,
+  message_type: WebSocketMessageType,
+  data?: { [p: string]: any },
+): Promise<WSResponse> {
+  const messageId = generateUniqueId()
+  let timeout: any = null
+
+  return new Promise((resolve, reject) => {
+    const messageListener = (event: MessageEvent<WebSocketReply>) => {
+      if (event.data && event.data.replyTo === messageId) {
+        const { success, message } = event.data
+        // Remove the listener once the response is received
+        worker.port.removeEventListener('message', messageListener)
+
+        if (!event.data.success) {
+          reject(new Error(message))
+        } else {
+          resolve({
+            success,
+            message,
+          })
+        }
+        if (timeout) {
+          clearTimeout(timeout)
+        }
+      }
+    }
+
+    worker.port.addEventListener('message', messageListener)
+
+    worker.port.postMessage({
+      ...(data ?? {}),
+      type: message_type,
+      messageId,
+    })
+
+    timeout = setTimeout(() => {
+      worker.port.removeEventListener('message', messageListener)
+      reject(new Error('WebSocket response timeout'))
+      clearTimeout(timeout)
+    }, 10000)
+  })
+}
+
+export const WebSocketProvider: React.FC<WebSocketProviderProps> = ({
+  children,
+}: WebSocketProviderProps) => {
+  const worker = useSharedWorker(WorkerTypes.WebSocket)
+  const [emitter, _] = useState(new EventEmitter())
+
+  const url = useMemo(() => {
+    return `${process.env.NEXT_PUBLIC_HOST_PROTOCOL}://${process.env.NEXT_PUBLIC_HOSTNAME}${process.env.NEXT_PUBLIC_HOSTNAME === 'localhost' && process.env.NEXT_PUBLIC_DEV_PORT ? `:${process.env.NEXT_PUBLIC_DEV_PORT}` : ''}`
+  }, [])
+
+  const opts = useMemo(
+    () => ({
+      forceNew: false,
+      multiplex: true,
+      reconnection: true,
+      path: '/api/v1/ws',
+      reconnectionAttempts: Infinity,
+      reconnectionDelay: 1000,
+      reconnectionDelayMax: 5000,
+      randomizationFactor: 0.5,
+      timeout: 5000,
+      autoConnect: false,
+    }),
+    [],
+  )
+
+  const ensureInitialized = useCallback(
+    async (worker: SharedWorker | null): Promise<boolean> => {
+      if (!worker) {
+        return false
+      }
+      const initializeResult = await postMessage(
+        worker,
+        WebSocketMessageType.Initialize,
+        {
+          url,
+          opts,
+        },
+      )
+      if (!initializeResult.success) {
+        return false
+      }
+      const connectResult = await postMessage(
+        worker,
+        WebSocketMessageType.Connect,
+      )
+      return connectResult.success
+    },
+    [url, opts],
+  )
+
+  const protectedPostMessage = useCallback(
+    async (
+      worker: SharedWorker | null,
+      type: WebSocketMessageType,
+      args?: { [p: string]: any },
+    ): Promise<WSResponse> => {
+      const init = await ensureInitialized(worker)
+      if (!init) {
+        return {
+          success: false,
+          message: 'Failed to initialize or connect with web socket.',
+        }
+      }
+      return await postMessage(worker as SharedWorker, type, args)
+    },
+    [ensureInitialized],
+  )
+
+  useEffect(() => {
+    if (!worker) return
+    const listener = (event: MessageEvent<WebSocketData>) => {
+      if (event.type !== 'message') {
+        return
+      }
+
+      const { external_event, data } = event.data
+      if (!external_event) {
+        return
+      }
+
+      emitter.emit(external_event, data)
+    }
+    worker.port.addEventListener('message', listener)
+    return () => worker.port.removeEventListener('message', listener)
+  }, [emitter, worker])
+
+  const contextValue = useMemo(() => {
+    if (!worker) {
+      return null
+    }
+    return {
+      onMessageEvent: emitter,
+      initialize: async () => {
+        return await protectedPostMessage(
+          worker,
+          WebSocketMessageType.Initialize,
+          {
+            url,
+            opts,
+          },
+        )
+      },
+      connect: async () => {
+        return await protectedPostMessage(worker, WebSocketMessageType.Connect)
+      },
+      disconnect: async () => {
+        return await protectedPostMessage(
+          worker,
+          WebSocketMessageType.Disconnect,
+        )
+      },
+      subscribe: async (event: string, params?: { [p: string]: any }) => {
+        return await protectedPostMessage(
+          worker,
+          WebSocketMessageType.Subscribe,
+          {
+            event,
+            params,
+          },
+        )
+      },
+      unsubscribe: async (event?: string, params?: { [p: string]: any }) => {
+        return await protectedPostMessage(
+          worker,
+          WebSocketMessageType.Unsubscribe,
+          {
+            event,
+            params,
+          },
+        )
+      },
+      setHeaders: async (auth?: { [p: string]: any }) => {
+        return await protectedPostMessage(
+          worker,
+          WebSocketMessageType.setHeaders,
+          auth,
+        )
+      },
+      setAuth: async (auth?: { [p: string]: any }) => {
+        return await protectedPostMessage(
+          worker,
+          WebSocketMessageType.setAuth,
+          auth,
+        )
+      },
+    }
+  }, [worker, emitter, protectedPostMessage, url, opts])
+
+  return (
+    <WebSocketContext.Provider value={contextValue}>
+      {children}
+    </WebSocketContext.Provider>
+  )
+}
+
+export const useWebSocketContext = (): WSContext => {
+  const context = useContext(WebSocketContext)
+
+  if (context === undefined) {
+    throw new Error(
+      'useWebSocketContext must be used within a WebSocketContextProvider',
+    )
+  }
+
+  if (context === null) {
+    throw new Error('useWebSocket must be used on the client')
+  }
+
+  return context
+}
+
+export const useWebSocket = (): WSContext => {
+  return useWebSocketContext()
+}
diff --git a/packages/frontend/app/hooks/useSharedWorker.ts b/packages/frontend/app/hooks/useSharedWorker.ts
new file mode 100644
index 000000000..fe4f3a5ba
--- /dev/null
+++ b/packages/frontend/app/hooks/useSharedWorker.ts
@@ -0,0 +1,16 @@
+import { useEffect, useState } from 'react'
+import { getWorker } from '@/app/utils/workerUtils'
+
+export enum WorkerTypes {
+  WebSocket = '/workers/client_websocket.js',
+}
+export function useSharedWorker(type: WorkerTypes): SharedWorker | null {
+  const [worker, setWorker] = useState<SharedWorker | null>(null)
+
+  useEffect(() => {
+    const instance = getWorker(type)
+    setWorker(instance)
+  }, [type])
+
+  return worker
+}
diff --git a/packages/frontend/app/layout.tsx b/packages/frontend/app/layout.tsx
index ca568a1d2..f7405dbd4 100644
--- a/packages/frontend/app/layout.tsx
+++ b/packages/frontend/app/layout.tsx
@@ -5,6 +5,7 @@ import { cn } from '@/app/utils/generalUtils'
 import AntdProvider from './components/AntdProvider'
 import CenteredSpinner from '@/app/components/CenteredSpinner'
 import { Suspense } from 'react'
+import { WebSocketProvider } from '@/app/contexts/WebSocketContext'
 
 const interFontSans = Inter({
   subsets: ['latin'],
@@ -37,7 +38,7 @@ export default function RootLayout({
       >
         <AntdProvider>
           <Suspense fallback={<CenteredSpinner tip={'Loading...'} />}>
-            {children}
+            <WebSocketProvider>{children}</WebSocketProvider>
           </Suspense>
         </AntdProvider>
       </body>
diff --git a/packages/frontend/app/utils/webSocketEventUtils.ts b/packages/frontend/app/utils/webSocketEventUtils.ts
new file mode 100644
index 000000000..7f63dc508
--- /dev/null
+++ b/packages/frontend/app/utils/webSocketEventUtils.ts
@@ -0,0 +1,17 @@
+import { ClassType } from 'class-transformer/ClassTransformer'
+import { plainToInstance } from 'class-transformer'
+
+export function filterWebSocketEvent<T>(
+  event: MessageEvent<{ type: string; data: T }>,
+  desiredEvent: string,
+  responseClass?: ClassType<T>,
+): { match: boolean; data?: T } {
+  const { type, data } = event.data
+  if (type === desiredEvent) {
+    return {
+      match: true,
+      data: responseClass ? plainToInstance(responseClass, data) : data,
+    }
+  }
+  return { match: false }
+}
diff --git a/packages/frontend/app/utils/workerUtils.ts b/packages/frontend/app/utils/workerUtils.ts
new file mode 100644
index 000000000..1bfe58e66
--- /dev/null
+++ b/packages/frontend/app/utils/workerUtils.ts
@@ -0,0 +1,28 @@
+'use client'
+
+const workerInstances: { [key: string]: SharedWorker } = {}
+
+export function getWorker(file: string) {
+  if (typeof window === 'undefined') {
+    return null
+  }
+
+  if (!workerInstances[file]) {
+    workerInstances[file] = new SharedWorker(
+      new URL(
+        `${process.env.NEXT_PUBLIC_HOST_PROTOCOL}://${process.env.NEXT_PUBLIC_HOSTNAME}${process.env.NEXT_PUBLIC_HOSTNAME === 'localhost' && process.env.NEXT_PUBLIC_DEV_PORT ? `:${process.env.NEXT_PUBLIC_DEV_PORT}` : ''}${file}`,
+      ),
+    )
+  }
+
+  const worker = workerInstances[file]
+  worker.port.start()
+
+  return worker
+}
+
+export function stopWorker(file: string) {
+  if (workerInstances[file]) {
+    workerInstances[file].port.close()
+  }
+}
diff --git a/packages/frontend/eslint.config.js b/packages/frontend/eslint.config.js
index c715559c3..271e0e57b 100644
--- a/packages/frontend/eslint.config.js
+++ b/packages/frontend/eslint.config.js
@@ -65,6 +65,7 @@ module.exports = defineConfig([
     },
     globalIgnores([
         "**/.eslintrc.js",
+        "**/webworkers/*",
         "node_modules/**/*",
         ".next/**/*",
         "dist/**/*",
diff --git a/packages/frontend/middleware.ts b/packages/frontend/middleware.ts
index 8801c490f..798ad50ce 100644
--- a/packages/frontend/middleware.ts
+++ b/packages/frontend/middleware.ts
@@ -4,8 +4,10 @@ import * as Sentry from '@sentry/nextjs'
 import { RequestCookies } from 'next/dist/compiled/@edge-runtime/cookies'
 import { getAuthTokenString } from '@/app/api/cookie-utils'
 
-// These are files that do not require authentication. Used for displaying logos outside of HelpMe.
+// These are files that do not require authentication.
+// Used for displaying logos outside of HelpMe, or for accessing web worker source code files.
 const publicFiles: RegExp[] = [
+  new RegExp('^/workers/.*[.]js$'),
   new RegExp('^/helpme_logo_(full|medium|small)[.]png$'),
 ]
 
diff --git a/packages/frontend/next.config.mjs b/packages/frontend/next.config.mjs
index 9cdfa61ef..760953a46 100644
--- a/packages/frontend/next.config.mjs
+++ b/packages/frontend/next.config.mjs
@@ -34,8 +34,18 @@ const nextConfig = {
     if (process.env.NEXT_PUBLIC_WHY_DID_YOU_RENDER === 'true') {
 		injectWhyDidYouRender(config, context)
     }
-		return config;
-	}
+    return config;
+  },
+  turbopack: {
+    resolveExtensions: ['.mdx', '.tsx', '.ts', '.jsx', '.js', '.mjs', '.json'],
+    rules: {
+      '*.svg': {
+        loaders: ['@svgr/webpack'],
+        as: '*.js',
+      },
+    },
+  },
+  transpilePackages: ['require-in-the-middle']
 };
 
 export default withSentryConfig(nextConfig, {
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
index 6b197bd9f..4e9765ce6 100644
--- a/packages/frontend/package.json
+++ b/packages/frontend/package.json
@@ -3,8 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev --turbopack",
-    "build": "next build",
+    "dev": "yarn watch:workers & next dev --turbopack",
+    "build": "yarn build:workers & next build",
+    "build:workers": "tsc -p tsconfig.workers.json",
+    "watch:workers": "tsc -p tsconfig.workers.json --watch",
     "start": "next start -p 3001",
     "lint": "next lint"
   },
@@ -55,6 +57,7 @@
     "remark-breaks": "^4.0.0",
     "remark-gfm": "^4.0.0",
     "remark-math": "^6.0.0",
+    "socket.io-client": "^4.8.3",
     "sonner": "^2.0.6",
     "swr": "^2.2.5",
     "tailwind-merge": "^2.4.0",
@@ -67,6 +70,7 @@
     "@types/react": "19.1.2",
     "@types/react-dom": "19.1.2",
     "@types/react-google-recaptcha": "^2.1.9",
+    "@types/webworker": "^0.0.51",
     "@welldone-software/why-did-you-render": "^10.0.1",
     "eslint": "^9.32.0",
     "eslint-config-next": "15.3.1",
diff --git a/packages/frontend/tsconfig.json b/packages/frontend/tsconfig.json
index 89b980249..7cfe5b174 100644
--- a/packages/frontend/tsconfig.json
+++ b/packages/frontend/tsconfig.json
@@ -1,7 +1,11 @@
 {
   "compilerOptions": {
     "target": "es2018",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext",
+    ],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
@@ -26,5 +30,5 @@
     }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules", "dist", ".next", "out", "next.config.js"]
+  "exclude": ["node_modules", "dist", ".next", "out", "next.config.js", "webworkers"]
 }
\ No newline at end of file
diff --git a/packages/frontend/tsconfig.workers.json b/packages/frontend/tsconfig.workers.json
new file mode 100644
index 000000000..a5083f505
--- /dev/null
+++ b/packages/frontend/tsconfig.workers.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "module": "CommonJS",
+    "outDir": "public/workers",
+    "lib": ["webworker"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "noEmit": false,
+    "esModuleInterop": false,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "incremental": false
+  },
+  "include": ["webworkers/**/*.ts"]
+}
\ No newline at end of file
diff --git a/packages/frontend/webworkers/client_websocket.ts b/packages/frontend/webworkers/client_websocket.ts
new file mode 100644
index 000000000..343671abb
--- /dev/null
+++ b/packages/frontend/webworkers/client_websocket.ts
@@ -0,0 +1,399 @@
+importScripts('https://cdn.socket.io/4.8.1/socket.io.min.js')
+
+const workerInstance: SharedWorkerGlobalScope = self as any
+
+const TIMEOUT_DEFAULT = 5000
+let ports: MessagePort[] = []
+
+function serializeResponse(data: any) {
+  if (typeof data == 'boolean' || !data) {
+    return data
+  }
+  if ('error' in data) {
+    throw new Error(data.error)
+  }
+  return data
+}
+
+function promiseWithTimeout<T>(
+  fx: (
+    resolve: (value: T) => void,
+    reject: (reason: Error) => void,
+    clearTimeout: any,
+  ) => void,
+  time: number,
+) {
+  let timeout: any = null
+  return new Promise<T>((resolve, reject) => {
+    fx(resolve, reject, () => {
+      if (timeout) {
+        clearTimeout(timeout)
+      }
+    })
+    timeout = setTimeout(() => {
+      reject(new Error('Request time-out'))
+    }, time)
+  })
+}
+
+class WebsocketClient {
+  private socket: any
+  private subscriptions: { [key: string]: { [key: string]: any }[] } = {}
+  private healthCheck: any
+  get connected(): boolean {
+    return this.socket && this.socket.connected
+  }
+
+  constructor(
+    private url: string,
+    private opts: any,
+  ) {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
+    this.socket = io(this.url, this.opts)
+    this.socket.onAny((event: any, data: any) => {
+      console.log('received:', event, data)
+      this.onMessage(event, data)
+    })
+    this.initHealthcheck()
+  }
+
+  async disable() {
+    this.disconnect().then()
+    this.clearHealthcheck()
+  }
+
+  clearHealthcheck() {
+    if (this.healthCheck) {
+      clearInterval(this.healthCheck)
+    }
+  }
+
+  initHealthcheck() {
+    this.clearHealthcheck()
+    this.healthCheck = setInterval(async () => {
+      if (this.socket.connected) {
+        try {
+          const result = await this.invoke('healthcheck')
+          this.onMessage('healthcheck', !!result)
+        } catch (_ignored) {
+          this.onMessage('healthcheck', false)
+        }
+      }
+    }, 10000)
+  }
+
+  async reconnect() {
+    const subs = { ...this.subscriptions }
+    this.subscriptions = {}
+
+    await this.socket.disconnect()
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
+    this.socket = io(this.url, this.opts)
+    this.socket.onAny((event: any, data: any) => this.onMessage(event, data))
+    await this.connect()
+
+    if (!this.socket.connected) {
+      return false
+    }
+
+    for (const key in subs) {
+      for (const params of subs[key]) {
+        await this.subscribe(key, params)
+      }
+    }
+
+    return true
+  }
+
+  async updateHeaders(headers: { [key: string]: string }) {
+    this.opts.extraHeaders = headers
+    return await this.reconnect()
+  }
+
+  async updateAuth(
+    auth: { [key: string]: any } | ((cb: (data: object) => void) => void),
+  ) {
+    this.opts.auth = auth
+    return await this.reconnect()
+  }
+
+  async connect() {
+    if (this.socket.connected) {
+      return true
+    }
+    const time = this.opts?.timeout ?? 20000
+    return promiseWithTimeout<boolean>((resolve, _, clearTimeout) => {
+      this.socket.once('connect', () => {
+        resolve(true)
+        clearTimeout()
+      })
+      this.socket.connect()
+    }, time)
+  }
+
+  async disconnect() {
+    if (!this.socket.connected) {
+      return true
+    }
+    const time = this.opts?.timeout ?? 20000
+    return promiseWithTimeout<boolean>((resolve, _, clearTimeout) => {
+      this.socket.once('disconnect', () => {
+        resolve(true)
+        clearTimeout()
+      })
+      this.socket.disconnect()
+    }, time)
+  }
+
+  async invoke(event: string, ...args: any[]) {
+    return await this.socket
+      .timeout(TIMEOUT_DEFAULT)
+      .emitWithAck(event, args)
+      .then(serializeResponse)
+  }
+
+  async subscribe(event: string, params: { [key: string]: string }) {
+    if (this.subscriptions[event]?.includes(params)) {
+      return
+    }
+
+    const success = await this.invoke(event, params)
+
+    if (success) {
+      this.subscriptions[event] ??= []
+      this.subscriptions[event].push(params)
+    }
+
+    return success
+  }
+
+  async unsubscribe(event?: string, params?: { [key: string]: string }) {
+    if (!event) {
+      const successes: { [key: string]: boolean | Error } = {}
+      for (const key in this.subscriptions) {
+        try {
+          const success = await this.invoke(key + '/unsubscribe')
+          if (success) {
+            delete this.subscriptions[key]
+            successes[key] = true
+          } else {
+            successes[key] = false
+          }
+        } catch (err: any) {
+          successes[key] = err as Error
+        }
+      }
+      return successes
+    }
+    if (!params) {
+      const success = await this.invoke(event + '/unsubscribe')
+      if (success) {
+        delete this.subscriptions[event]
+      }
+      return success
+    }
+    const success = this.invoke(event + '/unsubscribe', params)
+    const evt = this.subscriptions[event]
+    if (!evt || !success) {
+      return false
+    }
+    this.subscriptions[event].filter((v) => {
+      let allMatch = true
+      for (const key in params) {
+        if (v[key] != undefined && v[key] !== params[key]) {
+          allMatch = false
+          break
+        }
+      }
+      return !allMatch
+    })
+  }
+
+  onMessage(event: string, data: any) {
+    ports.forEach((port) => port.postMessage({ external_event: event, data }))
+  }
+}
+
+let ws: WebsocketClient
+
+function sendReply(
+  port: MessagePort,
+  success: boolean,
+  message: string,
+  replyTo: string,
+) {
+  port.postMessage({ success, message, replyTo })
+}
+
+function sendErrorMessage(port: MessagePort, message: string, replyTo: string) {
+  sendReply(port, false, message, replyTo)
+}
+
+function sendSuccessMessage(
+  port: MessagePort,
+  message: string,
+  replyTo: string,
+) {
+  sendReply(port, true, message, replyTo)
+}
+
+async function worker(port: MessagePort, evt: MessageEvent<any>) {
+  if (evt.data == 'onclose') {
+    ports = ports.filter((p) => p !== port)
+    return
+  }
+
+  const { type, messageId } = evt.data
+  if (!messageId || !type) {
+    sendErrorMessage(port, 'Invalid arguments', '')
+    return
+  }
+  if (type === 'socket_init' && ws) {
+    sendSuccessMessage(port, 'Socket already initialized', messageId)
+    return
+  }
+  if (type !== 'socket_init' && !ws) {
+    sendErrorMessage(port, 'Socket not initialized', messageId)
+    return
+  }
+  if (type !== 'socket_init' && type !== 'connect' && !ws.connected) {
+    sendErrorMessage(port, 'Socket not connected', messageId)
+    return
+  }
+
+  try {
+    switch (type) {
+      case 'socket_init': {
+        const { url, opts, connectNow } = evt.data
+        if (!url || !opts) {
+          sendErrorMessage(port, 'Missing URL and/or options', messageId)
+          return
+        }
+        ws = new WebsocketClient(evt.data.url, evt.data.opts)
+        if (connectNow) {
+          const result = await ws.connect()
+          sendReply(
+            port,
+            result,
+            result
+              ? 'Created & connected socket'
+              : 'Socket created, failed to connect',
+            messageId,
+          )
+        } else {
+          sendSuccessMessage(port, 'Created Socket', messageId)
+        }
+        break
+      }
+      case 'connect': {
+        const result = await ws.connect()
+        sendReply(
+          port,
+          result,
+          result ? 'Connected' : 'Failed to connect',
+          messageId,
+        )
+        break
+      }
+      case 'disconnect': {
+        const result = await ws.disconnect()
+        sendReply(
+          port,
+          result,
+          result ? 'Disconnected' : 'Failed to disconnect',
+          messageId,
+        )
+        break
+      }
+      case 'subscribe': {
+        const { event, params } = evt.data
+        if (!event) {
+          sendErrorMessage(port, 'Missing event to subscribe to', messageId)
+        }
+        const result = await ws.subscribe(event, params)
+        sendReply(
+          port,
+          result,
+          result
+            ? 'Successfully subscribed to event'
+            : 'Failed to subscribe to event',
+          messageId,
+        )
+        break
+      }
+      case 'unsubscribe': {
+        const { event, params } = evt.data
+        const result = await ws.unsubscribe(event, params)
+        if (typeof result == 'object') {
+          const results = Object.keys(result).map((k) => result[k])
+          const successes = results.filter((v) => v === true)
+          const failures = results.filter(
+            (v) => v === false || v instanceof Error,
+          )
+          if (failures.length === 0) {
+            sendReply(
+              port,
+              true,
+              'Successfully unsubscribed from all events',
+              messageId,
+            )
+          } else {
+            sendReply(
+              port,
+              false,
+              `Could not unsubscribe from all events: ${successes.length} succeeded, ${failures.length} failed.`,
+              messageId,
+            )
+          }
+        } else {
+          sendReply(
+            port,
+            result,
+            result
+              ? 'Successfully unsubscribed from event'
+              : 'Failed to unsubscribe from event',
+            messageId,
+          )
+        }
+        break
+      }
+      case 'setHeaders': {
+        const { headers } = evt.data
+        const result = await ws.updateHeaders(headers)
+        sendReply(
+          port,
+          result,
+          result
+            ? 'Successfully updated headers & reconnected'
+            : 'Failed to reconnect after updating headers',
+          messageId,
+        )
+        break
+      }
+      case 'setAuth': {
+        const { auth } = evt.data
+        const result = await ws.updateAuth(auth)
+        sendReply(
+          port,
+          result,
+          result
+            ? 'Successfully updated headers & reconnected'
+            : 'Failed to reconnect after updating headers',
+          messageId,
+        )
+        break
+      }
+    }
+  } catch (err) {
+    sendErrorMessage(port, JSON.stringify(err), messageId)
+  }
+}
+
+workerInstance.onconnect = function (e) {
+  const port = e.ports[0]
+  ports.push(port)
+  port.addEventListener('message', (event) => worker(port, event))
+  port.start()
+}
diff --git a/packages/server/package.json b/packages/server/package.json
index b9b5d4a7d..f4b343f2d 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -44,6 +44,7 @@
     "@nestjs/jwt": "^10.0.0",
     "@nestjs/passport": "^7.1.0",
     "@nestjs/platform-express": "^11.1.5",
+    "@nestjs/platform-socket.io": "^11.1.11",
     "@nestjs/schedule": "^0.4.0",
     "@nestjs/throttler": "^6.4.0",
     "@nestjs/typeorm": "^11.0.0",
@@ -110,6 +111,7 @@
     "rxjs": "^7.1.0",
     "sharp": "^0.33.5",
     "socket.io": "^4.8.3",
+    "socket.io-adapter": "^2.5.6",
     "socket.io-client": "^4.8.3",
     "sonner": "^2.0.2",
     "source-map-support": "^0.5.19",
diff --git a/packages/server/src/app.module.ts b/packages/server/src/app.module.ts
index f62d42a68..0ca7cf8cb 100644
--- a/packages/server/src/app.module.ts
+++ b/packages/server/src/app.module.ts
@@ -38,6 +38,7 @@ import { LmsIntegrationModule } from './lmsIntegration/lmsIntegration.module';
 import { BaseExceptionFilter } from 'exception_filters/generic-exception.filter';
 import { RedisModule } from '@liaoliaots/nestjs-redis';
 import { LtiModule } from './lti/lti.module';
+import { WebsocketModule } from './websocket/websocket.module';
 
 @Module({
   imports: [
@@ -108,6 +109,7 @@ import { LtiModule } from './lti/lti.module';
     ]),
     LmsIntegrationModule,
     LtiModule,
+    WebsocketModule,
   ],
   providers: [
     {
diff --git a/packages/server/src/auth/auth.module.ts b/packages/server/src/auth/auth.module.ts
index b135ee032..a5f95f3d6 100644
--- a/packages/server/src/auth/auth.module.ts
+++ b/packages/server/src/auth/auth.module.ts
@@ -7,11 +7,11 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { MailModule } from 'mail/mail.module';
 import { CourseService } from 'course/course.service';
 import { RedisProfileService } from 'redisProfile/redis-profile.service';
-import { ChatbotApiService } from 'chatbot/chatbot-api.service';
 import { OrganizationService } from '../organization/organization.service';
 import { OrganizationModule } from '../organization/organization.module';
 import { LoginModule } from '../login/login.module';
 import { LoginService } from '../login/login.service';
+import { ChatbotModule } from '../chatbot/chatbot.module';
 
 @Module({
   imports: [
@@ -25,6 +25,7 @@ import { LoginService } from '../login/login.service';
     MailModule,
     OrganizationModule,
     LoginModule,
+    ChatbotModule,
   ],
   controllers: [AuthController],
   providers: [
@@ -32,7 +33,6 @@ import { LoginService } from '../login/login.service';
     AuthService,
     CourseService,
     RedisProfileService,
-    ChatbotApiService,
     OrganizationService,
     LoginService,
   ],
diff --git a/packages/server/src/chatbot/chatbot-api.service.ts b/packages/server/src/chatbot/chatbot-api.service.ts
index 248af302e..c4c1b6f15 100644
--- a/packages/server/src/chatbot/chatbot-api.service.ts
+++ b/packages/server/src/chatbot/chatbot-api.service.ts
@@ -1,4 +1,4 @@
-import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
+import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { ClassType } from 'class-transformer/ClassTransformer';
 import { plainToClass } from 'class-transformer';
@@ -13,6 +13,9 @@ import {
   ChatbotQueryBody,
   ChatbotQueryTypeEnum,
   ChatbotQuestionResponse,
+  ChatbotResultEventArgs,
+  ChatbotResultEventName,
+  ChatbotResultEvents,
   ChatMessage,
   CloneCourseDocumentsBody,
   CreateChatbotCourseSettingsBody,
@@ -31,12 +34,7 @@ import {
   UpsertDocumentQueryBody,
 } from '@koh/common';
 import { isObject } from '@nestjs/common/utils/shared.utils';
-import {
-  ChatbotResultEventArgs,
-  ChatbotResultEventName,
-  ChatbotResultEvents,
-  ChatbotResultWebSocket,
-} from './intermediate-results/chatbot-result.websocket';
+import { ChatbotResultGateway } from './intermediate-results/chatbot-result.gateway';
 
 type ChatbotRequestInit<TBody> = {
   userToken?: string;
@@ -68,7 +66,8 @@ export class ChatbotApiService {
 
   constructor(
     private configService: ConfigService,
-    private chatbotResultWebSocket: ChatbotResultWebSocket,
+    @Inject(ChatbotResultGateway)
+    private chatbotResultWebSocket: ChatbotResultGateway,
   ) {
     // this.chatbotApiUrl = this.configService.get<string>('CHATBOT_API_URL');
     this.chatbotApiUrl = 'http://localhost:3003/chat';
@@ -120,6 +119,13 @@ export class ChatbotApiService {
         headers['HMS_API_TOKEN'] = userToken;
       }
 
+      let id: string | undefined = undefined;
+      if (webSocketEvent) {
+        id = await this.chatbotResultWebSocket.getUniqueId();
+        webSocketEvent['resultId'] = id;
+        data['ws_info'] = webSocketEvent;
+      }
+
       let body: BodyInit;
       if (data instanceof FormData) {
         body = data;
@@ -129,13 +135,6 @@ export class ChatbotApiService {
         body = data as any;
       }
 
-      let id: string | undefined = undefined;
-      if (webSocketEvent) {
-        id = await this.chatbotResultWebSocket.getUniqueId();
-        webSocketEvent['resultId'] = id;
-        body['ws_info'] = webSocketEvent;
-      }
-
       const response = await fetch(url, {
         method,
         headers,
@@ -158,16 +157,17 @@ export class ChatbotApiService {
         return;
       }
 
+      if (response.status === 202 && webSocketEvent) {
+        return (id ?? (await response.text())) as any;
+      }
+
       const plain = await response.json();
-      return id !== undefined
-        ? (id as any)
-        : responseClass
-          ? plainToClass(responseClass, plain)
-          : plain;
+      return responseClass ? plainToClass(responseClass, plain) : plain;
     } catch (error) {
       if (error instanceof HttpException) {
         throw error;
       }
+      console.error(error);
       throw new HttpException(
         'Failed to connect to chatbot service',
         HttpStatus.INTERNAL_SERVER_ERROR,
@@ -488,6 +488,16 @@ export class ChatbotApiService {
     );
   }
 
+  async deleteAllDocumentQueries(
+    documentId: string,
+    courseId: number,
+  ): Promise<void> {
+    return this.request(
+      'DELETE',
+      `document/query/${courseId}/${documentId}/all`,
+    );
+  }
+
   // Creates a document aggregate from raw text - generally only used for LMS documents
   async addDocument(
     courseId: number,
diff --git a/packages/server/src/chatbot/chatbot.controller.ts b/packages/server/src/chatbot/chatbot.controller.ts
index 12ef8c87f..c103e8070 100644
--- a/packages/server/src/chatbot/chatbot.controller.ts
+++ b/packages/server/src/chatbot/chatbot.controller.ts
@@ -22,7 +22,6 @@ import {
 import { ChatbotService } from './chatbot.service';
 import { JwtAuthGuard } from '../guards/jwt-auth.guard';
 import { EmailVerifiedGuard } from 'guards/email-verified.guard';
-import { io } from 'socket.io-client';
 import {
   ChatbotAskSuggestedBody,
   ChatbotCourseSettingsResponse,
@@ -33,6 +32,8 @@ import {
   ChatbotProvider,
   ChatbotQueryBody,
   ChatbotQuestionResponse,
+  ChatbotResultEventName,
+  ChatbotResultEvents,
   ChatbotServiceProvider,
   ChatbotServiceType,
   CourseChatbotSettings,
@@ -100,26 +101,19 @@ import {
   IgnoreSerializer,
 } from '../interceptors/IgnoreableClassSerializerInterceptor';
 import { plainToClass } from 'class-transformer';
-import {
-  ChatbotResultEventName,
-  ChatbotResultEvents,
-  ChatbotResultWebSocket,
-} from './intermediate-results/chatbot-result.websocket';
-import { ClientSocket } from '../websocket/clientSocket';
+import { ChatbotResultGateway } from './intermediate-results/chatbot-result.gateway';
+import { ClientSocketService } from 'websocket/client-socket.service';
 
 @Controller('chatbot')
 @UseGuards(JwtAuthGuard, EmailVerifiedGuard)
 @UseInterceptors(IgnoreableClassSerializerInterceptor)
 export class ChatbotController {
-  private socket: ClientSocket;
   constructor(
     private readonly chatbotService: ChatbotService,
     private readonly chatbotApiService: ChatbotApiService,
-    private readonly chatbotResultWebSocket: ChatbotResultWebSocket,
-  ) {
-    const socket = io();
-    this.socket = new ClientSocket(socket as any);
-  }
+    private readonly chatbotResultWebSocket: ChatbotResultGateway,
+    private readonly socket: ClientSocketService,
+  ) {}
 
   //
   // Endpoints for both students and staff
@@ -577,6 +571,16 @@ export class ChatbotController {
     await this.chatbotApiService.deleteDocumentQuery(queryId, courseId);
   }
 
+  @Delete(':courseId/query/:documentId/all')
+  @UseGuards(CourseRolesGuard)
+  @Roles(Role.PROFESSOR, Role.TA)
+  async deleteAllDocumentQueries(
+    @Param('courseId', ParseIntPipe) courseId: number,
+    @Param('documentId') documentId: string,
+  ): Promise<void> {
+    await this.chatbotApiService.deleteAllDocumentQueries(documentId, courseId);
+  }
+
   // TODO: eventually add tests for this I guess
   // note that there is no corresponding endpoint for this one on the frontend as you are supposed to make links to it
   @Get('document/:courseId/:docId')
diff --git a/packages/server/src/chatbot/chatbot.module.ts b/packages/server/src/chatbot/chatbot.module.ts
index 095cc91eb..361de2ac2 100644
--- a/packages/server/src/chatbot/chatbot.module.ts
+++ b/packages/server/src/chatbot/chatbot.module.ts
@@ -6,27 +6,58 @@ import { ChatbotSettingsSubscriber } from './chatbot-infrastructure-models/chatb
 import { CacheModule } from '@nestjs/cache-manager';
 import { ChatbotDataSourceModule } from './chatbot-datasource/chatbot-datasource.module';
 import { PostgresConnectionOptions } from 'typeorm/driver/postgres/PostgresConnectionOptions';
-import { ChatbotResultWebSocket } from './intermediate-results/chatbot-result.websocket';
+import { ChatbotResultGateway } from './intermediate-results/chatbot-result.gateway';
+import { WebsocketModule } from '../websocket/websocket.module';
+import { JwtModule } from '@nestjs/jwt';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import { JwtStrategy } from '../login/jwt.strategy';
 
 @Module({
   controllers: [ChatbotController],
-  imports: [CacheModule.register(), ChatbotDataSourceModule],
-  providers: [ChatbotService, ChatbotApiService, ChatbotSettingsSubscriber],
+  imports: [
+    JwtModule.registerAsync({
+      imports: [ConfigModule],
+      inject: [ConfigService],
+      useFactory: async (configService: ConfigService) => ({
+        secret: configService.get('JWT_SECRET'),
+      }),
+    }),
+    CacheModule.register(),
+    ChatbotDataSourceModule,
+    WebsocketModule,
+  ],
+  providers: [
+    JwtStrategy,
+    ChatbotService,
+    ChatbotApiService,
+    ChatbotSettingsSubscriber,
+    ChatbotResultGateway,
+  ],
+  exports: [ChatbotApiService, ChatbotResultGateway],
 })
 export class ChatbotModule {
   static forRoot(connectionOptions: PostgresConnectionOptions) {
     return {
       module: ChatbotModule,
       imports: [
+        JwtModule.registerAsync({
+          imports: [ConfigModule],
+          inject: [ConfigService],
+          useFactory: async (configService: ConfigService) => ({
+            secret: configService.get('JWT_SECRET'),
+          }),
+        }),
         CacheModule.register(),
         ChatbotDataSourceModule.forRoot(connectionOptions),
+        WebsocketModule,
       ],
       providers: [
         ChatbotService,
         ChatbotApiService,
         ChatbotSettingsSubscriber,
-        ChatbotResultWebSocket,
+        ChatbotResultGateway,
       ],
+      exports: [ChatbotApiService, ChatbotResultGateway],
     };
   }
 }
diff --git a/packages/server/src/course/course.module.ts b/packages/server/src/course/course.module.ts
index 067e46db6..ff950f28f 100644
--- a/packages/server/src/course/course.module.ts
+++ b/packages/server/src/course/course.module.ts
@@ -13,9 +13,9 @@ import { RedisProfileService } from '../redisProfile/redis-profile.service';
 import { ApplicationConfigModule } from '../config/application_config.module';
 import { RedisQueueModule } from '../redisQueue/redis-queue.module';
 import { MailModule } from 'mail/mail.module';
-import { ChatbotApiService } from 'chatbot/chatbot-api.service';
 import { CourseSubscriber } from './course.subscriber';
 import { OrganizationService } from '../organization/organization.service';
+import { ChatbotModule } from '../chatbot/chatbot.module';
 
 @Module({
   controllers: [CourseController],
@@ -27,6 +27,7 @@ import { OrganizationService } from '../organization/organization.service';
     MailModule,
     RedisQueueModule,
     ApplicationConfigModule,
+    ChatbotModule,
   ],
   providers: [
     HeatmapService,
@@ -36,9 +37,8 @@ import { OrganizationService } from '../organization/organization.service';
     RedisProfileService,
     QueueCleanService,
     ApplicationConfigService,
-    ChatbotApiService,
     OrganizationService,
   ],
-  exports: [CourseService, ChatbotApiService],
+  exports: [CourseService],
 })
 export class CourseModule {}
diff --git a/packages/server/src/exception_filters/generic-ws-exception.filter.ts b/packages/server/src/exception_filters/generic-ws-exception.filter.ts
new file mode 100644
index 000000000..84230ada0
--- /dev/null
+++ b/packages/server/src/exception_filters/generic-ws-exception.filter.ts
@@ -0,0 +1,83 @@
+import { ArgumentsHost, Logger, WsExceptionFilter } from '@nestjs/common';
+import { isObject } from '@nestjs/common/utils/shared.utils';
+import { MESSAGES } from '@nestjs/core/constants';
+import { ErrorPayload, WsException } from '@nestjs/websockets';
+import { IntrinsicException } from '@nestjs/common/exceptions/intrinsic.exception';
+import { SentryExceptionCaptured } from '@sentry/nestjs';
+
+type Func = (event: string, ...args: any[]) => void;
+
+/* This is the base WS exception filter take from Nest.js
+
+  It had an issue where the object check in 'handleUnknownError' would fail due to the object being checked
+  not being an object.
+  Added a @SentryExceptionCaptured() decorator so that sentry logs the exceptions to match
+  with generic-exception-filter.ts
+
+*/
+export class BaseWsExceptionFilter<
+  TError = any,
+> implements WsExceptionFilter<TError> {
+  protected static readonly logger = new Logger('WsExceptionsHandler');
+
+  @SentryExceptionCaptured()
+  public catch(exception: TError, host: ArgumentsHost) {
+    const client = host.switchToWs().getClient();
+    const pattern = host.switchToWs().getPattern();
+    const data = host.switchToWs().getData();
+    this.handleError(client, exception, {
+      pattern,
+      data,
+    });
+  }
+
+  public handleError<TClient extends { emit: Func }>(
+    client: TClient,
+    exception: TError,
+    cause: ErrorPayload['cause'],
+  ) {
+    if (!(exception instanceof WsException)) {
+      return this.handleUnknownError(exception, client, cause);
+    }
+
+    const status = 'error';
+    const result = exception.getError();
+
+    if (isObject(result)) {
+      return client.emit('exception', result);
+    }
+
+    const payload: ErrorPayload<unknown> = {
+      status,
+      message: result,
+    };
+
+    client.emit(cause.pattern, payload);
+  }
+
+  public handleUnknownError<TClient extends { emit: Func }>(
+    exception: TError,
+    client: TClient,
+    data: ErrorPayload['cause'],
+  ) {
+    const status = 'error';
+    const payload: ErrorPayload<unknown> = {
+      status,
+      message: MESSAGES.UNKNOWN_EXCEPTION_MESSAGE,
+    };
+
+    client.emit(data.pattern, payload);
+
+    if (
+      !this.isExceptionObject(exception) ||
+      !(exception instanceof IntrinsicException)
+    ) {
+      const logger = BaseWsExceptionFilter.logger;
+      logger.error(exception);
+    }
+  }
+
+  public isExceptionObject(err: any): err is Error {
+    return isObject(err) && !!(err as Error).message;
+  }
+}
diff --git a/packages/server/src/guards/websocket/ws-chatbot-api-key.guard.ts b/packages/server/src/guards/websocket/ws-api-key.guard.ts
similarity index 67%
rename from packages/server/src/guards/websocket/ws-chatbot-api-key.guard.ts
rename to packages/server/src/guards/websocket/ws-api-key.guard.ts
index f1bc42428..d8bdf7826 100644
--- a/packages/server/src/guards/websocket/ws-chatbot-api-key.guard.ts
+++ b/packages/server/src/guards/websocket/ws-api-key.guard.ts
@@ -3,10 +3,11 @@ import { WebSocketGuard } from './websocket.guard';
 import { Observable } from 'rxjs';
 import { Socket } from 'socket.io';
 import { WsUnauthorizedException } from '../../websocket/websocket.exception';
+import { ConfigService } from '@nestjs/config';
 
 @Injectable()
-export class WsChatbotApiKeyGuard extends WebSocketGuard {
-  constructor() {
+export class WsApiKeyGuard extends WebSocketGuard {
+  constructor(private configService: ConfigService) {
     super();
   }
 
@@ -18,8 +19,9 @@ export class WsChatbotApiKeyGuard extends WebSocketGuard {
 
   handleRequest(client: Socket): boolean {
     const handshake = client.handshake;
-    const apiKey = handshake.headers['hms-api-key'];
-    const validApiKey = process.env.CHATBOT_API_KEY;
+    const apiKey =
+      handshake.headers['hms-api-key'] ?? handshake.headers['HMS-API-KEY'];
+    const validApiKey = this.configService.get<string>('CHATBOT_API_KEY');
 
     if (!apiKey || apiKey !== validApiKey) {
       throw new WsUnauthorizedException('Invalid or missing API key');
diff --git a/packages/server/src/guards/websocket/ws-general.guard.ts b/packages/server/src/guards/websocket/ws-general.guard.ts
new file mode 100644
index 000000000..139732f5c
--- /dev/null
+++ b/packages/server/src/guards/websocket/ws-general.guard.ts
@@ -0,0 +1,59 @@
+import { ExecutionContext, Injectable } from '@nestjs/common';
+import { WebSocketGuard } from './websocket.guard';
+import { Observable } from 'rxjs';
+import { Socket } from 'socket.io';
+import {
+  WebSocketException,
+  WsUnauthorizedException,
+} from '../../websocket/websocket.exception';
+import { ConfigService } from '@nestjs/config';
+import { JwtService } from '@nestjs/jwt';
+import { WsJwtAuthGuard } from './ws-jwt-auth.guard';
+import { WsApiKeyGuard } from './ws-api-key.guard';
+
+@Injectable()
+export class WsGeneralGuard extends WebSocketGuard {
+  private wsJwtAuthGuard: WsJwtAuthGuard;
+  private wsApiKeyGuard: WsApiKeyGuard;
+
+  constructor(
+    private configService: ConfigService,
+    private jwtService: JwtService,
+  ) {
+    super();
+    this.wsApiKeyGuard = new WsApiKeyGuard(configService);
+    this.wsJwtAuthGuard = new WsJwtAuthGuard(jwtService);
+  }
+
+  canActivate(
+    context: ExecutionContext,
+  ): boolean | Promise<boolean> | Observable<boolean> {
+    return super.canActivate(context);
+  }
+
+  handleRequest(client: Socket): boolean {
+    let passedAuth = false,
+      passedApi = false;
+    const failed: string[] = [];
+    try {
+      passedAuth = this.wsJwtAuthGuard.handleRequest(client, {} as any, '');
+    } catch (err: any) {
+      if (err instanceof WebSocketException) {
+        failed.push(err.message);
+      }
+    }
+    try {
+      passedApi = this.wsApiKeyGuard.handleRequest(client);
+    } catch (err: any) {
+      if (err instanceof WebSocketException) {
+        failed.push(err.message);
+      }
+    }
+    if (!passedApi && !passedAuth) {
+      throw new WsUnauthorizedException(
+        failed.length > 0 ? failed.join(' & ') : undefined,
+      );
+    }
+    return true;
+  }
+}
diff --git a/packages/server/src/guards/websocket/ws-jwt-auth.guard.ts b/packages/server/src/guards/websocket/ws-jwt-auth.guard.ts
index 121b9cabc..bf40406c5 100644
--- a/packages/server/src/guards/websocket/ws-jwt-auth.guard.ts
+++ b/packages/server/src/guards/websocket/ws-jwt-auth.guard.ts
@@ -21,7 +21,12 @@ export class WsJwtAuthGuard extends WebSocketGuard {
     return super.canActivate(context);
   }
 
-  handleRequest(client: Socket, _: any, pattern: string): boolean {
+  handleRequest(
+    client: Socket,
+    _: any,
+    pattern: string,
+    skipPath?: boolean,
+  ): boolean {
     // Check if token is limited to specific endpoints
     const user = this.precheck(client);
     if (!user) {
@@ -30,7 +35,7 @@ export class WsJwtAuthGuard extends WebSocketGuard {
       );
     }
     const pathOrPaths: string | string[] = user.restrictPaths;
-    if (!pathOrPaths) {
+    if (!pathOrPaths || skipPath) {
       return user;
     }
 
@@ -71,25 +76,36 @@ export class WsJwtAuthGuard extends WebSocketGuard {
 
   precheck(client: Socket): any {
     const handshake = client.handshake;
-    const authHeader = handshake.headers.authorization;
+    const cookie = handshake.headers.cookie;
 
-    if (!authHeader) {
+    if (!cookie) {
       throw new WsUnauthorizedException(
         ERROR_MESSAGES.webSocket.jwt.missingAuthHeader,
       );
     }
 
-    // Extract the token part (remove "Bearer ")
-    const token = authHeader.split(' ')[1];
-
-    if (!token) {
+    const split = cookie.split(';');
+    const cookies = split.map((v) => {
+      const [key, value] = v.trim().split('=') as [string, string];
+      return { key, value };
+    });
+    const authCookie =
+      cookies.find((c) => c.key == 'auth_token') ??
+      cookies.find((c) => c.key == 'lti_auth_token');
+    if (!authCookie) {
+      throw new WsUnauthorizedException(
+        ERROR_MESSAGES.webSocket.jwt.missingAuthToken,
+      );
+    }
+    if (!authCookie.value) {
+      // latter half of string is empty
       throw new WsUnauthorizedException(
         ERROR_MESSAGES.webSocket.jwt.malformedToken,
       );
     }
 
     try {
-      client['user'] = this.jwtService.verify(token);
+      client['user'] = this.jwtService.verify(authCookie.value);
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
     } catch (_err) {
       throw new WsUnauthorizedException(
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.module.ts b/packages/server/src/lmsIntegration/lmsIntegration.module.ts
index 9cbbe8076..5699b5252 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.module.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.module.ts
@@ -8,9 +8,15 @@ import { ChatbotApiService } from '../chatbot/chatbot-api.service';
 import { SyncLMSCommand } from './sync_lms.command';
 import { CacheModule } from '@nestjs/cache-manager';
 import { OrganizationService } from '../organization/organization.service';
+import { WebsocketModule } from 'websocket/websocket.module';
 
 @Module({
-  imports: [ScheduleModule.forRoot(), ChatbotModule, CacheModule.register()],
+  imports: [
+    ScheduleModule.forRoot(),
+    ChatbotModule,
+    CacheModule.register(),
+    WebsocketModule,
+  ],
   controllers: [LMSIntegrationController],
   providers: [
     LMSIntegrationService,
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.service.ts b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
index b81b52a5b..702211e78 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.service.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
@@ -5,6 +5,8 @@ import {
 } from './lmsIntegration.adapter';
 import {
   ChatbotDocumentAggregateResponse,
+  ChatbotResultEventName,
+  ChatbotResultEvents,
   CoursePartial,
   dropUndefined,
   ERROR_MESSAGES,
@@ -44,13 +46,8 @@ import { LMSAccessTokenModel } from './lms-access-token.entity';
 import { pick } from 'lodash';
 import { LMSAuthStateModel } from './lms-auth-state.entity';
 import { UserModel } from '../profile/user.entity';
-import { io } from 'socket.io-client';
-import {
-  ChatbotResultEventName,
-  ChatbotResultEvents,
-  ChatbotResultWebSocket,
-} from '../chatbot/intermediate-results/chatbot-result.websocket';
-import { ClientSocket } from '../websocket/clientSocket';
+import { ChatbotResultGateway } from 'chatbot/intermediate-results/chatbot-result.gateway';
+import { ClientSocketService } from 'websocket/client-socket.service';
 
 export enum LMSGet {
   Course,
@@ -82,18 +79,15 @@ type ExtendedLMSItem = (
 
 @Injectable()
 export class LMSIntegrationService {
-  private socket: ClientSocket;
   constructor(
     @Inject(LMSIntegrationAdapter)
     private integrationAdapter: LMSIntegrationAdapter,
     @Inject(ChatbotApiService)
     private chatbotApiService: ChatbotApiService,
-    private chatbotResultWebSocket: ChatbotResultWebSocket,
+    private chatbotResultWebSocket: ChatbotResultGateway,
     @Inject(CACHE_MANAGER) private cacheManager: Cache,
-  ) {
-    const socket = io();
-    this.socket = new ClientSocket(socket as any);
-  }
+    private socket: ClientSocketService,
+  ) {}
 
   @Cron(CronExpression.EVERY_DAY_AT_MIDNIGHT, { name: 'CLEAR_LMS_AUTH_STATES' })
   async clearLMSAuthStates() {
@@ -573,6 +567,7 @@ export class LMSIntegrationService {
       itemsSynced: 0,
       itemsRemoved: 0,
       errors: 0,
+      resultIds: [],
     };
 
     // maybe add this later to fallback to all resources if db fetch does not work
@@ -754,8 +749,14 @@ export class LMSIntegrationService {
           adapter,
           model,
         );
-        if (!!response) syncDocumentsResult.itemsSynced++;
-        else syncDocumentsResult.errors++;
+        if (!!response) {
+          if (typeof response === 'string') {
+            syncDocumentsResult.resultIds.push(response);
+          }
+          syncDocumentsResult.itemsSynced++;
+        } else {
+          syncDocumentsResult.errors++;
+        }
       }
     }
     return syncDocumentsResult;
diff --git a/packages/server/src/login/login.module.ts b/packages/server/src/login/login.module.ts
index 1f1f47d40..325590580 100644
--- a/packages/server/src/login/login.module.ts
+++ b/packages/server/src/login/login.module.ts
@@ -7,8 +7,8 @@ import { CourseService } from 'course/course.service';
 import { RedisProfileModule } from 'redisProfile/redis-profile.module';
 import { RedisProfileService } from 'redisProfile/redis-profile.service';
 import { MailModule } from 'mail/mail.module';
-import { ChatbotApiService } from 'chatbot/chatbot-api.service';
 import { LoginService } from './login.service';
+import { ChatbotModule } from '../chatbot/chatbot.module';
 
 @Module({
   imports: [
@@ -20,14 +20,9 @@ import { LoginService } from './login.service';
       }),
     }),
     MailModule,
+    ChatbotModule,
   ],
   controllers: [LoginController],
-  providers: [
-    JwtStrategy,
-    CourseService,
-    LoginService,
-    RedisProfileService,
-    ChatbotApiService,
-  ],
+  providers: [JwtStrategy, CourseService, LoginService, RedisProfileService],
 })
 export class LoginModule {}
diff --git a/packages/server/src/lti/lti.controller.ts b/packages/server/src/lti/lti.controller.ts
index 0d103aed7..e775a6d11 100644
--- a/packages/server/src/lti/lti.controller.ts
+++ b/packages/server/src/lti/lti.controller.ts
@@ -229,6 +229,8 @@ export class LtiController {
   ): Promise<LtiPlatform> {
     const platform = await this.ltiService.provider.getPlatformById(kid);
 
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-expect-error
     return await this.ltiService.provider.DynamicRegistration.getRegistration(
       platform,
     );
diff --git a/packages/server/src/lti/lti.middleware.ts b/packages/server/src/lti/lti.middleware.ts
index 9d551114a..d2acf14ca 100644
--- a/packages/server/src/lti/lti.middleware.ts
+++ b/packages/server/src/lti/lti.middleware.ts
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 import { HttpException, INestApplication } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { DataSource } from 'typeorm';
diff --git a/packages/server/src/organization/organization.module.ts b/packages/server/src/organization/organization.module.ts
index 163693f16..4cb99b33c 100644
--- a/packages/server/src/organization/organization.module.ts
+++ b/packages/server/src/organization/organization.module.ts
@@ -5,17 +5,21 @@ import { RedisProfileModule } from 'redisProfile/redis-profile.module';
 import { ScheduleModule } from '@nestjs/schedule';
 import { CourseService } from 'course/course.service';
 import { MailModule } from 'mail/mail.module';
-import { ChatbotApiService } from 'chatbot/chatbot-api.service';
 import { OrganizationUserSubscriber } from './organization-user.subscriber';
 import { OrganizationSubscriber } from './organization.subscriber';
+import { ChatbotModule } from '../chatbot/chatbot.module';
 
 @Module({
-  imports: [RedisProfileModule, ScheduleModule.forRoot(), MailModule],
+  imports: [
+    RedisProfileModule,
+    ScheduleModule.forRoot(),
+    MailModule,
+    ChatbotModule,
+  ],
   controllers: [OrganizationController],
   providers: [
     OrganizationService,
     CourseService,
-    ChatbotApiService,
     OrganizationUserSubscriber,
     OrganizationSubscriber,
   ],
diff --git a/packages/server/src/websocket/clientSocket.ts b/packages/server/src/websocket/client-socket.service.ts
similarity index 74%
rename from packages/server/src/websocket/clientSocket.ts
rename to packages/server/src/websocket/client-socket.service.ts
index 91108c8a5..463842aef 100644
--- a/packages/server/src/websocket/clientSocket.ts
+++ b/packages/server/src/websocket/client-socket.service.ts
@@ -1,7 +1,19 @@
-import { DefaultEventsMap, Socket } from 'socket.io';
+import { io, Socket } from 'socket.io-client';
+import { ConfigService } from '@nestjs/config';
+import { Injectable } from '@nestjs/common';
 
-export class ClientSocket {
-  constructor(private socket: Socket<DefaultEventsMap, DefaultEventsMap>) {}
+@Injectable()
+export class ClientSocketService {
+  private socket: Socket;
+
+  constructor(private configService: ConfigService) {
+    this.socket = io({
+      path: '/api/v1/ws',
+      extraHeaders: {
+        'hms-api-key': this.configService.get<string>('CHATBOT_API_KEY'),
+      },
+    }) as Socket;
+  }
 
   private activeListeners: {
     [key: string]: ((data: any) => void | Promise<void>)[];
diff --git a/packages/server/src/websocket/websocket.event.ts b/packages/server/src/websocket/websocket.event.ts
index 902b0b651..c2dd638b4 100644
--- a/packages/server/src/websocket/websocket.event.ts
+++ b/packages/server/src/websocket/websocket.event.ts
@@ -6,10 +6,37 @@ export class WebSocketSubscriber<TParams extends object = object> {
     public params: TParams,
   ) {}
 
-  checkMatch(params: Partial<TParams>): boolean {
+  checkMatch(params: Partial<TParams>, exclusive?: boolean): boolean {
     for (const k in this.params) {
-      if (!(k in params) || this.params[k] !== params[k]) {
-        return false;
+      if (!(k in params)) {
+        if (exclusive) {
+          return false;
+        }
+        continue;
+      }
+      const array = Array.isArray(this.params[k])
+        ? (this.params[k] as any[])
+        : undefined;
+      if (array) {
+        const a2 = Array.isArray(params[k]) ? (params[k] as any[]) : undefined;
+        if (a2) {
+          const shared = array.filter((v) => a2.includes(v));
+          if (shared.length !== array.length) {
+            return false;
+          }
+        } else {
+          if (!array.includes(params[k])) {
+            return false;
+          }
+        }
+      } else {
+        if (
+          Array.isArray(params[k])
+            ? !(params[k] as any[]).includes(this.params[k])
+            : this.params[k] !== params[k]
+        ) {
+          return false;
+        }
       }
     }
     return true;
@@ -32,10 +59,8 @@ export class WebSocketEvent<TParams extends object = object, TData = any> {
       this.subscribers[existsIndex].params = params;
       return;
     }
-    this.subscribers = [
-      ...this.subscribers,
-      new WebSocketSubscriber(clientId, params),
-    ];
+    const newSub = new WebSocketSubscriber(clientId, params);
+    this.subscribers = [...this.subscribers, newSub];
   }
 
   unsubscribe(clientId: string, params?: Partial<TParams>) {
@@ -47,13 +72,7 @@ export class WebSocketEvent<TParams extends object = object, TData = any> {
       if (!subscriber.params || !params || Object.keys(params).length === 0) {
         return false;
       }
-      let matchParams = true;
-      for (const k in params) {
-        if ((subscriber.params as any)[k] !== params[k]) {
-          matchParams = false;
-          break;
-        }
-      }
+      const matchParams = subscriber.checkMatch(params, false);
       return !matchParams;
     });
   }
@@ -74,9 +93,14 @@ export class WebSocketEvent<TParams extends object = object, TData = any> {
         const subscriber = this.subscribers.find(
           (s) => s.socketId === socket.id,
         );
-        const match = subscriber.checkMatch(params);
+        if (!subscriber) return;
+        const match = subscriber.checkMatch(params, true);
+
         if (!match) return;
-        socket.emit(this.postEvent, data);
+        socket.emit(this.postEvent, {
+          params: params,
+          data: data,
+        });
       });
     });
   }
diff --git a/packages/server/src/websocket/websocket.gateway.ts b/packages/server/src/websocket/websocket.gateway.ts
new file mode 100644
index 000000000..3d6a845e7
--- /dev/null
+++ b/packages/server/src/websocket/websocket.gateway.ts
@@ -0,0 +1,127 @@
+import { Inject, Injectable, Logger, UseFilters } from '@nestjs/common';
+import {
+  OnGatewayConnection,
+  OnGatewayDisconnect,
+  OnGatewayInit,
+  SubscribeMessage,
+  WebSocketGateway,
+  WebSocketServer,
+} from '@nestjs/websockets';
+import { Server, ServerOptions, Socket } from 'socket.io';
+import { WebSocketEvent } from 'websocket/websocket.event';
+import { Cron, CronExpression } from '@nestjs/schedule';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { Cache } from 'cache-manager';
+import * as crypto from 'crypto';
+import { JwtService } from '@nestjs/jwt';
+import { ConfigService } from '@nestjs/config';
+import { WebSocketException } from './websocket.exception';
+import { isProd } from '@koh/common';
+import { WsGeneralGuard } from '../guards/websocket/ws-general.guard';
+import { BaseWsExceptionFilter } from '../exception_filters/generic-ws-exception.filter';
+
+export const DefaultWebSocketServerOptions = {
+  cors: {
+    origin: '*',
+  },
+  connectionStateRecovery: {
+    maxDisconnectionDuration: 10 * 1000,
+    skipMiddlewares: false,
+  },
+  path: '/api/v1/ws',
+  serveClient: false,
+  connectTimeout: 45000,
+  cleanupEmptyChildNamespaces: true,
+} as Partial<ServerOptions>;
+
+@Injectable()
+@UseFilters(new BaseWsExceptionFilter())
+@WebSocketGateway(DefaultWebSocketServerOptions)
+export class WebsocketGateway
+  implements OnGatewayInit, OnGatewayConnection, OnGatewayDisconnect
+{
+  protected readonly logger: Logger;
+  private wsGeneralGuard: WsGeneralGuard;
+
+  constructor(
+    protected configService: ConfigService,
+    protected jwtService: JwtService,
+    @Inject(CACHE_MANAGER)
+    protected cacheManager: Cache,
+  ) {
+    this.wsGeneralGuard = new WsGeneralGuard(configService, jwtService);
+    this.logger = new Logger(WebsocketGateway.name);
+  }
+
+  @WebSocketServer()
+  protected server: Server;
+  protected events: { [key: string]: WebSocketEvent } = {};
+
+  @Cron(CronExpression.EVERY_30_MINUTES, { name: 'CLEAR_SUBSCRIBERS' })
+  async removeHangingSubscribers() {
+    const ids = await this.server
+      .fetchSockets()
+      .then((sockets) =>
+        sockets.map((s) => s.id).reduce((p, c) => [...p, c], []),
+      );
+    for (const event of Object.values(this.events)) {
+      event.filterSubscribers(ids);
+    }
+  }
+
+  afterInit(server: Server): any {
+    this.server = server;
+    this.logger.debug(this.server.path());
+  }
+
+  handleConnection(client: Socket): any {
+    if (!isProd()) {
+      this.logger.debug(`Client ${client.id} attempting connection.`);
+    }
+    let passedGuard: boolean = false;
+    let passedGuardError: Error = undefined;
+    try {
+      passedGuard = this.wsGeneralGuard.handleRequest(client);
+    } catch (err: any) {
+      passedGuardError = err as WebSocketException;
+    }
+    if (!passedGuard) {
+      client.disconnect(true);
+      const msg = passedGuardError?.message ?? 'Unauthorized';
+      if (!isProd()) {
+        this.logger.debug(
+          `Client ${client.id} connection attempt failed: unauthorized (${msg})`,
+        );
+      }
+      return false;
+    }
+    if (!isProd()) {
+      this.logger.debug(`Client connected ${client.id}`);
+    }
+    return true;
+  }
+
+  handleDisconnect(client: Socket): any {
+    if (!isProd()) {
+      this.logger.debug(`Client disconnected ${client.id}`);
+    }
+    for (const event of Object.values(this.events)) {
+      event.unsubscribe(client.id);
+    }
+    return true;
+  }
+
+  async getUniqueId(): Promise<string> {
+    let id: string | undefined = undefined;
+    do {
+      id = crypto.randomBytes(32).toString('hex');
+    } while (await this.cacheManager.get(id));
+    await this.cacheManager.set(id, true, 30 * 60 * 1000); // persist for 30 min
+    return id;
+  }
+
+  @SubscribeMessage('healthcheck')
+  async onHealthCheck() {
+    return true;
+  }
+}
diff --git a/packages/server/src/websocket/websocket.module.ts b/packages/server/src/websocket/websocket.module.ts
new file mode 100644
index 000000000..370030d8b
--- /dev/null
+++ b/packages/server/src/websocket/websocket.module.ts
@@ -0,0 +1,8 @@
+import { Module } from '@nestjs/common';
+import { ClientSocketService } from './client-socket.service';
+
+@Module({
+  providers: [ClientSocketService],
+  exports: [ClientSocketService],
+})
+export class WebsocketModule {}
diff --git a/packages/server/src/websocket/websocket.template.ts b/packages/server/src/websocket/websocket.template.ts
deleted file mode 100644
index 3e2abeb93..000000000
--- a/packages/server/src/websocket/websocket.template.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import {
-  OnGatewayDisconnect,
-  OnGatewayInit,
-  WebSocketGateway,
-  WebSocketServer,
-} from '@nestjs/websockets';
-import { Server, Socket } from 'socket.io';
-import { WebSocketEvent } from 'websocket/websocket.event';
-import { Cron, CronExpression } from '@nestjs/schedule';
-import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { Cache } from 'cache-manager';
-import crypto from 'crypto';
-
-@Injectable()
-@WebSocketGateway({
-  cors: {
-    origin: '*',
-  },
-})
-export class WebSocketTemplate implements OnGatewayInit, OnGatewayDisconnect {
-  constructor(
-    @Inject(CACHE_MANAGER)
-    protected cacheManager: Cache,
-  ) {}
-
-  @WebSocketServer()
-  protected server: Server;
-  protected events: { [key: string]: WebSocketEvent } = {};
-
-  @Cron(CronExpression.EVERY_30_MINUTES, { name: 'CLEAR_SUBSCRIBERS' })
-  async removeHangingSubscribers() {
-    const ids = await this.server
-      .fetchSockets()
-      .then((sockets) =>
-        sockets.map((s) => s.id).reduce((p, c) => [...p, c], []),
-      );
-    for (const event of Object.values(this.events)) {
-      event.filterSubscribers(ids);
-    }
-  }
-
-  afterInit(server: Server): any {
-    this.server = server;
-  }
-
-  handleDisconnect(client: Socket): any {
-    for (const event of Object.values(this.events)) {
-      event.unsubscribe(client.id);
-    }
-  }
-
-  async getUniqueId(): Promise<string> {
-    let id: string | undefined = undefined;
-    do {
-      id = crypto.randomBytes(32).toString('hex');
-    } while (await this.cacheManager.get(id));
-    await this.cacheManager.set(id, true, 30 * 60 * 1000); // persist for 30 min
-    return id;
-  }
-}
diff --git a/yarn.lock b/yarn.lock
index 904bc9e4d..ea7d554b3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,14 +7,6 @@
   resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
   integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
 
-"@ampproject/remapping@^2.2.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
-  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.5"
-    "@jridgewell/trace-mapping" "^0.3.24"
-
 "@angular-devkit/core@11.2.4":
   version "11.2.4"
   resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-11.2.4.tgz#4404b86d8dbdb41a0e3f94cb08ff8604e0c49a2e"
@@ -123,9 +115,9 @@
     rc-util "^5.31.1"
 
 "@ant-design/nextjs-registry@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@ant-design/nextjs-registry/-/nextjs-registry-1.1.0.tgz#727ffdc357df663c5240b1e7c8a3a5c1eb44a292"
-  integrity sha512-zZ9SKyqTHonUK7l/z/ixpVx0LSnZTlIqYFOccSDI7jx7ojCMTGxzkl3ugGWPPh8xPYDsVxqzwJZBic84H7LgLw==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ant-design/nextjs-registry/-/nextjs-registry-1.3.0.tgz#ead26189403c0ff2b9cdb54bed71118430a04bb6"
+  integrity sha512-lHlg5bnj3LPYHUD+iZsO1k11NhIrx1mLWh2DXQ0m3Ly3OSaYfgeHX0WoVXxdVjEGjjYnPTe+OUY7YvU/p1aPZw==
 
 "@ant-design/react-slick@~1.1.2":
   version "1.1.2"
@@ -154,10 +146,447 @@
     "@csstools/css-tokenizer" "^3.0.3"
     lru-cache "^10.4.3"
 
+"@aws-crypto/sha256-browser@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz#153895ef1dba6f9fce38af550e0ef58988eb649e"
+  integrity sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==
+  dependencies:
+    "@aws-crypto/sha256-js" "^5.2.0"
+    "@aws-crypto/supports-web-crypto" "^5.2.0"
+    "@aws-crypto/util" "^5.2.0"
+    "@aws-sdk/types" "^3.222.0"
+    "@aws-sdk/util-locate-window" "^3.0.0"
+    "@smithy/util-utf8" "^2.0.0"
+    tslib "^2.6.2"
+
+"@aws-crypto/sha256-js@5.2.0", "@aws-crypto/sha256-js@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz#c4fdb773fdbed9a664fc1a95724e206cf3860042"
+  integrity sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==
+  dependencies:
+    "@aws-crypto/util" "^5.2.0"
+    "@aws-sdk/types" "^3.222.0"
+    tslib "^2.6.2"
+
+"@aws-crypto/supports-web-crypto@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz#a1e399af29269be08e695109aa15da0a07b5b5fb"
+  integrity sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==
+  dependencies:
+    tslib "^2.6.2"
+
+"@aws-crypto/util@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-5.2.0.tgz#71284c9cffe7927ddadac793c14f14886d3876da"
+  integrity sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==
+  dependencies:
+    "@aws-sdk/types" "^3.222.0"
+    "@smithy/util-utf8" "^2.0.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/client-ses@^3.731.1":
+  version "3.962.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-ses/-/client-ses-3.962.0.tgz#7dcae1cb36484fe02a2fd34ccca65c068764ceb0"
+  integrity sha512-3eEf0hQ48xin3nGt3gUE+54dIqXFdfzIqtDvv/i4GObSfgoNgiYpfiRdu0sXDKLSnzVPkp52YMmt2mUtXp5wbQ==
+  dependencies:
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/credential-provider-node" "3.962.0"
+    "@aws-sdk/middleware-host-header" "3.957.0"
+    "@aws-sdk/middleware-logger" "3.957.0"
+    "@aws-sdk/middleware-recursion-detection" "3.957.0"
+    "@aws-sdk/middleware-user-agent" "3.957.0"
+    "@aws-sdk/region-config-resolver" "3.957.0"
+    "@aws-sdk/types" "3.957.0"
+    "@aws-sdk/util-endpoints" "3.957.0"
+    "@aws-sdk/util-user-agent-browser" "3.957.0"
+    "@aws-sdk/util-user-agent-node" "3.957.0"
+    "@smithy/config-resolver" "^4.4.5"
+    "@smithy/core" "^3.20.0"
+    "@smithy/fetch-http-handler" "^5.3.8"
+    "@smithy/hash-node" "^4.2.7"
+    "@smithy/invalid-dependency" "^4.2.7"
+    "@smithy/middleware-content-length" "^4.2.7"
+    "@smithy/middleware-endpoint" "^4.4.1"
+    "@smithy/middleware-retry" "^4.4.17"
+    "@smithy/middleware-serde" "^4.2.8"
+    "@smithy/middleware-stack" "^4.2.7"
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/node-http-handler" "^4.4.7"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/smithy-client" "^4.10.2"
+    "@smithy/types" "^4.11.0"
+    "@smithy/url-parser" "^4.2.7"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-body-length-node" "^4.2.1"
+    "@smithy/util-defaults-mode-browser" "^4.3.16"
+    "@smithy/util-defaults-mode-node" "^4.2.19"
+    "@smithy/util-endpoints" "^3.2.7"
+    "@smithy/util-middleware" "^4.2.7"
+    "@smithy/util-retry" "^4.2.7"
+    "@smithy/util-utf8" "^4.2.0"
+    "@smithy/util-waiter" "^4.2.7"
+    tslib "^2.6.2"
+
+"@aws-sdk/client-sso@3.958.0":
+  version "3.958.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.958.0.tgz#d6f33d34e4d2dca5d0afe2518c381612545840a3"
+  integrity sha512-6qNCIeaMzKzfqasy2nNRuYnMuaMebCcCPP4J2CVGkA8QYMbIVKPlkn9bpB20Vxe6H/r3jtCCLQaOJjVTx/6dXg==
+  dependencies:
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/middleware-host-header" "3.957.0"
+    "@aws-sdk/middleware-logger" "3.957.0"
+    "@aws-sdk/middleware-recursion-detection" "3.957.0"
+    "@aws-sdk/middleware-user-agent" "3.957.0"
+    "@aws-sdk/region-config-resolver" "3.957.0"
+    "@aws-sdk/types" "3.957.0"
+    "@aws-sdk/util-endpoints" "3.957.0"
+    "@aws-sdk/util-user-agent-browser" "3.957.0"
+    "@aws-sdk/util-user-agent-node" "3.957.0"
+    "@smithy/config-resolver" "^4.4.5"
+    "@smithy/core" "^3.20.0"
+    "@smithy/fetch-http-handler" "^5.3.8"
+    "@smithy/hash-node" "^4.2.7"
+    "@smithy/invalid-dependency" "^4.2.7"
+    "@smithy/middleware-content-length" "^4.2.7"
+    "@smithy/middleware-endpoint" "^4.4.1"
+    "@smithy/middleware-retry" "^4.4.17"
+    "@smithy/middleware-serde" "^4.2.8"
+    "@smithy/middleware-stack" "^4.2.7"
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/node-http-handler" "^4.4.7"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/smithy-client" "^4.10.2"
+    "@smithy/types" "^4.11.0"
+    "@smithy/url-parser" "^4.2.7"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-body-length-node" "^4.2.1"
+    "@smithy/util-defaults-mode-browser" "^4.3.16"
+    "@smithy/util-defaults-mode-node" "^4.2.19"
+    "@smithy/util-endpoints" "^3.2.7"
+    "@smithy/util-middleware" "^4.2.7"
+    "@smithy/util-retry" "^4.2.7"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/core@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.957.0.tgz#a32aff5d48b4ed065567b9aab1cf671c17e71c9d"
+  integrity sha512-DrZgDnF1lQZv75a52nFWs6MExihJF2GZB6ETZRqr6jMwhrk2kbJPUtvgbifwcL7AYmVqHQDJBrR/MqkwwFCpiw==
+  dependencies:
+    "@aws-sdk/types" "3.957.0"
+    "@aws-sdk/xml-builder" "3.957.0"
+    "@smithy/core" "^3.20.0"
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/signature-v4" "^5.3.7"
+    "@smithy/smithy-client" "^4.10.2"
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-middleware" "^4.2.7"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-env@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.957.0.tgz#0728c47c066bc0274cb2ade3232d1f09863d9fee"
+  integrity sha512-475mkhGaWCr+Z52fOOVb/q2VHuNvqEDixlYIkeaO6xJ6t9qR0wpLt4hOQaR6zR1wfZV0SlE7d8RErdYq/PByog==
+  dependencies:
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-http@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.957.0.tgz#6be8d190ff179f535962b09bdc7063a640eb9414"
+  integrity sha512-8dS55QHRxXgJlHkEYaCGZIhieCs9NU1HU1BcqQ4RfUdSsfRdxxktqUKgCnBnOOn0oD3PPA8cQOCAVgIyRb3Rfw==
+  dependencies:
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/fetch-http-handler" "^5.3.8"
+    "@smithy/node-http-handler" "^4.4.7"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/smithy-client" "^4.10.2"
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-stream" "^4.5.8"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-ini@3.962.0":
+  version "3.962.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.962.0.tgz#243c5bb15143d649bfb66d6dc12bc1e1233fe9e1"
+  integrity sha512-h0kVnXLW2d3nxbcrR/Pfg3W/+YoCguasWz7/3nYzVqmdKarGrpJzaFdoZtLgvDSZ8VgWUC4lWOTcsDMV0UNqUQ==
+  dependencies:
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/credential-provider-env" "3.957.0"
+    "@aws-sdk/credential-provider-http" "3.957.0"
+    "@aws-sdk/credential-provider-login" "3.962.0"
+    "@aws-sdk/credential-provider-process" "3.957.0"
+    "@aws-sdk/credential-provider-sso" "3.958.0"
+    "@aws-sdk/credential-provider-web-identity" "3.958.0"
+    "@aws-sdk/nested-clients" "3.958.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/credential-provider-imds" "^4.2.7"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/shared-ini-file-loader" "^4.4.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-login@3.962.0":
+  version "3.962.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-login/-/credential-provider-login-3.962.0.tgz#510c7950549d141fcc3405201a4f988e00769550"
+  integrity sha512-kHYH6Av2UifG3mPkpPUNRh/PuX6adaAcpmsclJdHdxlixMCRdh8GNeEihq480DC0GmfqdpoSf1w2CLmLLPIS6w==
+  dependencies:
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/nested-clients" "3.958.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/shared-ini-file-loader" "^4.4.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-node@3.962.0":
+  version "3.962.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.962.0.tgz#860e545fafc0c9bd585c9284a477298fea0d841c"
+  integrity sha512-CS78NsWRxLa+nWqeWBEYMZTLacMFIXs1C5WJuM9kD05LLiWL32ksljoPsvNN24Bc7rCSQIIMx/U3KGvkDVZMVg==
+  dependencies:
+    "@aws-sdk/credential-provider-env" "3.957.0"
+    "@aws-sdk/credential-provider-http" "3.957.0"
+    "@aws-sdk/credential-provider-ini" "3.962.0"
+    "@aws-sdk/credential-provider-process" "3.957.0"
+    "@aws-sdk/credential-provider-sso" "3.958.0"
+    "@aws-sdk/credential-provider-web-identity" "3.958.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/credential-provider-imds" "^4.2.7"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/shared-ini-file-loader" "^4.4.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-process@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.957.0.tgz#cf30add7808e5ac9815d7a3bbd2aa6b3ba3500f3"
+  integrity sha512-/KIz9kadwbeLy6SKvT79W81Y+hb/8LMDyeloA2zhouE28hmne+hLn0wNCQXAAupFFlYOAtZR2NTBs7HBAReJlg==
+  dependencies:
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/shared-ini-file-loader" "^4.4.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-sso@3.958.0":
+  version "3.958.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.958.0.tgz#50bd726179fcfc52cdc4b27e891588e9e5f5cdd6"
+  integrity sha512-CBYHJ5ufp8HC4q+o7IJejCUctJXWaksgpmoFpXerbjAso7/Fg7LLUu9inXVOxlHKLlvYekDXjIUBXDJS2WYdgg==
+  dependencies:
+    "@aws-sdk/client-sso" "3.958.0"
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/token-providers" "3.958.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/shared-ini-file-loader" "^4.4.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-web-identity@3.958.0":
+  version "3.958.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.958.0.tgz#98f044d8f8a9f08f96f8f66402bbce2e62120b4a"
+  integrity sha512-dgnvwjMq5Y66WozzUzxNkCFap+umHUtqMMKlr8z/vl9NYMLem/WUbWNpFFOVFWquXikc+ewtpBMR4KEDXfZ+KA==
+  dependencies:
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/nested-clients" "3.958.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/shared-ini-file-loader" "^4.4.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-host-header@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.957.0.tgz#56cc0de787a28254be77ab3d8cb15dccd5b9949e"
+  integrity sha512-BBgKawVyfQZglEkNTuBBdC3azlyqNXsvvN4jPkWAiNYcY0x1BasaJFl+7u/HisfULstryweJq/dAvIZIxzlZaA==
+  dependencies:
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-logger@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.957.0.tgz#605b1cbaeaf847610f06b2a7c0efe250e99b5775"
+  integrity sha512-w1qfKrSKHf9b5a8O76yQ1t69u6NWuBjr5kBX+jRWFx/5mu6RLpqERXRpVJxfosbep7k3B+DSB5tZMZ82GKcJtQ==
+  dependencies:
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-recursion-detection@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.957.0.tgz#8c30f913975accb4e2c5ae249d05fbd4cbbbde75"
+  integrity sha512-D2H/WoxhAZNYX+IjkKTdOhOkWQaK0jjJrDBj56hKjU5c9ltQiaX/1PqJ4dfjHntEshJfu0w+E6XJ+/6A6ILBBA==
+  dependencies:
+    "@aws-sdk/types" "3.957.0"
+    "@aws/lambda-invoke-store" "^0.2.2"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-user-agent@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.957.0.tgz#3cbad11e78a72f95b3355754fcac260a8d352e9b"
+  integrity sha512-50vcHu96XakQnIvlKJ1UoltrFODjsq2KvtTgHiPFteUS884lQnK5VC/8xd1Msz/1ONpLMzdCVproCQqhDTtMPQ==
+  dependencies:
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/types" "3.957.0"
+    "@aws-sdk/util-endpoints" "3.957.0"
+    "@smithy/core" "^3.20.0"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/nested-clients@3.958.0":
+  version "3.958.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.958.0.tgz#e735ff085f5911faf577e611cef0b715f8cbd3a9"
+  integrity sha512-/KuCcS8b5TpQXkYOrPLYytrgxBhv81+5pChkOlhegbeHttjM69pyUpQVJqyfDM/A7wPLnDrzCAnk4zaAOkY0Nw==
+  dependencies:
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/middleware-host-header" "3.957.0"
+    "@aws-sdk/middleware-logger" "3.957.0"
+    "@aws-sdk/middleware-recursion-detection" "3.957.0"
+    "@aws-sdk/middleware-user-agent" "3.957.0"
+    "@aws-sdk/region-config-resolver" "3.957.0"
+    "@aws-sdk/types" "3.957.0"
+    "@aws-sdk/util-endpoints" "3.957.0"
+    "@aws-sdk/util-user-agent-browser" "3.957.0"
+    "@aws-sdk/util-user-agent-node" "3.957.0"
+    "@smithy/config-resolver" "^4.4.5"
+    "@smithy/core" "^3.20.0"
+    "@smithy/fetch-http-handler" "^5.3.8"
+    "@smithy/hash-node" "^4.2.7"
+    "@smithy/invalid-dependency" "^4.2.7"
+    "@smithy/middleware-content-length" "^4.2.7"
+    "@smithy/middleware-endpoint" "^4.4.1"
+    "@smithy/middleware-retry" "^4.4.17"
+    "@smithy/middleware-serde" "^4.2.8"
+    "@smithy/middleware-stack" "^4.2.7"
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/node-http-handler" "^4.4.7"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/smithy-client" "^4.10.2"
+    "@smithy/types" "^4.11.0"
+    "@smithy/url-parser" "^4.2.7"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-body-length-node" "^4.2.1"
+    "@smithy/util-defaults-mode-browser" "^4.3.16"
+    "@smithy/util-defaults-mode-node" "^4.2.19"
+    "@smithy/util-endpoints" "^3.2.7"
+    "@smithy/util-middleware" "^4.2.7"
+    "@smithy/util-retry" "^4.2.7"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/region-config-resolver@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.957.0.tgz#543591900f9d253ab28ef97a0659dafb8d5d90b9"
+  integrity sha512-V8iY3blh8l2iaOqXWW88HbkY5jDoWjH56jonprG/cpyqqCnprvpMUZWPWYJoI8rHRf2bqzZeql1slxG6EnKI7A==
+  dependencies:
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/config-resolver" "^4.4.5"
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/token-providers@3.958.0":
+  version "3.958.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.958.0.tgz#c1ce666b19dcbd3bf6ba82ecfdc2e6d067dc3551"
+  integrity sha512-UCj7lQXODduD1myNJQkV+LYcGYJ9iiMggR8ow8Hva1g3A/Na5imNXzz6O67k7DAee0TYpy+gkNw+SizC6min8Q==
+  dependencies:
+    "@aws-sdk/core" "3.957.0"
+    "@aws-sdk/nested-clients" "3.958.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/shared-ini-file-loader" "^4.4.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/types@3.957.0", "@aws-sdk/types@^3.222.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.957.0.tgz#06e899503028bdb8c655aa11a9a01f562882f361"
+  integrity sha512-wzWC2Nrt859ABk6UCAVY/WYEbAd7FjkdrQL6m24+tfmWYDNRByTJ9uOgU/kw9zqLCAwb//CPvrJdhqjTznWXAg==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/util-endpoints@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.957.0.tgz#a9defb68d2c88ca07641871bc4dfc28e44778b57"
+  integrity sha512-xwF9K24mZSxcxKS3UKQFeX/dPYkEps9wF1b+MGON7EvnbcucrJGyQyK1v1xFPn1aqXkBTFi+SZaMRx5E5YCVFw==
+  dependencies:
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/types" "^4.11.0"
+    "@smithy/url-parser" "^4.2.7"
+    "@smithy/util-endpoints" "^3.2.7"
+    tslib "^2.6.2"
+
+"@aws-sdk/util-locate-window@^3.0.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.957.0.tgz#58707301e648559d05946924a5f1ab1b664be33d"
+  integrity sha512-nhmgKHnNV9K+i9daumaIz8JTLsIIML9PE/HUks5liyrjUzenjW/aHoc7WJ9/Td/gPZtayxFnXQSJRb/fDlBuJw==
+  dependencies:
+    tslib "^2.6.2"
+
+"@aws-sdk/util-user-agent-browser@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.957.0.tgz#990c2ca62910aa6d51fbd76e52b1246c21722060"
+  integrity sha512-exueuwxef0lUJRnGaVkNSC674eAiWU07ORhxBnevFFZEKisln+09Qrtw823iyv5I1N8T+wKfh95xvtWQrNKNQw==
+  dependencies:
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/types" "^4.11.0"
+    bowser "^2.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/util-user-agent-node@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.957.0.tgz#243318783b1fa09c9017bc4cf041bd27df61a775"
+  integrity sha512-ycbYCwqXk4gJGp0Oxkzf2KBeeGBdTxz559D41NJP8FlzSej1Gh7Rk40Zo6AyTfsNWkrl/kVi1t937OIzC5t+9Q==
+  dependencies:
+    "@aws-sdk/middleware-user-agent" "3.957.0"
+    "@aws-sdk/types" "3.957.0"
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/xml-builder@3.957.0":
+  version "3.957.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.957.0.tgz#b9734189e1149953f8893bc485a9fd036aa63d29"
+  integrity sha512-Ai5iiQqS8kJ5PjzMhWcLKN0G2yasAkvpnPlq2EnqlIMdB48HsizElt62qcktdxp4neRMyGkFq4NzgmDbXnhRiA==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    fast-xml-parser "5.2.5"
+    tslib "^2.6.2"
+
+"@aws/lambda-invoke-store@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.2.tgz#b00f7d6aedfe832ef6c84488f3a422cce6a47efa"
+  integrity sha512-C0NBLsIqzDIae8HFw9YIrIBsbc0xTiOtt7fAukGPnqQ/+zZNaq+4jhuccltK0QuWHBnNm/a6kLIRA6GFiM10eg==
+
 "@babel/cli@^7.12.1", "@babel/cli@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.28.0.tgz#26959456cbedff569a2c3ac909e8a268ca6cb7e2"
-  integrity sha512-CYrZG7FagtE8ReKDBfItxnrEBf2khq2eTMnPuqO8UVN0wzhp1eMX1wfda8b1a32l2aqYLwRRIOGNovm8FVzmMw==
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.28.3.tgz#f33693753bc103ab0084a5776ccf8ab8a140038b"
+  integrity sha512-n1RU5vuCX0CsaqaXm9I0KUCNKNQMy5epmzl/xdSSm70bSqhg9GWhgeosypyQLc0bK24+Xpk1WGzZlI9pJtkZdg==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.28"
     commander "^6.2.0"
@@ -179,39 +608,39 @@
     js-tokens "^4.0.0"
     picocolors "^1.1.1"
 
-"@babel/compat-data@^7.27.2", "@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.0.tgz#9fc6fd58c2a6a15243cd13983224968392070790"
-  integrity sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==
+"@babel/compat-data@^7.27.2", "@babel/compat-data@^7.27.7", "@babel/compat-data@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.5.tgz#a8a4962e1567121ac0b3b487f52107443b455c7f"
+  integrity sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==
 
 "@babel/core@^7.12.3", "@babel/core@^7.18.5", "@babel/core@^7.23.9", "@babel/core@^7.27.4":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.0.tgz#55dad808d5bf3445a108eefc88ea3fdf034749a4"
-  integrity sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.5.tgz#4c81b35e51e1b734f510c99b07dfbc7bbbb48f7e"
+  integrity sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==
   dependencies:
-    "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.0"
+    "@babel/generator" "^7.28.5"
     "@babel/helper-compilation-targets" "^7.27.2"
-    "@babel/helper-module-transforms" "^7.27.3"
-    "@babel/helpers" "^7.27.6"
-    "@babel/parser" "^7.28.0"
+    "@babel/helper-module-transforms" "^7.28.3"
+    "@babel/helpers" "^7.28.4"
+    "@babel/parser" "^7.28.5"
     "@babel/template" "^7.27.2"
-    "@babel/traverse" "^7.28.0"
-    "@babel/types" "^7.28.0"
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
+    "@jridgewell/remapping" "^2.3.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.27.5", "@babel/generator@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.0.tgz#9cc2f7bd6eb054d77dc66c2664148a0c5118acd2"
-  integrity sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==
+"@babel/generator@^7.27.5", "@babel/generator@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298"
+  integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
   dependencies:
-    "@babel/parser" "^7.28.0"
-    "@babel/types" "^7.28.0"
+    "@babel/parser" "^7.28.5"
+    "@babel/types" "^7.28.5"
     "@jridgewell/gen-mapping" "^0.3.12"
     "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
@@ -234,26 +663,26 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz#5bee4262a6ea5ddc852d0806199eb17ca3de9281"
-  integrity sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.27.1", "@babel/helper-create-class-features-plugin@^7.28.3", "@babel/helper-create-class-features-plugin@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz#472d0c28028850968979ad89f173594a6995da46"
+  integrity sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.27.1"
-    "@babel/helper-member-expression-to-functions" "^7.27.1"
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    "@babel/helper-member-expression-to-functions" "^7.28.5"
     "@babel/helper-optimise-call-expression" "^7.27.1"
     "@babel/helper-replace-supers" "^7.27.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
+    "@babel/traverse" "^7.28.5"
     semver "^6.3.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz#05b0882d97ba1d4d03519e4bce615d70afa18c53"
-  integrity sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.28.5.tgz#7c1ddd64b2065c7f78034b25b43346a7e19ed997"
+  integrity sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.27.1"
-    regexpu-core "^6.2.0"
+    "@babel/helper-annotate-as-pure" "^7.27.3"
+    regexpu-core "^6.3.1"
     semver "^6.3.1"
 
 "@babel/helper-define-polyfill-provider@^0.6.5":
@@ -272,13 +701,13 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.28.0.tgz#b9430df2aa4e17bc28665eadeae8aa1d985e6674"
   integrity sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==
 
-"@babel/helper-member-expression-to-functions@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz#ea1211276be93e798ce19037da6f06fbb994fa44"
-  integrity sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==
+"@babel/helper-member-expression-to-functions@^7.27.1", "@babel/helper-member-expression-to-functions@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz#f3e07a10be37ed7a63461c63e6929575945a6150"
+  integrity sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==
   dependencies:
-    "@babel/traverse" "^7.27.1"
-    "@babel/types" "^7.27.1"
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
 
 "@babel/helper-module-imports@^7.27.1":
   version "7.27.1"
@@ -288,14 +717,14 @@
     "@babel/traverse" "^7.27.1"
     "@babel/types" "^7.27.1"
 
-"@babel/helper-module-transforms@^7.27.1", "@babel/helper-module-transforms@^7.27.3":
-  version "7.27.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz#db0bbcfba5802f9ef7870705a7ef8788508ede02"
-  integrity sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==
+"@babel/helper-module-transforms@^7.27.1", "@babel/helper-module-transforms@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz#a2b37d3da3b2344fe085dab234426f2b9a2fa5f6"
+  integrity sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==
   dependencies:
     "@babel/helper-module-imports" "^7.27.1"
     "@babel/helper-validator-identifier" "^7.27.1"
-    "@babel/traverse" "^7.27.3"
+    "@babel/traverse" "^7.28.3"
 
 "@babel/helper-optimise-call-expression@^7.27.1":
   version "7.27.1"
@@ -340,10 +769,10 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
   integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
 
-"@babel/helper-validator-identifier@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
-  integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
+"@babel/helper-validator-identifier@^7.27.1", "@babel/helper-validator-identifier@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
+  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
 
 "@babel/helper-validator-option@^7.27.1":
   version "7.27.1"
@@ -351,36 +780,36 @@
   integrity sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==
 
 "@babel/helper-wrap-function@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.27.1.tgz#b88285009c31427af318d4fe37651cd62a142409"
-  integrity sha512-NFJK2sHUvrjo8wAU/nQTWU890/zB2jj0qBcCbZbbf+005cAsv6tMjXz31fBign6M5ov1o0Bllu+9nbqkfsjjJQ==
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.28.3.tgz#fe4872092bc1438ffd0ce579e6f699609f9d0a7a"
+  integrity sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==
   dependencies:
-    "@babel/template" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
-    "@babel/types" "^7.27.1"
+    "@babel/template" "^7.27.2"
+    "@babel/traverse" "^7.28.3"
+    "@babel/types" "^7.28.2"
 
-"@babel/helpers@^7.27.6":
-  version "7.28.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.2.tgz#80f0918fecbfebea9af856c419763230040ee850"
-  integrity sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==
+"@babel/helpers@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.28.4.tgz#fe07274742e95bdf7cf1443593eeb8926ab63827"
+  integrity sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==
   dependencies:
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.28.2"
+    "@babel/types" "^7.28.4"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.27.2", "@babel/parser@^7.28.0", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.0.tgz#979829fbab51a29e13901e5a80713dbcb840825e"
-  integrity sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==
+"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.27.2", "@babel/parser@^7.28.5", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08"
+  integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
   dependencies:
-    "@babel/types" "^7.28.0"
+    "@babel/types" "^7.28.5"
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz#61dd8a8e61f7eb568268d1b5f129da3eee364bf9"
-  integrity sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz#fbde57974707bbfa0376d34d425ff4fa6c732421"
+  integrity sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
+    "@babel/traverse" "^7.28.5"
 
 "@babel/plugin-bugfix-safari-class-field-initializer-scope@^7.27.1":
   version "7.27.1"
@@ -405,13 +834,13 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
     "@babel/plugin-transform-optional-chaining" "^7.27.1"
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz#bb1c25af34d75115ce229a1de7fa44bf8f955670"
-  integrity sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.3.tgz#373f6e2de0016f73caf8f27004f61d167743742a"
+  integrity sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
+    "@babel/traverse" "^7.28.3"
 
 "@babel/plugin-proposal-class-properties@^7.12.1":
   version "7.18.6"
@@ -608,10 +1037,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-block-scoping@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.0.tgz#e7c50cbacc18034f210b93defa89638666099451"
-  integrity sha512-gKKnwjpdx5sER/wl0WN0efUBFzF/56YZO0RJrSYP4CljXnP31ByY7fol89AzomdlLNzI36AvOTmYHsnZTCkq8Q==
+"@babel/plugin-transform-block-scoping@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.5.tgz#e0d3af63bd8c80de2e567e690a54e84d85eb16f6"
+  integrity sha512-45DmULpySVvmq9Pj3X9B+62Xe+DJGov27QravQJU1LLcapR6/10i+gYVAucGGJpHBp5mYxIMK4nDAT/QDLr47g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -623,25 +1052,25 @@
     "@babel/helper-create-class-features-plugin" "^7.27.1"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-class-static-block@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz#7e920d5625b25bbccd3061aefbcc05805ed56ce4"
-  integrity sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==
+"@babel/plugin-transform-class-static-block@^7.28.3":
+  version "7.28.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz#d1b8e69b54c9993bc558203e1f49bfc979bfd852"
+  integrity sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.27.1"
+    "@babel/helper-create-class-features-plugin" "^7.28.3"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-classes@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.0.tgz#12fa46cffc32a6e084011b650539e880add8a0f8"
-  integrity sha512-IjM1IoJNw72AZFlj33Cu8X0q2XK/6AaVC3jQu+cgQ5lThWD5ajnuUAml80dqRmOhmPkTH8uAwnpMu9Rvj0LTRA==
+"@babel/plugin-transform-classes@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz#75d66175486788c56728a73424d67cbc7473495c"
+  integrity sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.27.3"
     "@babel/helper-compilation-targets" "^7.27.2"
     "@babel/helper-globals" "^7.28.0"
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-replace-supers" "^7.27.1"
-    "@babel/traverse" "^7.28.0"
+    "@babel/traverse" "^7.28.4"
 
 "@babel/plugin-transform-computed-properties@^7.27.1":
   version "7.27.1"
@@ -651,13 +1080,13 @@
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/template" "^7.27.1"
 
-"@babel/plugin-transform-destructuring@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.0.tgz#0f156588f69c596089b7d5b06f5af83d9aa7f97a"
-  integrity sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==
+"@babel/plugin-transform-destructuring@^7.28.0", "@babel/plugin-transform-destructuring@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz#b8402764df96179a2070bb7b501a1586cf8ad7a7"
+  integrity sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
-    "@babel/traverse" "^7.28.0"
+    "@babel/traverse" "^7.28.5"
 
 "@babel/plugin-transform-dotall-regex@^7.27.1":
   version "7.27.1"
@@ -697,10 +1126,10 @@
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/plugin-transform-destructuring" "^7.28.0"
 
-"@babel/plugin-transform-exponentiation-operator@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz#fc497b12d8277e559747f5a3ed868dd8064f83e1"
-  integrity sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==
+"@babel/plugin-transform-exponentiation-operator@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.28.5.tgz#7cc90a8170e83532676cfa505278e147056e94fe"
+  integrity sha512-D4WIMaFtwa2NizOp+dnoFjRez/ClKiC2BqqImwKd1X28nqBtZEyCYJ2ozQrrzlxAFrcrjxo39S6khe9RNDlGzw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -742,10 +1171,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-logical-assignment-operators@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz#890cb20e0270e0e5bebe3f025b434841c32d5baa"
-  integrity sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==
+"@babel/plugin-transform-logical-assignment-operators@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.5.tgz#d028fd6db8c081dee4abebc812c2325e24a85b0e"
+  integrity sha512-axUuqnUTBuXyHGcJEVVh9pORaN6wC5bYfE7FGzPiaWa3syib9m7g+/IT/4VgCOe2Upef43PHzeAvcrVek6QuuA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -772,15 +1201,15 @@
     "@babel/helper-module-transforms" "^7.27.1"
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-modules-systemjs@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.27.1.tgz#00e05b61863070d0f3292a00126c16c0e024c4ed"
-  integrity sha512-w5N1XzsRbc0PQStASMksmUeqECuzKuTJer7kFagK8AXgpCMkeDMO5S+aaFb7A51ZYDF7XI34qsTX+fkHiIm5yA==
+"@babel/plugin-transform-modules-systemjs@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.28.5.tgz#7439e592a92d7670dfcb95d0cbc04bd3e64801d2"
+  integrity sha512-vn5Jma98LCOeBy/KpeQhXcV2WZgaRUtjwQmjoBuLNlOmkg0fB5pdvYVeWRYI69wWKwK2cD1QbMiUQnoujWvrew==
   dependencies:
-    "@babel/helper-module-transforms" "^7.27.1"
+    "@babel/helper-module-transforms" "^7.28.3"
     "@babel/helper-plugin-utils" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.27.1"
-    "@babel/traverse" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
+    "@babel/traverse" "^7.28.5"
 
 "@babel/plugin-transform-modules-umd@^7.27.1":
   version "7.27.1"
@@ -819,16 +1248,16 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-object-rest-spread@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.0.tgz#d23021857ffd7cd809f54d624299b8086402ed8d"
-  integrity sha512-9VNGikXxzu5eCiQjdE4IZn8sb9q7Xsk5EXLDBKUYg1e/Tve8/05+KJEtcxGxAgCY5t/BpKQM+JEL/yT4tvgiUA==
+"@babel/plugin-transform-object-rest-spread@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz#9ee1ceca80b3e6c4bac9247b2149e36958f7f98d"
+  integrity sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==
   dependencies:
     "@babel/helper-compilation-targets" "^7.27.2"
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/plugin-transform-destructuring" "^7.28.0"
     "@babel/plugin-transform-parameters" "^7.27.7"
-    "@babel/traverse" "^7.28.0"
+    "@babel/traverse" "^7.28.4"
 
 "@babel/plugin-transform-object-super@^7.27.1":
   version "7.27.1"
@@ -845,10 +1274,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-optional-chaining@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz#874ce3c4f06b7780592e946026eb76a32830454f"
-  integrity sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==
+"@babel/plugin-transform-optional-chaining@^7.27.1", "@babel/plugin-transform-optional-chaining@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.5.tgz#8238c785f9d5c1c515a90bf196efb50d075a4b26"
+  integrity sha512-N6fut9IZlPnjPwgiQkXNhb+cT8wQKFlJNqcZkWlcTqkcqx6/kU4ynGmLFoa4LViBSirn05YAwk+sQBbPfxtYzQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
@@ -884,10 +1313,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-regenerator@^7.28.0":
-  version "7.28.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.1.tgz#bde80603442ff4bb4e910bc8b35485295d556ab1"
-  integrity sha512-P0QiV/taaa3kXpLY+sXla5zec4E+4t4Aqc9ggHlfZ7a2cp8/x/Gv08jfwEtn9gnnYIMvHx6aoOZ8XJL8eU71Dg==
+"@babel/plugin-transform-regenerator@^7.28.4":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz#9d3fa3bebb48ddd0091ce5729139cd99c67cea51"
+  integrity sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
@@ -942,13 +1371,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-typescript@^7.27.1":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.0.tgz#796cbd249ab56c18168b49e3e1d341b72af04a6b"
-  integrity sha512-4AEiDEBPIZvLQaWlc9liCavE0xRM0dNca41WtBeM3jgFptfUOSG9z0uteLhq6+3rq+WB6jIvUwKDTpXEHPJ2Vg==
+"@babel/plugin-transform-typescript@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.5.tgz#441c5f9a4a1315039516c6c612fc66d5f4594e72"
+  integrity sha512-x2Qa+v/CuEoX7Dr31iAfr0IhInrVOWZU/2vJMJ00FOR/2nM0BcBEclpaf9sWCDc+v5e9dMrhSH8/atq/kX7+bA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.27.3"
-    "@babel/helper-create-class-features-plugin" "^7.27.1"
+    "@babel/helper-create-class-features-plugin" "^7.28.5"
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.27.1"
     "@babel/plugin-syntax-typescript" "^7.27.1"
@@ -985,19 +1414,19 @@
     "@babel/helper-plugin-utils" "^7.27.1"
 
 "@babel/preset-env@^7.12.1":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.28.0.tgz#d23a6bc17b43227d11db77081a0779c706b5569c"
-  integrity sha512-VmaxeGOwuDqzLl5JUkIRM1X2Qu2uKGxHEQWh+cvvbl7JuJRgKGJSfsEF/bUaxFhJl/XAyxBe7q7qSuTbKFuCyg==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.28.5.tgz#82dd159d1563f219a1ce94324b3071eb89e280b0"
+  integrity sha512-S36mOoi1Sb6Fz98fBfE+UZSpYw5mJm0NUHtIKrOuNcqeFauy1J6dIvXm2KRVKobOSaGq4t/hBXdN4HGU3wL9Wg==
   dependencies:
-    "@babel/compat-data" "^7.28.0"
+    "@babel/compat-data" "^7.28.5"
     "@babel/helper-compilation-targets" "^7.27.2"
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-validator-option" "^7.27.1"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.27.1"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key" "^7.28.5"
     "@babel/plugin-bugfix-safari-class-field-initializer-scope" "^7.27.1"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.27.1"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.27.1"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.27.1"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.28.3"
     "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@babel/plugin-syntax-import-assertions" "^7.27.1"
     "@babel/plugin-syntax-import-attributes" "^7.27.1"
@@ -1006,42 +1435,42 @@
     "@babel/plugin-transform-async-generator-functions" "^7.28.0"
     "@babel/plugin-transform-async-to-generator" "^7.27.1"
     "@babel/plugin-transform-block-scoped-functions" "^7.27.1"
-    "@babel/plugin-transform-block-scoping" "^7.28.0"
+    "@babel/plugin-transform-block-scoping" "^7.28.5"
     "@babel/plugin-transform-class-properties" "^7.27.1"
-    "@babel/plugin-transform-class-static-block" "^7.27.1"
-    "@babel/plugin-transform-classes" "^7.28.0"
+    "@babel/plugin-transform-class-static-block" "^7.28.3"
+    "@babel/plugin-transform-classes" "^7.28.4"
     "@babel/plugin-transform-computed-properties" "^7.27.1"
-    "@babel/plugin-transform-destructuring" "^7.28.0"
+    "@babel/plugin-transform-destructuring" "^7.28.5"
     "@babel/plugin-transform-dotall-regex" "^7.27.1"
     "@babel/plugin-transform-duplicate-keys" "^7.27.1"
     "@babel/plugin-transform-duplicate-named-capturing-groups-regex" "^7.27.1"
     "@babel/plugin-transform-dynamic-import" "^7.27.1"
     "@babel/plugin-transform-explicit-resource-management" "^7.28.0"
-    "@babel/plugin-transform-exponentiation-operator" "^7.27.1"
+    "@babel/plugin-transform-exponentiation-operator" "^7.28.5"
     "@babel/plugin-transform-export-namespace-from" "^7.27.1"
     "@babel/plugin-transform-for-of" "^7.27.1"
     "@babel/plugin-transform-function-name" "^7.27.1"
     "@babel/plugin-transform-json-strings" "^7.27.1"
     "@babel/plugin-transform-literals" "^7.27.1"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.27.1"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.28.5"
     "@babel/plugin-transform-member-expression-literals" "^7.27.1"
     "@babel/plugin-transform-modules-amd" "^7.27.1"
     "@babel/plugin-transform-modules-commonjs" "^7.27.1"
-    "@babel/plugin-transform-modules-systemjs" "^7.27.1"
+    "@babel/plugin-transform-modules-systemjs" "^7.28.5"
     "@babel/plugin-transform-modules-umd" "^7.27.1"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.27.1"
     "@babel/plugin-transform-new-target" "^7.27.1"
     "@babel/plugin-transform-nullish-coalescing-operator" "^7.27.1"
     "@babel/plugin-transform-numeric-separator" "^7.27.1"
-    "@babel/plugin-transform-object-rest-spread" "^7.28.0"
+    "@babel/plugin-transform-object-rest-spread" "^7.28.4"
     "@babel/plugin-transform-object-super" "^7.27.1"
     "@babel/plugin-transform-optional-catch-binding" "^7.27.1"
-    "@babel/plugin-transform-optional-chaining" "^7.27.1"
+    "@babel/plugin-transform-optional-chaining" "^7.28.5"
     "@babel/plugin-transform-parameters" "^7.27.7"
     "@babel/plugin-transform-private-methods" "^7.27.1"
     "@babel/plugin-transform-private-property-in-object" "^7.27.1"
     "@babel/plugin-transform-property-literals" "^7.27.1"
-    "@babel/plugin-transform-regenerator" "^7.28.0"
+    "@babel/plugin-transform-regenerator" "^7.28.4"
     "@babel/plugin-transform-regexp-modifiers" "^7.27.1"
     "@babel/plugin-transform-reserved-words" "^7.27.1"
     "@babel/plugin-transform-shorthand-properties" "^7.27.1"
@@ -1070,20 +1499,20 @@
     esutils "^2.0.2"
 
 "@babel/preset-typescript@^7.12.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.27.1.tgz#190742a6428d282306648a55b0529b561484f912"
-  integrity sha512-l7WfQfX0WK4M0v2RudjuQK4u99BS6yLHYEmdtVPP7lKV013zr9DygFuWNlnbvQ9LR+LS0Egz/XAvGx5U9MX0fQ==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz#540359efa3028236958466342967522fd8f2a60c"
+  integrity sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
     "@babel/helper-validator-option" "^7.27.1"
     "@babel/plugin-syntax-jsx" "^7.27.1"
     "@babel/plugin-transform-modules-commonjs" "^7.27.1"
-    "@babel/plugin-transform-typescript" "^7.27.1"
+    "@babel/plugin-transform-typescript" "^7.28.5"
 
 "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.4", "@babel/runtime@^7.24.7", "@babel/runtime@^7.24.8", "@babel/runtime@^7.25.7", "@babel/runtime@^7.26.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
-  version "7.28.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.2.tgz#2ae5a9d51cc583bd1f5673b3bb70d6d819682473"
-  integrity sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
+  integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
 
 "@babel/template@^7.27.1", "@babel/template@^7.27.2":
   version "7.27.2"
@@ -1094,41 +1523,54 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/traverse@^7.27.1", "@babel/traverse@^7.27.3", "@babel/traverse@^7.28.0":
-  version "7.28.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.0.tgz#518aa113359b062042379e333db18380b537e34b"
-  integrity sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.0", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
+  integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.0"
+    "@babel/generator" "^7.28.5"
     "@babel/helper-globals" "^7.28.0"
-    "@babel/parser" "^7.28.0"
+    "@babel/parser" "^7.28.5"
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.28.0"
+    "@babel/types" "^7.28.5"
     debug "^4.3.1"
 
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.0", "@babel/types@^7.28.2", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
-  version "7.28.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.2.tgz#da9db0856a9a88e0a13b019881d7513588cf712b"
-  integrity sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.4", "@babel/types@^7.28.5", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b"
+  integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==
   dependencies:
     "@babel/helper-string-parser" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
 
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@borewit/text-codec@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@borewit/text-codec/-/text-codec-0.2.1.tgz#5d171538907a8cb395fdc2eb5e8f7947d96c7f2f"
+  integrity sha512-k7vvKPbf7J2fZ5klGRD9AeKfUvojuZIQ3BT5u7Jfv+puwXkUBUT5PVyMDfJZpy30CBDXGMgw7fguK/lpOMBvgw==
+
+"@cacheable/utils@^2.3.2":
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/@cacheable/utils/-/utils-2.3.3.tgz#56f0c0a3b2cad85f32ee2de3c73ff05d455e2c6c"
+  integrity sha512-JsXDL70gQ+1Vc2W/KUFfkAJzgb4puKwwKehNLuB+HrNKWf91O736kGfxn4KujXCCSuh6mRRL4XEB0PkAFjWS0A==
+  dependencies:
+    hashery "^1.3.0"
+    keyv "^5.5.5"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@csstools/color-helpers@^5.0.2":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.0.2.tgz#82592c9a7c2b83c293d9161894e2a6471feb97b8"
-  integrity sha512-JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==
+"@csstools/color-helpers@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.1.0.tgz#106c54c808cabfd1ab4c602d8505ee584c2996ef"
+  integrity sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==
 
 "@csstools/css-calc@^2.1.3", "@csstools/css-calc@^2.1.4":
   version "2.1.4"
@@ -1136,11 +1578,11 @@
   integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
 
 "@csstools/css-color-parser@^3.0.9":
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.10.tgz#79fc68864dd43c3b6782d2b3828bc0fa9d085c10"
-  integrity sha512-TiJ5Ajr6WRd1r8HSiwJvZBiJOqtH86aHpUjq5aEKWHiII2Qfjqd/HCWKPOW8EP4vcspXbHnXrwIDlu5savQipg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz#4e386af3a99dd36c46fef013cfe4c1c341eed6f0"
+  integrity sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==
   dependencies:
-    "@csstools/color-helpers" "^5.0.2"
+    "@csstools/color-helpers" "^5.1.0"
     "@csstools/css-calc" "^2.1.4"
 
 "@csstools/css-parser-algorithms@^3.0.4":
@@ -1154,24 +1596,24 @@
   integrity sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==
 
 "@emnapi/core@^1.4.3":
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.4.5.tgz#bfbb0cbbbb9f96ec4e2c4fd917b7bbe5495ceccb"
-  integrity sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/core/-/core-1.7.1.tgz#3a79a02dbc84f45884a1806ebb98e5746bdfaac4"
+  integrity sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==
   dependencies:
-    "@emnapi/wasi-threads" "1.0.4"
+    "@emnapi/wasi-threads" "1.1.0"
     tslib "^2.4.0"
 
-"@emnapi/runtime@^1.2.0", "@emnapi/runtime@^1.4.3", "@emnapi/runtime@^1.4.4":
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.4.5.tgz#c67710d0661070f38418b6474584f159de38aba9"
-  integrity sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==
+"@emnapi/runtime@^1.2.0", "@emnapi/runtime@^1.4.3", "@emnapi/runtime@^1.7.0":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@emnapi/runtime/-/runtime-1.7.1.tgz#a73784e23f5d57287369c808197288b52276b791"
+  integrity sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==
   dependencies:
     tslib "^2.4.0"
 
-"@emnapi/wasi-threads@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz#703fc094d969e273b1b71c292523b2f792862bf4"
-  integrity sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==
+"@emnapi/wasi-threads@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz#60b2102fddc9ccb78607e4a3cf8403ea69be41bf"
+  integrity sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==
   dependencies:
     tslib "^2.4.0"
 
@@ -1185,173 +1627,175 @@
   resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
   integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@esbuild/aix-ppc64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz#a1414903bb38027382f85f03dda6065056757727"
-  integrity sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==
-
-"@esbuild/android-arm64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz#c859994089e9767224269884061f89dae6fb51c6"
-  integrity sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==
-
-"@esbuild/android-arm@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.8.tgz#96a8f2ca91c6cd29ea90b1af79d83761c8ba0059"
-  integrity sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==
-
-"@esbuild/android-x64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.8.tgz#a3a626c4fec4a024a9fa8c7679c39996e92916f0"
-  integrity sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==
-
-"@esbuild/darwin-arm64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz#a5e1252ca2983d566af1c0ea39aded65736fc66d"
-  integrity sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==
-
-"@esbuild/darwin-x64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz#5271b0df2bb12ce8df886704bfdd1c7cc01385d2"
-  integrity sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==
-
-"@esbuild/freebsd-arm64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz#d0a0e7fdf19733b8bb1566b81df1aa0bb7e46ada"
-  integrity sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==
-
-"@esbuild/freebsd-x64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz#2de8b2e0899d08f1cb1ef3128e159616e7e85343"
-  integrity sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==
-
-"@esbuild/linux-arm64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz#a4209efadc0c2975716458484a4e90c237c48ae9"
-  integrity sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==
-
-"@esbuild/linux-arm@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz#ccd9e291c24cd8d9142d819d463e2e7200d25b19"
-  integrity sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==
-
-"@esbuild/linux-ia32@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz#006ad1536d0c2b28fb3a1cf0b53bcb85aaf92c4d"
-  integrity sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==
-
-"@esbuild/linux-loong64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz#127b3fbfb2c2e08b1397e985932f718f09a8f5c4"
-  integrity sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==
-
-"@esbuild/linux-mips64el@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz#837d1449517791e3fa7d82675a2d06d9f56cb340"
-  integrity sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==
-
-"@esbuild/linux-ppc64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz#aa2e3bd93ab8df084212f1895ca4b03c42d9e0fe"
-  integrity sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==
-
-"@esbuild/linux-riscv64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz#a340620e31093fef72767dd28ab04214b3442083"
-  integrity sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==
-
-"@esbuild/linux-s390x@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz#ddfed266c8c13f5efb3105a0cd47f6dcd0e79e71"
-  integrity sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==
-
-"@esbuild/linux-x64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz#9a4f78c75c051e8c060183ebb39a269ba936a2ac"
-  integrity sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==
-
-"@esbuild/netbsd-arm64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz#902c80e1d678047926387230bc037e63e00697d0"
-  integrity sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==
-
-"@esbuild/netbsd-x64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz#2d9eb4692add2681ff05a14ce99de54fbed7079c"
-  integrity sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==
-
-"@esbuild/openbsd-arm64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz#89c3b998c6de739db38ab7fb71a8a76b3fa84a45"
-  integrity sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==
-
-"@esbuild/openbsd-x64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz#2f01615cf472b0e48c077045cfd96b5c149365cc"
-  integrity sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==
-
-"@esbuild/openharmony-arm64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz#a201f720cd2c3ebf9a6033fcc3feb069a54b509a"
-  integrity sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==
-
-"@esbuild/sunos-x64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz#07046c977985a3334667f19e6ab3a01a80862afb"
-  integrity sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==
-
-"@esbuild/win32-arm64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz#4a5470caf0d16127c05d4833d4934213c69392d1"
-  integrity sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==
-
-"@esbuild/win32-ia32@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz#3de3e8470b7b328d99dbc3e9ec1eace207e5bbc4"
-  integrity sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==
-
-"@esbuild/win32-x64@0.25.8":
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz#610d7ea539d2fcdbe39237b5cc175eb2c4451f9c"
-  integrity sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==
-
-"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.7.0":
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz#607084630c6c033992a082de6e6fbc1a8b52175a"
-  integrity sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==
+"@esbuild/aix-ppc64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz#521cbd968dcf362094034947f76fa1b18d2d403c"
+  integrity sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==
+
+"@esbuild/android-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.27.2.tgz#61ea550962d8aa12a9b33194394e007657a6df57"
+  integrity sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==
+
+"@esbuild/android-arm@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.27.2.tgz#554887821e009dd6d853f972fde6c5143f1de142"
+  integrity sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==
+
+"@esbuild/android-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.27.2.tgz#a7ce9d0721825fc578f9292a76d9e53334480ba2"
+  integrity sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==
+
+"@esbuild/darwin-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.27.2.tgz#2cb7659bd5d109803c593cfc414450d5430c8256"
+  integrity sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==
+
+"@esbuild/darwin-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.27.2.tgz#e741fa6b1abb0cd0364126ba34ca17fd5e7bf509"
+  integrity sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==
+
+"@esbuild/freebsd-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.2.tgz#2b64e7116865ca172d4ce034114c21f3c93e397c"
+  integrity sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==
+
+"@esbuild/freebsd-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.27.2.tgz#e5252551e66f499e4934efb611812f3820e990bb"
+  integrity sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==
+
+"@esbuild/linux-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.27.2.tgz#dc4acf235531cd6984f5d6c3b13dbfb7ddb303cb"
+  integrity sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==
+
+"@esbuild/linux-arm@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.27.2.tgz#56a900e39240d7d5d1d273bc053daa295c92e322"
+  integrity sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==
+
+"@esbuild/linux-ia32@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.27.2.tgz#d4a36d473360f6870efcd19d52bbfff59a2ed1cc"
+  integrity sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==
+
+"@esbuild/linux-loong64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.27.2.tgz#fcf0ab8c3eaaf45891d0195d4961cb18b579716a"
+  integrity sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==
+
+"@esbuild/linux-mips64el@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.27.2.tgz#598b67d34048bb7ee1901cb12e2a0a434c381c10"
+  integrity sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==
+
+"@esbuild/linux-ppc64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.27.2.tgz#3846c5df6b2016dab9bc95dde26c40f11e43b4c0"
+  integrity sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==
+
+"@esbuild/linux-riscv64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.27.2.tgz#173d4475b37c8d2c3e1707e068c174bb3f53d07d"
+  integrity sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==
+
+"@esbuild/linux-s390x@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.27.2.tgz#f7a4790105edcab8a5a31df26fbfac1aa3dacfab"
+  integrity sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==
+
+"@esbuild/linux-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.27.2.tgz#2ecc1284b1904aeb41e54c9ddc7fcd349b18f650"
+  integrity sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==
+
+"@esbuild/netbsd-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.2.tgz#e2863c2cd1501845995cb11adf26f7fe4be527b0"
+  integrity sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==
+
+"@esbuild/netbsd-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.27.2.tgz#93f7609e2885d1c0b5a1417885fba8d1fcc41272"
+  integrity sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==
+
+"@esbuild/openbsd-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.2.tgz#a1985604a203cdc325fd47542e106fafd698f02e"
+  integrity sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==
+
+"@esbuild/openbsd-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.27.2.tgz#8209e46c42f1ffbe6e4ef77a32e1f47d404ad42a"
+  integrity sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==
+
+"@esbuild/openharmony-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.2.tgz#8fade4441893d9cc44cbd7dcf3776f508ab6fb2f"
+  integrity sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==
+
+"@esbuild/sunos-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.27.2.tgz#980d4b9703a16f0f07016632424fc6d9a789dfc2"
+  integrity sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==
+
+"@esbuild/win32-arm64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.27.2.tgz#1c09a3633c949ead3d808ba37276883e71f6111a"
+  integrity sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==
+
+"@esbuild/win32-ia32@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.27.2.tgz#1b1e3a63ad4bef82200fef4e369e0fff7009eee5"
+  integrity sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==
+
+"@esbuild/win32-x64@0.27.2":
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.27.2.tgz#9e585ab6086bef994c6e8a5b3a0481219ada862b"
+  integrity sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==
+
+"@eslint-community/eslint-utils@^4.7.0", "@eslint-community/eslint-utils@^4.8.0":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz#4e90af67bc51ddee6cdef5284edf572ec376b595"
+  integrity sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==
   dependencies:
     eslint-visitor-keys "^3.4.3"
 
 "@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.12.1":
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
-  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
+  integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
 
-"@eslint/config-array@^0.21.0":
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.21.0.tgz#abdbcbd16b124c638081766392a4d6b509f72636"
-  integrity sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==
+"@eslint/config-array@^0.21.1":
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.21.1.tgz#7d1b0060fea407f8301e932492ba8c18aff29713"
+  integrity sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==
   dependencies:
-    "@eslint/object-schema" "^2.1.6"
+    "@eslint/object-schema" "^2.1.7"
     debug "^4.3.1"
     minimatch "^3.1.2"
 
-"@eslint/config-helpers@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.3.1.tgz#d316e47905bd0a1a931fa50e669b9af4104d1617"
-  integrity sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==
+"@eslint/config-helpers@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.4.2.tgz#1bd006ceeb7e2e55b2b773ab318d300e1a66aeda"
+  integrity sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==
+  dependencies:
+    "@eslint/core" "^0.17.0"
 
-"@eslint/core@^0.15.2":
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.15.2.tgz#59386327d7862cc3603ebc7c78159d2dcc4a868f"
-  integrity sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==
+"@eslint/core@^0.17.0":
+  version "0.17.0"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.17.0.tgz#77225820413d9617509da9342190a2019e78761c"
+  integrity sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==
   dependencies:
     "@types/json-schema" "^7.0.15"
 
 "@eslint/eslintrc@^3.3.1":
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.1.tgz#e55f7f1dd400600dd066dbba349c4c0bac916964"
-  integrity sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.3.tgz#26393a0806501b5e2b6a43aa588a4d8df67880ac"
+  integrity sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -1359,26 +1803,26 @@
     globals "^14.0.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
+    js-yaml "^4.1.1"
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@9.33.0", "@eslint/js@^9.32.0":
-  version "9.33.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.33.0.tgz#475c92fdddab59b8b8cab960e3de2564a44bf368"
-  integrity sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==
+"@eslint/js@9.39.2", "@eslint/js@^9.32.0":
+  version "9.39.2"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.39.2.tgz#2d4b8ec4c3ea13c1b3748e0c97ecd766bdd80599"
+  integrity sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==
 
-"@eslint/object-schema@^2.1.6":
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.6.tgz#58369ab5b5b3ca117880c0f6c0b0f32f6950f24f"
-  integrity sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==
+"@eslint/object-schema@^2.1.7":
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.7.tgz#6e2126a1347e86a4dedf8706ec67ff8e107ebbad"
+  integrity sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==
 
-"@eslint/plugin-kit@^0.3.5":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz#fd8764f0ee79c8ddab4da65460c641cefee017c5"
-  integrity sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==
+"@eslint/plugin-kit@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz#9779e3fd9b7ee33571a57435cf4335a1794a6cb2"
+  integrity sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==
   dependencies:
-    "@eslint/core" "^0.15.2"
+    "@eslint/core" "^0.17.0"
     levn "^0.4.1"
 
 "@fullcalendar/common@^5.11.5":
@@ -1388,46 +1832,46 @@
   dependencies:
     tslib "^2.1.0"
 
-"@fullcalendar/core@~6.1.18":
-  version "6.1.18"
-  resolved "https://registry.yarnpkg.com/@fullcalendar/core/-/core-6.1.18.tgz#772477215aa45c4cad0f45a83465a9c8095bd15a"
-  integrity sha512-cD7XtZIZZ87Cg2+itnpsONCsZ89VIfLLDZ22pQX4IQVWlpYUB3bcCf878DhWkqyEen6dhi5ePtBoqYgm5K+0fQ==
+"@fullcalendar/core@~6.1.20":
+  version "6.1.20"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/core/-/core-6.1.20.tgz#e4cfa767a9b8b7dad015b33fcb8acb0fac986a85"
+  integrity sha512-1cukXLlePFiJ8YKXn/4tMKsy0etxYLCkXk8nUCFi11nRONF2Ba2CD5b21/ovtOO2tL6afTJfwmc1ed3HG7eB1g==
   dependencies:
     preact "~10.12.1"
 
-"@fullcalendar/daygrid@~6.1.18":
-  version "6.1.18"
-  resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-6.1.18.tgz#49b4a237d0115b4695cd8593d0dfa36d81fa5ad4"
-  integrity sha512-s452Zle1SdMEzZDw+pDczm8m3JLIZzS9ANMThXTnqeqJewW1gqNFYas18aHypJSgF9Fh9rDJjTSUw04BpXB/Mg==
+"@fullcalendar/daygrid@~6.1.20":
+  version "6.1.20"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/daygrid/-/daygrid-6.1.20.tgz#fcf33af4ea908b46fd755414278341811e01bdf8"
+  integrity sha512-AO9vqhkLP77EesmJzuU+IGXgxNulsA8mgQHynclJ8U70vSwAVnbcLG9qftiTAFSlZjiY/NvhE7sflve6cJelyQ==
 
-"@fullcalendar/interaction@~6.1.18":
-  version "6.1.18"
-  resolved "https://registry.yarnpkg.com/@fullcalendar/interaction/-/interaction-6.1.18.tgz#2fbcae93f982af2abfe8a1078bfa740fe559fe44"
-  integrity sha512-f/mD5RTjzw+Q6MGTMZrLCgIrQLIUUO9NV/58aM2J6ZBQZeRlNizDqmqldqyG+j49zj2vFhUfZibPrVKWm5yA4Q==
+"@fullcalendar/interaction@~6.1.20":
+  version "6.1.20"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/interaction/-/interaction-6.1.20.tgz#a73a53af5f93ac261f864b025ae80201609f1cd7"
+  integrity sha512-p6txmc5txL0bMiPaJxe2ip6o0T384TyoD2KGdsU6UjZ5yoBlaY+dg7kxfnYKpYMzEJLG58n+URrHr2PgNL2fyA==
 
-"@fullcalendar/list@~6.1.18":
-  version "6.1.18"
-  resolved "https://registry.yarnpkg.com/@fullcalendar/list/-/list-6.1.18.tgz#e37909506e0956b487ec76ab3bfbd2dac94d363a"
-  integrity sha512-XPZI50mq3HXyDQ5sT3jmqQUuwG8zQb5H14dQIUAmOHAIFRA3WpkxlzrXO0U1SrosvGySMPyyNNxvMKI1Q/jL7A==
+"@fullcalendar/list@~6.1.20":
+  version "6.1.20"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/list/-/list-6.1.20.tgz#d218906f0c50e1a7232a176df2426269f8601319"
+  integrity sha512-7Hzkbb7uuSqrXwTyD0Ld/7SwWNxPD6SlU548vtkIpH55rZ4qquwtwYdMPgorHos5OynHA4OUrZNcH51CjrCf2g==
 
-"@fullcalendar/multimonth@~6.1.18":
-  version "6.1.18"
-  resolved "https://registry.yarnpkg.com/@fullcalendar/multimonth/-/multimonth-6.1.18.tgz#87d5ecb468f205b260cadc99346ce268a9a68f77"
-  integrity sha512-4WSqtheJgWQMcJZjDDwTCYHe1JWTGZyJdCbIs84DuKbwZWH96g07Kr/3xDwsxiHgVX0iFlwljtkp2OmtMxQoDA==
+"@fullcalendar/multimonth@~6.1.20":
+  version "6.1.20"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/multimonth/-/multimonth-6.1.20.tgz#1d6add6285222751324868de1cb02371f4ad2330"
+  integrity sha512-rMMiPBA71lUJ1DV/0ckPtN4/G4LozkkDKoG7/CbmTYqFJiMRskM/1WpilhtRn4iUdNe03V5K7ofFQRs0wo4ZtQ==
   dependencies:
-    "@fullcalendar/daygrid" "~6.1.18"
+    "@fullcalendar/daygrid" "~6.1.20"
 
 "@fullcalendar/react@^6.1.15":
-  version "6.1.18"
-  resolved "https://registry.yarnpkg.com/@fullcalendar/react/-/react-6.1.18.tgz#6424d941dbc8aabdbf2db12c44c5e29a45daac11"
-  integrity sha512-Jwvb+T+/1yGZKe+UYXn0id022HJm0Fq2X/PGFvVh/QRYAI/6xPMRvJrwercBkToxf6LjqYXrDO+/NhRN6IDlmg==
+  version "6.1.20"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/react/-/react-6.1.20.tgz#7f2a8ede416364ab3b426c8e7c6739ec0ec476d0"
+  integrity sha512-1w0pZtceaUdfAnxMSCGHCQalhi+mR1jOe76sXzyAXpcPz/Lf0zHSdcGK/U2XpZlnQgQtBZW+d+QBnnzVQKCxAA==
 
-"@fullcalendar/timegrid@~6.1.18":
-  version "6.1.18"
-  resolved "https://registry.yarnpkg.com/@fullcalendar/timegrid/-/timegrid-6.1.18.tgz#8673c4870282ade1545f12e81c0dc11d2da039f6"
-  integrity sha512-T/ouhs+T1tM8JcW7Cjx+KiohL/qQWKqvRITwjol8ktJ1e1N/6noC40/obR1tyolqOxMRWHjJkYoj9fUqfoez9A==
+"@fullcalendar/timegrid@~6.1.20":
+  version "6.1.20"
+  resolved "https://registry.yarnpkg.com/@fullcalendar/timegrid/-/timegrid-6.1.20.tgz#929813235375c2fa3b387691ef5b1dcbb7b86dde"
+  integrity sha512-4H+/MWbz3ntA50lrPif+7TsvMeX3R1GSYjiLULz0+zEJ7/Yfd9pupZmAwUs/PBpA6aAcFmeRr0laWfcz1a9V1A==
   dependencies:
-    "@fullcalendar/daygrid" "~6.1.18"
+    "@fullcalendar/daygrid" "~6.1.20"
 
 "@humanfs/core@^0.19.1":
   version "0.19.1"
@@ -1435,28 +1879,28 @@
   integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
 
 "@humanfs/node@^0.16.6":
-  version "0.16.6"
-  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e"
-  integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==
+  version "0.16.7"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.7.tgz#822cb7b3a12c5a240a24f621b5a2413e27a45f26"
+  integrity sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==
   dependencies:
     "@humanfs/core" "^0.19.1"
-    "@humanwhocodes/retry" "^0.3.0"
+    "@humanwhocodes/retry" "^0.4.0"
 
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/retry@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.1.tgz#c72a5c76a9fbaf3488e231b13dc52c0da7bab42a"
-  integrity sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==
-
-"@humanwhocodes/retry@^0.4.2":
+"@humanwhocodes/retry@^0.4.0", "@humanwhocodes/retry@^0.4.2":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz#c2b9d2e374ee62c586d3adbea87199b1d7a7a6ba"
   integrity sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==
 
+"@img/colour@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@img/colour/-/colour-1.0.0.tgz#d2fabb223455a793bf3bf9c70de3d28526aa8311"
+  integrity sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==
+
 "@img/sharp-darwin-arm64@0.33.5":
   version "0.33.5"
   resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz#ef5b5a07862805f1e8145a377c8ba6e98813ca08"
@@ -1464,12 +1908,12 @@
   optionalDependencies:
     "@img/sharp-libvips-darwin-arm64" "1.0.4"
 
-"@img/sharp-darwin-arm64@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.3.tgz#4850c8ace3c1dc13607fa07d43377b1f9aa774da"
-  integrity sha512-ryFMfvxxpQRsgZJqBd4wsttYQbCxsJksrv9Lw/v798JcQ8+w84mBWuXwl+TT0WJ/WrYOLaYpwQXi3sA9nTIaIg==
+"@img/sharp-darwin-arm64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz#6e0732dcade126b6670af7aa17060b926835ea86"
+  integrity sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==
   optionalDependencies:
-    "@img/sharp-libvips-darwin-arm64" "1.2.0"
+    "@img/sharp-libvips-darwin-arm64" "1.2.4"
 
 "@img/sharp-darwin-x64@0.33.5":
   version "0.33.5"
@@ -1478,97 +1922,102 @@
   optionalDependencies:
     "@img/sharp-libvips-darwin-x64" "1.0.4"
 
-"@img/sharp-darwin-x64@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.3.tgz#edf93fb01479604f14ad6a64a716e2ef2bb23100"
-  integrity sha512-yHpJYynROAj12TA6qil58hmPmAwxKKC7reUqtGLzsOHfP7/rniNGTL8tjWX6L3CTV4+5P4ypcS7Pp+7OB+8ihA==
+"@img/sharp-darwin-x64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz#19bc1dd6eba6d5a96283498b9c9f401180ee9c7b"
+  integrity sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==
   optionalDependencies:
-    "@img/sharp-libvips-darwin-x64" "1.2.0"
+    "@img/sharp-libvips-darwin-x64" "1.2.4"
 
 "@img/sharp-libvips-darwin-arm64@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz#447c5026700c01a993c7804eb8af5f6e9868c07f"
   integrity sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==
 
-"@img/sharp-libvips-darwin-arm64@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.0.tgz#e20e9041031acde1de19da121dc5162c7d2cf251"
-  integrity sha512-sBZmpwmxqwlqG9ueWFXtockhsxefaV6O84BMOrhtg/YqbTaRdqDE7hxraVE3y6gVM4eExmfzW4a8el9ArLeEiQ==
+"@img/sharp-libvips-darwin-arm64@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz#2894c0cb87d42276c3889942e8e2db517a492c43"
+  integrity sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==
 
 "@img/sharp-libvips-darwin-x64@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz#e0456f8f7c623f9dbfbdc77383caa72281d86062"
   integrity sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==
 
-"@img/sharp-libvips-darwin-x64@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.0.tgz#918ca81c5446f31114834cb908425a7532393185"
-  integrity sha512-M64XVuL94OgiNHa5/m2YvEQI5q2cl9d/wk0qFTDVXcYzi43lxuiFTftMR1tOnFQovVXNZJ5TURSDK2pNe9Yzqg==
+"@img/sharp-libvips-darwin-x64@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz#e63681f4539a94af9cd17246ed8881734386f8cc"
+  integrity sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==
 
 "@img/sharp-libvips-linux-arm64@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz#979b1c66c9a91f7ff2893556ef267f90ebe51704"
   integrity sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==
 
-"@img/sharp-libvips-linux-arm64@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.0.tgz#1a5beafc857b43f378c3030427aa981ee3edbc54"
-  integrity sha512-RXwd0CgG+uPRX5YYrkzKyalt2OJYRiJQ8ED/fi1tq9WQW2jsQIn0tqrlR5l5dr/rjqq6AHAxURhj2DVjyQWSOA==
+"@img/sharp-libvips-linux-arm64@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz#b1b288b36864b3bce545ad91fa6dadcf1a4ad318"
+  integrity sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==
 
 "@img/sharp-libvips-linux-arm@1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz#99f922d4e15216ec205dcb6891b721bfd2884197"
   integrity sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==
 
-"@img/sharp-libvips-linux-arm@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.0.tgz#bff51182d5238ca35c5fe9e9f594a18ad6a5480d"
-  integrity sha512-mWd2uWvDtL/nvIzThLq3fr2nnGfyr/XMXlq8ZJ9WMR6PXijHlC3ksp0IpuhK6bougvQrchUAfzRLnbsen0Cqvw==
+"@img/sharp-libvips-linux-arm@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz#b9260dd1ebe6f9e3bdbcbdcac9d2ac125f35852d"
+  integrity sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==
 
-"@img/sharp-libvips-linux-ppc64@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.0.tgz#10c53ccf6f2d47d71fb3fa282697072c8fe9e40e"
-  integrity sha512-Xod/7KaDDHkYu2phxxfeEPXfVXFKx70EAFZ0qyUdOjCcxbjqyJOEUpDe6RIyaunGxT34Anf9ue/wuWOqBW2WcQ==
+"@img/sharp-libvips-linux-ppc64@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.4.tgz#4b83ecf2a829057222b38848c7b022e7b4d07aa7"
+  integrity sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==
+
+"@img/sharp-libvips-linux-riscv64@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.2.4.tgz#880b4678009e5a2080af192332b00b0aaf8a48de"
+  integrity sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==
 
 "@img/sharp-libvips-linux-s390x@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz#f8a5eb1f374a082f72b3f45e2fb25b8118a8a5ce"
   integrity sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==
 
-"@img/sharp-libvips-linux-s390x@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.0.tgz#392fd7557ddc5c901f1bed7ab3c567c08833ef3b"
-  integrity sha512-eMKfzDxLGT8mnmPJTNMcjfO33fLiTDsrMlUVcp6b96ETbnJmd4uvZxVJSKPQfS+odwfVaGifhsB07J1LynFehw==
+"@img/sharp-libvips-linux-s390x@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.4.tgz#74f343c8e10fad821b38f75ced30488939dc59ec"
+  integrity sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==
 
 "@img/sharp-libvips-linux-x64@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz#d4c4619cdd157774906e15770ee119931c7ef5e0"
   integrity sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==
 
-"@img/sharp-libvips-linux-x64@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.0.tgz#9315cf90a2fdcdc0e29ea7663cbd8b0f15254400"
-  integrity sha512-ZW3FPWIc7K1sH9E3nxIGB3y3dZkpJlMnkk7z5tu1nSkBoCgw2nSRTFHI5pB/3CQaJM0pdzMF3paf9ckKMSE9Tg==
+"@img/sharp-libvips-linux-x64@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz#df4183e8bd8410f7d61b66859a35edeab0a531ce"
+  integrity sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==
 
 "@img/sharp-libvips-linuxmusl-arm64@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz#166778da0f48dd2bded1fa3033cee6b588f0d5d5"
   integrity sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==
 
-"@img/sharp-libvips-linuxmusl-arm64@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.0.tgz#705e03e67d477f6f842f37eb7f66285b1150dc06"
-  integrity sha512-UG+LqQJbf5VJ8NWJ5Z3tdIe/HXjuIdo4JeVNADXBFuG7z9zjoegpzzGIyV5zQKi4zaJjnAd2+g2nna8TZvuW9Q==
+"@img/sharp-libvips-linuxmusl-arm64@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz#c8d6b48211df67137541007ee8d1b7b1f8ca8e06"
+  integrity sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==
 
 "@img/sharp-libvips-linuxmusl-x64@1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz#93794e4d7720b077fcad3e02982f2f1c246751ff"
   integrity sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==
 
-"@img/sharp-libvips-linuxmusl-x64@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.0.tgz#ec905071cc538df64848d5900e0d386d77c55f13"
-  integrity sha512-SRYOLR7CXPgNze8akZwjoGBoN1ThNZoqpOgfnOxmWsklTGVfJiGJoC/Lod7aNMGA1jSsKWM1+HRX43OP6p9+6Q==
+"@img/sharp-libvips-linuxmusl-x64@1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz#be11c75bee5b080cbee31a153a8779448f919f75"
+  integrity sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==
 
 "@img/sharp-linux-arm64@0.33.5":
   version "0.33.5"
@@ -1577,12 +2026,12 @@
   optionalDependencies:
     "@img/sharp-libvips-linux-arm64" "1.0.4"
 
-"@img/sharp-linux-arm64@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.3.tgz#476f8f13ce192555391ae9d4bc658637a6acf3e5"
-  integrity sha512-QdrKe3EvQrqwkDrtuTIjI0bu6YEJHTgEeqdzI3uWJOH6G1O8Nl1iEeVYRGdj1h5I21CqxSvQp1Yv7xeU3ZewbA==
+"@img/sharp-linux-arm64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz#7aa7764ef9c001f15e610546d42fce56911790cc"
+  integrity sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==
   optionalDependencies:
-    "@img/sharp-libvips-linux-arm64" "1.2.0"
+    "@img/sharp-libvips-linux-arm64" "1.2.4"
 
 "@img/sharp-linux-arm@0.33.5":
   version "0.33.5"
@@ -1591,19 +2040,26 @@
   optionalDependencies:
     "@img/sharp-libvips-linux-arm" "1.0.5"
 
-"@img/sharp-linux-arm@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.3.tgz#9898cd68ea3e3806b94fe25736d5d7ecb5eac121"
-  integrity sha512-oBK9l+h6KBN0i3dC8rYntLiVfW8D8wH+NPNT3O/WBHeW0OQWCjfWksLUaPidsrDKpJgXp3G3/hkmhptAW0I3+A==
+"@img/sharp-linux-arm@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz#5fb0c3695dd12522d39c3ff7a6bc816461780a0d"
+  integrity sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==
+  optionalDependencies:
+    "@img/sharp-libvips-linux-arm" "1.2.4"
+
+"@img/sharp-linux-ppc64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.5.tgz#9c213a81520a20caf66978f3d4c07456ff2e0813"
+  integrity sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==
   optionalDependencies:
-    "@img/sharp-libvips-linux-arm" "1.2.0"
+    "@img/sharp-libvips-linux-ppc64" "1.2.4"
 
-"@img/sharp-linux-ppc64@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.3.tgz#6a7cd4c608011333a0ddde6d96e03ac042dd9079"
-  integrity sha512-GLtbLQMCNC5nxuImPR2+RgrviwKwVql28FWZIW1zWruy6zLgA5/x2ZXk3mxj58X/tszVF69KK0Is83V8YgWhLA==
+"@img/sharp-linux-riscv64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.34.5.tgz#cdd28182774eadbe04f62675a16aabbccb833f60"
+  integrity sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==
   optionalDependencies:
-    "@img/sharp-libvips-linux-ppc64" "1.2.0"
+    "@img/sharp-libvips-linux-riscv64" "1.2.4"
 
 "@img/sharp-linux-s390x@0.33.5":
   version "0.33.5"
@@ -1612,12 +2068,12 @@
   optionalDependencies:
     "@img/sharp-libvips-linux-s390x" "1.0.4"
 
-"@img/sharp-linux-s390x@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.3.tgz#48e27ab969efe97d270e39297654c0e0c9b42919"
-  integrity sha512-3gahT+A6c4cdc2edhsLHmIOXMb17ltffJlxR0aC2VPZfwKoTGZec6u5GrFgdR7ciJSsHT27BD3TIuGcuRT0KmQ==
+"@img/sharp-linux-s390x@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.5.tgz#93eac601b9f329bb27917e0e19098c722d630df7"
+  integrity sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==
   optionalDependencies:
-    "@img/sharp-libvips-linux-s390x" "1.2.0"
+    "@img/sharp-libvips-linux-s390x" "1.2.4"
 
 "@img/sharp-linux-x64@0.33.5":
   version "0.33.5"
@@ -1626,12 +2082,12 @@
   optionalDependencies:
     "@img/sharp-libvips-linux-x64" "1.0.4"
 
-"@img/sharp-linux-x64@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.3.tgz#5aa77ad4aa447ddf6d642e2a2c5599eb1292dfaa"
-  integrity sha512-8kYso8d806ypnSq3/Ly0QEw90V5ZoHh10yH0HnrzOCr6DKAPI6QVHvwleqMkVQ0m+fc7EH8ah0BB0QPuWY6zJQ==
+"@img/sharp-linux-x64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz#55abc7cd754ffca5002b6c2b719abdfc846819a8"
+  integrity sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==
   optionalDependencies:
-    "@img/sharp-libvips-linux-x64" "1.2.0"
+    "@img/sharp-libvips-linux-x64" "1.2.4"
 
 "@img/sharp-linuxmusl-arm64@0.33.5":
   version "0.33.5"
@@ -1640,12 +2096,12 @@
   optionalDependencies:
     "@img/sharp-libvips-linuxmusl-arm64" "1.0.4"
 
-"@img/sharp-linuxmusl-arm64@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.3.tgz#62053a9d77c7d4632c677619325b741254689dd7"
-  integrity sha512-vAjbHDlr4izEiXM1OTggpCcPg9tn4YriK5vAjowJsHwdBIdx0fYRsURkxLG2RLm9gyBq66gwtWI8Gx0/ov+JKQ==
+"@img/sharp-linuxmusl-arm64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz#d6515ee971bb62f73001a4829b9d865a11b77086"
+  integrity sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==
   optionalDependencies:
-    "@img/sharp-libvips-linuxmusl-arm64" "1.2.0"
+    "@img/sharp-libvips-linuxmusl-arm64" "1.2.4"
 
 "@img/sharp-linuxmusl-x64@0.33.5":
   version "0.33.5"
@@ -1654,12 +2110,12 @@
   optionalDependencies:
     "@img/sharp-libvips-linuxmusl-x64" "1.0.4"
 
-"@img/sharp-linuxmusl-x64@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.3.tgz#5107c7709c7e0a44fe5abef59829f1de86fa0a3a"
-  integrity sha512-gCWUn9547K5bwvOn9l5XGAEjVTTRji4aPTqLzGXHvIr6bIDZKNTA34seMPgM0WmSf+RYBH411VavCejp3PkOeQ==
+"@img/sharp-linuxmusl-x64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz#d97978aec7c5212f999714f2f5b736457e12ee9f"
+  integrity sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==
   optionalDependencies:
-    "@img/sharp-libvips-linuxmusl-x64" "1.2.0"
+    "@img/sharp-libvips-linuxmusl-x64" "1.2.4"
 
 "@img/sharp-wasm32@0.33.5":
   version "0.33.5"
@@ -1668,42 +2124,42 @@
   dependencies:
     "@emnapi/runtime" "^1.2.0"
 
-"@img/sharp-wasm32@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.34.3.tgz#c1dcabb834ec2f71308a810b399bb6e6e3b79619"
-  integrity sha512-+CyRcpagHMGteySaWos8IbnXcHgfDn7pO2fiC2slJxvNq9gDipYBN42/RagzctVRKgxATmfqOSulgZv5e1RdMg==
+"@img/sharp-wasm32@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-wasm32/-/sharp-wasm32-0.34.5.tgz#2f15803aa626f8c59dd7c9d0bbc766f1ab52cfa0"
+  integrity sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==
   dependencies:
-    "@emnapi/runtime" "^1.4.4"
+    "@emnapi/runtime" "^1.7.0"
 
-"@img/sharp-win32-arm64@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.3.tgz#3e8654e368bb349d45799a0d7aeb29db2298628e"
-  integrity sha512-MjnHPnbqMXNC2UgeLJtX4XqoVHHlZNd+nPt1kRPmj63wURegwBhZlApELdtxM2OIZDRv/DFtLcNhVbd1z8GYXQ==
+"@img/sharp-win32-arm64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz#3706e9e3ac35fddfc1c87f94e849f1b75307ce0a"
+  integrity sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==
 
 "@img/sharp-win32-ia32@0.33.5":
   version "0.33.5"
   resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz#1a0c839a40c5351e9885628c85f2e5dfd02b52a9"
   integrity sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==
 
-"@img/sharp-win32-ia32@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.3.tgz#9d4c105e8d5074a351a81a0b6d056e0af913bf76"
-  integrity sha512-xuCdhH44WxuXgOM714hn4amodJMZl3OEvf0GVTm0BEyMeA2to+8HEdRPShH0SLYptJY1uBw+SCFP9WVQi1Q/cw==
+"@img/sharp-win32-ia32@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.5.tgz#0b71166599b049e032f085fb9263e02f4e4788de"
+  integrity sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==
 
 "@img/sharp-win32-x64@0.33.5":
   version "0.33.5"
   resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz#56f00962ff0c4e0eb93d34a047d29fa995e3e342"
   integrity sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==
 
-"@img/sharp-win32-x64@0.34.3":
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.3.tgz#d20c89bd41b1dd3d76d8575714aaaa3c43204b6a"
-  integrity sha512-OWwz05d++TxzLEv4VnsTz5CmZ6mI6S05sfQGEMrNrQcOEERbX46332IvE7pO/EUiw7jUrrS40z/M7kPyjfl04g==
+"@img/sharp-win32-x64@0.34.5":
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz#a81ffb00e69267cd0a1d626eaedb8a8430b2b2f8"
+  integrity sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==
 
-"@ioredis/commands@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@ioredis/commands/-/commands-1.3.0.tgz#4dc3ae9bfa7146b63baf27672a61db0ea86e35e5"
-  integrity sha512-M/T6Zewn7sDaBQEqIZ8Rb+i9y8qfGmq+5SDFSf9sA2lUZTmdDLVdOiQaeDp+Q4wElZ9HG1GAX5KhDaidp6LQsQ==
+"@ioredis/commands@1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@ioredis/commands/-/commands-1.4.0.tgz#9f657d51cdd5d2fdb8889592aa4a355546151f25"
+  integrity sha512-aFT2yemJJo+TZCmieA7qnYGQooOS7QfNmYrzGtsYd3g9j5iDP8AimYYAesf79ohjbLG12XxC4nG5DyEnC88AsQ==
 
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
@@ -1733,50 +2189,50 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.0.5.tgz#d7d027c2db5c64c20a973b7f3e57b49956d6c335"
-  integrity sha512-xY6b0XiL0Nav3ReresUarwl2oIz1gTnxGbGpho9/rbUWsLH0f1OD/VT84xs8c7VmH7MChnLb0pag6PhZhAdDiA==
+"@jest/console@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-30.2.0.tgz#c52fcd5b58fdd2e8eb66b2fd8ae56f2f64d05b28"
+  integrity sha512-+O1ifRjkvYIkBqASKWgLxrpEhQAAE7hY77ALLUufSk5717KfOShg6IbqLmdsLMPdUiFvA2kTs0R7YZy+l0IzZQ==
   dependencies:
-    "@jest/types" "30.0.5"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
     chalk "^4.1.2"
-    jest-message-util "30.0.5"
-    jest-util "30.0.5"
+    jest-message-util "30.2.0"
+    jest-util "30.2.0"
     slash "^3.0.0"
 
-"@jest/core@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.0.5.tgz#b5778922d2928f676636e3ec199829554e61e452"
-  integrity sha512-fKD0OulvRsXF1hmaFgHhVJzczWzA1RXMMo9LTPuFXo9q/alDbME3JIyWYqovWsUBWSoBcsHaGPSLF9rz4l9Qeg==
+"@jest/core@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-30.2.0.tgz#813d59faa5abd5510964a8b3a7b17cc77b775275"
+  integrity sha512-03W6IhuhjqTlpzh/ojut/pDB2LPRygyWX8ExpgHtQA8H/3K7+1vKmcINx5UzeOX1se6YEsBsOHQ1CRzf3fOwTQ==
   dependencies:
-    "@jest/console" "30.0.5"
+    "@jest/console" "30.2.0"
     "@jest/pattern" "30.0.1"
-    "@jest/reporters" "30.0.5"
-    "@jest/test-result" "30.0.5"
-    "@jest/transform" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/reporters" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
     ansi-escapes "^4.3.2"
     chalk "^4.1.2"
     ci-info "^4.2.0"
     exit-x "^0.2.2"
     graceful-fs "^4.2.11"
-    jest-changed-files "30.0.5"
-    jest-config "30.0.5"
-    jest-haste-map "30.0.5"
-    jest-message-util "30.0.5"
+    jest-changed-files "30.2.0"
+    jest-config "30.2.0"
+    jest-haste-map "30.2.0"
+    jest-message-util "30.2.0"
     jest-regex-util "30.0.1"
-    jest-resolve "30.0.5"
-    jest-resolve-dependencies "30.0.5"
-    jest-runner "30.0.5"
-    jest-runtime "30.0.5"
-    jest-snapshot "30.0.5"
-    jest-util "30.0.5"
-    jest-validate "30.0.5"
-    jest-watcher "30.0.5"
+    jest-resolve "30.2.0"
+    jest-resolve-dependencies "30.2.0"
+    jest-runner "30.2.0"
+    jest-runtime "30.2.0"
+    jest-snapshot "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
+    jest-watcher "30.2.0"
     micromatch "^4.0.8"
-    pretty-format "30.0.5"
+    pretty-format "30.2.0"
     slash "^3.0.0"
 
 "@jest/diff-sequences@30.0.1":
@@ -1784,22 +2240,22 @@
   resolved "https://registry.yarnpkg.com/@jest/diff-sequences/-/diff-sequences-30.0.1.tgz#0ededeae4d071f5c8ffe3678d15f3a1be09156be"
   integrity sha512-n5H8QLDJ47QqbCNn5SuFjCRDrOLEZ0h8vAHCK5RL9Ls7Xa8AQLa/YxAc9UjFqoEDM48muwtBGjtMY5cr0PLDCw==
 
-"@jest/environment@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.0.5.tgz#eaaae0403c7d3f8414053c2224acc3011e1c3a1b"
-  integrity sha512-aRX7WoaWx1oaOkDQvCWImVQ8XNtdv5sEWgk4gxR6NXb7WBUnL5sRak4WRzIQRZ1VTWPvV4VI4mgGjNL9TeKMYA==
+"@jest/environment@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-30.2.0.tgz#1e673cdb8b93ded707cf6631b8353011460831fa"
+  integrity sha512-/QPTL7OBJQ5ac09UDRa3EQes4gt1FTEG/8jZ/4v5IVzx+Cv7dLxlVIvfvSVRiiX2drWyXeBjkMSR8hvOWSog5g==
   dependencies:
-    "@jest/fake-timers" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/fake-timers" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    jest-mock "30.0.5"
+    jest-mock "30.2.0"
 
-"@jest/expect-utils@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.0.5.tgz#9d42e4b8bc80367db30abc6c42b2cb14073f66fc"
-  integrity sha512-F3lmTT7CXWYywoVUGTCmom0vXq3HTTkaZyTAzIy+bXSBizB7o5qzlC9VCtq0arOa8GqmNsbg/cE9C6HLn7Szew==
+"@jest/expect-utils@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-30.2.0.tgz#4f95413d4748454fdb17404bf1141827d15e6011"
+  integrity sha512-1JnRfhqpD8HGpOmQp180Fo9Zt69zNtC+9lR+kT7NVL05tNXIi+QC8Csz7lfidMoVLPD3FnOtcmp0CEFnxExGEA==
   dependencies:
-    "@jest/get-type" "30.0.1"
+    "@jest/get-type" "30.1.0"
 
 "@jest/expect-utils@^29.7.0":
   version "29.7.0"
@@ -1808,40 +2264,40 @@
   dependencies:
     jest-get-type "^29.6.3"
 
-"@jest/expect@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.0.5.tgz#2bbd101df4869f5d171c3cfee881f810f1525005"
-  integrity sha512-6udac8KKrtTtC+AXZ2iUN/R7dp7Ydry+Fo6FPFnDG54wjVMnb6vW/XNlf7Xj8UDjAE3aAVAsR4KFyKk3TCXmTA==
+"@jest/expect@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-30.2.0.tgz#9a5968499bb8add2bbb09136f69f7df5ddbf3185"
+  integrity sha512-V9yxQK5erfzx99Sf+7LbhBwNWEZ9eZay8qQ9+JSC0TrMR1pMDHLMY+BnVPacWU6Jamrh252/IKo4F1Xn/zfiqA==
   dependencies:
-    expect "30.0.5"
-    jest-snapshot "30.0.5"
+    expect "30.2.0"
+    jest-snapshot "30.2.0"
 
-"@jest/fake-timers@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.0.5.tgz#c028a9465a44b7744cb2368196bed89ce13c7054"
-  integrity sha512-ZO5DHfNV+kgEAeP3gK3XlpJLL4U3Sz6ebl/n68Uwt64qFFs5bv4bfEEjyRGK5uM0C90ewooNgFuKMdkbEoMEXw==
+"@jest/fake-timers@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-30.2.0.tgz#0941ddc28a339b9819542495b5408622dc9e94ec"
+  integrity sha512-HI3tRLjRxAbBy0VO8dqqm7Hb2mIa8d5bg/NJkyQcOk7V118ObQML8RC5luTF/Zsg4474a+gDvhce7eTnP4GhYw==
   dependencies:
-    "@jest/types" "30.0.5"
+    "@jest/types" "30.2.0"
     "@sinonjs/fake-timers" "^13.0.0"
     "@types/node" "*"
-    jest-message-util "30.0.5"
-    jest-mock "30.0.5"
-    jest-util "30.0.5"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
 
-"@jest/get-type@30.0.1":
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.0.1.tgz#0d32f1bbfba511948ad247ab01b9007724fc9f52"
-  integrity sha512-AyYdemXCptSRFirI5EPazNxyPwAL0jXt3zceFjaj8NFiKP9pOi0bfXonf6qkf82z2t3QWPeLCWWw4stPBzctLw==
+"@jest/get-type@30.1.0":
+  version "30.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/get-type/-/get-type-30.1.0.tgz#4fcb4dc2ebcf0811be1c04fd1cb79c2dba431cbc"
+  integrity sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==
 
-"@jest/globals@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.0.5.tgz#ca70e0ac08ab40417cf8cd92bcb76116c2ccca63"
-  integrity sha512-7oEJT19WW4oe6HR7oLRvHxwlJk2gev0U9px3ufs8sX9PoD1Eza68KF0/tlN7X0dq/WVsBScXQGgCldA1V9Y/jA==
+"@jest/globals@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-30.2.0.tgz#2f4b696d5862664b89c4ee2e49ae24d2bb7e0988"
+  integrity sha512-b63wmnKPaK+6ZZfpYhz9K61oybvbI1aMcIs80++JI1O1rR1vaxHUCNqo3ITu6NU0d4V34yZFoHMn/uoKr/Rwfw==
   dependencies:
-    "@jest/environment" "30.0.5"
-    "@jest/expect" "30.0.5"
-    "@jest/types" "30.0.5"
-    jest-mock "30.0.5"
+    "@jest/environment" "30.2.0"
+    "@jest/expect" "30.2.0"
+    "@jest/types" "30.2.0"
+    jest-mock "30.2.0"
 
 "@jest/pattern@30.0.1":
   version "30.0.1"
@@ -1851,16 +2307,16 @@
     "@types/node" "*"
     jest-regex-util "30.0.1"
 
-"@jest/reporters@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.0.5.tgz#b83585e6448d390a8d92a641c567f1655976d5c6"
-  integrity sha512-mafft7VBX4jzED1FwGC1o/9QUM2xebzavImZMeqnsklgcyxBto8mV4HzNSzUrryJ+8R9MFOM3HgYuDradWR+4g==
+"@jest/reporters@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-30.2.0.tgz#a36b28fcbaf0c4595250b108e6f20e363348fd91"
+  integrity sha512-DRyW6baWPqKMa9CzeiBjHwjd8XeAyco2Vt8XbcLFjiwCOEKOvy82GJ8QQnJE9ofsxCMPjH4MfH8fCWIHHDKpAQ==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "30.0.5"
-    "@jest/test-result" "30.0.5"
-    "@jest/transform" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/console" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
     "@jridgewell/trace-mapping" "^0.3.25"
     "@types/node" "*"
     chalk "^4.1.2"
@@ -1873,9 +2329,9 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^5.0.0"
     istanbul-reports "^3.1.3"
-    jest-message-util "30.0.5"
-    jest-util "30.0.5"
-    jest-worker "30.0.5"
+    jest-message-util "30.2.0"
+    jest-util "30.2.0"
+    jest-worker "30.2.0"
     slash "^3.0.0"
     string-length "^4.0.2"
     v8-to-istanbul "^9.0.1"
@@ -1894,12 +2350,12 @@
   dependencies:
     "@sinclair/typebox" "^0.27.8"
 
-"@jest/snapshot-utils@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.0.5.tgz#e23a0e786f174e8cff7f150c1cfbdc9cb7cc81a4"
-  integrity sha512-XcCQ5qWHLvi29UUrowgDFvV4t7ETxX91CbDczMnoqXPOIcZOxyNdSjm6kV5XMc8+HkxfRegU/MUmnTbJRzGrUQ==
+"@jest/snapshot-utils@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/snapshot-utils/-/snapshot-utils-30.2.0.tgz#387858eb90c2f98f67bff327435a532ac5309fbe"
+  integrity sha512-0aVxM3RH6DaiLcjj/b0KrIBZhSX1373Xci4l3cW5xiUWPctZ59zQ7jj4rqcJQ/Z8JuN/4wX3FpJSa3RssVvCug==
   dependencies:
-    "@jest/types" "30.0.5"
+    "@jest/types" "30.2.0"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
     natural-compare "^1.4.0"
@@ -1913,51 +2369,51 @@
     callsites "^3.1.0"
     graceful-fs "^4.2.11"
 
-"@jest/test-result@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.0.5.tgz#064c5210c24d5ea192fb02ceddad3be1cfa557c8"
-  integrity sha512-wPyztnK0gbDMQAJZ43tdMro+qblDHH1Ru/ylzUo21TBKqt88ZqnKKK2m30LKmLLoKtR2lxdpCC/P3g1vfKcawQ==
+"@jest/test-result@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-30.2.0.tgz#9c0124377fb7996cdffb86eda3dbc56eacab363d"
+  integrity sha512-RF+Z+0CCHkARz5HT9mcQCBulb1wgCP3FBvl9VFokMX27acKphwyQsNuWH3c+ojd1LeWBLoTYoxF0zm6S/66mjg==
   dependencies:
-    "@jest/console" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/console" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/istanbul-lib-coverage" "^2.0.6"
     collect-v8-coverage "^1.0.2"
 
-"@jest/test-sequencer@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.0.5.tgz#c6dba8fc3c386dd793c087626e8508ff1ead19f4"
-  integrity sha512-Aea/G1egWoIIozmDD7PBXUOxkekXl7ueGzrsGGi1SbeKgQqCYCIf+wfbflEbf2LiPxL8j2JZGLyrzZagjvW4YQ==
+"@jest/test-sequencer@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-30.2.0.tgz#bf0066bc72e176d58f5dfa7f212b6e7eee44f221"
+  integrity sha512-wXKgU/lk8fKXMu/l5Hog1R61bL4q5GCdT6OJvdAFz1P+QrpoFuLU68eoKuVc4RbrTtNnTL5FByhWdLgOPSph+Q==
   dependencies:
-    "@jest/test-result" "30.0.5"
+    "@jest/test-result" "30.2.0"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.0.5"
+    jest-haste-map "30.2.0"
     slash "^3.0.0"
 
-"@jest/transform@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.0.5.tgz#f8ca2e9f7466b77b406807d3bef1f6790dd384e4"
-  integrity sha512-Vk8amLQCmuZyy6GbBht1Jfo9RSdBtg7Lks+B0PecnjI8J+PCLQPGh7uI8Q/2wwpW2gLdiAfiHNsmekKlywULqg==
+"@jest/transform@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-30.2.0.tgz#54bef1a4510dcbd58d5d4de4fe2980a63077ef2a"
+  integrity sha512-XsauDV82o5qXbhalKxD7p4TZYYdwcaEXC77PPD2HixEFF+6YGppjrAAQurTl2ECWcEomHBMMNS9AH3kcCFx8jA==
   dependencies:
     "@babel/core" "^7.27.4"
-    "@jest/types" "30.0.5"
+    "@jest/types" "30.2.0"
     "@jridgewell/trace-mapping" "^0.3.25"
-    babel-plugin-istanbul "^7.0.0"
+    babel-plugin-istanbul "^7.0.1"
     chalk "^4.1.2"
     convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.0.5"
+    jest-haste-map "30.2.0"
     jest-regex-util "30.0.1"
-    jest-util "30.0.5"
+    jest-util "30.2.0"
     micromatch "^4.0.8"
     pirates "^4.0.7"
     slash "^3.0.0"
     write-file-atomic "^5.0.1"
 
-"@jest/types@30.0.5":
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.0.5.tgz#29a33a4c036e3904f1cfd94f6fe77f89d2e1cc05"
-  integrity sha512-aREYa3aku9SSnea4aX6bhKn4bgv3AXkgijoQgbYV3yvbiGt6z+MQ85+6mIhx9DsKW2BuB/cLR/A+tcMThx+KLQ==
+"@jest/types@30.2.0":
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-30.2.0.tgz#1c678a7924b8f59eafd4c77d56b6d0ba976d62b8"
+  integrity sha512-H9xg1/sfVvyfU7o3zMfBEjQ1gcsdeTMgqHoYdN79tuLqfTtuu7WckRA1R5whDwOzxaZAeMKTYWqP+WCAi0CHsg==
   dependencies:
     "@jest/pattern" "30.0.1"
     "@jest/schemas" "30.0.5"
@@ -1985,43 +2441,51 @@
   integrity sha512-bIcKnH5YmtTYr7S6J3J86dn/rFiklwRpOqbTOQ9C0WMmR9FKHVb3bxs2UYfqEmNb93O4nbA97sb6rtz33i9SyA==
 
 "@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
-  version "0.3.12"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz#2234ce26c62889f03db3d7fea43c1932ab3e927b"
-  integrity sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
+  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.5.0"
     "@jridgewell/trace-mapping" "^0.3.24"
 
+"@jridgewell/remapping@^2.3.5":
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/remapping/-/remapping-2.3.5.tgz#375c476d1972947851ba1e15ae8f123047445aa1"
+  integrity sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@jridgewell/resolve-uri@^3.1.0":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
   integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
 "@jridgewell/source-map@^0.3.3":
-  version "0.3.10"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.10.tgz#a35714446a2e84503ff9bfe66f1d1d4846f2075b"
-  integrity sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==
+  version "0.3.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.11.tgz#b21835cbd36db656b857c2ad02ebd413cc13a9ba"
+  integrity sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
 
-"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15", "@jridgewell/sourcemap-codec@^1.5.0":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz#7358043433b2e5da569aa02cbc4c121da3af27d7"
-  integrity sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15", "@jridgewell/sourcemap-codec@^1.5.0", "@jridgewell/sourcemap-codec@^1.5.5":
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz#6912b00d2c631c0d15ce1a7ab57cd657f2a8f8ba"
+  integrity sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==
 
 "@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
-  version "0.3.29"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz#a58d31eaadaf92c6695680b2e1d464a9b8fbf7fc"
-  integrity sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
+  integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@keyv/serialize@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@keyv/serialize/-/serialize-1.1.0.tgz#08f5d89096110fdcf778e5337362e1cd5afad70a"
-  integrity sha512-RlDgexML7Z63Q8BSaqhXdCYNBy/JQnqYIwxofUrNLGCblOMHp+xux2Q8nLMLlPpgHQPoU0Do8Z6btCpRBEqZ8g==
+"@keyv/serialize@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@keyv/serialize/-/serialize-1.1.1.tgz#0c01dd3a3483882af7cf3878d4e71d505c81fc4a"
+  integrity sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==
 
 "@liaoliaots/nestjs-redis@^8.0.0":
   version "8.2.2"
@@ -2078,9 +2542,9 @@
     pug "^2.0.0"
 
 "@nestjs/cache-manager@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@nestjs/cache-manager/-/cache-manager-3.0.1.tgz#893abd4fb8450d2fe6c6692bd71688c45b2d5128"
-  integrity sha512-4UxTnR0fsmKL5YDalU2eLFVnL+OBebWUpX+hEduKGncrVKH4PPNoiRn1kXyOCjmzb0UvWgqubpssNouc8e0MCw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@nestjs/cache-manager/-/cache-manager-3.1.0.tgz#65f3be68154e48557790c0a58a55aadb92439dd0"
+  integrity sha512-pEIqYZrBcE8UdkJmZRduurvoUfdU+3kRPeO1R2muiMbZnRuqlki5klFFNllO9LyYWzrx98bd1j0PSPKSJk1Wbw==
 
 "@nestjs/cli@^10.0.0":
   version "10.4.9"
@@ -2152,14 +2616,22 @@
   integrity sha512-iHD/4D01CsKKWg7kUzo4yGNS4m90z1an0eUz+6nBlE5VeEOuCzhGFoBKAt0OKLJLOTEsJKuj4C2b5QfjqXVTyQ==
 
 "@nestjs/platform-express@^11.1.5":
-  version "11.1.6"
-  resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-11.1.6.tgz#9b1dcf82a3b3fdd5761c918ad664aff83e4eacc7"
-  integrity sha512-HErwPmKnk+loTq8qzu1up+k7FC6Kqa8x6lJ4cDw77KnTxLzsCaPt+jBvOq6UfICmfqcqCCf3dKXg+aObQp+kIQ==
+  version "11.1.11"
+  resolved "https://registry.yarnpkg.com/@nestjs/platform-express/-/platform-express-11.1.11.tgz#dfb77659cbc45ef8903de5a48927a56cb7c7d1b2"
+  integrity sha512-kyABSskdMRIAMWL0SlbwtDy4yn59RL4HDdwHDz/fxWuv7/53YP8Y2DtV3/sHqY5Er0msMVTZrM38MjqXhYL7gw==
   dependencies:
     cors "2.8.5"
-    express "5.1.0"
+    express "5.2.1"
     multer "2.0.2"
-    path-to-regexp "8.2.0"
+    path-to-regexp "8.3.0"
+    tslib "2.8.1"
+
+"@nestjs/platform-socket.io@^11.1.11":
+  version "11.1.11"
+  resolved "https://registry.yarnpkg.com/@nestjs/platform-socket.io/-/platform-socket.io-11.1.11.tgz#9e43afa8b1d8e5c3a4d8f00caeeb0f004532fc9f"
+  integrity sha512-0z6pLg9CuTXtz7q2lRZoPOU94DN28OTa39f4cQrlZysKA6QrKM7w7z6xqb4g32qjF+LQHFNRmMJtE/pLrxBaig==
+  dependencies:
+    socket.io "4.8.3"
     tslib "2.8.1"
 
 "@nestjs/schedule@^0.4.0":
@@ -2200,9 +2672,9 @@
     tslib "2.8.1"
 
 "@nestjs/throttler@^6.4.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@nestjs/throttler/-/throttler-6.4.0.tgz#5060e2157f4e8b0cb7886eef367751700549de5e"
-  integrity sha512-osL67i0PUuwU5nqSuJjtUJZMkxAnYB4VldgYUMGzvYRJDCqGRFMWbsbzm/CkUtPLRL30I8T74Xgt/OQxnYokiA==
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@nestjs/throttler/-/throttler-6.5.0.tgz#1ee550a258c4ae697d3978f2c8932adff927439e"
+  integrity sha512-9j0ZRfH0QE1qyrj9JjIRDz5gQLPqq9yVC2nHsrosDVAfI5HHw08/aUAWx9DZLSdQf4HDkmhTTEGLrRFHENvchQ==
 
 "@nestjs/typeorm@^11.0.0":
   version "11.0.0"
@@ -2218,10 +2690,10 @@
     object-hash "3.0.0"
     tslib "2.8.1"
 
-"@next/env@15.5.7":
-  version "15.5.7"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.5.7.tgz#4168db34ae3bc9fd9ad3b951d327f4cfc38d4362"
-  integrity sha512-4h6Y2NyEkIEN7Z8YxkA27pq6zTkS09bUSYC0xjd0NpwFxjnIKeZEeH591o5WECSmjpUhLn3H2QLJcDye3Uzcvg==
+"@next/env@15.5.9":
+  version "15.5.9"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-15.5.9.tgz#53c2c34dc17cd87b61f70c6cc211e303123b2ab8"
+  integrity sha512-4GlTZ+EJM7WaW2HEZcyU317tIQDjkQIyENDLxYJfSWlfqguN+dHkZgyQTV/7ykvobU7yEH5gKvreNrH4B6QgIg==
 
 "@next/eslint-plugin-next@15.3.1":
   version "15.3.1"
@@ -2587,9 +3059,9 @@
   integrity sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==
 
 "@opentelemetry/semantic-conventions@^1.27.0", "@opentelemetry/semantic-conventions@^1.30.0", "@opentelemetry/semantic-conventions@^1.34.0":
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.36.0.tgz#149449bd4df4d0464220915ad4164121e0d75d4d"
-  integrity sha512-TtxJSRD8Ohxp6bKkhrm27JRHAxPczQA7idtcTOMYI+wQRRrfgqxHv1cFbCApcSnNjtXkmzFozn6jQtFrOmbjPQ==
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.38.0.tgz#8b5f415395a7ddb7c8e0c7932171deb9278df1a3"
+  integrity sha512-kocjix+/sSggfJhwXqClZ3i9Y/MI0fp7b+g7kCRm6psy2dsf8uApTRclwG18h8Avm7C9+fnt+O36PspJ/OzoWg==
 
 "@opentelemetry/sql-common@^0.40.1":
   version "0.40.1"
@@ -2599,9 +3071,9 @@
     "@opentelemetry/core" "^1.1.0"
 
 "@paralleldrive/cuid2@^2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz#7f91364d53b89e2c9cb9e02e8dd0f129e834455f"
-  integrity sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@paralleldrive/cuid2/-/cuid2-2.3.1.tgz#3d62ea9e7be867d3fa94b9897fab5b0ae187d784"
+  integrity sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==
   dependencies:
     "@noble/hashes" "^1.1.5"
 
@@ -2633,6 +3105,11 @@
     semver "~7.5.0"
     ws "~7.5.10"
 
+"@pm2/blessed@0.1.81":
+  version "0.1.81"
+  resolved "https://registry.yarnpkg.com/@pm2/blessed/-/blessed-0.1.81.tgz#0bbc17f13b0a11a292572d9edf38b7fc14347d8f"
+  integrity sha512-ZcNHqQjMuNRcQ7Z1zJbFIQZO/BDKV3KbiTckWdfbUaYhj7uNmUwb+FbdDWSCkvxNr9dBJQwvV17o6QBkAvgO0g==
+
 "@pm2/io@~6.1.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@pm2/io/-/io-6.1.0.tgz#37ea7908e2a1dd7b88862f60d98d8b1f495ee16a"
@@ -2658,7 +3135,7 @@
     extrareqp2 "^1.0.0"
     ws "^7.0.0"
 
-"@pm2/pm2-version-check@latest":
+"@pm2/pm2-version-check@^1.0.4":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@pm2/pm2-version-check/-/pm2-version-check-1.0.4.tgz#cf97fbb14b0eca95430ca05eedccbd2683806e43"
   integrity sha512-SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA==
@@ -2679,10 +3156,10 @@
   dependencies:
     "@opentelemetry/instrumentation" "^0.52.0 || ^0.53.0 || ^0.54.0 || ^0.55.0 || ^0.56.0 || ^0.57.0"
 
-"@radix-ui/primitive@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.2.tgz#83f415c4425f21e3d27914c12b3272a32e3dae65"
-  integrity sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==
+"@radix-ui/primitive@1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.3.tgz#e2dbc13bdc5e4168f4334f75832d7bdd3e2de5ba"
+  integrity sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==
 
 "@radix-ui/react-collection@1.1.7":
   version "1.1.7"
@@ -2705,19 +3182,19 @@
   integrity sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==
 
 "@radix-ui/react-dialog@^1.1.1":
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.14.tgz#4c69c80c258bc6561398cfce055202ea11075107"
-  integrity sha512-+CpweKjqpzTmwRwcYECQcNYbI8V9VSQt0SNFKeEBLgfucbsLssU6Ppq7wUdNXEGb573bMjFhVjKVll8rmV6zMw==
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz#1de3d7a7e9a17a9874d29c07f5940a18a119b632"
+  integrity sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==
   dependencies:
-    "@radix-ui/primitive" "1.1.2"
+    "@radix-ui/primitive" "1.1.3"
     "@radix-ui/react-compose-refs" "1.1.2"
     "@radix-ui/react-context" "1.1.2"
-    "@radix-ui/react-dismissable-layer" "1.1.10"
-    "@radix-ui/react-focus-guards" "1.1.2"
+    "@radix-ui/react-dismissable-layer" "1.1.11"
+    "@radix-ui/react-focus-guards" "1.1.3"
     "@radix-ui/react-focus-scope" "1.1.7"
     "@radix-ui/react-id" "1.1.1"
     "@radix-ui/react-portal" "1.1.9"
-    "@radix-ui/react-presence" "1.1.4"
+    "@radix-ui/react-presence" "1.1.5"
     "@radix-ui/react-primitive" "2.1.3"
     "@radix-ui/react-slot" "1.2.3"
     "@radix-ui/react-use-controllable-state" "1.2.2"
@@ -2729,21 +3206,21 @@
   resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.1.1.tgz#39e5a5769e676c753204b792fbe6cf508e550a14"
   integrity sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==
 
-"@radix-ui/react-dismissable-layer@1.1.10":
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.10.tgz#429b9bada3672c6895a5d6a642aca6ecaf4f18c3"
-  integrity sha512-IM1zzRV4W3HtVgftdQiiOmA0AdJlCtMLe00FXaHwgt3rAnNsIyDqshvkIW3hj/iu5hu8ERP7KIYki6NkqDxAwQ==
+"@radix-ui/react-dismissable-layer@1.1.11":
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz#e33ab6f6bdaa00f8f7327c408d9f631376b88b37"
+  integrity sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==
   dependencies:
-    "@radix-ui/primitive" "1.1.2"
+    "@radix-ui/primitive" "1.1.3"
     "@radix-ui/react-compose-refs" "1.1.2"
     "@radix-ui/react-primitive" "2.1.3"
     "@radix-ui/react-use-callback-ref" "1.1.1"
     "@radix-ui/react-use-escape-keydown" "1.1.1"
 
-"@radix-ui/react-focus-guards@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.2.tgz#4ec9a7e50925f7fb661394460045b46212a33bed"
-  integrity sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==
+"@radix-ui/react-focus-guards@1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz#2a5669e464ad5fde9f86d22f7fdc17781a4dfa7f"
+  integrity sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==
 
 "@radix-ui/react-focus-scope@1.1.7":
   version "1.1.7"
@@ -2762,18 +3239,18 @@
     "@radix-ui/react-use-layout-effect" "1.1.1"
 
 "@radix-ui/react-navigation-menu@^1.2.0":
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.13.tgz#8d49ce275bf4f49a8642be520074b5a7438a5fb0"
-  integrity sha512-WG8wWfDiJlSF5hELjwfjSGOXcBR/ZMhBFCGYe8vERpC39CQYZeq1PQ2kaYHdye3V95d06H89KGMsVCIE4LWo3g==
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.14.tgz#4e6d1172be3c89752e564f8721706f78574ad7dd"
+  integrity sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==
   dependencies:
-    "@radix-ui/primitive" "1.1.2"
+    "@radix-ui/primitive" "1.1.3"
     "@radix-ui/react-collection" "1.1.7"
     "@radix-ui/react-compose-refs" "1.1.2"
     "@radix-ui/react-context" "1.1.2"
     "@radix-ui/react-direction" "1.1.1"
-    "@radix-ui/react-dismissable-layer" "1.1.10"
+    "@radix-ui/react-dismissable-layer" "1.1.11"
     "@radix-ui/react-id" "1.1.1"
-    "@radix-ui/react-presence" "1.1.4"
+    "@radix-ui/react-presence" "1.1.5"
     "@radix-ui/react-primitive" "2.1.3"
     "@radix-ui/react-use-callback-ref" "1.1.1"
     "@radix-ui/react-use-controllable-state" "1.2.2"
@@ -2789,10 +3266,10 @@
     "@radix-ui/react-primitive" "2.1.3"
     "@radix-ui/react-use-layout-effect" "1.1.1"
 
-"@radix-ui/react-presence@1.1.4":
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.4.tgz#253ac0ad4946c5b4a9c66878335f5cf07c967ced"
-  integrity sha512-ueDqRbdc4/bkaQT3GIpLQssRlFgWaL/U2z/S31qRwwLWoxHLgry3SIfCwhxeQNbirEUXFa+lq3RL3oBYXtcmIA==
+"@radix-ui/react-presence@1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-presence/-/react-presence-1.1.5.tgz#5d8f28ac316c32f078afce2996839250c10693db"
+  integrity sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==
   dependencies:
     "@radix-ui/react-compose-refs" "1.1.2"
     "@radix-ui/react-use-layout-effect" "1.1.1"
@@ -2905,14 +3382,12 @@
     classnames "^2.3.2"
     rc-util "^5.24.4"
 
-"@rc-component/qrcode@~1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@rc-component/qrcode/-/qrcode-1.0.0.tgz#48a8de5eb11d0e65926f1377c4b1ef4c888997f5"
-  integrity sha512-L+rZ4HXP2sJ1gHMGHjsg9jlYBX/SLN2D6OxP9Zn3qgtpMWtO2vUfxVFwiogHpAIqs54FnALxraUy/BCO1yRIgg==
+"@rc-component/qrcode@~1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@rc-component/qrcode/-/qrcode-1.1.1.tgz#909f181bb9a7469d32a6e96c7f35476d4bd92008"
+  integrity sha512-LfLGNymzKdUPjXUbRP+xOhIWY4jQ+YMj5MmWAcgcAq1Ij8XP7tRmAXqyuv96XvLUBE/5cA8hLFl9eO1JQMujrA==
   dependencies:
     "@babel/runtime" "^7.24.7"
-    classnames "^2.3.2"
-    rc-util "^5.38.0"
 
 "@rc-component/tour@~1.15.1":
   version "1.15.1"
@@ -2951,9 +3426,9 @@
     picomatch "^4.0.2"
 
 "@rollup/pluginutils@^5.0.1":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.2.0.tgz#eac25ca5b0bdda4ba735ddaca5fbf26bd435f602"
-  integrity sha512-qWJ2ZTbmumwiLFomfzTyt5Kng4hwPi9rwCYN4SHb6eaRU1KNO4ccxINHr/VhH4GgPlt1XfSTLX2LBTme8ne4Zw==
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.3.0.tgz#57ba1b0cbda8e7a3c597a4853c807b156e21a7b4"
+  integrity sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==
   dependencies:
     "@types/estree" "^1.0.0"
     estree-walker "^2.0.2"
@@ -3060,9 +3535,9 @@
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
 "@rushstack/eslint-patch@^1.10.3":
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.12.0.tgz#326a7b46f6d4cfa54ae25bb888551697873069b4"
-  integrity sha512-5EwMtOqvJMMa3HbmxLlF74e+3/HhwBTMcvt3nqVJgGCozO6hzIPOBlwm8mGVNR9SN2IJpxSnlxczyDjcn7qIyw==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.15.0.tgz#8184bcb37791e6d3c3c13a9bfbe4af263f66665f"
+  integrity sha512-ojSshQPKwVvSMR8yT2L/QtUkV5SXi/IfDiJ4/8d6UbTPjiHVmxZzUAzGD8Tzks1b9+qQkZa0isUOvYObedITaw==
 
 "@selderee/plugin-htmlparser2@^0.11.0":
   version "0.11.0"
@@ -3164,75 +3639,75 @@
   resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.42.2.tgz#a32a4f226e717122b37d9969e8d4d0e14779f720"
   integrity sha512-GtJSuxER7Vrp1IpxdUyRZzcckzMnb4N5KTW7sbTwUiwqARRo+wxS+gczYrS8tdgtmXs5XYhzhs+t4d52ITHMIg==
 
-"@sentry/cli-darwin@2.51.1":
-  version "2.51.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.51.1.tgz#3a1db065651893f72dad3a502b2d7c2f5e6a7dd8"
-  integrity sha512-R1u8IQdn/7Rr8sf6bVVr0vJT4OqwCFdYsS44Y3OoWGVJW2aAQTWRJOTlV4ueclVLAyUQzmgBjfR8AtiUhd/M5w==
+"@sentry/cli-darwin@2.58.4":
+  version "2.58.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.58.4.tgz#5e3005c1f845acac243e8dcb23bef17337924768"
+  integrity sha512-kbTD+P4X8O+nsNwPxCywtj3q22ecyRHWff98rdcmtRrvwz8CKi/T4Jxn/fnn2i4VEchy08OWBuZAqaA5Kh2hRQ==
 
 "@sentry/cli-linux-arm64@2.42.2":
   version "2.42.2"
   resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.42.2.tgz#1c06c83ff21f51ec23acf5be3b1f8c7553bf86b1"
   integrity sha512-BOxzI7sgEU5Dhq3o4SblFXdE9zScpz6EXc5Zwr1UDZvzgXZGosUtKVc7d1LmkrHP8Q2o18HcDWtF3WvJRb5Zpw==
 
-"@sentry/cli-linux-arm64@2.51.1":
-  version "2.51.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.51.1.tgz#b4c957a06bafc13623c48971eadb0cff7d3662a3"
-  integrity sha512-nvA/hdhsw4bKLhslgbBqqvETjXwN1FVmwHLOrRvRcejDO6zeIKUElDiL5UOjGG0NC+62AxyNw5ri8Wzp/7rg9Q==
+"@sentry/cli-linux-arm64@2.58.4":
+  version "2.58.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.58.4.tgz#69da57656fda863f255d92123c3a3437e470408e"
+  integrity sha512-0g0KwsOozkLtzN8/0+oMZoOuQ0o7W6O+hx+ydVU1bktaMGKEJLMAWxOQNjsh1TcBbNIXVOKM/I8l0ROhaAb8Ig==
 
 "@sentry/cli-linux-arm@2.42.2":
   version "2.42.2"
   resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.42.2.tgz#00cadc359ae3c051efb3e63873c033c61dbd1ca1"
   integrity sha512-7udCw+YL9lwq+9eL3WLspvnuG+k5Icg92YE7zsteTzWLwgPVzaxeZD2f8hwhsu+wmL+jNqbpCRmktPteh3i2mg==
 
-"@sentry/cli-linux-arm@2.51.1":
-  version "2.51.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.51.1.tgz#f761d0c58d27be503471cee4ffc41875a7d9430b"
-  integrity sha512-Klro17OmSSKOOSaxVKBBNPXet2+HrIDZUTSp8NRl4LQsIubdc1S/aQ79cH/g52Muwzpl3aFwPxyXw+46isfEgA==
+"@sentry/cli-linux-arm@2.58.4":
+  version "2.58.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.58.4.tgz#869ddab30f0dcebc0e61cff2f3ff47dcd40f8abe"
+  integrity sha512-rdQ8beTwnN48hv7iV7e7ZKucPec5NJkRdrrycMJMZlzGBPi56LqnclgsHySJ6Kfq506A2MNuQnKGaf/sBC9REA==
 
 "@sentry/cli-linux-i686@2.42.2":
   version "2.42.2"
   resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.42.2.tgz#3b817b715dd806c20dfbffd539725ad8089c310a"
   integrity sha512-Sw/dQp5ZPvKnq3/y7wIJyxTUJYPGoTX/YeMbDs8BzDlu9to2LWV3K3r7hE7W1Lpbaw4tSquUHiQjP5QHCOS7aQ==
 
-"@sentry/cli-linux-i686@2.51.1":
-  version "2.51.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.51.1.tgz#62baaf83c5995e478186289a45315d0acd5bd3bf"
-  integrity sha512-jp4TmR8VXBdT9dLo6mHniQHN0xKnmJoPGVz9h9VDvO2Vp/8o96rBc555D4Am5wJOXmfuPlyjGcmwHlB3+kQRWw==
+"@sentry/cli-linux-i686@2.58.4":
+  version "2.58.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.58.4.tgz#e30ca6b897147b3fb7b2e8684b139183d55e21c6"
+  integrity sha512-NseoIQAFtkziHyjZNPTu1Gm1opeQHt7Wm1LbLrGWVIRvUOzlslO9/8i6wETUZ6TjlQxBVRgd3Q0lRBG2A8rFYA==
 
 "@sentry/cli-linux-x64@2.42.2":
   version "2.42.2"
   resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.42.2.tgz#ddf906bc3071cc79ce6e633eddcb76bb9068e688"
   integrity sha512-mU4zUspAal6TIwlNLBV5oq6yYqiENnCWSxtSQVzWs0Jyq97wtqGNG9U+QrnwjJZ+ta/hvye9fvL2X25D/RxHQw==
 
-"@sentry/cli-linux-x64@2.51.1":
-  version "2.51.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.51.1.tgz#0010fe24ad8ef492a917c12feb351ba768e72603"
-  integrity sha512-JuLt0MXM2KHNFmjqXjv23sly56mJmUQzGBWktkpY3r+jE08f5NLKPd5wQ6W/SoLXGIOKnwLz0WoUg7aBVyQdeQ==
+"@sentry/cli-linux-x64@2.58.4":
+  version "2.58.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.58.4.tgz#f667e1fcaf0860f15401af8e0ee72f5013d84458"
+  integrity sha512-d3Arz+OO/wJYTqCYlSN3Ktm+W8rynQ/IMtSZLK8nu0ryh5mJOh+9XlXY6oDXw4YlsM8qCRrNquR8iEI1Y/IH+Q==
 
-"@sentry/cli-win32-arm64@2.51.1":
-  version "2.51.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.51.1.tgz#0894f9a91e6ecb3021ca09fe644f995ff4ff826d"
-  integrity sha512-PiwjTdIFDazTQCTyDCutiSkt4omggYSKnO3HE1+LDjElsFrWY9pJs4fU3D40WAyE2oKu0MarjNH/WxYGdqEAlg==
+"@sentry/cli-win32-arm64@2.58.4":
+  version "2.58.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.58.4.tgz#f612c5788954e2a97b6626e9e46fa9a41cb049c1"
+  integrity sha512-bqYrF43+jXdDBh0f8HIJU3tbvlOFtGyRjHB8AoRuMQv9TEDUfENZyCelhdjA+KwDKYl48R1Yasb4EHNzsoO83w==
 
 "@sentry/cli-win32-i686@2.42.2":
   version "2.42.2"
   resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.42.2.tgz#9036085c7c6ce455ad45fda411c55ff39c06eb95"
   integrity sha512-iHvFHPGqgJMNqXJoQpqttfsv2GI3cGodeTq4aoVLU/BT3+hXzbV0x1VpvvEhncJkDgDicJpFLM8sEPHb3b8abw==
 
-"@sentry/cli-win32-i686@2.51.1":
-  version "2.51.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.51.1.tgz#6a6c6402cdce4fd038716b2c1e0bfa788b54f3e9"
-  integrity sha512-TMvZZpeiI2HmrDFNVQ0uOiTuYKvjEGOZdmUxe3WlhZW82A/2Oka7sQ24ljcOovbmBOj5+fjCHRUMYvLMCWiysA==
+"@sentry/cli-win32-i686@2.58.4":
+  version "2.58.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.58.4.tgz#5611c05499f1b959d23e37650d0621d299c49cfc"
+  integrity sha512-3triFD6jyvhVcXOmGyttf+deKZcC1tURdhnmDUIBkiDPJKGT/N5xa4qAtHJlAB/h8L9jgYih9bvJnvvFVM7yug==
 
 "@sentry/cli-win32-x64@2.42.2":
   version "2.42.2"
   resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.42.2.tgz#7d6464b63f32c9f97fff428f246b1f039b402233"
   integrity sha512-vPPGHjYoaGmfrU7xhfFxG7qlTBacroz5NdT+0FmDn6692D8IvpNXl1K+eV3Kag44ipJBBeR8g1HRJyx/F/9ACw==
 
-"@sentry/cli-win32-x64@2.51.1":
-  version "2.51.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.51.1.tgz#d361e37146c9269d40c37459271a6c2cfa1fa8a6"
-  integrity sha512-v2hreYUPPTNK1/N7+DeX7XBN/zb7p539k+2Osf0HFyVBaoUC3Y3+KBwSf4ASsnmgTAK7HCGR+X0NH1vP+icw4w==
+"@sentry/cli-win32-x64@2.58.4":
+  version "2.58.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.58.4.tgz#3290c59399579e8d484c97246cfa720171241061"
+  integrity sha512-cSzN4PjM1RsCZ4pxMjI0VI7yNCkxiJ5jmWncyiwHXGiXrV1eXYdQ3n1LhUYLZ91CafyprR0OhDcE+RVZ26Qb5w==
 
 "@sentry/cli@2.42.2":
   version "2.42.2"
@@ -3254,9 +3729,9 @@
     "@sentry/cli-win32-x64" "2.42.2"
 
 "@sentry/cli@^2.36.1", "@sentry/cli@^2.49.0":
-  version "2.51.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.51.1.tgz#c6bdc6025e8f600e44fc76f8274c369aeb5d4df4"
-  integrity sha512-FU+54kNcKJABU0+ekvtnoXHM9zVrDe1zXVFbQT7mS0On0m1P0zFRGdzbnWe2XzpzuEAJXtK6aog/W+esRU9AIA==
+  version "2.58.4"
+  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.58.4.tgz#eb8792600cdf956cc4fe2bf51380ea1682327411"
+  integrity sha512-ArDrpuS8JtDYEvwGleVE+FgR+qHaOp77IgdGSacz6SZy6Lv90uX0Nu4UrHCQJz8/xwIcNxSqnN22lq0dH4IqTg==
   dependencies:
     https-proxy-agent "^5.0.0"
     node-fetch "^2.6.7"
@@ -3264,37 +3739,37 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
   optionalDependencies:
-    "@sentry/cli-darwin" "2.51.1"
-    "@sentry/cli-linux-arm" "2.51.1"
-    "@sentry/cli-linux-arm64" "2.51.1"
-    "@sentry/cli-linux-i686" "2.51.1"
-    "@sentry/cli-linux-x64" "2.51.1"
-    "@sentry/cli-win32-arm64" "2.51.1"
-    "@sentry/cli-win32-i686" "2.51.1"
-    "@sentry/cli-win32-x64" "2.51.1"
+    "@sentry/cli-darwin" "2.58.4"
+    "@sentry/cli-linux-arm" "2.58.4"
+    "@sentry/cli-linux-arm64" "2.58.4"
+    "@sentry/cli-linux-i686" "2.58.4"
+    "@sentry/cli-linux-x64" "2.58.4"
+    "@sentry/cli-win32-arm64" "2.58.4"
+    "@sentry/cli-win32-i686" "2.58.4"
+    "@sentry/cli-win32-x64" "2.58.4"
 
 "@sentry/core@9.14.0":
   version "9.14.0"
   resolved "https://registry.yarnpkg.com/@sentry/core/-/core-9.14.0.tgz#4d51bf0ff719a8dee821d31be4abf1afd73f6c6e"
   integrity sha512-OLfucnP3LAL5bxVNWc2RVOHCX7fk9Er5bWPCS+O5cPjqNUUz0HQHhVh2Vhei5C0kYZZM4vy4BQit5T9LrlOaNA==
 
-"@sentry/core@9.45.0":
-  version "9.45.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-9.45.0.tgz#bc73bb327f84a410c7d51d1518210c87d995f4da"
-  integrity sha512-yTpB53fBEWTMzltD/8f/qI2MFTwgd2vSkn7pOZQusSOMtyt0Bsm/77oqXldIt+eMBAImZalzZaxmaN7RyiRKWQ==
+"@sentry/core@9.47.1":
+  version "9.47.1"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-9.47.1.tgz#6b95b8a03ade1ca04f8b9b457bc751eb8be0c06a"
+  integrity sha512-KX62+qIt4xgy8eHKHiikfhz2p5fOciXd0Cl+dNzhgPFq8klq4MGMNaf148GB3M/vBqP4nw/eFvRMAayFCgdRQw==
 
 "@sentry/nestjs@^9.3.0":
-  version "9.45.0"
-  resolved "https://registry.yarnpkg.com/@sentry/nestjs/-/nestjs-9.45.0.tgz#8f071e53d5162f81db7486f398253aff98a3a6ec"
-  integrity sha512-Rtf6BCbs62pVOCMLLbA+QywoCQ0O8QdumK1qNkjUgPCCKJX8ihM6ADbzUACZF8mZd/2GL+1WJK6Cd+kfkdwZoA==
+  version "9.47.1"
+  resolved "https://registry.yarnpkg.com/@sentry/nestjs/-/nestjs-9.47.1.tgz#9b5022546845f4e8b8a5e5293af5cc1555c41eeb"
+  integrity sha512-83Fw3ONzv/DNOXb2HoEbfdW7OGW/vTemZ906UorohVSuPmZmJB7E1qG/Mij8RPA4QjEYpbgglcWeRieez/tKpw==
   dependencies:
     "@opentelemetry/api" "^1.9.0"
     "@opentelemetry/core" "^1.30.1"
     "@opentelemetry/instrumentation" "0.57.2"
     "@opentelemetry/instrumentation-nestjs-core" "0.44.1"
     "@opentelemetry/semantic-conventions" "^1.34.0"
-    "@sentry/core" "9.45.0"
-    "@sentry/node" "9.45.0"
+    "@sentry/core" "9.47.1"
+    "@sentry/node" "9.47.1"
 
 "@sentry/nextjs@9.14.0":
   version "9.14.0"
@@ -3316,13 +3791,13 @@
     rollup "4.35.0"
     stacktrace-parser "^0.1.10"
 
-"@sentry/node-core@9.45.0":
-  version "9.45.0"
-  resolved "https://registry.yarnpkg.com/@sentry/node-core/-/node-core-9.45.0.tgz#6dc8a25390f884d0c016c9ab6c68114d1e4219c9"
-  integrity sha512-tzt60LO7P1m+0OLEqtL5Fd71PwKpg7dSOn3rqB7T6AJeDDiHsXV/yhUZiye1EWHTi0/yOcb0M1Ncjs8Cdyz9Nw==
+"@sentry/node-core@9.47.1":
+  version "9.47.1"
+  resolved "https://registry.yarnpkg.com/@sentry/node-core/-/node-core-9.47.1.tgz#e07281bbd4c3d2e1d76444efcb1149b471b92d0e"
+  integrity sha512-7TEOiCGkyShJ8CKtsri9lbgMCbB+qNts2Xq37itiMPN2m+lIukK3OX//L8DC5nfKYZlgikrefS63/vJtm669hQ==
   dependencies:
-    "@sentry/core" "9.45.0"
-    "@sentry/opentelemetry" "9.45.0"
+    "@sentry/core" "9.47.1"
+    "@sentry/opentelemetry" "9.47.1"
     import-in-the-middle "^1.14.2"
 
 "@sentry/node@9.14.0":
@@ -3365,10 +3840,10 @@
     "@sentry/opentelemetry" "9.14.0"
     import-in-the-middle "^1.13.0"
 
-"@sentry/node@9.45.0":
-  version "9.45.0"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-9.45.0.tgz#4b9f213966bed4d58956d274a500045f3e7f8a9b"
-  integrity sha512-c0SFcMeZwxLvjC1HrutI8V+Ag8AxENXPiU5PbSmqiTX7p4QnByTcxkENGw5EyLedDZluuEDmmHTBKckCC4X2nA==
+"@sentry/node@9.47.1":
+  version "9.47.1"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-9.47.1.tgz#955b1956a885e487bdf8592d4515880d608036aa"
+  integrity sha512-CDbkasBz3fnWRKSFs6mmaRepM2pa+tbZkrqhPWifFfIkJDidtVW40p6OnquTvPXyPAszCnDZRnZT14xyvNmKPQ==
   dependencies:
     "@opentelemetry/api" "^1.9.0"
     "@opentelemetry/context-async-hooks" "^1.30.1"
@@ -3400,9 +3875,9 @@
     "@opentelemetry/sdk-trace-base" "^1.30.1"
     "@opentelemetry/semantic-conventions" "^1.34.0"
     "@prisma/instrumentation" "6.11.1"
-    "@sentry/core" "9.45.0"
-    "@sentry/node-core" "9.45.0"
-    "@sentry/opentelemetry" "9.45.0"
+    "@sentry/core" "9.47.1"
+    "@sentry/node-core" "9.47.1"
+    "@sentry/opentelemetry" "9.47.1"
     import-in-the-middle "^1.14.2"
     minimatch "^9.0.0"
 
@@ -3413,21 +3888,21 @@
   dependencies:
     "@sentry/core" "9.14.0"
 
-"@sentry/opentelemetry@9.45.0":
-  version "9.45.0"
-  resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-9.45.0.tgz#861dcceee3f9326679d533897345f5e050616f7d"
-  integrity sha512-xLH7ZH6xcZBHK77mTa32YjIEL92jmc7i2qkxlchzTNacmTn9BNnuzPFBS7KuISJPXw9R1pXBra6IVEhm6hil/g==
+"@sentry/opentelemetry@9.47.1":
+  version "9.47.1"
+  resolved "https://registry.yarnpkg.com/@sentry/opentelemetry/-/opentelemetry-9.47.1.tgz#005673a6e912e32ee224162d3362de5777c0f1ba"
+  integrity sha512-STtFpjF7lwzeoedDJV+5XA6P89BfmFwFftmHSGSe3UTI8z8IoiR5yB6X2vCjSPvXlfeOs13qCNNCEZyznxM8Xw==
   dependencies:
-    "@sentry/core" "9.45.0"
+    "@sentry/core" "9.47.1"
 
 "@sentry/profiling-node@^9.3.0":
-  version "9.45.0"
-  resolved "https://registry.yarnpkg.com/@sentry/profiling-node/-/profiling-node-9.45.0.tgz#b52c1990775c456cc0788c27ea1dfa7b534ace69"
-  integrity sha512-58hZEqD1X0mLEJUdGuoEwaOO5GUZr9CcIVsxESIjbBBlGL63khWj5i6HIOPGY0WWBlvT6WPAVdcws2YoZMJDiA==
+  version "9.47.1"
+  resolved "https://registry.yarnpkg.com/@sentry/profiling-node/-/profiling-node-9.47.1.tgz#857325d572ec6f7f195be38fa1a52181f8920e76"
+  integrity sha512-4Llq0it2nL/1iJcEEm3JwdRyvRAjYuoS0MB9+9eKRaCJBIj//3fOcyjw75BbhdSFBhkDMRv2W5b3gn9oPrJAHA==
   dependencies:
     "@sentry-internal/node-cpu-profiler" "^2.2.0"
-    "@sentry/core" "9.45.0"
-    "@sentry/node" "9.45.0"
+    "@sentry/core" "9.47.1"
+    "@sentry/node" "9.47.1"
 
 "@sentry/react@9.14.0":
   version "9.14.0"
@@ -3470,9 +3945,9 @@
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
 "@sinclair/typebox@^0.34.0":
-  version "0.34.38"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.38.tgz#2365df7c23406a4d79413a766567bfbca708b49d"
-  integrity sha512-HpkxMmc2XmZKhvaKIZZThlHmx1L0I/V1hWK1NubtlFnr6ZqdiOpV72TKudZUNQjZNsyDBay72qFEhEvb+bcwcA==
+  version "0.34.46"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.34.46.tgz#33ea674ef3fbc46733c6d124ae94a6826abaf8cf"
+  integrity sha512-kiW7CtS/NkdvTUjkjUJo7d5JsFfbJ14YjdhDk9KoEgK6nFjKNXZPrX0jfLA8ZlET4cFLHxOZ/0vFKOP+bOxIOQ==
 
 "@sinonjs/commons@^3.0.1":
   version "3.0.1"
@@ -3488,6 +3963,418 @@
   dependencies:
     "@sinonjs/commons" "^3.0.1"
 
+"@smithy/abort-controller@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.7.tgz#b475e8d7bb1aeee45fdc8d984c35e6ca9bb0428c"
+  integrity sha512-rzMY6CaKx2qxrbYbqjXWS0plqEy7LOdKHS0bg4ixJ6aoGDPNUcLWk/FRNuCILh7GKLG9TFUXYYeQQldMBBwuyw==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/config-resolver@^4.4.5":
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.5.tgz#35e792b6db00887bdd029df9b41780ca005d064b"
+  integrity sha512-HAGoUAFYsUkoSckuKbCPayECeMim8pOu+yLy1zOxt1sifzEbrsRpYa+mKcMdiHKMeiqOibyPG0sFJnmaV/OGEg==
+  dependencies:
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-config-provider" "^4.2.0"
+    "@smithy/util-endpoints" "^3.2.7"
+    "@smithy/util-middleware" "^4.2.7"
+    tslib "^2.6.2"
+
+"@smithy/core@^3.20.0":
+  version "3.20.0"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.20.0.tgz#59dbd689e2efe70870591e4331faece9b20a18dd"
+  integrity sha512-WsSHCPq/neD5G/MkK4csLI5Y5Pkd9c1NMfpYEKeghSGaD4Ja1qLIohRQf2D5c1Uy5aXp76DeKHkzWZ9KAlHroQ==
+  dependencies:
+    "@smithy/middleware-serde" "^4.2.8"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-middleware" "^4.2.7"
+    "@smithy/util-stream" "^4.5.8"
+    "@smithy/util-utf8" "^4.2.0"
+    "@smithy/uuid" "^1.1.0"
+    tslib "^2.6.2"
+
+"@smithy/credential-provider-imds@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.7.tgz#bfbbf797599c3944509ef4c9690a5c960e153ef5"
+  integrity sha512-CmduWdCiILCRNbQWFR0OcZlUPVtyE49Sr8yYL0rZQ4D/wKxiNzBNS/YHemvnbkIWj623fplgkexUd/c9CAKdoA==
+  dependencies:
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/types" "^4.11.0"
+    "@smithy/url-parser" "^4.2.7"
+    tslib "^2.6.2"
+
+"@smithy/fetch-http-handler@^5.3.8":
+  version "5.3.8"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.8.tgz#092a1b6dfdf5981853c7b0d98ebf048cc5e56c2b"
+  integrity sha512-h/Fi+o7mti4n8wx1SR6UHWLaakwHRx29sizvp8OOm7iqwKGFneT06GCSFhml6Bha5BT6ot5pj3CYZnCHhGC2Rg==
+  dependencies:
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/querystring-builder" "^4.2.7"
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-base64" "^4.3.0"
+    tslib "^2.6.2"
+
+"@smithy/hash-node@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.7.tgz#74a3d3ed8d47ecbe68d19e79af1d23f5abbb7253"
+  integrity sha512-PU/JWLTBCV1c8FtB8tEFnY4eV1tSfBc7bDBADHfn1K+uRbPgSJ9jnJp0hyjiFN2PMdPzxsf1Fdu0eo9fJ760Xw==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-buffer-from" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/invalid-dependency@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.7.tgz#0afcc586db3032f94f3c1ea1054665b16f793b16"
+  integrity sha512-ncvgCr9a15nPlkhIUx3CU4d7E7WEuVJOV7fS7nnK2hLtPK9tYRBkMHQbhXU1VvvKeBm/O0x26OEoBq+ngFpOEQ==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/is-array-buffer@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111"
+  integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/is-array-buffer@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz#b0f874c43887d3ad44f472a0f3f961bcce0550c2"
+  integrity sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/middleware-content-length@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.7.tgz#d9968dc1a6ac3aea9f05a92a900f231e72ba3fbc"
+  integrity sha512-GszfBfCcvt7kIbJ41LuNa5f0wvQCHhnGx/aDaZJCCT05Ld6x6U2s0xsc/0mBFONBZjQJp2U/0uSJ178OXOwbhg==
+  dependencies:
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-endpoint@^4.4.1":
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.1.tgz#118f27b3ce85cdf66b62866c8de87fa2a5ec86ee"
+  integrity sha512-gpLspUAoe6f1M6H0u4cVuFzxZBrsGZmjx2O9SigurTx4PbntYa4AJ+o0G0oGm1L2oSX6oBhcGHwrfJHup2JnJg==
+  dependencies:
+    "@smithy/core" "^3.20.0"
+    "@smithy/middleware-serde" "^4.2.8"
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/shared-ini-file-loader" "^4.4.2"
+    "@smithy/types" "^4.11.0"
+    "@smithy/url-parser" "^4.2.7"
+    "@smithy/util-middleware" "^4.2.7"
+    tslib "^2.6.2"
+
+"@smithy/middleware-retry@^4.4.17":
+  version "4.4.17"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.17.tgz#b71568f8292f2743801aecd056021bca5a66e013"
+  integrity sha512-MqbXK6Y9uq17h+4r0ogu/sBT6V/rdV+5NvYL7ZV444BKfQygYe8wAhDrVXagVebN6w2RE0Fm245l69mOsPGZzg==
+  dependencies:
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/service-error-classification" "^4.2.7"
+    "@smithy/smithy-client" "^4.10.2"
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-middleware" "^4.2.7"
+    "@smithy/util-retry" "^4.2.7"
+    "@smithy/uuid" "^1.1.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-serde@^4.2.8":
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.8.tgz#57f1baa98899fd96f4737465b3a363acf1963e0a"
+  integrity sha512-8rDGYen5m5+NV9eHv9ry0sqm2gI6W7mc1VSFMtn6Igo25S507/HaOX9LTHAS2/J32VXD0xSzrY0H5FJtOMS4/w==
+  dependencies:
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-stack@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.7.tgz#39d7bdf3a403b3d1f82caad71be66bfe7d88a790"
+  integrity sha512-bsOT0rJ+HHlZd9crHoS37mt8qRRN/h9jRve1SXUhVbkRzu0QaNYZp1i1jha4n098tsvROjcwfLlfvcFuJSXEsw==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/node-config-provider@^4.3.7":
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.7.tgz#c023fa857b008c314f621fb5b124724c157b2fd3"
+  integrity sha512-7r58wq8sdOcrwWe+klL9y3bc4GW1gnlfnFOuL7CXa7UzfhzhxKuzNdtqgzmTV+53lEp9NXh5hY/S4UgjLOzPfw==
+  dependencies:
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/shared-ini-file-loader" "^4.4.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/node-http-handler@^4.4.7":
+  version "4.4.7"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.7.tgz#ebdb6c10e8d203af22429987ed795b105e4e848f"
+  integrity sha512-NELpdmBOO6EpZtWgQiHjoShs1kmweaiNuETUpuup+cmm/xJYjT4eUjfhrXRP4jCOaAsS3c3yPsP3B+K+/fyPCQ==
+  dependencies:
+    "@smithy/abort-controller" "^4.2.7"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/querystring-builder" "^4.2.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/property-provider@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.7.tgz#cd0044e13495cf4064b3a6ed3299e5f549ba7513"
+  integrity sha512-jmNYKe9MGGPoSl/D7JDDs1C8b3dC8f/w78LbaVfoTtWy4xAd5dfjaFG9c9PWPihY4ggMQNQSMtzU77CNgAJwmA==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/protocol-http@^5.3.7":
+  version "5.3.7"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.7.tgz#2a58a1dfdb7cc90a8c79f081b5b6cf96d888891a"
+  integrity sha512-1r07pb994I20dD/c2seaZhoCuNYm0rWrvBxhCQ70brNh11M5Ml2ew6qJVo0lclB3jMIXirD4s2XRXRe7QEi0xA==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/querystring-builder@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.7.tgz#92ada986c6026a56b26e36c64bcea6ece68d0ecb"
+  integrity sha512-eKONSywHZxK4tBxe2lXEysh8wbBdvDWiA+RIuaxZSgCMmA0zMgoDpGLJhnyj+c0leOQprVnXOmcB4m+W9Rw7sg==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-uri-escape" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/querystring-parser@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.7.tgz#4c645b8164d7c17270b60fc2e0f5098ae3bf0fad"
+  integrity sha512-3X5ZvzUHmlSTHAXFlswrS6EGt8fMSIxX/c3Rm1Pni3+wYWB6cjGocmRIoqcQF9nU5OgGmL0u7l9m44tSUpfj9w==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/service-error-classification@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.7.tgz#bcad2f16874187135d24ab588a3bb4424b073d89"
+  integrity sha512-YB7oCbukqEb2Dlh3340/8g8vNGbs/QsNNRms+gv3N2AtZz9/1vSBx6/6tpwQpZMEJFs7Uq8h4mmOn48ZZ72MkA==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+
+"@smithy/shared-ini-file-loader@^4.4.2":
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.2.tgz#8fa1b459de485b11185fe8c64182e3205a280ba9"
+  integrity sha512-M7iUUff/KwfNunmrgtqBfvZSzh3bmFgv/j/t1Y1dQ+8dNo34br1cqVEqy6v0mYEgi0DkGO7Xig0AnuOaEGVlcg==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/signature-v4@^5.3.7":
+  version "5.3.7"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.7.tgz#20fe4e8e9abea413b1bdbf8560e74ad7cdee65cf"
+  integrity sha512-9oNUlqBlFZFOSdxgImA6X5GFuzE7V2H7VG/7E70cdLhidFbdtvxxt81EHgykGK5vq5D3FafH//X+Oy31j3CKOg==
+  dependencies:
+    "@smithy/is-array-buffer" "^4.2.0"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-hex-encoding" "^4.2.0"
+    "@smithy/util-middleware" "^4.2.7"
+    "@smithy/util-uri-escape" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/smithy-client@^4.10.2":
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.10.2.tgz#82b9ef9e764201e86fa38d00f0b59c7b34a62463"
+  integrity sha512-D5z79xQWpgrGpAHb054Fn2CCTQZpog7JELbVQ6XAvXs5MNKWf28U9gzSBlJkOyMl9LA1TZEjRtwvGXfP0Sl90g==
+  dependencies:
+    "@smithy/core" "^3.20.0"
+    "@smithy/middleware-endpoint" "^4.4.1"
+    "@smithy/middleware-stack" "^4.2.7"
+    "@smithy/protocol-http" "^5.3.7"
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-stream" "^4.5.8"
+    tslib "^2.6.2"
+
+"@smithy/types@^4.11.0":
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.11.0.tgz#c02f6184dcb47c4f0b387a32a7eca47956cc09f1"
+  integrity sha512-mlrmL0DRDVe3mNrjTcVcZEgkFmufITfUAPBEA+AHYiIeYyJebso/He1qLbP3PssRe22KUzLRpQSdBPbXdgZ2VA==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/url-parser@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.7.tgz#3137e6f190c446dc8d89271c35f46a2e704bca19"
+  integrity sha512-/RLtVsRV4uY3qPWhBDsjwahAtt3x2IsMGnP5W1b2VZIe+qgCqkLxI1UOHDZp1Q1QSOrdOR32MF3Ph2JfWT1VHg==
+  dependencies:
+    "@smithy/querystring-parser" "^4.2.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/util-base64@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.3.0.tgz#5e287b528793aa7363877c1a02cd880d2e76241d"
+  integrity sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ==
+  dependencies:
+    "@smithy/util-buffer-from" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/util-body-length-browser@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz#04e9fc51ee7a3e7f648a4b4bcdf96c350cfa4d61"
+  integrity sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/util-body-length-node@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz#79c8a5d18e010cce6c42d5cbaf6c1958523e6fec"
+  integrity sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/util-buffer-from@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b"
+  integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==
+  dependencies:
+    "@smithy/is-array-buffer" "^2.2.0"
+    tslib "^2.6.2"
+
+"@smithy/util-buffer-from@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz#7abd12c4991b546e7cee24d1e8b4bfaa35c68a9d"
+  integrity sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew==
+  dependencies:
+    "@smithy/is-array-buffer" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/util-config-provider@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz#2e4722937f8feda4dcb09672c59925a4e6286cfc"
+  integrity sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/util-defaults-mode-browser@^4.3.16":
+  version "4.3.16"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.16.tgz#b89e84e3a50a12dde0ba09f0475bd3c8db1075b7"
+  integrity sha512-/eiSP3mzY3TsvUOYMeL4EqUX6fgUOj2eUOU4rMMgVbq67TiRLyxT7Xsjxq0bW3OwuzK009qOwF0L2OgJqperAQ==
+  dependencies:
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/smithy-client" "^4.10.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/util-defaults-mode-node@^4.2.19":
+  version "4.2.19"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.19.tgz#a545d026859f4a8f3ab27454d3f026f901bff257"
+  integrity sha512-3a4+4mhf6VycEJyHIQLypRbiwG6aJvbQAeRAVXydMmfweEPnLLabRbdyo/Pjw8Rew9vjsh5WCdhmDaHkQnhhhA==
+  dependencies:
+    "@smithy/config-resolver" "^4.4.5"
+    "@smithy/credential-provider-imds" "^4.2.7"
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/property-provider" "^4.2.7"
+    "@smithy/smithy-client" "^4.10.2"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/util-endpoints@^3.2.7":
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.7.tgz#78cd5dd4aac8d9977f49d256d1e3418a09cade72"
+  integrity sha512-s4ILhyAvVqhMDYREeTS68R43B1V5aenV5q/V1QpRQJkCXib5BPRo4s7uNdzGtIKxaPHCfU/8YkvPAEvTpxgspg==
+  dependencies:
+    "@smithy/node-config-provider" "^4.3.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/util-hex-encoding@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz#1c22ea3d1e2c3a81ff81c0a4f9c056a175068a7b"
+  integrity sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/util-middleware@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.7.tgz#1cae2c4fd0389ac858d29f7170c33b4443e83524"
+  integrity sha512-i1IkpbOae6NvIKsEeLLM9/2q4X+M90KV3oCFgWQI4q0Qz+yUZvsr+gZPdAEAtFhWQhAHpTsJO8DRJPuwVyln+w==
+  dependencies:
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/util-retry@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.7.tgz#4abb0d85fbd766757d4569227a68d7caa3a7b8bb"
+  integrity sha512-SvDdsQyF5CIASa4EYVT02LukPHVzAgUA4kMAuZ97QJc2BpAqZfA4PINB8/KOoCXEw9tsuv/jQjMeaHFvxdLNGg==
+  dependencies:
+    "@smithy/service-error-classification" "^4.2.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/util-stream@^4.5.8":
+  version "4.5.8"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.8.tgz#f3c79ff0720ebbae5b90e15be5482b4eeb297882"
+  integrity sha512-ZnnBhTapjM0YPGUSmOs0Mcg/Gg87k503qG4zU2v/+Js2Gu+daKOJMeqcQns8ajepY8tgzzfYxl6kQyZKml6O2w==
+  dependencies:
+    "@smithy/fetch-http-handler" "^5.3.8"
+    "@smithy/node-http-handler" "^4.4.7"
+    "@smithy/types" "^4.11.0"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-buffer-from" "^4.2.0"
+    "@smithy/util-hex-encoding" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/util-uri-escape@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz#096a4cec537d108ac24a68a9c60bee73fc7e3a9e"
+  integrity sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/util-utf8@^2.0.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5"
+  integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==
+  dependencies:
+    "@smithy/util-buffer-from" "^2.2.0"
+    tslib "^2.6.2"
+
+"@smithy/util-utf8@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.2.0.tgz#8b19d1514f621c44a3a68151f3d43e51087fed9d"
+  integrity sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw==
+  dependencies:
+    "@smithy/util-buffer-from" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/util-waiter@^4.2.7":
+  version "4.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-4.2.7.tgz#1865defa25e4812c3e338447587332fb316421d8"
+  integrity sha512-vHJFXi9b7kUEpHWUCY3Twl+9NPOZvQ0SAi+Ewtn48mbiJk4JY9MZmKQjGB4SCvVb9WPiSphZJYY6RIbs+grrzw==
+  dependencies:
+    "@smithy/abort-controller" "^4.2.7"
+    "@smithy/types" "^4.11.0"
+    tslib "^2.6.2"
+
+"@smithy/uuid@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@smithy/uuid/-/uuid-1.1.0.tgz#9fd09d3f91375eab94f478858123387df1cda987"
+  integrity sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==
+  dependencies:
+    tslib "^2.6.2"
+
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2"
@@ -3525,9 +4412,9 @@
   integrity sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==
 
 "@tybys/wasm-util@^0.10.0":
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.0.tgz#2fd3cd754b94b378734ce17058d0507c45c88369"
-  integrity sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@tybys/wasm-util/-/wasm-util-0.10.1.tgz#ecddd3205cf1e2d5274649ff0eedd2991ed7f414"
+  integrity sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==
   dependencies:
     tslib "^2.4.0"
 
@@ -3632,9 +4519,9 @@
   integrity sha512-Reoy+pKnvsksN0lQUlcH6dOGjRZ/3WRwXR//m+/8lt1BXeI4xyaUZoqULNjyXXRuh0Mj4LNpkCvhUpQlY3X5xQ==
 
 "@types/d3-array@^3.0.3":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.2.1.tgz#1f6658e3d2006c4fceac53fde464166859f8b8c5"
-  integrity sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.2.2.tgz#e02151464d02d4a1b44646d0fcdb93faf88fde8c"
+  integrity sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==
 
 "@types/d3-color@*":
   version "3.1.3"
@@ -3781,9 +4668,9 @@
   integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
 "@types/express-serve-static-core@^5.0.0":
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.0.7.tgz#2fa94879c9d46b11a5df4c74ac75befd6b283de6"
-  integrity sha512-R+33OsgWw7rOhD1emjU7dzCDHucJrgJXMA5PYCzJxVil0dsyx5iBEPHqpPfiKNJQb7lZ1vxwoLR4Z87bBUpeGQ==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-5.1.0.tgz#74f47555b3d804b54cb7030e6f9aa0c7485cfc5b"
+  integrity sha512-jnHMsrd0Mwa9Cf4IdOzbz543y4XJepXrbia2T4b6+spXC2We3t1y6K44D3mR8XMFSXMCf3/l7rCgddfx7UNVBA==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -3798,13 +4685,13 @@
     "@types/express" "*"
 
 "@types/express@*", "@types/express@^5.0.0":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.3.tgz#6c4bc6acddc2e2a587142e1d8be0bce20757e956"
-  integrity sha512-wGA0NX93b19/dZC1J18tKWVIYWyyF2ZjT9vin/NRu0qzzvfVzWjs04iq2rQ3H65vCTQYlRqs3YHfY7zjdV+9Kw==
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-5.0.6.tgz#2d724b2c990dcb8c8444063f3580a903f6d500cc"
+  integrity sha512-sKYVuV7Sv9fbPIt/442koC7+IIwK5olP1KWeD88e/idgoJqDm3JV/YUiPwkoKK92ylff2MGxSz1CSjsXelx0YA==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^5.0.0"
-    "@types/serve-static" "*"
+    "@types/serve-static" "^2"
 
 "@types/geojson@*":
   version "7946.0.16"
@@ -3836,9 +4723,9 @@
   integrity sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==
 
 "@types/http-proxy@^1.17.15":
-  version "1.17.16"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.16.tgz#dee360707b35b3cc85afcde89ffeebff7d7f9240"
-  integrity sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==
+  version "1.17.17"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.17.tgz#d9e2c4571fe3507343cb210cd41790375e59a533"
+  integrity sha512-ED6LB+Z1AVylNTu7hdzuBqOgMnvG/ld6wGCG8wFnAzKX5uyW2K3WD52v0gnLCTK/VLpXtKckgWuyScYK6cSPaw==
   dependencies:
     "@types/node" "*"
 
@@ -3916,9 +4803,9 @@
   integrity sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==
 
 "@types/lodash@^4.14.157", "@types/lodash@^4.14.172":
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.20.tgz#1ca77361d7363432d29f5e55950d9ec1e1c6ea93"
-  integrity sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.17.21.tgz#b806831543d696b14f8112db600ea9d3a1df6ea4"
+  integrity sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==
 
 "@types/luxon@~3.4.0":
   version "3.4.2"
@@ -3937,11 +4824,6 @@
   resolved "https://registry.yarnpkg.com/@types/methods/-/methods-1.1.4.tgz#d3b7ac30ac47c91054ea951ce9eed07b1051e547"
   integrity sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==
 
-"@types/mime@^1":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690"
-  integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
-
 "@types/ms@*":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
@@ -3969,14 +4851,7 @@
     "@types/node" "*"
     form-data "^4.0.4"
 
-"@types/node@*":
-  version "24.2.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.2.1.tgz#83e41543f0a518e006594bb394e2cd961de56727"
-  integrity sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==
-  dependencies:
-    undici-types "~7.10.0"
-
-"@types/node@>=10.0.0":
+"@types/node@*", "@types/node@>=10.0.0":
   version "25.0.3"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-25.0.3.tgz#79b9ac8318f373fbfaaf6e2784893efa9701f269"
   integrity sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==
@@ -3984,24 +4859,25 @@
     undici-types "~7.16.0"
 
 "@types/node@^18.11.18":
-  version "18.19.122"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.122.tgz#e7358f8df7cc3f14e860198e1ca4dc2ed9a7de06"
-  integrity sha512-yzegtT82dwTNEe/9y+CM8cgb42WrUfMMCg2QqSddzO1J6uPmBD7qKCZ7dOHZP2Yrpm/kb0eqdNMn2MUyEiqBmA==
+  version "18.19.130"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.130.tgz#da4c6324793a79defb7a62cba3947ec5add00d59"
+  integrity sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==
   dependencies:
     undici-types "~5.26.4"
 
 "@types/node@^22.13.9", "@types/node@^22.15.2":
-  version "22.17.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.17.1.tgz#484a755050497ebc3b37ff5adb7470f2e3ea5f5b"
-  integrity sha512-y3tBaz+rjspDTylNjAX37jEC3TETEFGNJL6uQDxwF9/8GLLIjW1rvVHlynyuUKMnMr1Roq8jOv3vkopBjC4/VA==
+  version "22.19.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.19.3.tgz#8dfde7630d7a8528dc9b34db23d34f764467c02c"
+  integrity sha512-1N9SBnWYOJTrNZCdh/yJE+t910Y128BoyY+zBLWhL3r0TYzlTmFdXrPwHL9DyFZmlEXNQQolTZh3KHV31QDhyA==
   dependencies:
     undici-types "~6.21.0"
 
 "@types/nodemailer@^6.4.7":
-  version "6.4.17"
-  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.17.tgz#5c82a42aee16a3dd6ea31446a1bd6a447f1ac1a4"
-  integrity sha512-I9CCaIp6DTldEg7vyUTZi8+9Vo0hi1/T8gv3C89yk1rSAAzoKQ8H8ki/jBYJSFoH/BisgLP8tkZMlQ91CIquww==
+  version "6.4.21"
+  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.21.tgz#a87634864592e4d8fca8eb8f168cbe0db32c76f7"
+  integrity sha512-Eix+sb/Nj28MNnWvO2X1OLrk5vuD4C9SMnb2Vf4itWnxphYeSceqkFX7IdmxTzn+dvmnNz7paMbg4Uc60wSfJg==
   dependencies:
+    "@aws-sdk/client-ses" "^3.731.1"
     "@types/node" "*"
 
 "@types/passport-jwt@^4.0.1":
@@ -4035,9 +4911,9 @@
     "@types/pg" "*"
 
 "@types/pg@*":
-  version "8.15.5"
-  resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.15.5.tgz#ef43e0f33b62dac95cae2f042888ec7980b30c09"
-  integrity sha512-LF7lF6zWEKxuT3/OR8wAZGzkg4ENGXFNyiV/JeOt9z5B+0ZVwbql9McqX5c/WStFq1GaGso7H1AzP/qSzmlCKQ==
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.16.0.tgz#b7af0d642752340b7c9de1c33afd9bc5c5f0ebeb"
+  integrity sha512-RmhMd/wD+CF8Dfo+cVIy3RR5cl8CyfXQ0tGgW6XBL8L4LM/UTEbNXYRbLwU6w+CgrKBNbrQWt4FUtTfaU5jSYQ==
   dependencies:
     "@types/node" "*"
     pg-protocol "*"
@@ -4068,9 +4944,9 @@
   integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
 
 "@types/react-dom@*":
-  version "19.1.7"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.1.7.tgz#2863f2aa89e023592b981204ef92c5221b286410"
-  integrity sha512-i5ZzwYpqjmrKenzkoLM2Ibzt6mAsM7pxB6BCIouEVVmgiqaMj1TjaK7hnA36hbW5aZv20kx7Lw6hWzPWg0Rurw==
+  version "19.2.3"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-19.2.3.tgz#c1e305d15a52a3e508d54dca770d202cb63abf2c"
+  integrity sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==
 
 "@types/react-dom@19.1.2":
   version "19.1.2"
@@ -4085,9 +4961,9 @@
     "@types/react" "*"
 
 "@types/react-highlight-words@^0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@types/react-highlight-words/-/react-highlight-words-0.20.0.tgz#c7e3e8302acb5082980e611ce2d93c6e6d3b4022"
-  integrity sha512-Qm512TiOakvtNzHJ2+TNVHnLn5cJ2wLQV0+LrhuispVth6dRf5b8ydjq3Kc0thpZ7bz4s6RnG6meboAXHWRK+Q==
+  version "0.20.1"
+  resolved "https://registry.yarnpkg.com/@types/react-highlight-words/-/react-highlight-words-0.20.1.tgz#f84a47b36d5e571afc7da47f273aaabf366b71a0"
+  integrity sha512-EgF6RaoibBurIhxk3X3d5xL0uMqjD7KtShvZ8S+d7/o6xZ+mQ4rct1a2E49vWA9r63OzrHCIyghqvQHASb/ERw==
   dependencies:
     "@types/react" "*"
 
@@ -4099,11 +4975,11 @@
     "@types/react" "*"
 
 "@types/react@*":
-  version "19.1.9"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.1.9.tgz#f42b24f35474566a39b5c3a98e4d0c425b79a849"
-  integrity sha512-WmdoynAX8Stew/36uTSVMcLJJ1KRh6L3IZRx1PZ7qJtBqT3dYTgyDTx8H1qoRghErydW7xw9mSJ3wS//tCRpFA==
+  version "19.2.7"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-19.2.7.tgz#84e62c0f23e8e4e5ac2cadcea1ffeacccae7f62f"
+  integrity sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==
   dependencies:
-    csstype "^3.0.2"
+    csstype "^3.2.2"
 
 "@types/react@19.1.2":
   version "19.1.2"
@@ -4125,30 +5001,28 @@
     "@types/node" "*"
 
 "@types/redlock@^4.0.1":
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/@types/redlock/-/redlock-4.0.7.tgz#33ed56f22a38d6b2f2e6ae5ed1b3fc1875a08e6b"
-  integrity sha512-5D6egBv0fCfdbmnCETjEynVuiwFMEFFc3YFjh9EwhaaVTAi0YmB6UI1swq1S1rjIu+n27ppmlTFDK3D3cadJqg==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/@types/redlock/-/redlock-4.0.8.tgz#faeb416ac15d6005a2a7827117732f41b13adb10"
+  integrity sha512-xuJs90FmH3fmGTuLdUzFIGXL3ThWhWRZLL6LFomtzj0DSW+py/brU7NzF1FZ3M/bs/S0Di+XvMGwzVU2j0RXSw==
   dependencies:
     "@types/bluebird" "*"
     "@types/ioredis" "^4.28.10"
     "@types/redis" "^2.8.0"
 
 "@types/send@*":
-  version "0.17.5"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.5.tgz#d991d4f2b16f2b1ef497131f00a9114290791e74"
-  integrity sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-1.2.1.tgz#6a784e45543c18c774c049bff6d3dbaf045c9c74"
+  integrity sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==
   dependencies:
-    "@types/mime" "^1"
     "@types/node" "*"
 
-"@types/serve-static@*":
-  version "1.15.8"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.8.tgz#8180c3fbe4a70e8f00b9f70b9ba7f08f35987877"
-  integrity sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==
+"@types/serve-static@^2":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-2.2.0.tgz#d4a447503ead0d1671132d1ab6bd58b805d8de6a"
+  integrity sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==
   dependencies:
     "@types/http-errors" "*"
     "@types/node" "*"
-    "@types/send" "*"
 
 "@types/shimmer@^1.2.0":
   version "1.2.0"
@@ -4204,10 +5078,10 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.11.tgz#11af57b127e32487774841f7a4e54eab166d03c4"
   integrity sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==
 
-"@types/validator@^13.11.8":
-  version "13.15.2"
-  resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.15.2.tgz#ee533a20ab977df36917a454754c7e0df4aa6f8f"
-  integrity sha512-y7pa/oEJJ4iGYBxOpfAKn5b9+xuihvzDVnC/OSvlVnGxVg0pOqmjiMafiJ1KVNQEaPZf9HsEp5icEwGg8uIe5Q==
+"@types/validator@^13.15.3":
+  version "13.15.10"
+  resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.15.10.tgz#742b77ec34d58554b94a76a14cef30d59e3c16b9"
+  integrity sha512-T8L6i7wCuyoK8A/ZeLYt1+q0ty3Zb9+qbSSvrIVitzT3YjZqkTZ40IbRsPanlB4h1QB3JVL1SYCdR6ngtFYcuA==
 
 "@types/web-push@3.6.4":
   version "3.6.4"
@@ -4216,15 +5090,20 @@
   dependencies:
     "@types/node" "*"
 
+"@types/webworker@^0.0.51":
+  version "0.0.51"
+  resolved "https://registry.yarnpkg.com/@types/webworker/-/webworker-0.0.51.tgz#9636cc58291b3ab5faf3c8dcf60ec26bebf063be"
+  integrity sha512-Jkpt9VVlkemuO70o4Hm/Ocqer2ixUoQMT2w1Q4CLE2KyOBjYPMvqS5tY6LZzh52V0ECYA2NPw1Rj7o55tPvDmQ==
+
 "@types/yargs-parser@*":
   version "21.0.3"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
   integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
 "@types/yargs@^17.0.33", "@types/yargs@^17.0.8":
-  version "17.0.33"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.33.tgz#8c32303da83eec050a84b3c7ae7b9f922d13e32d"
-  integrity sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==
+  version "17.0.35"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.35.tgz#07013e46aa4d7d7d50a49e15604c1c5340d4eb24"
+  integrity sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -4236,101 +5115,99 @@
     "@types/node" "*"
 
 "@typescript-eslint/eslint-plugin@^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/eslint-plugin@^8.38.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.39.0.tgz#c9afec1866ee1a6ea3d768b5f8e92201efbbba06"
-  integrity sha512-bhEz6OZeUR+O/6yx9Jk6ohX6H9JSFTaiY0v9/PuKT3oGK0rn0jNplLmyFUGV+a9gfYnVNwGDwS/UkLIuXNb2Rw==
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.51.0.tgz#8985230730c0d955bf6aa0aed98c5c2c95102e1a"
+  integrity sha512-XtssGWJvypyM2ytBnSnKtHYOGT+4ZwTnBVl36TA4nRO2f4PRNGz5/1OszHzcZCvcBMh+qb7I06uoCmLTRdR9og==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.39.0"
-    "@typescript-eslint/type-utils" "8.39.0"
-    "@typescript-eslint/utils" "8.39.0"
-    "@typescript-eslint/visitor-keys" "8.39.0"
-    graphemer "^1.4.0"
+    "@typescript-eslint/scope-manager" "8.51.0"
+    "@typescript-eslint/type-utils" "8.51.0"
+    "@typescript-eslint/utils" "8.51.0"
+    "@typescript-eslint/visitor-keys" "8.51.0"
     ignore "^7.0.0"
     natural-compare "^1.4.0"
-    ts-api-utils "^2.1.0"
+    ts-api-utils "^2.2.0"
 
 "@typescript-eslint/parser@^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0", "@typescript-eslint/parser@^8.38.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.39.0.tgz#c4b895d7a47f4cd5ee6ee77ea30e61d58b802008"
-  integrity sha512-g3WpVQHngx0aLXn6kfIYCZxM6rRJlWzEkVpqEFLT3SgEDsp9cpCbxxgwnE504q4H+ruSDh/VGS6nqZIDynP+vg==
-  dependencies:
-    "@typescript-eslint/scope-manager" "8.39.0"
-    "@typescript-eslint/types" "8.39.0"
-    "@typescript-eslint/typescript-estree" "8.39.0"
-    "@typescript-eslint/visitor-keys" "8.39.0"
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.51.0.tgz#584fb8be3a867cbf980917aabed5f7528f615d6b"
+  integrity sha512-3xP4XzzDNQOIqBMWogftkwxhg5oMKApqY0BAflmLZiFYHqyhSOxv/cd/zPQLTcCXr4AkaKb25joocY0BD1WC6A==
+  dependencies:
+    "@typescript-eslint/scope-manager" "8.51.0"
+    "@typescript-eslint/types" "8.51.0"
+    "@typescript-eslint/typescript-estree" "8.51.0"
+    "@typescript-eslint/visitor-keys" "8.51.0"
     debug "^4.3.4"
 
-"@typescript-eslint/project-service@8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.39.0.tgz#71cb29c3f8139f99a905b8705127bffc2ae84759"
-  integrity sha512-CTzJqaSq30V/Z2Og9jogzZt8lJRR5TKlAdXmWgdu4hgcC9Kww5flQ+xFvMxIBWVNdxJO7OifgdOK4PokMIWPew==
+"@typescript-eslint/project-service@8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.51.0.tgz#3cfef313d8bebbf4b2442675a4dd463cef4c8369"
+  integrity sha512-Luv/GafO07Z7HpiI7qeEW5NW8HUtZI/fo/kE0YbtQEFpJRUuR0ajcWfCE5bnMvL7QQFrmT/odMe8QZww8X2nfQ==
   dependencies:
-    "@typescript-eslint/tsconfig-utils" "^8.39.0"
-    "@typescript-eslint/types" "^8.39.0"
+    "@typescript-eslint/tsconfig-utils" "^8.51.0"
+    "@typescript-eslint/types" "^8.51.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.39.0.tgz#ba4bf6d8257bbc172c298febf16bc22df4856570"
-  integrity sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A==
+"@typescript-eslint/scope-manager@8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.51.0.tgz#19b42f65680c21f7b6f40fe9024327f6bb1893c1"
+  integrity sha512-JhhJDVwsSx4hiOEQPeajGhCWgBMBwVkxC/Pet53EpBVs7zHHtayKefw1jtPaNRXpI9RA2uocdmpdfE7T+NrizA==
   dependencies:
-    "@typescript-eslint/types" "8.39.0"
-    "@typescript-eslint/visitor-keys" "8.39.0"
+    "@typescript-eslint/types" "8.51.0"
+    "@typescript-eslint/visitor-keys" "8.51.0"
 
-"@typescript-eslint/tsconfig-utils@8.39.0", "@typescript-eslint/tsconfig-utils@^8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.0.tgz#b2e87fef41a3067c570533b722f6af47be213f13"
-  integrity sha512-Fd3/QjmFV2sKmvv3Mrj8r6N8CryYiCS8Wdb/6/rgOXAWGcFuc+VkQuG28uk/4kVNVZBQuuDHEDUpo/pQ32zsIQ==
+"@typescript-eslint/tsconfig-utils@8.51.0", "@typescript-eslint/tsconfig-utils@^8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.51.0.tgz#a575e9885e62dbd260fb64474eff1dae6e317515"
+  integrity sha512-Qi5bSy/vuHeWyir2C8u/uqGMIlIDu8fuiYWv48ZGlZ/k+PRPHtaAu7erpc7p5bzw2WNNSniuxoMSO4Ar6V9OXw==
 
-"@typescript-eslint/type-utils@8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.39.0.tgz#310ec781ae5e7bb0f5940bfd652573587f22786b"
-  integrity sha512-6B3z0c1DXVT2vYA9+z9axjtc09rqKUPRmijD5m9iv8iQpHBRYRMBcgxSiKTZKm6FwWw1/cI4v6em35OsKCiN5Q==
+"@typescript-eslint/type-utils@8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.51.0.tgz#ec165b0312a6025c2a2a3f39641e46ab4f049564"
+  integrity sha512-0XVtYzxnobc9K0VU7wRWg1yiUrw4oQzexCG2V2IDxxCxhqBMSMbjB+6o91A+Uc0GWtgjCa3Y8bi7hwI0Tu4n5Q==
   dependencies:
-    "@typescript-eslint/types" "8.39.0"
-    "@typescript-eslint/typescript-estree" "8.39.0"
-    "@typescript-eslint/utils" "8.39.0"
+    "@typescript-eslint/types" "8.51.0"
+    "@typescript-eslint/typescript-estree" "8.51.0"
+    "@typescript-eslint/utils" "8.51.0"
     debug "^4.3.4"
-    ts-api-utils "^2.1.0"
-
-"@typescript-eslint/types@8.39.0", "@typescript-eslint/types@^8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.39.0.tgz#80f010b7169d434a91cd0529d70a528dbc9c99c6"
-  integrity sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg==
-
-"@typescript-eslint/typescript-estree@8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.0.tgz#b9477a5c47a0feceffe91adf553ad9a3cd4cb3d6"
-  integrity sha512-ndWdiflRMvfIgQRpckQQLiB5qAKQ7w++V4LlCHwp62eym1HLB/kw7D9f2e8ytONls/jt89TEasgvb+VwnRprsw==
-  dependencies:
-    "@typescript-eslint/project-service" "8.39.0"
-    "@typescript-eslint/tsconfig-utils" "8.39.0"
-    "@typescript-eslint/types" "8.39.0"
-    "@typescript-eslint/visitor-keys" "8.39.0"
+    ts-api-utils "^2.2.0"
+
+"@typescript-eslint/types@8.51.0", "@typescript-eslint/types@^8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.51.0.tgz#6996e59d49e92fb893531bdc249f0d92a7bebdbb"
+  integrity sha512-TizAvWYFM6sSscmEakjY3sPqGwxZRSywSsPEiuZF6d5GmGD9Gvlsv0f6N8FvAAA0CD06l3rIcWNbsN1e5F/9Ag==
+
+"@typescript-eslint/typescript-estree@8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.51.0.tgz#b57f5157d1ac2127bd7c2c9ad8060fa017df4a1a"
+  integrity sha512-1qNjGqFRmlq0VW5iVlcyHBbCjPB7y6SxpBkrbhNWMy/65ZoncXCEPJxkRZL8McrseNH6lFhaxCIaX+vBuFnRng==
+  dependencies:
+    "@typescript-eslint/project-service" "8.51.0"
+    "@typescript-eslint/tsconfig-utils" "8.51.0"
+    "@typescript-eslint/types" "8.51.0"
+    "@typescript-eslint/visitor-keys" "8.51.0"
     debug "^4.3.4"
-    fast-glob "^3.3.2"
-    is-glob "^4.0.3"
     minimatch "^9.0.4"
     semver "^7.6.0"
-    ts-api-utils "^2.1.0"
+    tinyglobby "^0.2.15"
+    ts-api-utils "^2.2.0"
 
-"@typescript-eslint/utils@8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.39.0.tgz#dfea42f3c7ec85f9f3e994ff0bba8f3b2f09e220"
-  integrity sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ==
+"@typescript-eslint/utils@8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.51.0.tgz#b9a071cd210647f860a38873acf9bc5157bea56a"
+  integrity sha512-11rZYxSe0zabiKaCP2QAwRf/dnmgFgvTmeDTtZvUvXG3UuAdg/GU02NExmmIXzz3vLGgMdtrIosI84jITQOxUA==
   dependencies:
     "@eslint-community/eslint-utils" "^4.7.0"
-    "@typescript-eslint/scope-manager" "8.39.0"
-    "@typescript-eslint/types" "8.39.0"
-    "@typescript-eslint/typescript-estree" "8.39.0"
+    "@typescript-eslint/scope-manager" "8.51.0"
+    "@typescript-eslint/types" "8.51.0"
+    "@typescript-eslint/typescript-estree" "8.51.0"
 
-"@typescript-eslint/visitor-keys@8.39.0":
-  version "8.39.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.0.tgz#5d619a6e810cdd3fd1913632719cbccab08bf875"
-  integrity sha512-ldgiJ+VAhQCfIjeOgu8Kj5nSxds0ktPOSO9p4+0VDH2R2pLvQraaM5Oen2d7NxzMCm+Sn/vJT+mv2H5u6b/3fA==
+"@typescript-eslint/visitor-keys@8.51.0":
+  version "8.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.51.0.tgz#d37f5c82b9bece2c8aeb3ba7bb836bbba0f92bb8"
+  integrity sha512-mM/JRQOzhVN1ykejrvwnBRV3+7yTKK8tVANVN3o1O0t0v7o+jqdVu9crPy5Y9dov15TJk/FTIgoUGHrTOVL3Zg==
   dependencies:
-    "@typescript-eslint/types" "8.39.0"
+    "@typescript-eslint/types" "8.51.0"
     eslint-visitor-keys "^4.2.1"
 
 "@ungap/structured-clone@^1.0.0", "@ungap/structured-clone@^1.3.0":
@@ -4861,9 +5738,9 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.2:
     type-fest "^0.21.3"
 
 ansi-escapes@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.0.0.tgz#00fc19f491bbb18e1d481b97868204f92109bfe7"
-  integrity sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-7.2.0.tgz#31b25afa3edd3efc09d98c2fee831d460ff06b49"
+  integrity sha512-g6LhBsl+GBPRWGWsBtutpzBYuIIdBkLEvad5C/va/74Db018+5TZiyA26cZJAr3Rft5lprVqOIPxf5Vid6tqAw==
   dependencies:
     environment "^1.0.0"
 
@@ -4878,9 +5755,9 @@ ansi-regex@^5.0.1:
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-regex@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
-  integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
+  integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
@@ -4901,25 +5778,25 @@ ansi-styles@^5.0.0, ansi-styles@^5.2.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.0.0, ansi-styles@^6.1.0, ansi-styles@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+ansi-styles@^6.1.0, ansi-styles@^6.2.1:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.3.tgz#c044d5dcc521a076413472597a1acb1f103c4041"
+  integrity sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==
 
 ansis@4.0.0-node10:
   version "4.0.0-node10"
   resolved "https://registry.yarnpkg.com/ansis/-/ansis-4.0.0-node10.tgz#bbddd48b549d3fe2a4caa5ba33602ef240b492aa"
   integrity sha512-BRrU0Bo1X9dFGw6KgGz6hWrqQuOlVEDOzkb0QSLZY9sXHqA7pNj7yHPVJRz7y/rj4EOJ3d/D5uxH+ee9leYgsg==
 
-ansis@^3.17.0:
-  version "3.17.0"
-  resolved "https://registry.yarnpkg.com/ansis/-/ansis-3.17.0.tgz#fa8d9c2a93fe7d1177e0c17f9eeb562a58a832d7"
-  integrity sha512-0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg==
+ansis@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ansis/-/ansis-4.2.0.tgz#2e6e61c46b11726ac67f78785385618b9e658780"
+  integrity sha512-HqZ5rWlFjGiV0tDm3UxxgNRqsOTniqoKZu0pIAfh7TZQMGuZK+hH0drySty0si0QXj1ieop4+SkSfPZBPPkHig==
 
 antd@^5.26.2:
-  version "5.26.7"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-5.26.7.tgz#e2f7e37330b27eec0de7a7789767975373f61602"
-  integrity sha512-iCyXN6+i2CUVEOSzzJKfbKeg115qoJhGvSkCh5uzAf9hANwHUOJQhsMn+KtN+Lx/2NQ6wfM7nGZ+7NPNO5Pn1w==
+  version "5.29.3"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-5.29.3.tgz#404eda9f9716b2ff9b06251dfecb7028d7c4de40"
+  integrity sha512-3DdbGCa9tWAJGcCJ6rzR8EJFsv2CtyEbkVabZE14pfgUHfCicWCj0/QzQVLDYg8CPfQk9BH7fHCoTXHTy7MP/A==
   dependencies:
     "@ant-design/colors" "^7.2.1"
     "@ant-design/cssinjs" "^1.23.0"
@@ -4930,7 +5807,7 @@ antd@^5.26.2:
     "@babel/runtime" "^7.26.0"
     "@rc-component/color-picker" "~2.0.1"
     "@rc-component/mutate-observer" "^1.1.0"
-    "@rc-component/qrcode" "~1.0.0"
+    "@rc-component/qrcode" "~1.1.0"
     "@rc-component/tour" "~1.15.1"
     "@rc-component/trigger" "^2.3.0"
     classnames "^2.5.1"
@@ -4942,7 +5819,7 @@ antd@^5.26.2:
     rc-dialog "~9.6.0"
     rc-drawer "~7.3.0"
     rc-dropdown "~4.2.1"
-    rc-field-form "~2.7.0"
+    rc-field-form "~2.7.1"
     rc-image "~7.12.0"
     rc-input "~1.8.0"
     rc-input-number "~9.5.0"
@@ -4957,16 +5834,16 @@ antd@^5.26.2:
     rc-resize-observer "^1.4.3"
     rc-segmented "~2.7.0"
     rc-select "~14.16.8"
-    rc-slider "~11.1.8"
+    rc-slider "~11.1.9"
     rc-steps "~6.0.1"
     rc-switch "~4.1.0"
-    rc-table "~7.51.1"
-    rc-tabs "~15.6.1"
-    rc-textarea "~1.10.1"
+    rc-table "~7.54.0"
+    rc-tabs "~15.7.0"
+    rc-textarea "~1.10.2"
     rc-tooltip "~6.4.0"
     rc-tree "~5.13.1"
     rc-tree-select "~5.27.0"
-    rc-upload "~4.9.2"
+    rc-upload "~4.11.0"
     rc-util "^5.44.4"
     scroll-into-view-if-needed "^3.1.0"
     throttle-debounce "^5.0.2"
@@ -5179,6 +6056,11 @@ async-function@^1.0.0:
   resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
   integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
 
+async@3.2.6, async@^3.2.0, async@^3.2.6, async@~3.2.0:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
+
 async@^2.6.3, async@~2.6.1:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
@@ -5186,11 +6068,6 @@ async@^2.6.3, async@~2.6.1:
   dependencies:
     lodash "^4.17.14"
 
-async@^3.2.0, async@^3.2.6, async@~3.2.0, async@~3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
-  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -5209,14 +6086,14 @@ available-typed-arrays@^1.0.7:
     possible-typed-array-names "^1.0.0"
 
 axe-core@^4.10.0:
-  version "4.10.3"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.3.tgz#04145965ac7894faddbac30861e5d8f11bfd14fc"
-  integrity sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.11.0.tgz#16f74d6482e343ff263d4f4503829e9ee91a86b6"
+  integrity sha512-ilYanEU8vxxBexpJd8cWM4ElSQq4QctCLKih0TSfjIfCQTeyH/6zVrmIJfLPrKTKJRbiG+cfnZbQIjAlJmF1jQ==
 
-axios@^1.11.0, axios@^1.7.9:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6"
-  integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==
+axios@^1.11.0, axios@^1.12.2, axios@^1.7.9:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.2.tgz#9ada120b7b5ab24509553ec3e40123521117f687"
+  integrity sha512-VPk9ebNqPcy5lRGuSlKx752IlDatOjT9paPlm8A7yOuW2Fbvp4X3JznJtT4f0GzGLLiWE9W8onz51SqLYwzGaA==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.4"
@@ -5227,23 +6104,23 @@ axobject-query@^4.1.0:
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-4.1.0.tgz#28768c76d0e3cff21bc62a9e2d0b6ac30042a1ee"
   integrity sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==
 
-babel-jest@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.0.5.tgz#7cc7dd03d0d613125d458521f635b8c2361e89cc"
-  integrity sha512-mRijnKimhGDMsizTvBTWotwNpzrkHr+VvZUQBof2AufXKB8NXrL1W69TG20EvOz7aevx6FTJIaBuBkYxS8zolg==
+babel-jest@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-30.2.0.tgz#fd44a1ec9552be35ead881f7381faa7d8f3b95ac"
+  integrity sha512-0YiBEOxWqKkSQWL9nNGGEgndoeL0ZpWrbLMNL5u/Kaxrli3Eaxlt3ZtIDktEvXt4L/R9r3ODr2zKwGM/2BjxVw==
   dependencies:
-    "@jest/transform" "30.0.5"
+    "@jest/transform" "30.2.0"
     "@types/babel__core" "^7.20.5"
-    babel-plugin-istanbul "^7.0.0"
-    babel-preset-jest "30.0.1"
+    babel-plugin-istanbul "^7.0.1"
+    babel-preset-jest "30.2.0"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
     slash "^3.0.0"
 
-babel-plugin-istanbul@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.0.tgz#629a178f63b83dc9ecee46fd20266283b1f11280"
-  integrity sha512-C5OzENSx/A+gt7t4VH1I2XsflxyPUmXRFPKBxt33xncdOmq7oROVM3bZv9Ysjjkv8OJYDMa+tKuKMvqU/H3xdw==
+babel-plugin-istanbul@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-7.0.1.tgz#d8b518c8ea199364cf84ccc82de89740236daf92"
+  integrity sha512-D8Z6Qm8jCvVXtIRkBnqNHX0zJ37rQcFJ9u8WOS6tkYOsRdHBzypCstaxWiu5ZIlqQtviRYbgnRLSoCEvjqcqbA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@istanbuljs/load-nyc-config" "^1.0.0"
@@ -5251,13 +6128,11 @@ babel-plugin-istanbul@^7.0.0:
     istanbul-lib-instrument "^6.0.2"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@30.0.1:
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.0.1.tgz#f271b2066d2c1fb26a863adb8e13f85b06247125"
-  integrity sha512-zTPME3pI50NsFW8ZBaVIOeAxzEY7XHlmWeXXu9srI+9kNfzCUTy8MFan46xOGZY8NZThMqq+e3qZUKsvXbasnQ==
+babel-plugin-jest-hoist@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-30.2.0.tgz#94c250d36b43f95900f3a219241e0f4648191ce2"
+  integrity sha512-ftzhzSGMUnOzcCXd6WHdBGMyuwy15Wnn0iyyWGKgBDLxf9/s5ABuraCSpBX2uG0jUg4rqJnxsLc5+oYBqoxVaA==
   dependencies:
-    "@babel/template" "^7.27.2"
-    "@babel/types" "^7.27.3"
     "@types/babel__core" "^7.20.5"
 
 babel-plugin-polyfill-corejs2@^0.4.14:
@@ -5284,7 +6159,7 @@ babel-plugin-polyfill-regenerator@^0.6.5:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.6.5"
 
-babel-preset-current-node-syntax@^1.1.0:
+babel-preset-current-node-syntax@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz#20730d6cdc7dda5d89401cab10ac6a32067acde6"
   integrity sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==
@@ -5305,13 +6180,13 @@ babel-preset-current-node-syntax@^1.1.0:
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
 
-babel-preset-jest@30.0.1:
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.0.1.tgz#7d28db9531bce264e846c8483d54236244b8ae88"
-  integrity sha512-+YHejD5iTWI46cZmcc/YtX4gaKBtdqCHCVfuVinizVpbmyjO3zYmeuyFdfA8duRqQZfgCAMlsfmkVbJ+e2MAJw==
+babel-preset-jest@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-30.2.0.tgz#04717843e561347781d6d7f69c81e6bcc3ed11ce"
+  integrity sha512-US4Z3NOieAQumwFnYdUWKvUKh8+YSnS/gB3t6YBiz0bskpu7Pine8pPCheNxlPEW4wnUkma2a94YuW2q3guvCQ==
   dependencies:
-    babel-plugin-jest-hoist "30.0.1"
-    babel-preset-current-node-syntax "^1.1.0"
+    babel-plugin-jest-hoist "30.2.0"
+    babel-preset-current-node-syntax "^1.2.0"
 
 babel-walk@3.0.0-canary-5:
   version "3.0.0-canary-5"
@@ -5345,6 +6220,11 @@ base64id@2.0.0, base64id@~2.0.0:
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
   integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
 
+baseline-browser-mapping@^2.9.0:
+  version "2.9.11"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz#53724708c8db5f97206517ecfe362dbe5181deea"
+  integrity sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==
+
 basic-auth@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
@@ -5353,9 +6233,9 @@ basic-auth@~2.0.1:
     safe-buffer "5.1.2"
 
 basic-ftp@^5.0.2:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.0.5.tgz#14a474f5fffecca1f4f406f1c26b18f800225ac0"
-  integrity sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.1.0.tgz#00eb8128ce536aa697c45716c739bf38e8d890f5"
+  integrity sha512-RkaJzeJKDbaDWTIPiJwubyljaEPwpVWkm9Rt5h9Nd6h7tEXTJ3VB4qxdZBioV7JO5yLUaOKwz7vDOzlncUsegw==
 
 bcrypt@^5.0.0:
   version "5.1.1"
@@ -5384,11 +6264,6 @@ bl@^4.0.3, bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-blessed@0.1.81:
-  version "0.1.81"
-  resolved "https://registry.yarnpkg.com/blessed/-/blessed-0.1.81.tgz#f962d687ec2c369570ae71af843256e6d0ca1129"
-  integrity sha512-LoF5gae+hlmfORcG1M5+5XZi4LBmvlXTzwJWzUlPryN/SJdSflZvROM2TwkT0GMpq7oqT48NRd4GS7BiVBc5OQ==
-
 bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -5422,26 +6297,31 @@ body-parser@^1.20.2, body-parser@~1.20.3:
     type-is "~1.6.18"
     unpipe "~1.0.0"
 
-body-parser@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-2.2.0.tgz#f7a9656de305249a715b549b7b8fd1ab9dfddcfa"
-  integrity sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==
+body-parser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-2.2.1.tgz#6df606b0eb0a6e3f783dde91dde182c24c82438c"
+  integrity sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==
   dependencies:
     bytes "^3.1.2"
     content-type "^1.0.5"
-    debug "^4.4.0"
+    debug "^4.4.3"
     http-errors "^2.0.0"
-    iconv-lite "^0.6.3"
+    iconv-lite "^0.7.0"
     on-finished "^2.4.1"
     qs "^6.14.0"
-    raw-body "^3.0.0"
-    type-is "^2.0.0"
+    raw-body "^3.0.1"
+    type-is "^2.0.1"
 
 boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
+bowser@^2.11.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.13.1.tgz#5a4c652de1d002f847dd011819f5fc729f308a7e"
+  integrity sha512-OHawaAbjwx6rqICCKgSG0SAnT05bzd7ppyKLVUITZpANBaaMFBAsaNkto3LoQ31tyFP5kNujE8Cdx85G9VzOkw==
+
 brace-expansion@^1.1.7, brace-expansion@^2.0.1, brace-expansion@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.2.tgz#54fc53237a613d854c7bd37463aad17df87214e7"
@@ -5456,15 +6336,16 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.24.0, browserslist@^4.25.1:
-  version "4.25.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.25.1.tgz#ba9e8e6f298a1d86f829c9b975e07948967bb111"
-  integrity sha512-KGj0KoOMXLpSNkkEI6Z6mShmQy0bc1I+T7K9N81k4WWMrfz+6fQ6es80B/YLAeRoKvjYE1YSHHOW1qe9xIVzHw==
+browserslist@^4.24.0, browserslist@^4.28.0:
+  version "4.28.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.1.tgz#7f534594628c53c63101079e27e40de490456a95"
+  integrity sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==
   dependencies:
-    caniuse-lite "^1.0.30001726"
-    electron-to-chromium "^1.5.173"
-    node-releases "^2.0.19"
-    update-browserslist-db "^1.1.3"
+    baseline-browser-mapping "^2.9.0"
+    caniuse-lite "^1.0.30001759"
+    electron-to-chromium "^1.5.263"
+    node-releases "^2.0.27"
+    update-browserslist-db "^1.2.0"
 
 bs-logger@^0.2.6:
   version "0.2.6"
@@ -5518,17 +6399,18 @@ busboy@^1.6.0:
   dependencies:
     streamsearch "^1.1.0"
 
-bytes@3.1.2, bytes@^3.1.2, bytes@~3.1.2:
+bytes@^3.1.2, bytes@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
 cache-manager@*:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/cache-manager/-/cache-manager-7.1.1.tgz#0b231defef6ad06060ffe88b5622ae8201fb16e1"
-  integrity sha512-YZ5CXZ4cNOcVH5bokYE1Bo5NARvJhOkYAAwImGf7DozC0uyrT5Jqd5AWfPnSRavlHTPiHp2yZL3Q3ZEWBfkQvQ==
+  version "7.2.7"
+  resolved "https://registry.yarnpkg.com/cache-manager/-/cache-manager-7.2.7.tgz#17271c6bfd63ec6fc93dfe300882065acd29e1d8"
+  integrity sha512-TKeeb9nSybk1e9E5yAiPVJ6YKdX9FYhwqqy8fBfVKAFVTJYZUNmeIvwjURW6+UikNsO6l2ta27thYgo/oumDsw==
   dependencies:
-    keyv "^5.5.0"
+    "@cacheable/utils" "^2.3.2"
+    keyv "^5.5.4"
 
 cache-manager@^6.0.0:
   version "6.4.3"
@@ -5583,10 +6465,10 @@ camelcase@^6.3.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001726:
-  version "1.0.30001733"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001733.tgz#918405ed6647a62840fb328832cf5a03f986974b"
-  integrity sha512-e4QKw/O2Kavj2VQTKZWrwzkt3IxOmIlU6ajRb6LP64LHpBo1J67k2Hi4Vu/TgJWsNtynurfS0uK3MaUTCPfu5Q==
+caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001759:
+  version "1.0.30001762"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001762.tgz#e4dbfeda63d33258cdde93e53af2023a13ba27d4"
+  integrity sha512-PxZwGNvH7Ak8WX5iXzoK1KPZttBXNPuaOvI2ZYU7NrlM+d9Ov+TUvlLOBNGzVXAntMSMMlJPd+jY6ovrVjSmUw==
 
 canvas-renderer@~2.2.0:
   version "2.2.1"
@@ -5625,10 +6507,10 @@ chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^5.3.0, chalk@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.5.0.tgz#67ada1df5ca809dc84c9b819d76418ddcf128428"
-  integrity sha512-1tm8DTaJhPBG3bIkVeZt1iZM9GfSX2lzOeDVZH9R9ffRHpmHvxZ/QhgQH/aDTkswQVt+YHdXAdS/In/30OjCbg==
+chalk@^5.3.0:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea"
+  integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==
 
 char-regex@^1.0.2:
   version "1.0.2"
@@ -5747,9 +6629,9 @@ chrome-trace-event@^1.0.2:
   integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==
 
 chromiumly@^4.1.1:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/chromiumly/-/chromiumly-4.1.3.tgz#7854545082fef70692bddd87bf732e41ecb412f4"
-  integrity sha512-7v1kGQhTlF4VA734/yHytM8m/xdumQtN2Ox/9AOm40ePDHVF+TdnXhYHa+fp9BASCzey5tyCpki9lpyE0pRzdQ==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/chromiumly/-/chromiumly-4.2.0.tgz#766d19052abd7c63837a1cb60c62a380ef26b63a"
+  integrity sha512-fqCjZhOuePO3/nrNKkjxnjXhYD0RZaWlQZLFgNMUTLjJw0V+qf+v29n/2UZAwU4K37bcFKfIKLpKl/tD0ZNtIg==
   optionalDependencies:
     config "4.x"
     dotenv "17.x"
@@ -5760,9 +6642,9 @@ ci-info@^3.2.0:
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
 ci-info@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.3.0.tgz#c39b1013f8fdbd28cd78e62318357d02da160cd7"
-  integrity sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.3.1.tgz#355ad571920810b5623e11d40232f443f16f1daa"
+  integrity sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==
 
 cjs-module-lexer@^1.2.2:
   version "1.4.3"
@@ -5770,9 +6652,9 @@ cjs-module-lexer@^1.2.2:
   integrity sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==
 
 cjs-module-lexer@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.1.0.tgz#586e87d4341cb2661850ece5190232ccdebcff8b"
-  integrity sha512-UX0OwmYRYQQetfrLEZeewIFFI+wSTofC+pMBLNuH3RUuu/xzG1oz84UCEDOSoQlN3fZ4+AzmV50ZYvGqkMh9yA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-2.2.0.tgz#b3ca5101843389259ade7d88c77bd06ce55849ca"
+  integrity sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==
 
 class-transformer@0.3.1:
   version "0.3.1"
@@ -5785,13 +6667,13 @@ class-transformer@^0.5.1:
   integrity sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==
 
 class-validator@^0.14.1:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/class-validator/-/class-validator-0.14.2.tgz#a3de95edd26b703e89c151a2023d3c115030340d"
-  integrity sha512-3kMVRF2io8N8pY1IFIXlho9r8IPUUIfHe2hYVtiebvAzU2XeQFXTv+XI4WX+TnXmtwXMDcjngcpkiPM0O9PvLw==
+  version "0.14.3"
+  resolved "https://registry.yarnpkg.com/class-validator/-/class-validator-0.14.3.tgz#834a4caafa8359aed73d7708badb4cf271be50fe"
+  integrity sha512-rXXekcjofVN1LTOSw+u4u9WXVEUvNBVjORW154q/IdmYWy1nMbOU9aNtZB0t8m+FJQ9q91jlr2f9CwwUFdFMRA==
   dependencies:
-    "@types/validator" "^13.11.8"
+    "@types/validator" "^13.15.3"
     libphonenumber-js "^1.11.1"
-    validator "^13.9.0"
+    validator "^13.15.20"
 
 class-variance-authority@^0.7.0:
   version "0.7.1"
@@ -5833,20 +6715,20 @@ cli-table3@0.6.5:
   optionalDependencies:
     "@colors/colors" "1.5.0"
 
-cli-tableau@^2.0.0:
+cli-tableau@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/cli-tableau/-/cli-tableau-2.0.1.tgz#baa78d83e08a2d7ab79b7dad9406f0254977053f"
   integrity sha512-he+WTicka9cl0Fg/y+YyxcN6/bfQ/1O3QmgxRXDhABKqLzvoOSM4fMzp39uMyLBulAFuywD2N7UaoQE7WaADxQ==
   dependencies:
     chalk "3.0.0"
 
-cli-truncate@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-4.0.0.tgz#6cc28a2924fee9e25ce91e973db56c7066e6172a"
-  integrity sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==
+cli-truncate@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-5.1.1.tgz#455476face9904d94b7d11e98d9adbca15292ea5"
+  integrity sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==
   dependencies:
-    slice-ansi "^5.0.0"
-    string-width "^7.0.0"
+    slice-ansi "^7.1.0"
+    string-width "^8.0.0"
 
 cli-width@^3.0.0:
   version "3.0.0"
@@ -5902,9 +6784,9 @@ co@^4.6.0:
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
 collect-v8-coverage@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
-  integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.3.tgz#cc1f01eb8d02298cbc9a437c74c70ab4e5210b80"
+  integrity sha512-1L5aqIkwPfiodaMgQunkF1zRhNqifHBmtbbbxcr6yVxxBnliw4TDOW6NxpO8DJLgJ16OT+Y4ztZqP6p/FtXnAw==
 
 color-convert@^1.9.0:
   version "1.9.3"
@@ -5983,10 +6865,10 @@ commander@4.1.1, commander@^4.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.0.tgz#f244fc74a92343514e56229f16ef5c5e22ced5e9"
-  integrity sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==
+commander@^14.0.2:
+  version "14.0.2"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-14.0.2.tgz#b71fd37fe4069e4c3c7c13925252ada4eba14e8e"
+  integrity sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==
 
 commander@^2.20.0:
   version "2.20.3"
@@ -6055,9 +6937,9 @@ concurrently@^5.2.0:
     yargs "^13.3.0"
 
 config@4.x:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/config/-/config-4.1.0.tgz#c3e0112c105e0ba6577fc9ae889a4821335d7555"
-  integrity sha512-uxu0WQTPXwwkR9ZVNQm3ID3f39lWa9HEmppVC6q2HL6sOZszTBL/HGwIHG1dhnWW8006TkhHwZjX6yvAfkXp6Q==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/config/-/config-4.1.1.tgz#798f636e2a5b7baa7050280d1eb21f8e10abb8c9"
+  integrity sha512-jljfwqNZ7QHwAW9Z9NDZdJARFiu5pjLqQO0K4ooY22iY/bIY78n0afI4ANEawfgQOxri0K/3oTayX8XIauWcLA==
   dependencies:
     json5 "^2.2.3"
 
@@ -6085,11 +6967,9 @@ constantinople@^4.0.1:
     "@babel/types" "^7.6.1"
 
 content-disposition@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-1.0.0.tgz#844426cb398f934caefcbb172200126bc7ceace2"
-  integrity sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==
-  dependencies:
-    safe-buffer "5.2.1"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-1.0.1.tgz#a8b7bbeb2904befdfb6787e5c0c086959f605f9b"
+  integrity sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==
 
 content-disposition@~0.5.4:
   version "0.5.4"
@@ -6149,11 +7029,11 @@ copy-to-clipboard@^3.3.3:
     toggle-selection "^1.0.6"
 
 core-js-compat@^3.43.0:
-  version "3.45.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.45.0.tgz#bc0017525dcb7a42ba3241d02f6fce9bae8e5c33"
-  integrity sha512-gRoVMBawZg0OnxaVv3zpqLLxaHmsubEGyTnqdpI/CEBvX4JadI1dMSHxagThprYRtSVbuQxvi6iUatdPxohHpA==
+  version "3.47.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.47.0.tgz#698224bbdbb6f2e3f39decdda4147b161e3772a3"
+  integrity sha512-IGfuznZ/n7Kp9+nypamBhvwdwLsW6KC8IOaURw2doAK5e98AG3acVLdh0woOnEqCfUtS+Vu882JE4k/DAm3ItQ==
   dependencies:
-    browserslist "^4.25.1"
+    browserslist "^4.28.0"
 
 core-util-is@^1.0.3, core-util-is@~1.0.0:
   version "1.0.3"
@@ -6193,7 +7073,7 @@ cron@^3.1.8:
     "@types/luxon" "~3.4.0"
     luxon "~3.5.0"
 
-croner@~4.1.92:
+croner@4.1.97:
   version "4.1.97"
   resolved "https://registry.yarnpkg.com/croner/-/croner-4.1.97.tgz#6e373dc7bb3026fab2deb0d82685feef20796766"
   integrity sha512-/f6gpQuxDaqXu+1kwQYSckUglPaOrHdbIlBAu0YuW8/Cdb45XwXYNUBXg3r/9Mo6n540Kn/smKcZWko5x99KrQ==
@@ -6255,10 +7135,10 @@ cssstyle@^4.2.1:
     "@asamuzakjp/css-color" "^3.2.0"
     rrweb-cssom "^0.8.0"
 
-csstype@^3.0.2, csstype@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
-  integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
+csstype@^3.0.2, csstype@^3.1.3, csstype@^3.2.2:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.2.3.tgz#ec48c0f3e993e50648c86da559e2610995cf989a"
+  integrity sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==
 
 culvert@^0.1.2:
   version "0.1.2"
@@ -6421,10 +7301,15 @@ date-fns@^2.0.1:
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-dayjs@^1.11.11, dayjs@^1.11.13, dayjs@~1.11.13:
-  version "1.11.13"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
-  integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
+dayjs@1.11.15:
+  version "1.11.15"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.15.tgz#fd7fd2db6fc92f08ffe4adc306756d45db00ada3"
+  integrity sha512-MC+DfnSWiM9APs7fpiurHGCoeIx0Gdl6QZBy+5lu8MbYKN5FZEXqOgrundfibdfhGZ15o9hzmZ2xJjZnbvgKXQ==
+
+dayjs@^1.11.11, dayjs@^1.11.13, dayjs@^1.11.19:
+  version "1.11.19"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.19.tgz#15dc98e854bb43917f12021806af897c58ae2938"
+  integrity sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==
 
 dayjs@~1.8.24:
   version "1.8.36"
@@ -6438,10 +7323,10 @@ debug@2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.3.7, debug@^4.4.0, debug@^4.4.1:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
-  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
+debug@4, debug@4.4.3, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.4.0, debug@^4.4.1, debug@^4.4.3, debug@~4.4.1:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
+  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
   dependencies:
     ms "^2.1.3"
 
@@ -6453,16 +7338,9 @@ debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
     ms "^2.1.1"
 
 debug@~4.3.1:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
-  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
-  dependencies:
-    ms "^2.1.3"
-
-debug@~4.4.1:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
-  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
   dependencies:
     ms "^2.1.3"
 
@@ -6488,10 +7366,10 @@ decode-named-character-reference@^1.0.0:
   dependencies:
     character-entities "^2.0.0"
 
-dedent@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.6.0.tgz#79d52d6389b1ffa67d2bcef59ba51847a9d503b2"
-  integrity sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==
+dedent@^1.6.0, dedent@^1.7.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.7.1.tgz#364661eea3d73f3faba7089214420ec2f8f13e15"
+  integrity sha512-9JmrhGZpOlEgOLdQgSm0zxFaYoQon408V1v49aqTWuXENVlnCuY9JBZcXZiCsZQWDjTm5Qf/nIvAy77mXDAjEg==
 
 deep-is@^0.1.3:
   version "0.1.4"
@@ -6579,10 +7457,10 @@ destroy@1.2.0, destroy@~1.2.0:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
-detect-libc@^2.0.0, detect-libc@^2.0.3, detect-libc@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.4.tgz#f04715b8ba815e53b4d8109655b6508a6865a7e8"
-  integrity sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==
+detect-libc@^2.0.0, detect-libc@^2.0.3, detect-libc@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
+  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
 
 detect-newline@^3.1.0:
   version "3.1.0"
@@ -6692,11 +7570,11 @@ dotenv@16.4.7:
   integrity sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==
 
 dotenv@17.x:
-  version "17.2.1"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-17.2.1.tgz#6f32e10faf014883515538dc922a0fb8765d9b32"
-  integrity sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==
+  version "17.2.3"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-17.2.3.tgz#ad995d6997f639b11065f419a22fabf567cdb9a2"
+  integrity sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==
 
-dotenv@^16.3.0, dotenv@^16.3.1, dotenv@^16.4.5, dotenv@^16.4.7:
+dotenv@^16.3.0, dotenv@^16.3.1, dotenv@^16.4.5, dotenv@^16.6.1:
   version "16.6.1"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.6.1.tgz#773f0e69527a8315c7285d5ee73c4459d20a8020"
   integrity sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==
@@ -6727,10 +7605,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.5.173:
-  version "1.5.199"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.199.tgz#4d8be9c78362c05f095eb7392e9a54f1fb14fd3a"
-  integrity sha512-3gl0S7zQd88kCAZRO/DnxtBKuhMO4h0EaQIN3YgZfV6+pW+5+bf2AdQeHNESCoaQqo/gjGVYEf2YM4O5HJQqpQ==
+electron-to-chromium@^1.5.263:
+  version "1.5.267"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz#5d84f2df8cdb6bfe7e873706bb21bd4bfb574dc7"
+  integrity sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -6738,9 +7616,9 @@ emittery@^0.13.1:
   integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
 emoji-regex@^10.3.0:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.4.0.tgz#03553afea80b3975749cfcb36f776ca268e413d4"
-  integrity sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==
+  version "10.6.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.6.0.tgz#bf3d6e8f7f8fd22a65d9703475bc0147357a6b0d"
+  integrity sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -6809,9 +7687,9 @@ engine.io@~6.6.0:
     ws "~8.18.3"
 
 enhanced-resolve@^5.0.0, enhanced-resolve@^5.17.1, enhanced-resolve@^5.7.0:
-  version "5.18.3"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"
-  integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==
+  version "5.18.4"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.4.tgz#c22d33055f3952035ce6a144ce092447c525f828"
+  integrity sha512-LgQMM4WXU3QI+SYgEc2liRgznaD5ojbmY3sb8LxyguVkIg5FxdpTkvk72te2R38/TGKxH634oLxXRGY6d7AP+Q==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -6839,16 +7717,16 @@ environment@^1.0.0:
   integrity sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==
 
 error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.4.tgz#b3a8d8bb6f92eecc1629e3e27d3c8607a8a32414"
+  integrity sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0:
-  version "1.24.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz#c44732d2beb0acc1ed60df840869e3106e7af328"
-  integrity sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==
+es-abstract@^1.17.5, es-abstract@^1.23.2, es-abstract@^1.23.3, es-abstract@^1.23.5, es-abstract@^1.23.6, es-abstract@^1.23.9, es-abstract@^1.24.0, es-abstract@^1.24.1:
+  version "1.24.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.1.tgz#f0c131ed5ea1bb2411134a8dd94def09c46c7899"
+  integrity sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==
   dependencies:
     array-buffer-byte-length "^1.0.2"
     arraybuffer.prototype.slice "^1.0.4"
@@ -6916,25 +7794,25 @@ es-errors@^1.3.0:
   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
 es-iterator-helpers@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz#d1dd0f58129054c0ad922e6a9a1e65eef435fe75"
-  integrity sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.2.2.tgz#d979a9f686e2b0b72f88dbead7229924544720bc"
+  integrity sha512-BrUQ0cPTB/IwXj23HtwHjS9n7O4h9FX94b4xc5zlTHxeLgTAdzYUDyy6KdExAl9lbN5rtfe44xpjpmj9grxs5w==
   dependencies:
     call-bind "^1.0.8"
-    call-bound "^1.0.3"
+    call-bound "^1.0.4"
     define-properties "^1.2.1"
-    es-abstract "^1.23.6"
+    es-abstract "^1.24.1"
     es-errors "^1.3.0"
-    es-set-tostringtag "^2.0.3"
+    es-set-tostringtag "^2.1.0"
     function-bind "^1.1.2"
-    get-intrinsic "^1.2.6"
+    get-intrinsic "^1.3.0"
     globalthis "^1.0.4"
     gopd "^1.2.0"
     has-property-descriptors "^1.0.2"
     has-proto "^1.2.0"
     has-symbols "^1.1.0"
     internal-slot "^1.1.0"
-    iterator.prototype "^1.1.4"
+    iterator.prototype "^1.1.5"
     safe-array-concat "^1.1.3"
 
 es-module-lexer@^1.2.1:
@@ -6949,7 +7827,7 @@ es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
   dependencies:
     es-errors "^1.3.0"
 
-es-set-tostringtag@^2.0.3, es-set-tostringtag@^2.1.0:
+es-set-tostringtag@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz#f31dbbe0c183b00a6d26eb6325c810c0fd18bd4d"
   integrity sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==
@@ -6975,37 +7853,37 @@ es-to-primitive@^1.3.0:
     is-date-object "^1.0.5"
     is-symbol "^1.0.4"
 
-esbuild@~0.25.0:
-  version "0.25.8"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.8.tgz#482d42198b427c9c2f3a81b63d7663aecb1dda07"
-  integrity sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==
+esbuild@~0.27.0:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.27.2.tgz#d83ed2154d5813a5367376bb2292a9296fc83717"
+  integrity sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.25.8"
-    "@esbuild/android-arm" "0.25.8"
-    "@esbuild/android-arm64" "0.25.8"
-    "@esbuild/android-x64" "0.25.8"
-    "@esbuild/darwin-arm64" "0.25.8"
-    "@esbuild/darwin-x64" "0.25.8"
-    "@esbuild/freebsd-arm64" "0.25.8"
-    "@esbuild/freebsd-x64" "0.25.8"
-    "@esbuild/linux-arm" "0.25.8"
-    "@esbuild/linux-arm64" "0.25.8"
-    "@esbuild/linux-ia32" "0.25.8"
-    "@esbuild/linux-loong64" "0.25.8"
-    "@esbuild/linux-mips64el" "0.25.8"
-    "@esbuild/linux-ppc64" "0.25.8"
-    "@esbuild/linux-riscv64" "0.25.8"
-    "@esbuild/linux-s390x" "0.25.8"
-    "@esbuild/linux-x64" "0.25.8"
-    "@esbuild/netbsd-arm64" "0.25.8"
-    "@esbuild/netbsd-x64" "0.25.8"
-    "@esbuild/openbsd-arm64" "0.25.8"
-    "@esbuild/openbsd-x64" "0.25.8"
-    "@esbuild/openharmony-arm64" "0.25.8"
-    "@esbuild/sunos-x64" "0.25.8"
-    "@esbuild/win32-arm64" "0.25.8"
-    "@esbuild/win32-ia32" "0.25.8"
-    "@esbuild/win32-x64" "0.25.8"
+    "@esbuild/aix-ppc64" "0.27.2"
+    "@esbuild/android-arm" "0.27.2"
+    "@esbuild/android-arm64" "0.27.2"
+    "@esbuild/android-x64" "0.27.2"
+    "@esbuild/darwin-arm64" "0.27.2"
+    "@esbuild/darwin-x64" "0.27.2"
+    "@esbuild/freebsd-arm64" "0.27.2"
+    "@esbuild/freebsd-x64" "0.27.2"
+    "@esbuild/linux-arm" "0.27.2"
+    "@esbuild/linux-arm64" "0.27.2"
+    "@esbuild/linux-ia32" "0.27.2"
+    "@esbuild/linux-loong64" "0.27.2"
+    "@esbuild/linux-mips64el" "0.27.2"
+    "@esbuild/linux-ppc64" "0.27.2"
+    "@esbuild/linux-riscv64" "0.27.2"
+    "@esbuild/linux-s390x" "0.27.2"
+    "@esbuild/linux-x64" "0.27.2"
+    "@esbuild/netbsd-arm64" "0.27.2"
+    "@esbuild/netbsd-x64" "0.27.2"
+    "@esbuild/openbsd-arm64" "0.27.2"
+    "@esbuild/openbsd-x64" "0.27.2"
+    "@esbuild/openharmony-arm64" "0.27.2"
+    "@esbuild/sunos-x64" "0.27.2"
+    "@esbuild/win32-arm64" "0.27.2"
+    "@esbuild/win32-ia32" "0.27.2"
+    "@esbuild/win32-x64" "0.27.2"
 
 escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
@@ -7205,23 +8083,22 @@ eslint-visitor-keys@^4.2.1:
   integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
 
 eslint@^9.32.0:
-  version "9.33.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.33.0.tgz#cc186b3d9eb0e914539953d6a178a5b413997b73"
-  integrity sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==
+  version "9.39.2"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.39.2.tgz#cb60e6d16ab234c0f8369a3fe7cc87967faf4b6c"
+  integrity sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/eslint-utils" "^4.8.0"
     "@eslint-community/regexpp" "^4.12.1"
-    "@eslint/config-array" "^0.21.0"
-    "@eslint/config-helpers" "^0.3.1"
-    "@eslint/core" "^0.15.2"
+    "@eslint/config-array" "^0.21.1"
+    "@eslint/config-helpers" "^0.4.2"
+    "@eslint/core" "^0.17.0"
     "@eslint/eslintrc" "^3.3.1"
-    "@eslint/js" "9.33.0"
-    "@eslint/plugin-kit" "^0.3.5"
+    "@eslint/js" "9.39.2"
+    "@eslint/plugin-kit" "^0.4.1"
     "@humanfs/node" "^0.16.6"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@humanwhocodes/retry" "^0.4.2"
     "@types/estree" "^1.0.6"
-    "@types/json-schema" "^7.0.15"
     ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.6"
@@ -7260,9 +8137,9 @@ esprima@^4.0.0, esprima@^4.0.1:
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
-  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d"
+  integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==
   dependencies:
     estraverse "^5.1.0"
 
@@ -7368,17 +8245,17 @@ exit-x@^0.2.2:
   resolved "https://registry.yarnpkg.com/exit-x/-/exit-x-0.2.2.tgz#1f9052de3b8d99a696b10dad5bced9bdd5c3aa64"
   integrity sha512-+I6B/IkJc1o/2tiURyz/ivu/O0nKNEArIUB5O7zBrlDVJr22SCLH3xTeEry428LvFhRzIA1g8izguxJ/gbNcVQ==
 
-expect@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-30.0.5.tgz#c23bf193c5e422a742bfd2990ad990811de41a5a"
-  integrity sha512-P0te2pt+hHI5qLJkIR+iMvS+lYUZml8rKKsohVHAGY+uClp9XVbdyYNJOIjSRpHVp8s8YqxJCiHUkSYZGr8rtQ==
+expect@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-30.2.0.tgz#d4013bed267013c14bc1199cec8aa57cee9b5869"
+  integrity sha512-u/feCi0GPsI+988gU2FLcsHyAHTU0MX1Wg68NhAnN7z/+C5wqG+CY8J53N9ioe8RXgaoz0nBR/TYMf3AycUuPw==
   dependencies:
-    "@jest/expect-utils" "30.0.5"
-    "@jest/get-type" "30.0.1"
-    jest-matcher-utils "30.0.5"
-    jest-message-util "30.0.5"
-    jest-mock "30.0.5"
-    jest-util "30.0.5"
+    "@jest/expect-utils" "30.2.0"
+    "@jest/get-type" "30.1.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
 
 expect@^29.0.0:
   version "29.7.0"
@@ -7405,18 +8282,19 @@ express-session@^1.18.2:
     safe-buffer "5.2.1"
     uid-safe "~2.1.5"
 
-express@5.1.0, express@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/express/-/express-5.1.0.tgz#d31beaf715a0016f0d53f47d3b4d7acf28c75cc9"
-  integrity sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==
+express@5.2.1, express@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-5.2.1.tgz#8f21d15b6d327f92b4794ecf8cb08a72f956ac04"
+  integrity sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==
   dependencies:
     accepts "^2.0.0"
-    body-parser "^2.2.0"
+    body-parser "^2.2.1"
     content-disposition "^1.0.0"
     content-type "^1.0.5"
     cookie "^0.7.1"
     cookie-signature "^1.2.1"
     debug "^4.4.0"
+    depd "^2.0.0"
     encodeurl "^2.0.0"
     escape-html "^1.0.3"
     etag "^1.8.1"
@@ -7523,9 +8401,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-equals@^5.0.1:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-5.2.2.tgz#885d7bfb079fac0ce0e8450374bce29e9b742484"
-  integrity sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-5.4.0.tgz#b60073b8764f27029598447f05773c7534ba7f1e"
+  integrity sha512-jt2DW/aNFNwke7AUd+Z+e6pz39KO5rzdbbFCg2sGafS4mk13MI7Z8O5z9cADNn5lhGODIgLwug6TZO2ctf7kcw==
 
 fast-glob@3.3.1:
   version "3.3.1"
@@ -7570,9 +8448,9 @@ fast-safe-stringify@2.1.1, fast-safe-stringify@^2.1.1:
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
 
 fast-uri@^3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.6.tgz#88f130b77cfaea2378d56bf970dea21257a68748"
-  integrity sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.0.tgz#66eecff6c764c0df9b762e62ca7edcfb53b4edfa"
+  integrity sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==
 
 fast-url-parser@^1.1.3:
   version "1.1.3"
@@ -7581,10 +8459,17 @@ fast-url-parser@^1.1.3:
   dependencies:
     punycode "^1.3.2"
 
+fast-xml-parser@5.2.5:
+  version "5.2.5"
+  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz#4809fdfb1310494e341098c25cb1341a01a9144a"
+  integrity sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==
+  dependencies:
+    strnum "^2.1.0"
+
 fastq@^1.6.0:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.19.1.tgz#d50eaba803c8846a883c16492821ebcd2cda55f5"
-  integrity sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.20.1.tgz#ca750a10dc925bc8b18839fd203e3ef4b3ced675"
+  integrity sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==
   dependencies:
     reusify "^1.0.4"
 
@@ -7614,10 +8499,10 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-fdir@^6.2.0, fdir@^6.4.4:
-  version "6.4.6"
-  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.6.tgz#2b268c0232697063111bbf3f64810a2a741ba281"
-  integrity sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==
+fdir@^6.2.0, fdir@^6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
+  integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
 
 fflate@^0.8.2:
   version "0.8.2"
@@ -7656,9 +8541,9 @@ fill-range@^7.1.1:
     to-regex-range "^5.0.1"
 
 finalhandler@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-2.1.0.tgz#72306373aa89d05a8242ed569ed86a1bff7c561f"
-  integrity sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-2.1.1.tgz#a2c517a6559852bcdb06d1f8bd7f51b68fad8099"
+  integrity sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==
   dependencies:
     debug "^4.4.0"
     encodeurl "^2.0.0"
@@ -7779,9 +8664,9 @@ form-data-encoder@1.7.2:
   integrity sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==
 
 form-data@^2.3.1, form-data@^4.0.0, form-data@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
-  integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
+  integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
@@ -7878,16 +8763,16 @@ fsevents@^2.3.3, fsevents@~2.3.2, fsevents@~2.3.3:
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
 fullcalendar@^6.1.15:
-  version "6.1.18"
-  resolved "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-6.1.18.tgz#6148c3dda5ab11fea8bce357f5436833aaea5d18"
-  integrity sha512-jwZrCleBhY78j+uBf97FW2rgzjH6nmCpfx0p0m+XSNPZrKWbsk759ri1QWXS3PoISrHjcU5wFM4dRPP9inp5Pg==
+  version "6.1.20"
+  resolved "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-6.1.20.tgz#49df7c39affba29b4386934b7b1bf9408e9a8f41"
+  integrity sha512-7lz2P+0YdA86fBTwfr/ducajrM3zUw5o6uoiiYk9xMqcoTf003xBh3mpzW5om9slfAMwGgCBh0KsiYcU1JY1eQ==
   dependencies:
-    "@fullcalendar/core" "~6.1.18"
-    "@fullcalendar/daygrid" "~6.1.18"
-    "@fullcalendar/interaction" "~6.1.18"
-    "@fullcalendar/list" "~6.1.18"
-    "@fullcalendar/multimonth" "~6.1.18"
-    "@fullcalendar/timegrid" "~6.1.18"
+    "@fullcalendar/core" "~6.1.20"
+    "@fullcalendar/daygrid" "~6.1.20"
+    "@fullcalendar/interaction" "~6.1.20"
+    "@fullcalendar/list" "~6.1.20"
+    "@fullcalendar/multimonth" "~6.1.20"
+    "@fullcalendar/timegrid" "~6.1.20"
 
 function-bind@^1.1.2:
   version "1.1.2"
@@ -7946,6 +8831,11 @@ gcp-metadata@^6.1.0:
     google-logging-utils "^0.0.2"
     json-bigint "^1.0.0"
 
+generator-function@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
+  integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -7956,10 +8846,10 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-east-asian-width@^1.0.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz#21b4071ee58ed04ee0db653371b55b4299875389"
-  integrity sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==
+get-east-asian-width@^1.0.0, get-east-asian-width@^1.3.0, get-east-asian-width@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz#9bc4caa131702b4b61729cb7e42735bc550c9ee6"
+  integrity sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==
 
 get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, get-intrinsic@^1.3.0:
   version "1.3.0"
@@ -8022,9 +8912,9 @@ get-symbol-description@^1.1.0:
     get-intrinsic "^1.2.6"
 
 get-tsconfig@^4.10.0, get-tsconfig@^4.7.5:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.10.1.tgz#d34c1c01f47d65a606c37aa7a177bc3e56ab4b2e"
-  integrity sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.13.0.tgz#fcdd991e6d22ab9a600f00e91c318707a5d9a0d7"
+  integrity sha512-1VKTZJCwBrvbd+Wn3AOgQP/2Av+TfTCOlE4AcRJE72W1ksZXbAx8PPBR9RzgTeSPzlPMHrbANMH3LbltH73wxQ==
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
@@ -8073,7 +8963,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@10.4.5, glob@^10.3.10, glob@^10.3.7, glob@^10.4.5:
+glob@10.4.5:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
   integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
@@ -8097,6 +8987,18 @@ glob@7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^10.3.10, glob@^10.3.7, glob@^10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
+  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^1.11.1"
+
 glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -8125,9 +9027,9 @@ globals@^14.0.0:
   integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
 globals@^16.3.0:
-  version "16.3.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-16.3.0.tgz#66118e765ddaf9e2d880f7e17658543f93f1f667"
-  integrity sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ==
+  version "16.5.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-16.5.0.tgz#ccf1594a437b97653b2be13ed4d8f5c9f850cac1"
+  integrity sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==
 
 globalthis@^1.0.4:
   version "1.0.4"
@@ -8164,11 +9066,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11,
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-graphemer@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
-  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
-
 gtoken@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-7.1.0.tgz#d61b4ebd10132222817f7222b1e6064bd463fc26"
@@ -8240,6 +9137,13 @@ has-unicode@^2.0.1:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
+hashery@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/hashery/-/hashery-1.4.0.tgz#3af04d9af0c63ff2f15a353ee9c2d11fdef7919f"
+  integrity sha512-Wn2i1In6XFxl8Az55kkgnFRiAlIAushzh26PTjL2AKtQcEfXrcLa7Hn5QOWGZEf3LU057P9TwwZjFyxfS1VuvQ==
+  dependencies:
+    hookified "^1.14.0"
+
 hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
@@ -8403,6 +9307,11 @@ hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   dependencies:
     react-is "^16.7.0"
 
+hookified@^1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/hookified/-/hookified-1.14.0.tgz#815ca3b9f3e77c782f583bf3974e966df7a9fd7b"
+  integrity sha512-pi1ynXIMFx/uIIwpWJ/5CEtOHLGtnUB0WhGeeYT+fKcQ+WCQbm3/rrkAXnpfph++PgepNqPdTC2WTj8A6k6zoQ==
+
 hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
@@ -8463,18 +9372,7 @@ htmlparser2@^8.0.2:
     domutils "^3.0.1"
     entities "^4.4.0"
 
-http-errors@2.0.0, http-errors@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
-  dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
-
-http-errors@~2.0.0, http-errors@~2.0.1:
+http-errors@^2.0.0, http-errors@^2.0.1, http-errors@~2.0.0, http-errors@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.1.tgz#36d2f65bc909c8790018dd36fb4d93da6caae06b"
   integrity sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==
@@ -8581,6 +9479,13 @@ iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.7.0, iconv-lite@~0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.1.tgz#d4af1d2092f2bb05aab6296e5e7cd286d2f15432"
+  integrity sha512-2Tth85cXwGFHfvRgZWszZSvdo+0Xsqmw8k8ZwxScfcBneNUraK+dxRxRm24nszx80Y0TVio8kKLt5sLE7ZCLlw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -8605,9 +9510,9 @@ import-fresh@^3.2.1, import-fresh@^3.3.0:
     resolve-from "^4.0.0"
 
 import-in-the-middle@^1.13.0, import-in-the-middle@^1.14.2, import-in-the-middle@^1.8.1:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.14.2.tgz#283661625a88ff7c0462bd2984f77715c3bc967c"
-  integrity sha512-5tCuY9BV8ujfOpwtAGgsTx9CGUapcFMEEyByLv1B+v2+6DhAcw+Zr0nhQT7uwaZ7DiourxFEscghOR8e1aPLQw==
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.15.0.tgz#9e20827a322bbadaeb5e3bac49ea8f6d4685fdd8"
+  integrity sha512-bpQy+CrsRmYmoPMAE/0G33iwRqwW4ouqdRg8jgbH3aKuCtOc8lxgmYXg2dMM92CRiGP660EtBcymH/eVUpCSaA==
   dependencies:
     acorn "^8.14.0"
     acorn-import-attributes "^1.9.5"
@@ -8635,7 +9540,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3, inherits@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -8658,10 +9563,10 @@ inline-css@2.6.3, inline-css@^4.0.3:
     slick "^1.12.2"
     specificity "^0.4.1"
 
-inline-style-parser@0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.4.tgz#f4af5fe72e612839fcd453d989a586566d695f22"
-  integrity sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==
+inline-style-parser@0.2.7:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.7.tgz#b1fc68bfc0313b8685745e4464e37f9376b9c909"
+  integrity sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==
 
 inquirer@8.2.6:
   version "8.2.6"
@@ -8720,11 +9625,11 @@ internal-slot@^1.1.0:
   integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==
 
 ioredis@^5.3.0, ioredis@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.7.0.tgz#be8f4a09bfb67bfa84ead297ff625973a5dcefc3"
-  integrity sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.8.2.tgz#c7a228a26cf36f17a5a8011148836877780e2e14"
+  integrity sha512-C6uC+kleiIMmjViJINWk80sOQw5lEzse1ZmvD+S/s8p8CWapftSaC+kocGTx6xrbrJ4WmYQGC08ffHLr6ToR6Q==
   dependencies:
-    "@ioredis/commands" "^1.3.0"
+    "@ioredis/commands" "1.4.0"
     cluster-key-slot "^1.1.0"
     debug "^4.3.4"
     denque "^2.1.0"
@@ -8734,13 +9639,10 @@ ioredis@^5.3.0, ioredis@^5.6.0:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
-ip-address@^9.0.5:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a"
-  integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==
-  dependencies:
-    jsbn "1.1.0"
-    sprintf-js "^1.1.3"
+ip-address@^10.0.1:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4"
+  integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -8788,9 +9690,9 @@ is-arrayish@^0.2.1:
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.4.tgz#1ee5553818511915685d33bb13d31bf854e5059d"
+  integrity sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==
 
 is-async-function@^2.0.0:
   version "2.1.1"
@@ -8837,7 +9739,7 @@ is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.13.0, is-core-module@^2.16.0, is-core-module@^2.16.1:
+is-core-module@^2.13.0, is-core-module@^2.16.1:
   version "2.16.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
   integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
@@ -8901,17 +9803,12 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-fullwidth-code-point@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88"
-  integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==
-
 is-fullwidth-code-point@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz#9609efced7c2f97da7b60145ef481c787c7ba704"
-  integrity sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz#046b2a6d4f6b156b2233d3207d4b5a9783999b98"
+  integrity sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==
   dependencies:
-    get-east-asian-width "^1.0.0"
+    get-east-asian-width "^1.3.1"
 
 is-generator-fn@^2.1.0:
   version "2.1.0"
@@ -8919,12 +9816,13 @@ is-generator-fn@^2.1.0:
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-generator-function@^1.0.10:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"
-  integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5"
+  integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==
   dependencies:
-    call-bound "^1.0.3"
-    get-proto "^1.0.0"
+    call-bound "^1.0.4"
+    generator-function "^2.0.0"
+    get-proto "^1.0.1"
     has-tostringtag "^1.0.2"
     safe-regex-test "^1.1.0"
 
@@ -9136,9 +10034,9 @@ istanbul-lib-source-maps@^5.0.0:
     istanbul-lib-coverage "^3.0.0"
 
 istanbul-reports@^3.1.3:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
-  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.2.0.tgz#cb4535162b5784aa623cee21a7252cf2c807ac93"
+  integrity sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -9148,7 +10046,7 @@ iterare@1.2.1:
   resolved "https://registry.yarnpkg.com/iterare/-/iterare-1.2.1.tgz#139c400ff7363690e33abffa33cbba8920f00042"
   integrity sha512-RKYVTCjAnRthyJes037NX/IiqeidgN1xc3j1RjFfECFp28A1GVwK9nA+i0rJPaHqSZwygLzRnFlzUuHFoWWy+Q==
 
-iterator.prototype@^1.1.4:
+iterator.prototype@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.5.tgz#12c959a29de32de0aa3bbbb801f4d777066dae39"
   integrity sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==
@@ -9176,96 +10074,96 @@ jdenticon@^3.3.0:
   dependencies:
     canvas-renderer "~2.2.0"
 
-jest-changed-files@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.0.5.tgz#ec448f83bd9caa894dd7da8707f207c356a19924"
-  integrity sha512-bGl2Ntdx0eAwXuGpdLdVYVr5YQHnSZlQ0y9HVDu565lCUAe9sj6JOtBbMmBBikGIegne9piDDIOeiLVoqTkz4A==
+jest-changed-files@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-30.2.0.tgz#602266e478ed554e1e1469944faa7efd37cee61c"
+  integrity sha512-L8lR1ChrRnSdfeOvTrwZMlnWV8G/LLjQ0nG9MBclwWZidA2N5FviRki0Bvh20WRMOX31/JYvzdqTJrk5oBdydQ==
   dependencies:
     execa "^5.1.1"
-    jest-util "30.0.5"
+    jest-util "30.2.0"
     p-limit "^3.1.0"
 
-jest-circus@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.0.5.tgz#9b4d44feb56c7ffe14411ad7fc08af188c5d4da7"
-  integrity sha512-h/sjXEs4GS+NFFfqBDYT7y5Msfxh04EwWLhQi0F8kuWpe+J/7tICSlswU8qvBqumR3kFgHbfu7vU6qruWWBPug==
+jest-circus@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-30.2.0.tgz#98b8198b958748a2f322354311023d1d02e7603f"
+  integrity sha512-Fh0096NC3ZkFx05EP2OXCxJAREVxj1BcW/i6EWqqymcgYKWjyyDpral3fMxVcHXg6oZM7iULer9wGRFvfpl+Tg==
   dependencies:
-    "@jest/environment" "30.0.5"
-    "@jest/expect" "30.0.5"
-    "@jest/test-result" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/environment" "30.2.0"
+    "@jest/expect" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
     chalk "^4.1.2"
     co "^4.6.0"
     dedent "^1.6.0"
     is-generator-fn "^2.1.0"
-    jest-each "30.0.5"
-    jest-matcher-utils "30.0.5"
-    jest-message-util "30.0.5"
-    jest-runtime "30.0.5"
-    jest-snapshot "30.0.5"
-    jest-util "30.0.5"
+    jest-each "30.2.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-runtime "30.2.0"
+    jest-snapshot "30.2.0"
+    jest-util "30.2.0"
     p-limit "^3.1.0"
-    pretty-format "30.0.5"
+    pretty-format "30.2.0"
     pure-rand "^7.0.0"
     slash "^3.0.0"
     stack-utils "^2.0.6"
 
-jest-cli@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.0.5.tgz#c3fbfdabd1a5c428429476f915a1ba6d0774cc50"
-  integrity sha512-Sa45PGMkBZzF94HMrlX4kUyPOwUpdZasaliKN3mifvDmkhLYqLLg8HQTzn6gq7vJGahFYMQjXgyJWfYImKZzOw==
+jest-cli@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-30.2.0.tgz#1780f8e9d66bf84a10b369aea60aeda7697dcc67"
+  integrity sha512-Os9ukIvADX/A9sLt6Zse3+nmHtHaE6hqOsjQtNiugFTbKRHYIYtZXNGNK9NChseXy7djFPjndX1tL0sCTlfpAA==
   dependencies:
-    "@jest/core" "30.0.5"
-    "@jest/test-result" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/core" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/types" "30.2.0"
     chalk "^4.1.2"
     exit-x "^0.2.2"
     import-local "^3.2.0"
-    jest-config "30.0.5"
-    jest-util "30.0.5"
-    jest-validate "30.0.5"
+    jest-config "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
     yargs "^17.7.2"
 
-jest-config@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.0.5.tgz#567cf39b595229b786506a496c22e222d5e8d480"
-  integrity sha512-aIVh+JNOOpzUgzUnPn5FLtyVnqc3TQHVMupYtyeURSb//iLColiMIR8TxCIDKyx9ZgjKnXGucuW68hCxgbrwmA==
+jest-config@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-30.2.0.tgz#29df8c50e2ad801cc59c406b50176c18c362a90b"
+  integrity sha512-g4WkyzFQVWHtu6uqGmQR4CQxz/CH3yDSlhzXMWzNjDx843gYjReZnMRanjRCq5XZFuQrGDxgUaiYWE8BRfVckA==
   dependencies:
     "@babel/core" "^7.27.4"
-    "@jest/get-type" "30.0.1"
+    "@jest/get-type" "30.1.0"
     "@jest/pattern" "30.0.1"
-    "@jest/test-sequencer" "30.0.5"
-    "@jest/types" "30.0.5"
-    babel-jest "30.0.5"
+    "@jest/test-sequencer" "30.2.0"
+    "@jest/types" "30.2.0"
+    babel-jest "30.2.0"
     chalk "^4.1.2"
     ci-info "^4.2.0"
     deepmerge "^4.3.1"
     glob "^10.3.10"
     graceful-fs "^4.2.11"
-    jest-circus "30.0.5"
-    jest-docblock "30.0.1"
-    jest-environment-node "30.0.5"
+    jest-circus "30.2.0"
+    jest-docblock "30.2.0"
+    jest-environment-node "30.2.0"
     jest-regex-util "30.0.1"
-    jest-resolve "30.0.5"
-    jest-runner "30.0.5"
-    jest-util "30.0.5"
-    jest-validate "30.0.5"
+    jest-resolve "30.2.0"
+    jest-runner "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
     micromatch "^4.0.8"
     parse-json "^5.2.0"
-    pretty-format "30.0.5"
+    pretty-format "30.2.0"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.0.5.tgz#b40f81e0c0d13e5b81c4d62b0d0dfa6a524ee0fd"
-  integrity sha512-1UIqE9PoEKaHcIKvq2vbibrCog4Y8G0zmOxgQUVEiTqwR5hJVMCoDsN1vFvI5JvwD37hjueZ1C4l2FyGnfpE0A==
+jest-diff@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-30.2.0.tgz#e3ec3a6ea5c5747f605c9e874f83d756cba36825"
+  integrity sha512-dQHFo3Pt4/NLlG5z4PxZ/3yZTZ1C7s9hveiOj+GCN+uT109NC2QgsoVZsVOAvbJ3RgKkvyLGXZV9+piDpWbm6A==
   dependencies:
     "@jest/diff-sequences" "30.0.1"
-    "@jest/get-type" "30.0.1"
+    "@jest/get-type" "30.1.0"
     chalk "^4.1.2"
-    pretty-format "30.0.5"
+    pretty-format "30.2.0"
 
 jest-diff@^29.7.0:
   version "29.7.0"
@@ -9277,77 +10175,77 @@ jest-diff@^29.7.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
-jest-docblock@30.0.1:
-  version "30.0.1"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-30.0.1.tgz#545ff59f2fa88996bd470dba7d3798a8421180b1"
-  integrity sha512-/vF78qn3DYphAaIc3jy4gA7XSAz167n9Bm/wn/1XhTLW7tTBIzXtCJpb/vcmc73NIIeeohCbdL94JasyXUZsGA==
+jest-docblock@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-30.2.0.tgz#42cd98d69f887e531c7352309542b1ce4ee10256"
+  integrity sha512-tR/FFgZKS1CXluOQzZvNH3+0z9jXr3ldGSD8bhyuxvlVUwbeLOGynkunvlTMxchC5urrKndYiwCFC0DLVjpOCA==
   dependencies:
     detect-newline "^3.1.0"
 
-jest-each@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.0.5.tgz#5962264ff246cd757ba44db096c1bc5b4835173e"
-  integrity sha512-dKjRsx1uZ96TVyejD3/aAWcNKy6ajMaN531CwWIsrazIqIoXI9TnnpPlkrEYku/8rkS3dh2rbH+kMOyiEIv0xQ==
+jest-each@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-30.2.0.tgz#39e623ae71641c2ac3ee69b3ba3d258fce8e768d"
+  integrity sha512-lpWlJlM7bCUf1mfmuqTA8+j2lNURW9eNafOy99knBM01i5CQeY5UH1vZjgT9071nDJac1M4XsbyI44oNOdhlDQ==
   dependencies:
-    "@jest/get-type" "30.0.1"
-    "@jest/types" "30.0.5"
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.2.0"
     chalk "^4.1.2"
-    jest-util "30.0.5"
-    pretty-format "30.0.5"
+    jest-util "30.2.0"
+    pretty-format "30.2.0"
 
-jest-environment-node@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.0.5.tgz#6a98dd80e0384ead67ed05643381395f6cda93c9"
-  integrity sha512-ppYizXdLMSvciGsRsMEnv/5EFpvOdXBaXRBzFUDPWrsfmog4kYrOGWXarLllz6AXan6ZAA/kYokgDWuos1IKDA==
+jest-environment-node@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-30.2.0.tgz#3def7980ebd2fd86e74efd4d2e681f55ab38da0f"
+  integrity sha512-ElU8v92QJ9UrYsKrxDIKCxu6PfNj4Hdcktcn0JX12zqNdqWHB0N+hwOnnBBXvjLd2vApZtuLUGs1QSY+MsXoNA==
   dependencies:
-    "@jest/environment" "30.0.5"
-    "@jest/fake-timers" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/environment" "30.2.0"
+    "@jest/fake-timers" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    jest-mock "30.0.5"
-    jest-util "30.0.5"
-    jest-validate "30.0.5"
+    jest-mock "30.2.0"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
 
 jest-get-type@^29.6.3:
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
   integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
 
-jest-haste-map@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.0.5.tgz#fdd0daa322b02eb34267854cff2859fae21e92a6"
-  integrity sha512-dkmlWNlsTSR0nH3nRfW5BKbqHefLZv0/6LCccG0xFCTWcJu8TuEwG+5Cm75iBfjVoockmO6J35o5gxtFSn5xeg==
+jest-haste-map@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-30.2.0.tgz#808e3889f288603ac70ff0ac047598345a66022e"
+  integrity sha512-sQA/jCb9kNt+neM0anSj6eZhLZUIhQgwDt7cPGjumgLM4rXsfb9kpnlacmvZz3Q5tb80nS+oG/if+NBKrHC+Xw==
   dependencies:
-    "@jest/types" "30.0.5"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
     anymatch "^3.1.3"
     fb-watchman "^2.0.2"
     graceful-fs "^4.2.11"
     jest-regex-util "30.0.1"
-    jest-util "30.0.5"
-    jest-worker "30.0.5"
+    jest-util "30.2.0"
+    jest-worker "30.2.0"
     micromatch "^4.0.8"
     walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.3"
 
-jest-leak-detector@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.0.5.tgz#00cfd2b323f48d8f4416b0a3e05fcf4c51f18864"
-  integrity sha512-3Uxr5uP8jmHMcsOtYMRB/zf1gXN3yUIc+iPorhNETG54gErFIiUhLvyY/OggYpSMOEYqsmRxmuU4ZOoX5jpRFg==
+jest-leak-detector@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-30.2.0.tgz#292fdca7b7c9cf594e1e570ace140b01d8beb736"
+  integrity sha512-M6jKAjyzjHG0SrQgwhgZGy9hFazcudwCNovY/9HPIicmNSBuockPSedAP9vlPK6ONFJ1zfyH/M2/YYJxOz5cdQ==
   dependencies:
-    "@jest/get-type" "30.0.1"
-    pretty-format "30.0.5"
+    "@jest/get-type" "30.1.0"
+    pretty-format "30.2.0"
 
-jest-matcher-utils@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.0.5.tgz#dff3334be58faea4a5e1becc228656fbbfc2467d"
-  integrity sha512-uQgGWt7GOrRLP1P7IwNWwK1WAQbq+m//ZY0yXygyfWp0rJlksMSLQAA4wYQC3b6wl3zfnchyTx+k3HZ5aPtCbQ==
+jest-matcher-utils@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-30.2.0.tgz#69a0d4c271066559ec8b0d8174829adc3f23a783"
+  integrity sha512-dQ94Nq4dbzmUWkQ0ANAWS9tBRfqCrn0bV9AMYdOi/MHW726xn7eQmMeRTpX2ViC00bpNaWXq+7o4lIQ3AX13Hg==
   dependencies:
-    "@jest/get-type" "30.0.1"
+    "@jest/get-type" "30.1.0"
     chalk "^4.1.2"
-    jest-diff "30.0.5"
-    pretty-format "30.0.5"
+    jest-diff "30.2.0"
+    pretty-format "30.2.0"
 
 jest-matcher-utils@^29.7.0:
   version "29.7.0"
@@ -9359,18 +10257,18 @@ jest-matcher-utils@^29.7.0:
     jest-get-type "^29.6.3"
     pretty-format "^29.7.0"
 
-jest-message-util@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.0.5.tgz#dd12ffec91dd3fa6a59cbd538a513d8e239e070c"
-  integrity sha512-NAiDOhsK3V7RU0Aa/HnrQo+E4JlbarbmI3q6Pi4KcxicdtjV82gcIUrejOtczChtVQR4kddu1E1EJlW6EN9IyA==
+jest-message-util@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-30.2.0.tgz#fc97bf90d11f118b31e6131e2b67fc4f39f92152"
+  integrity sha512-y4DKFLZ2y6DxTWD4cDe07RglV88ZiNEdlRfGtqahfbIjfsw1nMCPx49Uev4IA/hWn3sDKyAnSPwoYSsAEdcimw==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@jest/types" "30.0.5"
+    "@jest/types" "30.2.0"
     "@types/stack-utils" "^2.0.3"
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
     micromatch "^4.0.8"
-    pretty-format "30.0.5"
+    pretty-format "30.2.0"
     slash "^3.0.0"
     stack-utils "^2.0.6"
 
@@ -9389,14 +10287,14 @@ jest-message-util@^29.7.0:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.0.5.tgz#ef437e89212560dd395198115550085038570bdd"
-  integrity sha512-Od7TyasAAQX/6S+QCbN6vZoWOMwlTtzzGuxJku1GhGanAjz9y+QsQkpScDmETvdc9aSXyJ/Op4rhpMYBWW91wQ==
+jest-mock@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-30.2.0.tgz#69f991614eeb4060189459d3584f710845bff45e"
+  integrity sha512-JNNNl2rj4b5ICpmAcq+WbLH83XswjPbjH4T7yvGzfAGCPh1rw+xVNbtk+FnRslvt9lkCcdn9i1oAoKUuFsOxRw==
   dependencies:
-    "@jest/types" "30.0.5"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
-    jest-util "30.0.5"
+    jest-util "30.2.0"
 
 jest-pnp-resolver@^1.2.3:
   version "1.2.3"
@@ -9408,117 +10306,117 @@ jest-regex-util@30.0.1:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-30.0.1.tgz#f17c1de3958b67dfe485354f5a10093298f2a49b"
   integrity sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==
 
-jest-resolve-dependencies@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.0.5.tgz#53be4c51d296c84a0e75608e7b77b6fe92dbac29"
-  integrity sha512-/xMvBR4MpwkrHW4ikZIWRttBBRZgWK4d6xt3xW1iRDSKt4tXzYkMkyPfBnSCgv96cpkrctfXs6gexeqMYqdEpw==
+jest-resolve-dependencies@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-30.2.0.tgz#3370e2c0b49cc560f6a7e8ec3a59dd99525e1a55"
+  integrity sha512-xTOIGug/0RmIe3mmCqCT95yO0vj6JURrn1TKWlNbhiAefJRWINNPgwVkrVgt/YaerPzY3iItufd80v3lOrFJ2w==
   dependencies:
     jest-regex-util "30.0.1"
-    jest-snapshot "30.0.5"
+    jest-snapshot "30.2.0"
 
-jest-resolve@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.0.5.tgz#f52f91600070b7073db465dc553eee5471ea8e06"
-  integrity sha512-d+DjBQ1tIhdz91B79mywH5yYu76bZuE96sSbxj8MkjWVx5WNdt1deEFRONVL4UkKLSrAbMkdhb24XN691yDRHg==
+jest-resolve@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-30.2.0.tgz#2e2009cbd61e8f1f003355d5ec87225412cebcd7"
+  integrity sha512-TCrHSxPlx3tBY3hWNtRQKbtgLhsXa1WmbJEqBlTBrGafd5fiQFByy2GNCEoGR+Tns8d15GaL9cxEzKOO3GEb2A==
   dependencies:
     chalk "^4.1.2"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.0.5"
+    jest-haste-map "30.2.0"
     jest-pnp-resolver "^1.2.3"
-    jest-util "30.0.5"
-    jest-validate "30.0.5"
+    jest-util "30.2.0"
+    jest-validate "30.2.0"
     slash "^3.0.0"
     unrs-resolver "^1.7.11"
 
-jest-runner@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.0.5.tgz#5cbaaf85964246da4f65d697f186846f23cd9b5a"
-  integrity sha512-JcCOucZmgp+YuGgLAXHNy7ualBx4wYSgJVWrYMRBnb79j9PD0Jxh0EHvR5Cx/r0Ce+ZBC4hCdz2AzFFLl9hCiw==
-  dependencies:
-    "@jest/console" "30.0.5"
-    "@jest/environment" "30.0.5"
-    "@jest/test-result" "30.0.5"
-    "@jest/transform" "30.0.5"
-    "@jest/types" "30.0.5"
+jest-runner@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-30.2.0.tgz#c62b4c3130afa661789705e13a07bdbcec26a114"
+  integrity sha512-PqvZ2B2XEyPEbclp+gV6KO/F1FIFSbIwewRgmROCMBo/aZ6J1w8Qypoj2pEOcg3G2HzLlaP6VUtvwCI8dM3oqQ==
+  dependencies:
+    "@jest/console" "30.2.0"
+    "@jest/environment" "30.2.0"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
     chalk "^4.1.2"
     emittery "^0.13.1"
     exit-x "^0.2.2"
     graceful-fs "^4.2.11"
-    jest-docblock "30.0.1"
-    jest-environment-node "30.0.5"
-    jest-haste-map "30.0.5"
-    jest-leak-detector "30.0.5"
-    jest-message-util "30.0.5"
-    jest-resolve "30.0.5"
-    jest-runtime "30.0.5"
-    jest-util "30.0.5"
-    jest-watcher "30.0.5"
-    jest-worker "30.0.5"
+    jest-docblock "30.2.0"
+    jest-environment-node "30.2.0"
+    jest-haste-map "30.2.0"
+    jest-leak-detector "30.2.0"
+    jest-message-util "30.2.0"
+    jest-resolve "30.2.0"
+    jest-runtime "30.2.0"
+    jest-util "30.2.0"
+    jest-watcher "30.2.0"
+    jest-worker "30.2.0"
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.0.5.tgz#d6a7e22687264240d1786d6f7682ac6a2872e552"
-  integrity sha512-7oySNDkqpe4xpX5PPiJTe5vEa+Ak/NnNz2bGYZrA1ftG3RL3EFlHaUkA1Cjx+R8IhK0Vg43RML5mJedGTPNz3A==
+jest-runtime@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-30.2.0.tgz#395ea792cde048db1b0cd1a92dc9cb9f1921bf8a"
+  integrity sha512-p1+GVX/PJqTucvsmERPMgCPvQJpFt4hFbM+VN3n8TMo47decMUcJbt+rgzwrEme0MQUA/R+1de2axftTHkKckg==
   dependencies:
-    "@jest/environment" "30.0.5"
-    "@jest/fake-timers" "30.0.5"
-    "@jest/globals" "30.0.5"
+    "@jest/environment" "30.2.0"
+    "@jest/fake-timers" "30.2.0"
+    "@jest/globals" "30.2.0"
     "@jest/source-map" "30.0.1"
-    "@jest/test-result" "30.0.5"
-    "@jest/transform" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/test-result" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
     chalk "^4.1.2"
     cjs-module-lexer "^2.1.0"
     collect-v8-coverage "^1.0.2"
     glob "^10.3.10"
     graceful-fs "^4.2.11"
-    jest-haste-map "30.0.5"
-    jest-message-util "30.0.5"
-    jest-mock "30.0.5"
+    jest-haste-map "30.2.0"
+    jest-message-util "30.2.0"
+    jest-mock "30.2.0"
     jest-regex-util "30.0.1"
-    jest-resolve "30.0.5"
-    jest-snapshot "30.0.5"
-    jest-util "30.0.5"
+    jest-resolve "30.2.0"
+    jest-snapshot "30.2.0"
+    jest-util "30.2.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.0.5.tgz#6600716eef2e6d8ea1dd788ae4385f3a2791b11f"
-  integrity sha512-T00dWU/Ek3LqTp4+DcW6PraVxjk28WY5Ua/s+3zUKSERZSNyxTqhDXCWKG5p2HAJ+crVQ3WJ2P9YVHpj1tkW+g==
+jest-snapshot@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-30.2.0.tgz#266fbbb4b95fc4665ce6f32f1f38eeb39f4e26d0"
+  integrity sha512-5WEtTy2jXPFypadKNpbNkZ72puZCa6UjSr/7djeecHWOu7iYhSXSnHScT8wBz3Rn8Ena5d5RYRcsyKIeqG1IyA==
   dependencies:
     "@babel/core" "^7.27.4"
     "@babel/generator" "^7.27.5"
     "@babel/plugin-syntax-jsx" "^7.27.1"
     "@babel/plugin-syntax-typescript" "^7.27.1"
     "@babel/types" "^7.27.3"
-    "@jest/expect-utils" "30.0.5"
-    "@jest/get-type" "30.0.1"
-    "@jest/snapshot-utils" "30.0.5"
-    "@jest/transform" "30.0.5"
-    "@jest/types" "30.0.5"
-    babel-preset-current-node-syntax "^1.1.0"
+    "@jest/expect-utils" "30.2.0"
+    "@jest/get-type" "30.1.0"
+    "@jest/snapshot-utils" "30.2.0"
+    "@jest/transform" "30.2.0"
+    "@jest/types" "30.2.0"
+    babel-preset-current-node-syntax "^1.2.0"
     chalk "^4.1.2"
-    expect "30.0.5"
+    expect "30.2.0"
     graceful-fs "^4.2.11"
-    jest-diff "30.0.5"
-    jest-matcher-utils "30.0.5"
-    jest-message-util "30.0.5"
-    jest-util "30.0.5"
-    pretty-format "30.0.5"
+    jest-diff "30.2.0"
+    jest-matcher-utils "30.2.0"
+    jest-message-util "30.2.0"
+    jest-util "30.2.0"
+    pretty-format "30.2.0"
     semver "^7.7.2"
     synckit "^0.11.8"
 
-jest-util@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.0.5.tgz#035d380c660ad5f1748dff71c4105338e05f8669"
-  integrity sha512-pvyPWssDZR0FlfMxCBoc0tvM8iUEskaRFALUtGQYzVEAqisAztmy+R8LnU14KT4XA0H/a5HMVTXat1jLne010g==
+jest-util@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-30.2.0.tgz#5142adbcad6f4e53c2776c067a4db3c14f913705"
+  integrity sha512-QKNsM0o3Xe6ISQU869e+DhG+4CK/48aHYdJZGlFQVTjnbvgpcKyxpzk29fGiO7i/J8VENZ+d2iGnSsvmuHywlA==
   dependencies:
-    "@jest/types" "30.0.5"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
     chalk "^4.1.2"
     ci-info "^4.2.0"
@@ -9537,40 +10435,40 @@ jest-util@^29.7.0:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.0.5.tgz#d26fd218b8d566bff48fd98880b8ea94fd0d8456"
-  integrity sha512-ouTm6VFHaS2boyl+k4u+Qip4TSH7Uld5tyD8psQ8abGgt2uYYB8VwVfAHWHjHc0NWmGGbwO5h0sCPOGHHevefw==
+jest-validate@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-30.2.0.tgz#273eaaed4c0963b934b5b31e96289edda6e0a2ef"
+  integrity sha512-FBGWi7dP2hpdi8nBoWxSsLvBFewKAg0+uSQwBaof4Y4DPgBabXgpSYC5/lR7VmnIlSpASmCi/ntRWPbv7089Pw==
   dependencies:
-    "@jest/get-type" "30.0.1"
-    "@jest/types" "30.0.5"
+    "@jest/get-type" "30.1.0"
+    "@jest/types" "30.2.0"
     camelcase "^6.3.0"
     chalk "^4.1.2"
     leven "^3.1.0"
-    pretty-format "30.0.5"
+    pretty-format "30.2.0"
 
-jest-watcher@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.0.5.tgz#90db6e3f582b88085bde58f7555cbdd3a1beb10d"
-  integrity sha512-z9slj/0vOwBDBjN3L4z4ZYaA+pG56d6p3kTUhFRYGvXbXMWhXmb/FIxREZCD06DYUwDKKnj2T80+Pb71CQ0KEg==
+jest-watcher@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-30.2.0.tgz#f9c055de48e18c979e7756a3917e596e2d69b07b"
+  integrity sha512-PYxa28dxJ9g777pGm/7PrbnMeA0Jr7osHP9bS7eJy9DuAjMgdGtxgf0uKMyoIsTWAkIbUW5hSDdJ3urmgXBqxg==
   dependencies:
-    "@jest/test-result" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/test-result" "30.2.0"
+    "@jest/types" "30.2.0"
     "@types/node" "*"
     ansi-escapes "^4.3.2"
     chalk "^4.1.2"
     emittery "^0.13.1"
-    jest-util "30.0.5"
+    jest-util "30.2.0"
     string-length "^4.0.2"
 
-jest-worker@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.0.5.tgz#0b85cbab10610303e8d84e214f94d8f052c3cd04"
-  integrity sha512-ojRXsWzEP16NdUuBw/4H/zkZdHOa7MMYCk4E430l+8fELeLg/mqmMlRhjL7UNZvQrDmnovWZV4DxX03fZF48fQ==
+jest-worker@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-30.2.0.tgz#fd5c2a36ff6058ec8f74366ec89538cc99539d26"
+  integrity sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g==
   dependencies:
     "@types/node" "*"
     "@ungap/structured-clone" "^1.3.0"
-    jest-util "30.0.5"
+    jest-util "30.2.0"
     merge-stream "^2.0.0"
     supports-color "^8.1.1"
 
@@ -9584,16 +10482,16 @@ jest-worker@^27.4.5:
     supports-color "^8.0.0"
 
 jest@^30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-30.0.5.tgz#ee62729fb77829790d67c660d852350fbde315ce"
-  integrity sha512-y2mfcJywuTUkvLm2Lp1/pFX8kTgMO5yyQGq/Sk/n2mN7XWYp4JsCZ/QXW34M8YScgk8bPZlREH04f6blPnoHnQ==
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-30.2.0.tgz#9f0a71e734af968f26952b5ae4b724af82681630"
+  integrity sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==
   dependencies:
-    "@jest/core" "30.0.5"
-    "@jest/types" "30.0.5"
+    "@jest/core" "30.2.0"
+    "@jest/types" "30.2.0"
     import-local "^3.2.0"
-    jest-cli "30.0.5"
+    jest-cli "30.2.0"
 
-jiti@^1.21.6:
+jiti@^1.21.7:
   version "1.21.7"
   resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.7.tgz#9dd81043424a3d28458b193d965f0d18a2300ba9"
   integrity sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==
@@ -9618,26 +10516,21 @@ js-stringify@^1.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@4.1.1, js-yaml@^4.1.0, js-yaml@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
+  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
+  dependencies:
+    argparse "^2.0.1"
+
 js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0"
+  integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0, js-yaml@~4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-jsbn@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
-  integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
-
 jsdom@^26.1.0:
   version "26.1.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-26.1.0.tgz#ab5f1c1cafc04bd878725490974ea5e8bf0c72b3"
@@ -9664,16 +10557,11 @@ jsdom@^26.1.0:
     ws "^8.18.0"
     xml-name-validator "^5.0.0"
 
-jsesc@^3.0.2:
+jsesc@^3.0.2, jsesc@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
   integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
 
-jsesc@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
-  integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
-
 json-bigint@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/json-bigint/-/json-bigint-1.0.0.tgz#ae547823ac0cad8398667f8cd9ef4730f5b01ff1"
@@ -9756,15 +10644,15 @@ jsonc-parser@3.3.1:
   integrity sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==
 
 jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.2.0.tgz#7c265bd1b65de6977478300087c99f1c84383f62"
+  integrity sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==
   dependencies:
     universalify "^2.0.0"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonwebtoken@9.0.2, jsonwebtoken@^9.0.0:
+jsonwebtoken@9.0.2:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz#65ff91f4abef1784697d40952bb1998c504caaf3"
   integrity sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==
@@ -9780,7 +10668,7 @@ jsonwebtoken@9.0.2, jsonwebtoken@^9.0.0:
     ms "^2.1.1"
     semver "^7.5.4"
 
-jsonwebtoken@^9.0.2:
+jsonwebtoken@^9.0.0, jsonwebtoken@^9.0.2:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz#6cd57ab01e9b0ac07cb847d53d3c9b6ee31f7ae2"
   integrity sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==
@@ -9814,7 +10702,7 @@ jstransformer@1.0.0:
     object.assign "^4.1.4"
     object.values "^1.1.6"
 
-jwa@^1.4.1:
+jwa@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.2.tgz#16011ac6db48de7b102777e57897901520eec7b9"
   integrity sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==
@@ -9823,7 +10711,7 @@ jwa@^1.4.1:
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
-jwa@^2.0.0, jwa@^2.0.1:
+jwa@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.1.tgz#bf8176d1ad0cd72e0f3f58338595a13e110bc804"
   integrity sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==
@@ -9833,22 +10721,14 @@ jwa@^2.0.0, jwa@^2.0.1:
     safe-buffer "^5.0.1"
 
 jws@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
-  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
-  dependencies:
-    jwa "^1.4.1"
-    safe-buffer "^5.0.1"
-
-jws@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"
-  integrity sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.3.tgz#5ac0690b460900a27265de24520526853c0b8ca1"
+  integrity sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==
   dependencies:
-    jwa "^2.0.0"
+    jwa "^1.4.2"
     safe-buffer "^5.0.1"
 
-jws@^4.0.1:
+jws@^4.0.0, jws@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.1.tgz#07edc1be8fac20e677b283ece261498bd38f0690"
   integrity sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==
@@ -9857,9 +10737,9 @@ jws@^4.0.1:
     safe-buffer "^5.0.1"
 
 katex@^0.16.0, katex@^0.16.22:
-  version "0.16.22"
-  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.22.tgz#d2b3d66464b1e6d69e6463b28a86ced5a02c5ccd"
-  integrity sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==
+  version "0.16.27"
+  resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.27.tgz#4ecf6f620e0ca1c1a5de722e85fcdcec49086a48"
+  integrity sha512-aeQoDkuRWSqQN6nSvVCEFvfXdqo1OQiCmmW1kc9xSdjutPv7BGO7pqY9sQRJpMOGrEdfDgF2TfRXe5eUAD2Waw==
   dependencies:
     commander "^8.3.0"
 
@@ -9870,12 +10750,12 @@ keyv@^4.5.4:
   dependencies:
     json-buffer "3.0.1"
 
-keyv@^5.3.3, keyv@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.5.0.tgz#0ad5037484a7e01b033df7018033b5cc9ca7884f"
-  integrity sha512-QG7qR2tijh1ftOvClut4YKKg1iW6cx3GZsKoGyJPxHkGWK9oJhG9P3j5deP0QQOGDowBMVQFaP+Vm4NpGYvmIQ==
+keyv@^5.3.3, keyv@^5.5.4, keyv@^5.5.5:
+  version "5.5.5"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-5.5.5.tgz#a975b32fc03e300a0e443c705b103d8b05220834"
+  integrity sha512-FA5LmZVF1VziNc0bIdCSA1IoSVnDCqE8HJIZZv2/W8YmoAM50+tnUgJR/gQZwEeIMleuIOnRnHA/UaZRNeV4iQ==
   dependencies:
-    "@keyv/serialize" "^1.1.0"
+    "@keyv/serialize" "^1.1.1"
 
 language-subtag-registry@^0.3.20:
   version "0.3.23"
@@ -9908,11 +10788,11 @@ levn@^0.4.1:
     type-check "~0.4.0"
 
 libphonenumber-js@^1.11.1:
-  version "1.12.10"
-  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.12.10.tgz#525f7c9ffaea40c21463d3906f52ec3209ea5945"
-  integrity sha512-E91vHJD61jekHHR/RF/E83T/CMoaLXT7cwYA75T4gim4FZjnM6hbJjVIGg7chqlSqRsSvQ3izGmOjHy1SQzcGQ==
+  version "1.12.33"
+  resolved "https://registry.yarnpkg.com/libphonenumber-js/-/libphonenumber-js-1.12.33.tgz#c92ca21e5fe081ed978e8a3331511842f08fd5df"
+  integrity sha512-r9kw4OA6oDO4dPXkOrXTkArQAafIKAU71hChInV4FxZ69dxCfbwQGDPzqR5/vea94wU705/3AZroEbSoeVWrQw==
 
-lilconfig@^3.0.0, lilconfig@^3.1.3:
+lilconfig@^3.1.1, lilconfig@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4"
   integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==
@@ -9923,17 +10803,14 @@ lines-and-columns@^1.1.6:
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 lint-staged@^16.1.2:
-  version "16.1.5"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-16.1.5.tgz#e102066b2c98157bad03afffb491d2329553e86b"
-  integrity sha512-uAeQQwByI6dfV7wpt/gVqg+jAPaSp8WwOA8kKC/dv1qw14oGpnpAisY65ibGHUGDUv0rYaZ8CAJZ/1U8hUvC2A==
+  version "16.2.7"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-16.2.7.tgz#c4a635960c17b52fe774f1f40aee8ce1bd86531f"
+  integrity sha512-lDIj4RnYmK7/kXMya+qJsmkRFkGolciXjrsZ6PC25GdTfWOAWetR0ZbsNXRAj1EHHImRSalc+whZFg56F5DVow==
   dependencies:
-    chalk "^5.5.0"
-    commander "^14.0.0"
-    debug "^4.4.1"
-    lilconfig "^3.1.3"
-    listr2 "^9.0.1"
+    commander "^14.0.2"
+    listr2 "^9.0.5"
     micromatch "^4.0.8"
-    nano-spawn "^1.0.2"
+    nano-spawn "^2.0.0"
     pidtree "^0.6.0"
     string-argv "^0.3.2"
     yaml "^2.8.1"
@@ -9946,12 +10823,12 @@ list-stylesheets@^2.0.1:
     cheerio "1.0.0"
     pick-util "^1.1.5"
 
-listr2@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-9.0.1.tgz#3cad12d81d998f8024621d9b35c969dba5da4103"
-  integrity sha512-SL0JY3DaxylDuo/MecFeiC+7pedM0zia33zl0vcjgwcq1q1FWWF1To9EIauPbl8GbMCU0R2e0uJ8bZunhYKD2g==
+listr2@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/listr2/-/listr2-9.0.5.tgz#92df7c4416a6da630eb9ef46da469b70de97b316"
+  integrity sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==
   dependencies:
-    cli-truncate "^4.0.0"
+    cli-truncate "^5.0.0"
     colorette "^2.0.20"
     eventemitter3 "^5.0.1"
     log-update "^6.1.0"
@@ -9959,9 +10836,9 @@ listr2@^9.0.1:
     wrap-ansi "^9.0.0"
 
 loader-runner@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
-  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.1.tgz#6c76ed29b0ccce9af379208299f07f876de737e3"
+  integrity sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==
 
 locate-path@^3.0.0:
   version "3.0.0"
@@ -10139,6 +11016,7 @@ lru-cache@^7.14.1:
   version "0.1.0"
   resolved "https://codeload.github.com/bhunt02/lti-typescript/tar.gz/c450a985b74fcf4c0069543402cae6b3961082e9"
   dependencies:
+    axios "^1.12.2"
     body-parser "^1.20.2"
     cookie-parser "^1.4.7"
     cors "^2.8.5"
@@ -10179,11 +11057,11 @@ magic-string@0.30.8:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
 magic-string@^0.30.3:
-  version "0.30.17"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.17.tgz#450a449673d2460e5bbcfba9a61916a1714c7453"
-  integrity sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==
+  version "0.30.21"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.21.tgz#56763ec09a0fa8091df27879fd94d19078c00d91"
+  integrity sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==
   dependencies:
-    "@jridgewell/sourcemap-codec" "^1.5.0"
+    "@jridgewell/sourcemap-codec" "^1.5.5"
 
 make-dir@^2.1.0:
   version "2.1.0"
@@ -10399,9 +11277,9 @@ mdast-util-phrasing@^4.0.0:
     unist-util-is "^6.0.0"
 
 mdast-util-to-hast@^13.0.0:
-  version "13.2.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz#5ca58e5b921cc0a3ded1bc02eed79a4fe4fe41f4"
-  integrity sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==
+  version "13.2.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz#d7ff84ca499a57e2c060ae67548ad950e689a053"
+  integrity sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==
   dependencies:
     "@types/hast" "^3.0.0"
     "@types/mdast" "^4.0.0"
@@ -10800,10 +11678,10 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.24, mime-types@~2.1.34:
   dependencies:
     mime-db "1.52.0"
 
-mime-types@^3.0.0, mime-types@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-3.0.1.tgz#b1d94d6997a9b32fd69ebaed0db73de8acb519ce"
-  integrity sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA==
+mime-types@^3.0.0, mime-types@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-3.0.2.tgz#39002d4182575d5af036ffa118100f2524b2e2ab"
+  integrity sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==
   dependencies:
     mime-db "^1.54.0"
 
@@ -10975,20 +11853,25 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nano-spawn@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nano-spawn/-/nano-spawn-1.0.2.tgz#9853795681f0e96ef6f39104c2e4347b6ba79bf6"
-  integrity sha512-21t+ozMQDAL/UGgQVBbZ/xXvNO10++ZPuTmKRO8k9V3AClVRht49ahtDjfY8l1q6nSHOrE5ASfthzH3ol6R/hg==
+nano-spawn@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/nano-spawn/-/nano-spawn-2.0.0.tgz#f1250434c09ae18870d4f729fc54b406cf85a3e1"
+  integrity sha512-tacvGzUY5o2D8CBh2rrwxyNojUsZNU2zjNTzKQrkgGJQTbGAfArVWXSKMBokBeeg6C7OLRGUEyoFlYbfeWQIqw==
 
-nanoid@^3.3.11, nanoid@^3.3.6, nanoid@^5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.1.5.tgz#f7597f9d9054eb4da9548cdd53ca70f1790e87de"
-  integrity sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==
+nanoid@^3.3.11, nanoid@^3.3.6:
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
+
+nanoid@^5.1.5:
+  version "5.1.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.1.6.tgz#30363f664797e7d40429f6c16946d6bd7a3f26c9"
+  integrity sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==
 
 napi-postinstall@^0.3.0:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/napi-postinstall/-/napi-postinstall-0.3.2.tgz#03c62080e88b311c4d7423b0f15f0c920bbcc626"
-  integrity sha512-tWVJxJHmBWLy69PvO96TZMZDrzmw5KeiZBz3RHmiM2XZ9grBJ2WgMAFVVg25nqp3ZjTFUs2Ftw1JhscL3Teliw==
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/napi-postinstall/-/napi-postinstall-0.3.4.tgz#7af256d6588b5f8e952b9190965d6b019653bbb9"
+  integrity sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -11033,11 +11916,11 @@ netmask@^2.0.2:
   integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
 
 next@^15.3.6:
-  version "15.5.7"
-  resolved "https://registry.yarnpkg.com/next/-/next-15.5.7.tgz#4507700b2bbcaf2c9fb7a9ad25c0dac2ba4a9a75"
-  integrity sha512-+t2/0jIJ48kUpGKkdlhgkv+zPTEOoXyr60qXe68eB/pl3CMJaLeIGjzp5D6Oqt25hCBiBTt8wEeeAzfJvUKnPQ==
+  version "15.5.9"
+  resolved "https://registry.yarnpkg.com/next/-/next-15.5.9.tgz#1b80d05865cc27e710fb4dcfc6fd9e726ed12ad4"
+  integrity sha512-agNLK89seZEtC5zUHwtut0+tNrc0Xw4FT/Dg+B/VLEo9pAcS9rtTKpek3V6kVcVwsB2YlqMaHdfZL4eLEVYuCg==
   dependencies:
-    "@next/env" "15.5.7"
+    "@next/env" "15.5.9"
     "@swc/helpers" "0.5.15"
     caniuse-lite "^1.0.30001579"
     postcss "8.4.31"
@@ -11054,9 +11937,9 @@ next@^15.3.6:
     sharp "^0.34.3"
 
 node-abi@^3.73.0:
-  version "3.75.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.75.0.tgz#2f929a91a90a0d02b325c43731314802357ed764"
-  integrity sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==
+  version "3.85.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.85.0.tgz#b115d575e52b2495ef08372b058e13d202875a7d"
+  integrity sha512-zsFhmbkAzwhTft6nd3VxcG0cvJsT70rL+BIGHWVq5fi6MwGrHwzqKaxXE+Hl2GmnGItnDKPPkO5/LQqjVkIdFg==
   dependencies:
     semver "^7.3.5"
 
@@ -11094,10 +11977,10 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.19:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314"
-  integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==
+node-releases@^2.0.27:
+  version "2.0.27"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e"
+  integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
 
 nodemailer@^6.8.0:
   version "6.10.1"
@@ -11156,9 +12039,9 @@ nth-check@^2.0.1, nth-check@^2.1.1:
     boolbase "^1.0.0"
 
 nwsapi@^2.2.16:
-  version "2.2.21"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.21.tgz#8df7797079350adda208910d8c33fc4c2d7520c3"
-  integrity sha512-o6nIY3qwiSXl7/LuOU0Dmuctd34Yay0yeuZRLFmDPrrdHpXKFndPj3hM+YEPVHYC5fx2otBx4Ilc/gyYSAUaIA==
+  version "2.2.23"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.23.tgz#59712c3a88e6de2bb0b6ccc1070397267019cf6c"
+  integrity sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==
 
 object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
@@ -11576,10 +12459,10 @@ path-to-regexp@3.3.0:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.3.0.tgz#f7f31d32e8518c2660862b644414b6d5c63a611b"
   integrity sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==
 
-path-to-regexp@8.2.0, path-to-regexp@^8.0.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.2.0.tgz#73990cc29e57a3ff2a0d914095156df5db79e8b4"
-  integrity sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==
+path-to-regexp@8.3.0, path-to-regexp@^8.0.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.3.0.tgz#aa818a6981f99321003a08987d3cec9c3474cd1f"
+  integrity sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==
 
 path-to-regexp@~0.1.12:
   version "0.1.12"
@@ -11701,7 +12584,7 @@ picomatch@^3.0.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-3.0.1.tgz#817033161def55ec9638567a2f3bbc876b3e7516"
   integrity sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==
 
-picomatch@^4.0.2:
+picomatch@^4.0.2, picomatch@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042"
   integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==
@@ -11711,6 +12594,13 @@ pidtree@^0.6.0:
   resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
   integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
 
+pidusage@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-3.0.2.tgz#6faa5402b2530b3af2cf93d13bcf202889724a53"
+  integrity sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w==
+  dependencies:
+    safe-buffer "^5.2.1"
+
 pidusage@^2.0.21:
   version "2.0.21"
   resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-2.0.21.tgz#7068967b3d952baea73e57668c98b9eaa876894e"
@@ -11718,13 +12608,6 @@ pidusage@^2.0.21:
   dependencies:
     safe-buffer "^5.2.1"
 
-pidusage@~3.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/pidusage/-/pidusage-3.0.2.tgz#6faa5402b2530b3af2cf93d13bcf202889724a53"
-  integrity sha512-g0VU+y08pKw5M8EZ2rIGiEBaB8wrQMjYGFfW2QVIfyT8V+fq8YFLkvlz4bz5ljvFDJYNFCWT3PWqcRr2FKO81w==
-  dependencies:
-    safe-buffer "^5.2.1"
-
 pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -11806,36 +12689,36 @@ pm2-sysmonit@^1.2.8:
     tx2 "~1.0.4"
 
 pm2@^6.0.8:
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/pm2/-/pm2-6.0.8.tgz#4b84e9a683eff46f4b9cbb164692cb3f9f4d475a"
-  integrity sha512-y7sO+UuGjfESK/ChRN+efJKAsHrBd95GY2p1GQfjVTtOfFtUfiW0NOuUhP5dN5QTF2F0EWcepgkLqbF32j90Iw==
+  version "6.0.14"
+  resolved "https://registry.yarnpkg.com/pm2/-/pm2-6.0.14.tgz#c606444e2d3259b25643527f4c75136f6c003ac7"
+  integrity sha512-wX1FiFkzuT2H/UUEA8QNXDAA9MMHDsK/3UHj6Dkd5U7kxyigKDA5gyDw78ycTQZAuGCLWyUX5FiXEuVQWafukA==
   dependencies:
     "@pm2/agent" "~2.1.1"
+    "@pm2/blessed" "0.1.81"
     "@pm2/io" "~6.1.0"
     "@pm2/js-api" "~0.8.0"
-    "@pm2/pm2-version-check" latest
+    "@pm2/pm2-version-check" "^1.0.4"
     ansis "4.0.0-node10"
-    async "~3.2.6"
-    blessed "0.1.81"
-    chokidar "^3.5.3"
-    cli-tableau "^2.0.0"
+    async "3.2.6"
+    chokidar "3.6.0"
+    cli-tableau "2.0.1"
     commander "2.15.1"
-    croner "~4.1.92"
-    dayjs "~1.11.13"
-    debug "^4.3.7"
+    croner "4.1.97"
+    dayjs "1.11.15"
+    debug "4.4.3"
     enquirer "2.3.6"
     eventemitter2 "5.0.1"
     fclone "1.0.11"
-    js-yaml "~4.1.0"
+    js-yaml "4.1.1"
     mkdirp "1.0.4"
     needle "2.4.0"
-    pidusage "~3.0"
+    pidusage "3.0.2"
     pm2-axon "~4.0.1"
     pm2-axon-rpc "~0.7.1"
     pm2-deploy "~1.0.2"
     pm2-multimeter "^0.1.2"
-    promptly "^2"
-    semver "^7.6.2"
+    promptly "2.2.0"
+    semver "7.7.2"
     source-map-support "0.5.21"
     sprintf-js "1.1.2"
     vizion "~2.2.1"
@@ -11857,19 +12740,18 @@ postcss-import@^15.1.0:
     resolve "^1.1.7"
 
 postcss-js@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2"
-  integrity sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.1.0.tgz#003b63c6edde948766e40f3daf7e997ae43a5ce6"
+  integrity sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==
   dependencies:
     camelcase-css "^2.0.1"
 
-postcss-load-config@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.2.tgz#7159dcf626118d33e299f485d6afe4aff7c4a3e3"
-  integrity sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==
+"postcss-load-config@^4.0.2 || ^5.0 || ^6.0":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-6.0.1.tgz#6fd7dcd8ae89badcf1b2d644489cbabf83aa8096"
+  integrity sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==
   dependencies:
-    lilconfig "^3.0.0"
-    yaml "^2.3.4"
+    lilconfig "^3.1.1"
 
 postcss-nested@^6.2.0:
   version "6.2.0"
@@ -11915,9 +12797,9 @@ postgres-array@~2.0.0:
   integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==
 
 postgres-bytea@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
-  integrity sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.1.tgz#c40b3da0222c500ff1e51c5d7014b60b79697c7a"
+  integrity sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==
 
 postgres-date@~1.0.4:
   version "1.0.7"
@@ -11947,14 +12829,14 @@ prettier-plugin-tailwindcss@^0.5.6:
   integrity sha512-Puaz+wPUAhFp8Lo9HuciYKM2Y2XExESjeT+9NQoVFXZsPPnc9VYss2SpxdQ6vbatmt8/4+SN0oe0I1cPDABg9Q==
 
 prettier@^3.0.3:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
-  integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.7.4.tgz#d2f8335d4b1cec47e1c8098645411b0c9dff9c0f"
+  integrity sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==
 
-pretty-format@30.0.5:
-  version "30.0.5"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.0.5.tgz#e001649d472800396c1209684483e18a4d250360"
-  integrity sha512-D1tKtYvByrBkFLe2wHJl2bwMJIiT8rW+XA+TiataH79/FszLQMrpGEvzUVkzPau7OCO0Qnrhpe87PqtOAIB8Yw==
+pretty-format@30.2.0:
+  version "30.2.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-30.2.0.tgz#2d44fe6134529aed18506f6d11509d8a62775ebe"
+  integrity sha512-9uBdv/B4EefsuAL+pWqueZyZS2Ba+LxfFeQ9DN14HU4bN8bhaxKdkpjpB6fs9+pSjIBu+FXQHImEg8j/Lw0+vA==
   dependencies:
     "@jest/schemas" "30.0.5"
     ansi-styles "^5.2.0"
@@ -11995,11 +12877,16 @@ pretty-quick@^4.2.2:
     tinyexec "^0.3.2"
     tslib "^2.8.1"
 
-prismjs@^1.27.0, prismjs@^1.30.0, prismjs@~1.27.0:
+prismjs@^1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.30.0.tgz#d9709969d9d4e16403f6f348c63553b19f0975a9"
   integrity sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==
 
+prismjs@~1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
+  integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -12017,7 +12904,7 @@ promise@^7.0.1:
   dependencies:
     asap "~2.0.3"
 
-promptly@^2:
+promptly@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/promptly/-/promptly-2.2.0.tgz#2a13fa063688a2a5983b161fff0108a07d26fc74"
   integrity sha512-aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA==
@@ -12199,9 +13086,9 @@ pure-rand@^7.0.0:
   integrity sha512-oTUZM/NAZS8p7ANR3SHh30kXB+zK2r2BPcEn/awJIbOvq82WoMN4p62AWWp3Hhw50G0xMsw1mhIBLqHw64EcNQ==
 
 qs@^6.11.0, qs@^6.14.0, qs@^6.5.1, qs@~6.14.0:
-  version "6.14.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
-  integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
+  version "6.14.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.1.tgz#a41d85b9d3902f31d27861790506294881871159"
+  integrity sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==
   dependencies:
     side-channel "^1.1.0"
 
@@ -12232,15 +13119,15 @@ rasha@^1.2.5:
   resolved "https://registry.yarnpkg.com/rasha/-/rasha-1.2.5.tgz#72668da31dcc68ac277c5b73d610e087cd33b031"
   integrity sha512-KxtX+/fBk+wM7O3CNgwjSh5elwFilLvqWajhr6wFr2Hd63JnKTTi43Tw+Jb1hxJQWOwoya+NZWR2xztn3hCrTw==
 
-raw-body@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-3.0.0.tgz#25b3476f07a51600619dae3fe82ddc28a36e5e0f"
-  integrity sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==
+raw-body@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-3.0.2.tgz#3e3ada5ae5568f9095d84376fd3a49b8fb000a51"
+  integrity sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==
   dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.6.3"
-    unpipe "1.0.0"
+    bytes "~3.1.2"
+    http-errors "~2.0.1"
+    iconv-lite "~0.7.0"
+    unpipe "~1.0.0"
 
 raw-body@~2.5.3:
   version "2.5.3"
@@ -12319,10 +13206,10 @@ rc-dropdown@~4.2.0, rc-dropdown@~4.2.1:
     classnames "^2.2.6"
     rc-util "^5.44.1"
 
-rc-field-form@~2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-2.7.0.tgz#22413e793f35bfc1f35b0ec462774d7277f5a399"
-  integrity sha512-hgKsCay2taxzVnBPZl+1n4ZondsV78G++XVsMIJCAoioMjlMQR9YwAp7JZDIECzIu2Z66R+f4SFIRrO2DjDNAA==
+rc-field-form@~2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-2.7.1.tgz#8bb1d7c6bf40e2b99b494816972252c327d9b5a0"
+  integrity sha512-vKeSifSJ6HoLaAB+B8aq/Qgm8a3dyxROzCtKNCsBQgiverpc4kWDQihoUwzUj+zNWJOykwSY4dNX3QrGwtVb9A==
   dependencies:
     "@babel/runtime" "^7.18.0"
     "@rc-component/async-validator" "^5.0.3"
@@ -12405,9 +13292,9 @@ rc-notification@~5.6.4:
     rc-util "^5.20.1"
 
 rc-overflow@^1.3.1, rc-overflow@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.4.1.tgz#e1bcf0375979c24cffa2d87bf83a19ded5fcdf45"
-  integrity sha512-3MoPQQPV1uKyOMVNd6SZfONi+f3st0r8PksexIdBTeIYbMX0Jr+k7pHEDvsXtR4BpCv90/Pv2MovVNhktKrwvw==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.5.0.tgz#02e58a15199e392adfcc87e0d6e9e7c8e57f2771"
+  integrity sha512-Lm/v9h0LymeUYJf0x39OveU52InkdRXqnn2aYXfWmo8WdOonIKB2kfau+GF0fWq6jPgtdO9yMqveGcK6aIhJmg==
   dependencies:
     "@babel/runtime" "^7.11.1"
     classnames "^2.2.1"
@@ -12464,9 +13351,9 @@ rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.0, rc-resize-observer@^1.3.1,
     resize-observer-polyfill "^1.5.1"
 
 rc-segmented@~2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/rc-segmented/-/rc-segmented-2.7.0.tgz#f56c2044abf8f03958b3a9a9d32987f10dcc4fc4"
-  integrity sha512-liijAjXz+KnTRVnxxXG2sYDGd6iLL7VpGGdR8gwoxAXy2KglviKCxLWZdjKYJzYzGSUwKDSTdYk8brj54Bn5BA==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rc-segmented/-/rc-segmented-2.7.1.tgz#08a598b14e755117c5b37d238955c2d50eaa5d33"
+  integrity sha512-izj1Nw/Dw2Vb7EVr+D/E9lUTkBe+kKC+SAFSU9zqr7WV2W5Ktaa9Gc7cB2jTqgk8GROJayltaec+DBlYKc6d+g==
   dependencies:
     "@babel/runtime" "^7.11.1"
     classnames "^2.2.1"
@@ -12486,10 +13373,10 @@ rc-select@~14.16.2, rc-select@~14.16.8:
     rc-util "^5.16.1"
     rc-virtual-list "^3.5.2"
 
-rc-slider@~11.1.8:
-  version "11.1.8"
-  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-11.1.8.tgz#cf3b30dacac8f98d44f7685f733f6f7da146fc06"
-  integrity sha512-2gg/72YFSpKP+Ja5AjC5DPL1YnV8DEITDQrcc1eASrUYjl0esptaBVJBh5nLTXCCp15eD8EuGjwezVGSHhs9tQ==
+rc-slider@~11.1.9:
+  version "11.1.9"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-11.1.9.tgz#d872130fbf4ec51f28543d62e90451091d6f5208"
+  integrity sha512-h8IknhzSh3FEM9u8ivkskh+Ef4Yo4JRIY2nj7MrH6GQmrwV6mcpJf5/4KgH5JaVI1H3E52yCdpOlVyGZIeph5A==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.5"
@@ -12513,10 +13400,10 @@ rc-switch@~4.1.0:
     classnames "^2.2.1"
     rc-util "^5.30.0"
 
-rc-table@~7.51.1:
-  version "7.51.1"
-  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.51.1.tgz#cd69ae3262d3b61e4c93c979c12786906e944691"
-  integrity sha512-5iq15mTHhvC42TlBLRCoCBLoCmGlbRZAlyF21FonFnS/DIC8DeRqnmdyVREwt2CFbPceM0zSNdEeVfiGaqYsKw==
+rc-table@~7.54.0:
+  version "7.54.0"
+  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.54.0.tgz#dedd4ea18d1189f2acdf90a80f04d8ca0111e16a"
+  integrity sha512-/wDTkki6wBTjwylwAGjpLKYklKo9YgjZwAU77+7ME5mBoS32Q4nAwoqhA2lSge6fobLW3Tap6uc5xfwaL2p0Sw==
   dependencies:
     "@babel/runtime" "^7.10.1"
     "@rc-component/context" "^1.4.0"
@@ -12525,10 +13412,10 @@ rc-table@~7.51.1:
     rc-util "^5.44.3"
     rc-virtual-list "^3.14.2"
 
-rc-tabs@~15.6.1:
-  version "15.6.1"
-  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-15.6.1.tgz#f0b6c65384dfa09a64eb539e86a0667c7a650708"
-  integrity sha512-/HzDV1VqOsUWyuC0c6AkxVYFjvx9+rFPKZ32ejxX0Uc7QCzcEjTA9/xMgv4HemPKwzBNX8KhGVbbumDjnj92aA==
+rc-tabs@~15.7.0:
+  version "15.7.0"
+  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-15.7.0.tgz#14ca2ee6213d00491a8b67ae26e2d35c256bf19a"
+  integrity sha512-ZepiE+6fmozYdWf/9gVp7k56PKHB1YYoDsKeQA1CBlJ/POIhjkcYiv0AGP0w2Jhzftd3AVvZP/K+V+Lpi2ankA==
   dependencies:
     "@babel/runtime" "^7.11.2"
     classnames "2.x"
@@ -12538,7 +13425,7 @@ rc-tabs@~15.6.1:
     rc-resize-observer "^1.0.0"
     rc-util "^5.34.1"
 
-rc-textarea@~1.10.0, rc-textarea@~1.10.1:
+rc-textarea@~1.10.0, rc-textarea@~1.10.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-1.10.2.tgz#459e3574a95c32939c6793045a1e4db04cb514cc"
   integrity sha512-HfaeXiaSlpiSp0I/pvWpecFEHpVysZ9tpDLNkxQbMvMz6gsr7aVZ7FpWP9kt4t7DB+jJXesYS0us1uPZnlRnwQ==
@@ -12581,10 +13468,10 @@ rc-tree@~5.13.0, rc-tree@~5.13.1:
     rc-util "^5.16.1"
     rc-virtual-list "^3.5.1"
 
-rc-upload@~4.9.2:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.9.2.tgz#297f52fd1b1c2a4b570c3e42444609b7530531bb"
-  integrity sha512-nHx+9rbd1FKMiMRYsqQ3NkXUv7COHPBo3X1Obwq9SWS6/diF/A0aJ5OHubvwUAIDs+4RMleljV0pcrNUc823GQ==
+rc-upload@~4.11.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.11.0.tgz#c2ced905a8b38b3e5c48493d388ca0e8373de18b"
+  integrity sha512-ZUyT//2JAehfHzjWowqROcwYJKnZkIUGWaTE/VogVrepSl7AFNbQf4+zGfX4zl9Vrj/Jm8scLO0R6UlPDKK4wA==
   dependencies:
     "@babel/runtime" "^7.18.3"
     classnames "^2.2.5"
@@ -12599,9 +13486,9 @@ rc-util@^5.0.1, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.2.
     react-is "^18.2.0"
 
 rc-virtual-list@^3.14.2, rc-virtual-list@^3.5.1, rc-virtual-list@^3.5.2:
-  version "3.19.1"
-  resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.19.1.tgz#785b5f409b0bbbfa1eaadcc811971359c83dd9fb"
-  integrity sha512-DCapO2oyPqmooGhxBuXHM4lFuX+sshQwWqqkuyFA+4rShLe//+GEPVwiDgO+jKtKHtbeYwZoNvetwfHdOf+iUQ==
+  version "3.19.2"
+  resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.19.2.tgz#1dd2d782c9a3ccbe537bb873447d73f83af8de0f"
+  integrity sha512-Ys6NcjwGkuwkeaWBDqfI3xWuZ7rDiQXlH1o2zLfFzATfEgXcqpk8CkgMfbJD81McqjcJVez25a3kPxCR807evA==
   dependencies:
     "@babel/runtime" "^7.20.0"
     classnames "^2.2.6"
@@ -12624,9 +13511,9 @@ react-dom@19.1.2:
     scheduler "^0.26.0"
 
 react-easy-crop@^5.0.8:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/react-easy-crop/-/react-easy-crop-5.5.0.tgz#91782bbba72c9f8f65fa6110323d2c5dff8a6480"
-  integrity sha512-OZzU+yXMhe69vLkDex+5QxcfT94FdcgVCyW2dBUw35ZoC3Is42TUxUy04w8nH1mfMKaizVdC3rh/wUfNW1mK4w==
+  version "5.5.6"
+  resolved "https://registry.yarnpkg.com/react-easy-crop/-/react-easy-crop-5.5.6.tgz#1a1ea3a90f83559d93b0636a5d984df143b40fe4"
+  integrity sha512-Jw3/ozs8uXj3NpL511Suc4AHY+mLRO23rUgipXvNYKqezcFSYHxe4QXibBymkOoY6oOtLVMPO2HNPRHYvMPyTw==
   dependencies:
     normalize-wheel "^1.0.1"
     tslib "^2.0.1"
@@ -12688,9 +13575,9 @@ react-remove-scroll-bar@^2.3.7:
     tslib "^2.0.0"
 
 react-remove-scroll@^2.6.3:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.7.1.tgz#d2101d414f6d81d7d3bf033f3c1cb4785789f753"
-  integrity sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz#6442da56791117661978ae99cd29be9026fecca0"
+  integrity sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==
   dependencies:
     react-remove-scroll-bar "^2.3.7"
     react-style-singleton "^2.2.3"
@@ -12716,15 +13603,15 @@ react-style-singleton@^2.2.2, react-style-singleton@^2.2.3:
     tslib "^2.0.0"
 
 react-syntax-highlighter@^15.6.1:
-  version "15.6.1"
-  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-15.6.1.tgz#fa567cb0a9f96be7bbccf2c13a3c4b5657d9543e"
-  integrity sha512-OqJ2/vL7lEeV5zTJyG7kmARppUjiB9h9udl4qHQjjgEos66z00Ia0OckwYfRxCSFrW8RJIBnsBwQsHZbVPspqg==
+  version "15.6.6"
+  resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-15.6.6.tgz#77417c81ebdc554300d0332800a2e1efe5b1190b"
+  integrity sha512-DgXrc+AZF47+HvAPEmn7Ua/1p10jNoVZVI/LoPiYdtY+OM+/nG5yefLHKJwdKqY1adMuHFbeyBaG9j64ML7vTw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     highlight.js "^10.4.1"
     highlightjs-vue "^1.0.0"
     lowlight "^1.17.0"
-    prismjs "^1.27.0"
+    prismjs "^1.30.0"
     refractor "^3.6.0"
 
 react-transition-group@^4.4.5:
@@ -12934,10 +13821,10 @@ refractor@^3.6.0:
     parse-entities "^2.0.0"
     prismjs "~1.27.0"
 
-regenerate-unicode-properties@^10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0"
-  integrity sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==
+regenerate-unicode-properties@^10.2.2:
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz#aa113812ba899b630658c7623466be71e1f86f66"
+  integrity sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==
   dependencies:
     regenerate "^1.4.2"
 
@@ -12958,29 +13845,29 @@ regexp.prototype.flags@^1.5.3, regexp.prototype.flags@^1.5.4:
     gopd "^1.2.0"
     set-function-name "^2.0.2"
 
-regexpu-core@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.2.0.tgz#0e5190d79e542bf294955dccabae04d3c7d53826"
-  integrity sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==
+regexpu-core@^6.3.1:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-6.4.0.tgz#3580ce0c4faedef599eccb146612436b62a176e5"
+  integrity sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==
   dependencies:
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.2.0"
+    regenerate-unicode-properties "^10.2.2"
     regjsgen "^0.8.0"
-    regjsparser "^0.12.0"
+    regjsparser "^0.13.0"
     unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
+    unicode-match-property-value-ecmascript "^2.2.1"
 
 regjsgen@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.8.0.tgz#df23ff26e0c5b300a6470cad160a9d090c3a37ab"
   integrity sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==
 
-regjsparser@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.12.0.tgz#0e846df6c6530586429377de56e0475583b088dc"
-  integrity sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==
+regjsparser@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.13.0.tgz#01f8351335cf7898d43686bc74d2dd71c847ecc0"
+  integrity sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==
   dependencies:
-    jsesc "~3.0.2"
+    jsesc "~3.1.0"
 
 rehype-katex@^7.0.1:
   version "7.0.1"
@@ -13149,11 +14036,11 @@ resolve@1.22.8:
     supports-preserve-symlinks-flag "^1.0.0"
 
 resolve@^1.1.7, resolve@^1.10.0, resolve@^1.15.1, resolve@^1.22.1, resolve@^1.22.10, resolve@^1.22.4, resolve@^1.22.8:
-  version "1.22.10"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
-  integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
+  version "1.22.11"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
+  integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
   dependencies:
-    is-core-module "^2.16.0"
+    is-core-module "^2.16.1"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -13349,9 +14236,9 @@ safe-regex-test@^1.0.3, safe-regex-test@^1.1.0:
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sax@>=0.6.0, sax@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
-  integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.3.tgz#fcebae3b756cdc8428321805f4b70f16ec0ab5db"
+  integrity sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==
 
 saxes@^6.0.0:
   version "6.0.0"
@@ -13375,9 +14262,9 @@ schema-utils@^3.1.1, schema-utils@^3.2.0:
     ajv-keywords "^3.5.2"
 
 schema-utils@^4.3.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.2.tgz#0c10878bf4a73fd2b1dfd14b9462b26788c806ae"
-  integrity sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.3.tgz#5b1850912fa31df90716963d45d9121fdfc09f46"
+  integrity sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==
   dependencies:
     "@types/json-schema" "^7.0.9"
     ajv "^8.9.0"
@@ -13403,15 +14290,20 @@ selderee@^0.11.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
+semver@7.7.2:
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+
 semver@^6.0.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3, semver@^7.7.1, semver@^7.7.2:
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
-  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3, semver@^7.7.1, semver@^7.7.2, semver@^7.7.3:
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
+  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
 
 semver@~7.5.0, semver@~7.5.4:
   version "7.5.4"
@@ -13421,21 +14313,21 @@ semver@~7.5.0, semver@~7.5.4:
     lru-cache "^6.0.0"
 
 send@^1.1.0, send@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-1.2.0.tgz#32a7554fb777b831dfa828370f773a3808d37212"
-  integrity sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-1.2.1.tgz#9eab743b874f3550f40a26867bf286ad60d3f3ed"
+  integrity sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==
   dependencies:
-    debug "^4.3.5"
+    debug "^4.4.3"
     encodeurl "^2.0.0"
     escape-html "^1.0.3"
     etag "^1.8.1"
     fresh "^2.0.0"
-    http-errors "^2.0.0"
-    mime-types "^3.0.1"
+    http-errors "^2.0.1"
+    mime-types "^3.0.2"
     ms "^2.1.3"
     on-finished "^2.4.1"
     range-parser "^1.2.1"
-    statuses "^2.0.1"
+    statuses "^2.0.2"
 
 send@~0.19.0, send@~0.19.1:
   version "0.19.2"
@@ -13464,9 +14356,9 @@ serialize-javascript@^6.0.2:
     randombytes "^2.1.0"
 
 serve-static@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-2.2.0.tgz#9c02564ee259bdd2251b82d659a2e7e1938d66f9"
-  integrity sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-2.2.1.tgz#7f186a4a4e5f5b663ad7a4294ff1bf37cf0e98a9"
+  integrity sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==
   dependencies:
     encodeurl "^2.0.0"
     escape-html "^1.0.3"
@@ -13524,7 +14416,7 @@ setprototypeof@1.2.0, setprototypeof@~1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-sha.js@^2.4.11:
+sha.js@^2.4.12:
   version "2.4.12"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
   integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==
@@ -13563,36 +14455,38 @@ sharp@^0.33.5:
     "@img/sharp-win32-x64" "0.33.5"
 
 sharp@^0.34.3:
-  version "0.34.3"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.34.3.tgz#10a03bcd15fb72f16355461af0b9245ccb8a5da3"
-  integrity sha512-eX2IQ6nFohW4DbvHIOLRB3MHFpYqaqvXd3Tp5e/T/dSH83fxaNJQRvDMhASmkNTsNTVF2/OOopzRCt7xokgPfg==
+  version "0.34.5"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.34.5.tgz#b6f148e4b8c61f1797bde11a9d1cfebbae2c57b0"
+  integrity sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==
   dependencies:
-    color "^4.2.3"
-    detect-libc "^2.0.4"
-    semver "^7.7.2"
+    "@img/colour" "^1.0.0"
+    detect-libc "^2.1.2"
+    semver "^7.7.3"
   optionalDependencies:
-    "@img/sharp-darwin-arm64" "0.34.3"
-    "@img/sharp-darwin-x64" "0.34.3"
-    "@img/sharp-libvips-darwin-arm64" "1.2.0"
-    "@img/sharp-libvips-darwin-x64" "1.2.0"
-    "@img/sharp-libvips-linux-arm" "1.2.0"
-    "@img/sharp-libvips-linux-arm64" "1.2.0"
-    "@img/sharp-libvips-linux-ppc64" "1.2.0"
-    "@img/sharp-libvips-linux-s390x" "1.2.0"
-    "@img/sharp-libvips-linux-x64" "1.2.0"
-    "@img/sharp-libvips-linuxmusl-arm64" "1.2.0"
-    "@img/sharp-libvips-linuxmusl-x64" "1.2.0"
-    "@img/sharp-linux-arm" "0.34.3"
-    "@img/sharp-linux-arm64" "0.34.3"
-    "@img/sharp-linux-ppc64" "0.34.3"
-    "@img/sharp-linux-s390x" "0.34.3"
-    "@img/sharp-linux-x64" "0.34.3"
-    "@img/sharp-linuxmusl-arm64" "0.34.3"
-    "@img/sharp-linuxmusl-x64" "0.34.3"
-    "@img/sharp-wasm32" "0.34.3"
-    "@img/sharp-win32-arm64" "0.34.3"
-    "@img/sharp-win32-ia32" "0.34.3"
-    "@img/sharp-win32-x64" "0.34.3"
+    "@img/sharp-darwin-arm64" "0.34.5"
+    "@img/sharp-darwin-x64" "0.34.5"
+    "@img/sharp-libvips-darwin-arm64" "1.2.4"
+    "@img/sharp-libvips-darwin-x64" "1.2.4"
+    "@img/sharp-libvips-linux-arm" "1.2.4"
+    "@img/sharp-libvips-linux-arm64" "1.2.4"
+    "@img/sharp-libvips-linux-ppc64" "1.2.4"
+    "@img/sharp-libvips-linux-riscv64" "1.2.4"
+    "@img/sharp-libvips-linux-s390x" "1.2.4"
+    "@img/sharp-libvips-linux-x64" "1.2.4"
+    "@img/sharp-libvips-linuxmusl-arm64" "1.2.4"
+    "@img/sharp-libvips-linuxmusl-x64" "1.2.4"
+    "@img/sharp-linux-arm" "0.34.5"
+    "@img/sharp-linux-arm64" "0.34.5"
+    "@img/sharp-linux-ppc64" "0.34.5"
+    "@img/sharp-linux-riscv64" "0.34.5"
+    "@img/sharp-linux-s390x" "0.34.5"
+    "@img/sharp-linux-x64" "0.34.5"
+    "@img/sharp-linuxmusl-arm64" "0.34.5"
+    "@img/sharp-linuxmusl-x64" "0.34.5"
+    "@img/sharp-wasm32" "0.34.5"
+    "@img/sharp-win32-arm64" "0.34.5"
+    "@img/sharp-win32-ia32" "0.34.5"
+    "@img/sharp-win32-x64" "0.34.5"
 
 shebang-command@^2.0.0:
   version "2.0.0"
@@ -13662,9 +14556,9 @@ signal-exit@^4.0.1, signal-exit@^4.1.0:
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
 simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.4.tgz#a8d11a45a11600d6a1ecdff6363329e3648c3667"
+  integrity sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==
   dependencies:
     is-arrayish "^0.3.1"
 
@@ -13678,18 +14572,10 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a"
-  integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==
-  dependencies:
-    ansi-styles "^6.0.0"
-    is-fullwidth-code-point "^4.0.0"
-
 slice-ansi@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.0.tgz#cd6b4655e298a8d1bdeb04250a433094b347b9a9"
-  integrity sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-7.1.2.tgz#adf7be70aa6d72162d907cd0e6d5c11f507b5403"
+  integrity sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==
   dependencies:
     ansi-styles "^6.2.1"
     is-fullwidth-code-point "^5.0.0"
@@ -13704,7 +14590,7 @@ smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
-socket.io-adapter@~2.5.2:
+socket.io-adapter@^2.5.6, socket.io-adapter@~2.5.2:
   version "2.5.6"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.6.tgz#c697f609d36a676a46749782274607d8df52c1d8"
   integrity sha512-DkkO/dz7MGln0dHn5bmN3pPy+JmywNICWrJqVWiVOyvXjWQFIv9c2h24JrQLLFJ2aQVQf/Cvl1vblnd4r2apLQ==
@@ -13730,7 +14616,7 @@ socket.io-parser@~4.2.4:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.4.1"
 
-socket.io@^4.8.3:
+socket.io@4.8.3, socket.io@^4.8.3:
   version "4.8.3"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.3.tgz#ca6ba1431c69532e1e0a6f496deebeb601dbc4df"
   integrity sha512-2Dd78bqzzjE6KPkD5fHZmDAKRNe3J15q+YHDrIsy9WEkqttc7GY+kT9OBLSMaPbQaEd0x1BjcmtMtXkfpc+T5A==
@@ -13753,11 +14639,11 @@ socks-proxy-agent@^8.0.2, socks-proxy-agent@^8.0.5:
     socks "^2.8.3"
 
 socks@^2.8.3:
-  version "2.8.6"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.6.tgz#e335486a2552f34f932f0c27d8dbb93f2be867aa"
-  integrity sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==
+  version "2.8.7"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.8.7.tgz#e2fb1d9a603add75050a2067db8c381a0b5669ea"
+  integrity sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==
   dependencies:
-    ip-address "^9.0.5"
+    ip-address "^10.0.1"
     smart-buffer "^4.2.0"
 
 sonner@^2.0.2, sonner@^2.0.6:
@@ -13874,17 +14760,12 @@ sprintf-js@1.1.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
   integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
-sprintf-js@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
-  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sql-highlight@^6.0.0:
+sql-highlight@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/sql-highlight/-/sql-highlight-6.1.0.tgz#e34024b4c6eac2744648771edfe3c1f894153743"
   integrity sha512-ed7OK4e9ywpE7pgRMkMQmZDPKSVdm0oX5IEtZiKnFucSF0zu6c80GZBe38UqHuVhTWJ9xsKgSMjCG2bml86KvA==
@@ -13913,12 +14794,7 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
-statuses@^2.0.1, statuses@~2.0.1, statuses@~2.0.2:
+statuses@^2.0.1, statuses@^2.0.2, statuses@~2.0.1, statuses@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382"
   integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==
@@ -13999,6 +14875,14 @@ string-width@^7.0.0:
     get-east-asian-width "^1.0.0"
     strip-ansi "^7.1.0"
 
+string-width@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-8.1.0.tgz#9e9fb305174947cf45c30529414b5da916e9e8d1"
+  integrity sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==
+  dependencies:
+    get-east-asian-width "^1.3.0"
+    strip-ansi "^7.1.0"
+
 string.prototype.includes@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.includes/-/string.prototype.includes-2.0.1.tgz#eceef21283640761a81dbe16d6c7171a4edf7d92"
@@ -14111,9 +14995,9 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
     ansi-regex "^5.0.1"
 
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
-  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.2.tgz#132875abde678c7ea8d691533f2e7e22bb744dba"
+  integrity sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==
   dependencies:
     ansi-regex "^6.0.1"
 
@@ -14137,6 +15021,11 @@ strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
+strnum@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/strnum/-/strnum-2.1.2.tgz#a5e00ba66ab25f9cafa3726b567ce7a49170937a"
+  integrity sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==
+
 strtok3@^10.2.0:
   version "10.3.4"
   resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-10.3.4.tgz#793ebd0d59df276a085586134b73a406e60be9c1"
@@ -14154,18 +15043,18 @@ style-data@^2.0.1:
     pick-util "^1.1.5"
 
 style-to-js@^1.0.0:
-  version "1.1.17"
-  resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.17.tgz#488b1558a8c1fd05352943f088cc3ce376813d83"
-  integrity sha512-xQcBGDxJb6jjFCTzvQtfiPn6YvvP2O8U1MDIPNfJQlWMYfktPy+iGsHE7cssjs7y84d9fQaK4UF3RIJaAHSoYA==
+  version "1.1.21"
+  resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.21.tgz#2908941187f857e79e28e9cd78008b9a0b3e0e8d"
+  integrity sha512-RjQetxJrrUJLQPHbLku6U/ocGtzyjbJMP9lCNK7Ag0CNh690nSH8woqWH9u16nMjYBAok+i7JO1NP2pOy8IsPQ==
   dependencies:
-    style-to-object "1.0.9"
+    style-to-object "1.0.14"
 
-style-to-object@1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.9.tgz#35c65b713f4a6dba22d3d0c61435f965423653f0"
-  integrity sha512-G4qppLgKu/k6FwRpHiGiKPaPTFcG3g4wNVX/Qsfu+RqQM30E7Tyu/TEgxcL9PNLF5pdRLwQdE3YKKf+KF2Dzlw==
+style-to-object@1.0.14:
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.14.tgz#1d22f0e7266bb8c6d8cae5caf4ec4f005e08f611"
+  integrity sha512-LIN7rULI0jBscWQYaSswptyderlarFkjQ+t79nzty8tcIAceVomEVlLzH5VP4Cmsv6MtKhs7qaAiwlcp+Mgaxw==
   dependencies:
-    inline-style-parser "0.2.4"
+    inline-style-parser "0.2.7"
 
 styled-jsx@5.1.6:
   version "5.1.6"
@@ -14180,16 +15069,16 @@ stylis@^4.3.4:
   integrity sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==
 
 sucrase@^3.35.0:
-  version "3.35.0"
-  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
-  integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==
+  version "3.35.1"
+  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.1.tgz#4619ea50393fe8bd0ae5071c26abd9b2e346bfe1"
+  integrity sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.2"
     commander "^4.0.0"
-    glob "^10.3.10"
     lines-and-columns "^1.1.6"
     mz "^2.7.0"
     pirates "^4.0.1"
+    tinyglobby "^0.2.11"
     ts-interface-checker "^0.1.9"
 
 superagent@^3.8.3:
@@ -14266,12 +15155,12 @@ supports-preserve-symlinks-flag@^1.0.0:
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 swr@^2.2.5:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/swr/-/swr-2.3.4.tgz#60bcb5b97cae157a6ef69eff0ed2beb9010eba69"
-  integrity sha512-bYd2lrhc+VarcpkgWclcUi92wYCpOgMws9Sd1hG1ntAu0NEy+14CbotuFjshBU2kt9rYj9TSmDcybpxpeTU1fg==
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-2.3.8.tgz#aa15596321a34e575226a60576bade0b57adf7bf"
+  integrity sha512-gaCPRVoMq8WGDcWj9p4YWzCMPHzE0WNl6W8ADIx9c3JBEIdMkJGMzW+uzXvxHMltwcYACr9jP+32H8/hgwMR7w==
   dependencies:
     dequal "^2.0.3"
-    use-sync-external-store "^1.4.0"
+    use-sync-external-store "^1.6.0"
 
 symbol-observable@4.0.0:
   version "4.0.0"
@@ -14291,9 +15180,9 @@ synckit@^0.11.8:
     "@pkgr/core" "^0.2.9"
 
 systeminformation@^5.7:
-  version "5.27.7"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.27.7.tgz#4dc9d436419948cd5e5f076779a1298220d19a72"
-  integrity sha512-saaqOoVEEFaux4v0K8Q7caiauRwjXC4XbD2eH60dxHXbpKxQ8kH9Rf7Jh+nryKpOUSEFxtCdBlSUx0/lO6rwRg==
+  version "5.28.9"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.28.9.tgz#15be386affadb0aa38ac7674fdf91ddb182669c1"
+  integrity sha512-/+QlBcOBTRTGWpZMTCvvDf32dtGlECpX5TNiqOtNJhzjflGCcRQ2ADNJ05+DAO0b7ZUv/4pwMdWWCFCTDl3VPg==
 
 tailwind-merge@^2.4.0:
   version "2.6.0"
@@ -14306,9 +15195,9 @@ tailwindcss-animate@^1.0.7:
   integrity sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==
 
 tailwindcss@^3.4.1:
-  version "3.4.17"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.17.tgz#ae8406c0f96696a631c790768ff319d46d5e5a63"
-  integrity sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==
+  version "3.4.19"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.19.tgz#af2a0a4ae302d52ebe078b6775e799e132500ee2"
+  integrity sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==
   dependencies:
     "@alloc/quick-lru" "^5.2.0"
     arg "^5.0.2"
@@ -14318,7 +15207,7 @@ tailwindcss@^3.4.1:
     fast-glob "^3.3.2"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
-    jiti "^1.21.6"
+    jiti "^1.21.7"
     lilconfig "^3.1.3"
     micromatch "^4.0.8"
     normalize-path "^3.0.0"
@@ -14327,16 +15216,16 @@ tailwindcss@^3.4.1:
     postcss "^8.4.47"
     postcss-import "^15.1.0"
     postcss-js "^4.0.1"
-    postcss-load-config "^4.0.2"
+    postcss-load-config "^4.0.2 || ^5.0 || ^6.0"
     postcss-nested "^6.2.0"
     postcss-selector-parser "^6.1.2"
     resolve "^1.22.8"
     sucrase "^3.35.0"
 
 tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.2.tgz#ab4984340d30cb9989a490032f086dbb8b56d872"
-  integrity sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.3.0.tgz#7e3ea6d5ca31ba8e078b560f0d83ce9a14aa8be6"
+  integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==
 
 tar@^6.1.11, tar@^6.1.15:
   version "6.2.1"
@@ -14351,9 +15240,9 @@ tar@^6.1.11, tar@^6.1.15:
     yallist "^4.0.0"
 
 terser-webpack-plugin@^5.3.10:
-  version "5.3.14"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz#9031d48e57ab27567f02ace85c7d690db66c3e06"
-  integrity sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==
+  version "5.3.16"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.16.tgz#741e448cc3f93d8026ebe4f7ef9e4afacfd56330"
+  integrity sha512-h9oBFCWrq78NyWWVcSwZarJkZ01c2AyGrzs1crmHZO3QUg9D61Wu4NPjBy69n7JqylFF5y+CsUZYmYEIZ3mR+Q==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.25"
     jest-worker "^27.4.5"
@@ -14362,12 +15251,12 @@ terser-webpack-plugin@^5.3.10:
     terser "^5.31.1"
 
 terser@^5.31.1:
-  version "5.43.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.43.1.tgz#88387f4f9794ff1a29e7ad61fb2932e25b4fdb6d"
-  integrity sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==
+  version "5.44.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.44.1.tgz#e391e92175c299b8c284ad6ded609e37303b0a9c"
+  integrity sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.14.0"
+    acorn "^8.15.0"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
@@ -14419,13 +15308,13 @@ tinyexec@^0.3.2:
   resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
   integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
 
-tinyglobby@^0.2.13:
-  version "0.2.14"
-  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.14.tgz#5280b0cf3f972b050e74ae88406c0a6a58f4079d"
-  integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==
+tinyglobby@^0.2.11, tinyglobby@^0.2.13, tinyglobby@^0.2.15:
+  version "0.2.15"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2"
+  integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==
   dependencies:
-    fdir "^6.4.4"
-    picomatch "^4.0.2"
+    fdir "^6.5.0"
+    picomatch "^4.0.3"
 
 tldts-core@^6.1.86:
   version "6.1.86"
@@ -14457,9 +15346,9 @@ tmpl@1.0.5:
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-buffer@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.1.tgz#2ce650cdb262e9112a18e65dc29dcb513c8155e0"
-  integrity sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.2.tgz#ffe59ef7522ada0a2d1cb5dfe03bb8abc3cdc133"
+  integrity sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==
   dependencies:
     isarray "^2.0.5"
     safe-buffer "^5.2.1"
@@ -14477,7 +15366,7 @@ toggle-selection@^1.0.6:
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
   integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==
 
-toidentifier@1.0.1, toidentifier@~1.0.1:
+toidentifier@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
@@ -14488,10 +15377,11 @@ token-stream@1.0.0:
   integrity sha512-VSsyNPPW74RpHwR8Fc21uubwHY7wMDeJLys2IX5zJNih+OnAnaifKHo+1LHT7DAdloQ7apeaaWg8l7qnf/TnEg==
 
 token-types@^6.0.0:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/token-types/-/token-types-6.0.4.tgz#1582ef6d1d77398cd738c87ea38dd5729fa49ec5"
-  integrity sha512-MD9MjpVNhVyH4fyd5rKphjvt/1qj+PtQUz65aFqAZA6XniWAuSFRjLk3e2VALEFlh9OwBpXUN7rfeqSnT/Fmkw==
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/token-types/-/token-types-6.1.2.tgz#18d0fd59b996d421f9f83914d6101c201bd08129"
+  integrity sha512-dRXchy+C0IgK8WPC6xvCHFRIWYUbqqdEIKPaKo/AcTUNzwLTK6AH7RjdLWsEZcAN/TBdtfUw3PYEgPr5VPr6ww==
   dependencies:
+    "@borewit/text-codec" "^0.2.1"
     "@tokenizer/token" "^0.3.0"
     ieee754 "^1.2.1"
 
@@ -14529,10 +15419,10 @@ trough@^2.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-2.2.0.tgz#94a60bd6bd375c152c1df911a4b11d5b0256f50f"
   integrity sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==
 
-ts-api-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz#595f7094e46eed364c13fd23e75f9513d29baf91"
-  integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==
+ts-api-utils@^2.2.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.4.0.tgz#2690579f96d2790253bdcf1ca35d569ad78f9ad8"
+  integrity sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==
 
 ts-interface-checker@^0.1.9:
   version "0.1.13"
@@ -14540,9 +15430,9 @@ ts-interface-checker@^0.1.9:
   integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
 
 ts-jest@^29.1.2:
-  version "29.4.1"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.4.1.tgz#42d33beb74657751d315efb9a871fe99e3b9b519"
-  integrity sha512-SaeUtjfpg9Uqu8IbeDKtdaS0g8lS6FT6OzM3ezrDfErPJPHNDo/Ey+VFGP1bQIDfagYDLyRpd7O15XpG1Es2Uw==
+  version "29.4.6"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.4.6.tgz#51cb7c133f227396818b71297ad7409bb77106e9"
+  integrity sha512-fSpWtOO/1AjSNQguk43hb/JCo16oJDnMJf3CdEGNkqsEX3t0KX96xvyX1D7PfLCpVoKu4MfVrqUkFyblYoY4lA==
   dependencies:
     bs-logger "^0.2.6"
     fast-json-stable-stringify "^2.1.0"
@@ -14550,14 +15440,14 @@ ts-jest@^29.1.2:
     json5 "^2.2.3"
     lodash.memoize "^4.1.2"
     make-error "^1.3.6"
-    semver "^7.7.2"
+    semver "^7.7.3"
     type-fest "^4.41.0"
     yargs-parser "^21.1.1"
 
 ts-loader@^9.5.2:
-  version "9.5.2"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.2.tgz#1f3d7f4bb709b487aaa260e8f19b301635d08020"
-  integrity sha512-Qo4piXvOTWcMGIgRiuFa6nHNm+54HbYaZCKqc9eeZCLRy3XqafQgwX2F7mofrbJG3g7EEb+lkiR+z2Lic2s3Zw==
+  version "9.5.4"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.4.tgz#44b571165c10fb5a90744aa5b7e119233c4f4585"
+  integrity sha512-nCz0rEwunlTZiy6rXFByQU1kVVpCIgUpc/psFiKVrUwrizdnIbRFu8w7bxhUF0X613DYwT4XzrZHpVyMe758hQ==
   dependencies:
     chalk "^4.1.0"
     enhanced-resolve "^5.0.0"
@@ -14626,11 +15516,11 @@ tslib@^1.9.0:
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tsx@^4.19.2:
-  version "4.20.3"
-  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.20.3.tgz#f913e4911d59ad177c1bcee19d1035ef8dd6e2fb"
-  integrity sha512-qjbnuR9Tr+FJOMBqJCW5ehvIo/buZq7vH7qD7JziU98h6l3qGy0a/yPFjwO+y0/T7GFpNgNAvEcPPVfyT8rrPQ==
+  version "4.21.0"
+  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.21.0.tgz#32aa6cf17481e336f756195e6fe04dae3e6308b1"
+  integrity sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw==
   dependencies:
-    esbuild "~0.25.0"
+    esbuild "~0.27.0"
     get-tsconfig "^4.7.5"
   optionalDependencies:
     fsevents "~2.3.3"
@@ -14682,7 +15572,7 @@ type-is@^1.6.18, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-type-is@^2.0.0, type-is@^2.0.1:
+type-is@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-2.0.1.tgz#64f6cf03f92fce4015c2b224793f6bdd4b068c97"
   integrity sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==
@@ -14746,21 +15636,22 @@ typedarray@^0.0.6:
   resolved "https://codeload.github.com/AdamFipke/typeorm-factory/tar.gz/3ae186b344ab50027a985a387812581ce6588ade"
 
 typeorm@^0.3.20:
-  version "0.3.25"
-  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.25.tgz#9a416f93cda0f612b20f8450e03d6b0e11b467fb"
-  integrity sha512-fTKDFzWXKwAaBdEMU4k661seZewbNYET4r1J/z3Jwf+eAvlzMVpTLKAVcAzg75WwQk7GDmtsmkZ5MfkmXCiFWg==
+  version "0.3.28"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.28.tgz#a3aabed8ef64287ee68da278d8ffa1d3c6c6b8ca"
+  integrity sha512-6GH7wXhtfq2D33ZuRXYwIsl/qM5685WZcODZb7noOOcRMteM9KF2x2ap3H0EBjnSV0VO4gNAfJT5Ukp0PkOlvg==
   dependencies:
     "@sqltools/formatter" "^1.2.5"
-    ansis "^3.17.0"
+    ansis "^4.2.0"
     app-root-path "^3.1.0"
     buffer "^6.0.3"
-    dayjs "^1.11.13"
-    debug "^4.4.0"
-    dedent "^1.6.0"
-    dotenv "^16.4.7"
-    glob "^10.4.5"
-    sha.js "^2.4.11"
-    sql-highlight "^6.0.0"
+    dayjs "^1.11.19"
+    debug "^4.4.3"
+    dedent "^1.7.0"
+    dotenv "^16.6.1"
+    glob "^10.5.0"
+    reflect-metadata "^0.2.2"
+    sha.js "^2.4.12"
+    sql-highlight "^6.1.0"
     tslib "^2.8.1"
     uuid "^11.1.0"
     yargs "^17.7.2"
@@ -14771,9 +15662,9 @@ typescript@5.7.2:
   integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
 
 typescript@^5, typescript@^5.2.2:
-  version "5.9.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.2.tgz#d93450cddec5154a2d5cabe3b8102b83316fb2a6"
-  integrity sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==
+  version "5.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
+  integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
 
 uglify-js@^3.1.4:
   version "3.19.3"
@@ -14795,9 +15686,9 @@ uid@2.0.2:
     "@lukeed/csprng" "^1.0.0"
 
 uint8array-extras@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/uint8array-extras/-/uint8array-extras-1.4.0.tgz#e42a678a6dd335ec2d21661333ed42f44ae7cc74"
-  integrity sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/uint8array-extras/-/uint8array-extras-1.5.0.tgz#10d2a85213de3ada304fea1c454f635c73839e86"
+  integrity sha512-rvKSBiC5zqCCiDZ9kAOszZcDvdAHwwIKJG33Ykj43OKcWsnmcBRL09YTU4nOeHZ8Y2a7l1MgTd08SBe9A8Qj6A==
 
 unbox-primitive@^1.1.0:
   version "1.1.0"
@@ -14819,20 +15710,15 @@ undici-types@~6.21.0:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
   integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
 
-undici-types@~7.10.0:
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.10.0.tgz#4ac2e058ce56b462b056e629cc6a02393d3ff350"
-  integrity sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==
-
 undici-types@~7.16.0:
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
   integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
 
 undici@^7.12.0:
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-7.13.0.tgz#9331f99fc42970dcbdf54199e6604755ba54433a"
-  integrity sha512-l+zSMssRqrzDcb3fjMkjjLGmuiiK2pMIcV++mJaAc9vhjSGpvM7h43QgP+OAMb1GImHmbPyG2tBXeuyG5iY4gA==
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-7.16.0.tgz#cb2a1e957726d458b536e3f076bf51f066901c1a"
+  integrity sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.1"
@@ -14847,15 +15733,15 @@ unicode-match-property-ecmascript@^2.0.0:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz#a0401aee72714598f739b68b104e4fe3a0cb3c71"
-  integrity sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==
+unicode-match-property-value-ecmascript@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz#65a7adfad8574c219890e219285ce4c64ed67eaa"
+  integrity sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==
 
 unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
-  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.2.0.tgz#301d4f8a43d2b75c97adfad87c9dd5350c9475d1"
+  integrity sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==
 
 unified@^11.0.0:
   version "11.0.5"
@@ -14879,9 +15765,9 @@ unist-util-find-after@^5.0.0:
     unist-util-is "^6.0.0"
 
 unist-util-is@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-6.0.0.tgz#b775956486aff107a9ded971d996c173374be424"
-  integrity sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-6.0.1.tgz#d0a3f86f2dd0db7acd7d8c2478080b5c67f9c6a9"
+  integrity sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==
   dependencies:
     "@types/unist" "^3.0.0"
 
@@ -14908,9 +15794,9 @@ unist-util-stringify-position@^4.0.0:
     "@types/unist" "^3.0.0"
 
 unist-util-visit-parents@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz#4d5f85755c3b8f0dc69e21eca5d6d82d22162815"
-  integrity sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz#777df7fb98652ce16b4b7cd999d0a1a40efa3a02"
+  integrity sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==
   dependencies:
     "@types/unist" "^3.0.0"
     unist-util-is "^6.0.0"
@@ -14929,7 +15815,7 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
   integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
-unpipe@1.0.0, unpipe@~1.0.0:
+unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
@@ -14971,10 +15857,10 @@ unrs-resolver@^1.6.2, unrs-resolver@^1.7.11:
     "@unrs/resolver-binding-win32-ia32-msvc" "1.11.1"
     "@unrs/resolver-binding-win32-x64-msvc" "1.11.1"
 
-update-browserslist-db@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
-  integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
+update-browserslist-db@^1.2.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz#64d76db58713136acbeb4c49114366cc6cc2e80d"
+  integrity sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==
   dependencies:
     escalade "^3.2.0"
     picocolors "^1.1.1"
@@ -15006,10 +15892,10 @@ use-sidecar@^1.1.3:
     detect-node-es "^1.1.0"
     tslib "^2.0.0"
 
-use-sync-external-store@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz#55122e2a3edd2a6c106174c27485e0fd59bcfca0"
-  integrity sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==
+use-sync-external-store@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
+  integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==
 
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
@@ -15053,10 +15939,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validator@^13.9.0:
-  version "13.15.15"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-13.15.15.tgz#246594be5671dc09daa35caec5689fcd18c6e7e4"
-  integrity sha512-BgWVbCI72aIQy937xbawcs+hrVaN/CZ2UwutgaJ36hGqRrLNM+f5LUT/YPRbo8IV/ASeFzXszezV+y2+rq3l8A==
+validator@^13.15.20:
+  version "13.15.26"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.15.26.tgz#36c3deeab30e97806a658728a155c66fcaa5b944"
+  integrity sha512-spH26xU080ydGggxRyR1Yhcbgx+j3y5jbNXk/8L+iRvdIEQ4uTRH2Sgf2dokud6Q4oAtsbNvJ1Ft+9xmm6IZcA==
 
 vary@^1, vary@^1.1.2, vary@~1.1.2:
   version "1.1.2"
@@ -15144,9 +16030,9 @@ walker@^1.0.8:
     makeerror "1.0.12"
 
 watchpack@^2.4.1:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.4.tgz#473bda72f0850453da6425081ea46fc0d7602947"
-  integrity sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.5.0.tgz#fa115d5ccaa4bf3aa594f586257c0bc4768939fd"
+  integrity sha512-e6vZvY6xboSwLz2GD36c16+O/2Z6fKvIf4pOXptw2rY9MVwE/TXc6RGqxD3I3x0a28lwBY7DE+76uTPSsBrrCA==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -15405,9 +16291,9 @@ wrap-ansi@^8.1.0:
     strip-ansi "^7.0.1"
 
 wrap-ansi@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.0.tgz#1a3dc8b70d85eeb8398ddfb1e4a02cd186e58b3e"
-  integrity sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-9.0.2.tgz#956832dea9494306e6d209eb871643bb873d7c98"
+  integrity sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==
   dependencies:
     ansi-styles "^6.2.1"
     string-width "^7.0.0"
@@ -15516,10 +16402,10 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^2.3.4, yaml@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.1.tgz#1870aa02b631f7e8328b93f8bc574fac5d6c4d79"
-  integrity sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==
+yaml@^2.8.1:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.2.tgz#5694f25eca0ce9c3e7a9d9e00ce0ddabbd9e35c5"
+  integrity sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==
 
 yargs-parser@21.1.1, yargs-parser@^21.1.1:
   version "21.1.1"

From 96709ce2c4dfedd9b5b825d81ff6aa09c10d3694 Mon Sep 17 00:00:00 2001
From: bhunt02 <bridgette.hunt02@outlook.com>
Date: Mon, 5 Jan 2026 15:14:39 -0800
Subject: [PATCH 5/8] why did these guys not go?

---
 eslint.config.js                              |   2 +-
 ...websocket.ts => chatbot-result.gateway.ts} | 109 ++++++++++--------
 2 files changed, 62 insertions(+), 49 deletions(-)
 rename packages/server/src/chatbot/intermediate-results/{chatbot-result.websocket.ts => chatbot-result.gateway.ts} (52%)

diff --git a/eslint.config.js b/eslint.config.js
index 315d157b4..74a52ca02 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -60,7 +60,7 @@ module.exports = defineConfig([
             }],
         },
     },
-    globalIgnores(["**/.eslintrc.js", "./langchain-services/**/*"]),
+    globalIgnores(["**/.eslintrc.js", "./langchain-services/**/*", "packages/frontend/webworkers/*"]),
     {
         files: ["**/*.entity.ts"],
 
diff --git a/packages/server/src/chatbot/intermediate-results/chatbot-result.websocket.ts b/packages/server/src/chatbot/intermediate-results/chatbot-result.gateway.ts
similarity index 52%
rename from packages/server/src/chatbot/intermediate-results/chatbot-result.websocket.ts
rename to packages/server/src/chatbot/intermediate-results/chatbot-result.gateway.ts
index 71f11d562..457c7975d 100644
--- a/packages/server/src/chatbot/intermediate-results/chatbot-result.websocket.ts
+++ b/packages/server/src/chatbot/intermediate-results/chatbot-result.gateway.ts
@@ -3,59 +3,41 @@ import {
   HttpStatus,
   Inject,
   Injectable,
-  ParseEnumPipe,
   UseGuards,
 } from '@nestjs/common';
 import {
   ConnectedSocket,
   MessageBody,
   SubscribeMessage,
-  WebSocketGateway,
 } from '@nestjs/websockets';
 import { Server, Socket } from 'socket.io';
 import { WsJwtAuthGuard } from '../../guards/websocket/ws-jwt-auth.guard';
-import { WsChatbotApiKeyGuard } from '../../guards/websocket/ws-chatbot-api-key.guard';
+import { WsApiKeyGuard } from '../../guards/websocket/ws-api-key.guard';
 import { WebSocketEvent } from '../../websocket/websocket.event';
 import {
   WebSocketException,
   WsNotFoundException,
 } from '../../websocket/websocket.exception';
 import { Cache } from 'cache-manager';
-import { WebSocketTemplate } from '../../websocket/websocket.template';
-
-export enum ChatbotResultEvents {
-  GET_RESULT = 'chatbot/get_result',
-  POST_RESULT = 'chatbot/post_result',
-  RESULT_RECEIVED = 'chatbot/received_result',
-}
-
-export enum ChatbotResultEventName {
-  ADD_AGGREGATE = 'add_aggregate_complete',
-  UPDATE_AGGREGATE = 'update_aggregate_complete',
-  ADD_CHUNK = 'add_chunk_complete',
-  UPDATE_CHUNK = 'update_chunk_complete',
-  DOCUMENT_QUERIES = 'query_generation_complete',
-}
-
-export type ChatbotResultEventArgs = {
-  returnMessage: ChatbotResultEvents;
-  type: ChatbotResultEventName;
-};
-
-export type ChatbotEventParams = {
-  type: ChatbotResultEventName;
-  resultId: string;
-};
+import { WebsocketGateway } from '../../websocket/websocket.gateway';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { JwtService } from '@nestjs/jwt';
+import { ConfigService } from '@nestjs/config';
+import {
+  ChatbotEventParams,
+  ChatbotResultEventName,
+  ChatbotResultEvents,
+  isProd,
+} from '@koh/common';
 
 @Injectable()
-@WebSocketGateway({
-  cors: {
-    origin: '*',
-  },
-})
-export class ChatbotResultWebSocket extends WebSocketTemplate {
-  constructor(@Inject() protected cacheManager: Cache) {
-    super(cacheManager);
+export class ChatbotResultGateway extends WebsocketGateway {
+  constructor(
+    protected configService: ConfigService,
+    protected jwtService: JwtService,
+    @Inject(CACHE_MANAGER) protected cacheManager: Cache,
+  ) {
+    super(configService, jwtService, cacheManager);
   }
 
   afterInit(server: Server): any {
@@ -74,17 +56,28 @@ export class ChatbotResultWebSocket extends WebSocketTemplate {
   @SubscribeMessage(ChatbotResultEvents.GET_RESULT)
   async subscribeResultEvent(
     @ConnectedSocket() client: Socket,
-    @MessageBody('id') resultId: number,
-    @MessageBody('type', new ParseEnumPipe(ChatbotResultEventName))
-    type: ChatbotResultEventName,
+    @MessageBody() body: [{ resultId: string; type: ChatbotResultEventName }],
   ): Promise<boolean> {
+    if (!isProd()) {
+      this.logger.debug(
+        `Client ${client.id} subscribe request: ${JSON.stringify(body)}.`,
+      );
+    }
+    const { resultId, type } = body[0];
     if (!this.events[ChatbotResultEvents.GET_RESULT]) {
       throw new WsNotFoundException();
     }
+
     this.events[ChatbotResultEvents.GET_RESULT].subscribe(client.id, {
       type,
       resultId,
     });
+    if (!isProd()) {
+      this.logger.debug(`Client ${client.id} subscribe success.`);
+    }
+    client.emit(ChatbotResultEvents.GET_RESULT, {
+      success: true,
+    });
     return true;
   }
 
@@ -92,10 +85,14 @@ export class ChatbotResultWebSocket extends WebSocketTemplate {
   @SubscribeMessage(ChatbotResultEvents.GET_RESULT + '/unsubscribe')
   async unsubscribeResultEvent(
     @ConnectedSocket() client: Socket,
-    @MessageBody('id') resultId: number,
-    @MessageBody('type', new ParseEnumPipe(ChatbotResultEventName))
-    type: ChatbotResultEventName,
+    @MessageBody() body: [{ resultId: string; type: ChatbotResultEventName }],
   ): Promise<boolean> {
+    if (!isProd()) {
+      this.logger.debug(
+        `Client ${client.id} unsubscribe: ${JSON.stringify(body)}.`,
+      );
+    }
+    const { resultId, type } = body[0];
     if (!this.events[ChatbotResultEvents.GET_RESULT]) {
       throw new WsNotFoundException();
     }
@@ -103,27 +100,43 @@ export class ChatbotResultWebSocket extends WebSocketTemplate {
       resultId,
       type,
     });
+    if (!isProd()) {
+      this.logger.debug(`Client ${client.id} unsubscribe success.`);
+    }
     return true;
   }
 
-  @UseGuards(WsChatbotApiKeyGuard)
+  @UseGuards(WsApiKeyGuard)
   @SubscribeMessage(ChatbotResultEvents.POST_RESULT)
   async handlePostResultEvent(
-    @MessageBody('id') resultId: number,
-    @MessageBody('type', new ParseEnumPipe(ChatbotResultEventName))
-    type: ChatbotResultEventName,
-    @MessageBody('resultBody') resultBody: any,
+    @ConnectedSocket() client: Socket,
+    @MessageBody()
+    body: { resultId: string; type: ChatbotResultEventName; data: any },
   ): Promise<any> {
+    if (!isProd()) {
+      this.logger.debug(
+        `Client ${client.id} post data: ${JSON.stringify(body)}.`,
+      );
+    }
+    const { resultId, type, data } = body;
     if (!this.events[ChatbotResultEvents.GET_RESULT]) {
       throw new WsNotFoundException();
     }
     try {
       this.events[ChatbotResultEvents.GET_RESULT].post(
         { type, resultId },
-        resultBody,
+        data,
       );
+      if (!isProd()) {
+        this.logger.debug(`Client ${client.id} post data success!`);
+      }
       return true;
     } catch (error) {
+      if (!isProd()) {
+        this.logger.debug(
+          `Client ${client.id} post data failure: ${JSON.stringify(error)}.`,
+        );
+      }
       if (error instanceof HttpException) {
         throw new WebSocketException(error.getStatus(), error.message);
       } else {

From 49d6252fadd1d6b93a9b6f27877a4c11a82f3d8d Mon Sep 17 00:00:00 2001
From: bhunt02 <bridgette.hunt02@outlook.com>
Date: Tue, 6 Jan 2026 14:38:30 -0800
Subject: [PATCH 6/8] switching to other dev device

---
 .../components/AddChatbotDocumentModal.tsx    | 465 +++++++++++-------
 .../settings/chatbot_settings/page.tsx        |   4 +-
 .../server/src/chatbot/chatbot-api.service.ts |  14 +-
 .../server/src/chatbot/chatbot.controller.ts  |   9 +-
 .../src/websocket/client-socket.service.ts    |  67 ++-
 5 files changed, 369 insertions(+), 190 deletions(-)

diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
index 9f19a1a76..d271b2ed4 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
@@ -1,23 +1,30 @@
 'use client'
 
 import {
+  CheckOutlined,
+  DeleteOutlined,
   FileAddOutlined,
   GithubOutlined,
+  LoadingOutlined,
+  RedoOutlined,
   UploadOutlined,
+  WarningOutlined,
 } from '@ant-design/icons'
 import {
   Form,
   Input,
+  List,
   message,
   Modal,
   Segmented,
   Switch,
+  Tooltip,
   UploadFile,
 } from 'antd'
 import Dragger from 'antd/es/upload/Dragger'
 import { useCallback, useEffect, useState } from 'react'
 import { API } from '@/app/api'
-import { getErrorMessage } from '@/app/utils/generalUtils'
+import { cn, getErrorMessage } from '@/app/utils/generalUtils'
 import { useAsyncToaster } from '@/app/contexts/AsyncToasterContext'
 import ChatbotHelpTooltip from '../../components/ChatbotHelpTooltip'
 import { useWebSocket } from '@/app/contexts/WebSocketContext'
@@ -41,6 +48,18 @@ type SocketExpectedReturn = {
   data: ChatbotDocumentAggregateResponse | Error
 }
 
+type UploadedStatus =
+  | 'error'
+  | 'done'
+  | 'uploading'
+  | 'removed'
+  | 'queued'
+  | 'uploaded'
+type UploadedFile = Omit<UploadFile, 'status'> & {
+  status?: UploadedStatus
+  resultId?: string
+}
+
 const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
   courseId,
   open,
@@ -54,7 +73,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
   const [form] = Form.useForm()
   const [isSlideDeck, setIsSlideDeck] = useState(false)
   const [fileList, setFileList] = useState<
-    (UploadFile & { resultId?: string })[]
+    (UploadedFile & { resultId?: string })[]
   >([])
   const [selectedFiles, setSelectedFiles] = useState<UploadFile[]>([])
   const [urlUpload, setUrlUpload] = useState<
@@ -77,137 +96,137 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
     }
   }
 
-  const uploadNextFile = useCallback(async () => {
-    const i = fileList.findIndex(
-      (v) => v.status !== 'uploading' && v.status !== 'done',
-    )
-    if (i < 0) {
-      // no more pending documents = all done!
-      message.info('All file uploads have finished processing.')
-    }
-    const file = fileList[i]
-    // if the file is already uploading or done, skip it and inform the user
-    if (fileList.find((f) => f.uid === file.uid)?.status === 'uploading') {
-      message.info(`${file.name} is still being processed.`)
-      return
-    } else if (fileList.find((f) => f.uid === file.uid)?.status === 'done') {
-      message.info(`${file.name} is already done being processed.`)
-      return
-    }
+  const uploadNextFile = useCallback(
+    async (callback: () => Promise<void>) => {
+      const i = fileList.findIndex((v) => v.status === 'queued')
+      if (i < 0) {
+        // no more pending documents = all done!
+        message.info('All file uploads have finished processing.')
+      }
+      const file = fileList[i]
 
-    const formData = new FormData()
-    formData.append('file', file.originFileObj!)
-    formData.append('parseAsPng', isSlideDeck.toString())
+      const formData = new FormData()
+      formData.append('file', file.originFileObj!)
+      formData.append('parseAsPng', isSlideDeck.toString())
 
-    setFileList((prevFileList) =>
-      prevFileList.map((f) =>
-        f.uid === file.uid ? { ...f, status: 'uploading' } : f,
-      ),
-    )
+      setFileList((prev) =>
+        prev.map((f) =>
+          f.uid === file.uid ? { ...f, status: 'uploading' } : f,
+        ),
+      )
 
-    runAsyncToast(
-      () => API.chatbot.staffOnly.uploadDocument(courseId, formData),
-      (result: string, error) => {
-        // handle the success/error
-        if (error) {
-          setFileList((prevFileList) =>
-            prevFileList.map((f) =>
-              f.uid === file.uid
-                ? { ...f, status: 'error', response: getErrorMessage(error) }
-                : f,
-            ),
-          )
-        } else {
-          webSocket
-            .subscribe(ChatbotResultEvents.GET_RESULT, {
-              type: ChatbotResultEventName.ADD_AGGREGATE,
-              resultId: result,
-            })
-            .then((res) => {
-              if (!res.success) {
-                toast.info(
-                  `Queued processing for but failed to subscribe for ${file.name}'s results. Queueing next upload.`,
-                )
-                setFileList((prev) => prev.filter((f) => f.uid !== file.uid))
-                const hasRemainingFile = fileList.some(
-                  (v) => v.status !== 'uploading' && v.status !== 'done',
-                )
-                if (hasRemainingFile) {
-                  // arbitrarily prioritize files
-                  uploadNextFile().then()
+      runAsyncToast(
+        () => API.chatbot.staffOnly.uploadDocument(courseId, formData),
+        (result: string, error) => {
+          // handle the success/error
+          if (error) {
+            setFileList((prevFileList) =>
+              prevFileList.map((f) =>
+                f.uid === file.uid
+                  ? { ...f, status: 'error', response: getErrorMessage(error) }
+                  : f,
+              ),
+            )
+          } else {
+            webSocket
+              .subscribe(ChatbotResultEvents.GET_RESULT, {
+                type: ChatbotResultEventName.ADD_AGGREGATE,
+                resultId: result,
+              })
+              .then((res) => {
+                if (!res.success) {
+                  toast.info(
+                    `Queued processing for but failed to subscribe for ${file.name}'s results. Queueing next upload.`,
+                  )
+                  setFileList((prev) =>
+                    prev.map((f) =>
+                      f.uid === file.uid
+                        ? {
+                            ...f,
+                            status: 'uploaded',
+                            response: getErrorMessage(error),
+                          }
+                        : f,
+                    ),
+                  )
+                  callback()
+                  return
                 }
-                return
-              }
-              setFileList((prev) =>
-                prev.map((f) =>
-                  f.uid === file.uid ? { ...f, resultId: result } : f,
-                ),
-              )
-            })
-        }
-      },
-      {
-        successMsg: `${file.name} uploaded and queued for processing!`,
-        errorMsg: `Failed to upload and/or queue processing for ${file.name}`,
-        appendApiError: true,
-        successDuration: 3500,
-      },
-    )
-  }, [courseId, fileList, isSlideDeck, runAsyncToast, webSocket])
+                setFileList((prev) =>
+                  prev.map((f) =>
+                    f.uid === file.uid ? { ...f, resultId: result } : f,
+                  ),
+                )
+              })
+          }
+        },
+        {
+          successMsg: `${file.name} uploaded and queued for processing!`,
+          errorMsg: `Failed to upload and/or queue processing for ${file.name}`,
+          appendApiError: true,
+          successDuration: 3500,
+        },
+      )
+    },
+    [courseId, fileList, isSlideDeck, runAsyncToast, webSocket],
+  )
 
-  const uploadNextUrl = useCallback(async () => {
-    const next = urlUpload.find((v) => v.status === 'queued')
-    if (!next) {
-      message.info('All URL uploads have finished processing.')
-      return
-    }
+  const uploadNextUrl = useCallback(
+    async (callback: () => Promise<void>) => {
+      const next = urlUpload.find((v) => v.status === 'queued')
+      if (!next) {
+        message.info('All URL uploads have finished processing.')
+        return
+      }
 
-    runAsyncToast(
-      () => API.chatbot.staffOnly.addDocumentFromURL(courseId, next.url),
-      (result: string, error) => {
-        // handle the success/error
-        if (error) {
-          setUrlUpload((prev) => prev.filter((v) => v.url != next.url))
-        } else {
-          webSocket
-            .subscribe(ChatbotResultEvents.GET_RESULT, {
-              type: ChatbotResultEventName.ADD_AGGREGATE,
-              resultId: result,
-            })
-            .then((res) => {
-              if (!res.success) {
-                toast.info(
-                  `Queued processing for but failed to subscribe for results of URL "${next.url}".`,
-                )
-                setUrlUpload((prev) => prev.filter((v) => v.url !== next.url))
+      runAsyncToast(
+        () => API.chatbot.staffOnly.addDocumentFromURL(courseId, next.url),
+        (result: string, error) => {
+          // handle the success/error
+          if (error) {
+            setUrlUpload((prev) => prev.filter((v) => v.url != next.url))
+          } else {
+            webSocket
+              .subscribe(ChatbotResultEvents.GET_RESULT, {
+                type: ChatbotResultEventName.ADD_AGGREGATE,
+                resultId: result,
+              })
+              .then((res) => {
+                if (!res.success) {
+                  toast.info(
+                    `Queued processing for but failed to subscribe for results of URL "${next.url}".`,
+                  )
+                  setUrlUpload((prev) => prev.filter((v) => v.url !== next.url))
 
-                const hasRemainingUrl = urlUpload.some(
-                  (v) => v.status !== 'uploading',
-                )
+                  const hasRemainingUrl = urlUpload.some(
+                    (v) => v.status !== 'uploading',
+                  )
 
-                if (hasRemainingUrl) {
-                  uploadNextUrl().then()
+                  if (hasRemainingUrl) {
+                    callback()
+                  }
+                  return
                 }
-                return
-              }
-              setUrlUpload((prev) =>
-                prev.map((v) =>
-                  v.url === next.url
-                    ? { ...v, status: 'uploading', resultId: result }
-                    : v,
-                ),
-              )
-            })
-        }
-      },
-      {
-        successMsg: `File at URL "${next.url}" queued for processing. You will be notified of completion.`,
-        errorMsg: `Failed to queue processing for URL "${next.url}". Please check the file type of the document at this URL.`,
-        appendApiError: true,
-        successDuration: 3500,
-      },
-    )
-  }, [courseId, runAsyncToast, urlUpload, webSocket])
+                setUrlUpload((prev) =>
+                  prev.map((v) =>
+                    v.url === next.url
+                      ? { ...v, status: 'uploading', resultId: result }
+                      : v,
+                  ),
+                )
+              })
+          }
+        },
+        {
+          successMsg: `File at URL "${next.url}" queued for processing. You will be notified of completion.`,
+          errorMsg: `Failed to queue processing for URL "${next.url}". Please check the file type of the document at this URL.`,
+          appendApiError: true,
+          successDuration: 3500,
+        },
+      )
+    },
+    [courseId, runAsyncToast, urlUpload, webSocket],
+  )
 
   const listener = useCallback(
     async (data: SocketExpectedReturn) => {
@@ -244,56 +263,57 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
             setUrlUpload((prev) => prev.filter((v) => v.resultId !== resultId))
           }
         }
-
-        const hasRemainingFile = fileList.some(
-          (v) => v.status !== 'uploading' && v.status !== 'done',
-        )
-        const hasRemainingUrl = urlUpload.some((v) => v.status !== 'uploading')
-
-        if (hasRemainingFile) {
-          // arbitrarily prioritize files
-          uploadNextFile().then()
-          return
-        }
-        if (hasRemainingUrl) {
-          uploadNextUrl().then()
-          return
-        }
       }
     },
     [fileList, getDocumentsProxy, urlUpload, uploadNextUrl, uploadNextFile],
   )
 
-  useEffect(() => {
-    if (webSocket) {
-      webSocket.onMessageEvent.on(
-        ChatbotResultEventName.ADD_AGGREGATE,
-        listener,
-      )
-      return () => {
-        webSocket.onMessageEvent.off(
-          ChatbotResultEventName.ADD_AGGREGATE,
-          listener,
-        )
-      }
+  async function uploadNext() {
+    const hasRemainingFile = fileList.some((v) => v.status !== 'queued')
+    const hasRemainingUrl = urlUpload.some((v) => v.status !== 'uploading')
+
+    if (hasRemainingFile) {
+      // arbitrarily prioritize files
+      await uploadNextFile(uploadNext)
+      return
     }
-    return () => {}
-  }, [listener, webSocket])
+    if (hasRemainingUrl) {
+      await uploadNextUrl(uploadNext)
+      return
+    }
+  }
 
   const uploadFiles = async () => {
     const uids = fileList.map((f) => f.uid)
     const subset = selectedFiles.filter((s) => !uids.includes(s.uid))
-    setFileList((prev) => [...prev, ...subset])
-    if (!fileList.some((v) => v.status === 'uploading')) {
-      uploadNextFile().then()
-    } else {
-      message.info(
-        `There is already a file being uploaded, but the file${subset.length > 1 ? 's' : ''}: ${subset.map((v) => v.name).join(', ')} ha${subset.length > 1 ? 've' : 's'} been queued.`,
-      )
-    }
+    setFileList((prev) => [
+      ...prev,
+      ...subset.map((f) => ({ ...f, status: 'queued' as UploadedStatus })),
+    ])
+    setSelectedFiles([])
     onClose()
   }
 
+  const [prevFileList, setPrevFileList] = useState<UploadedFile[]>([])
+  useEffect(() => {
+    const uids = prevFileList.map((v) => v.uid)
+    const newAmount = fileList.length - prevFileList.length
+    const newFiles = fileList.filter((v) => !uids.includes(v.uid))
+    if (
+      fileList.length > 0 &&
+      !fileList.some((v) => v.status === 'uploading')
+    ) {
+      uploadNextFile(uploadNext).then()
+    } else {
+      if (newAmount > 1) {
+        message.info(
+          `There is already a file being uploaded, but the file${newAmount > 1 ? 's' : ''} ${newFiles.map((v) => v.name).join(', ')} ha${newAmount > 1 ? 've' : 's'} been queued.`,
+        )
+      }
+    }
+    setPrevFileList(fileList)
+  }, [fileList])
+
   const addUrl = async (url: string) => {
     if (urlUpload.some((v) => v.url == url)) {
       message.warning(
@@ -303,7 +323,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
     }
     setUrlUpload((prev) => [...prev, { url, status: 'queued' }])
     if (!urlUpload.some((v) => v.status === 'uploading')) {
-      uploadNextUrl().then()
+      uploadNextUrl(uploadNext).then()
     } else {
       message.info(
         `There is already a URL being uploaded, but the URL "${url}" has been queued.`,
@@ -312,6 +332,22 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
     onClose()
   }
 
+  useEffect(() => {
+    if (webSocket) {
+      webSocket.onMessageEvent.on(
+        ChatbotResultEventName.ADD_AGGREGATE,
+        listener,
+      )
+      return () => {
+        webSocket.onMessageEvent.off(
+          ChatbotResultEventName.ADD_AGGREGATE,
+          listener,
+        )
+      }
+    }
+    return () => {}
+  }, [listener, webSocket])
+
   return (
     <Modal
       centered
@@ -426,16 +462,9 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
                   multiple={true}
                   accept=".docx,.pptx,.txt,.csv,.pdf,.md,.png,.jpg,.jpeg,.gif,.tiff,.xls,.xlsx,.doc,.rtf,.svg,.ppt,.odt,.ods,.odp,.epub,.vsd,.vsdx"
                   fileList={selectedFiles}
-                  onChange={(info: UploadChangeParam<UploadFile<any>>) => {
+                  onChange={(info: UploadChangeParam) =>
                     setSelectedFiles(info.fileList)
-                    const uids = info.fileList.map((f) => f.uid)
-                    setFileList((prev) =>
-                      prev.filter(
-                        (f) =>
-                          !(f.status !== 'uploading' && !uids.includes(f.uid)),
-                      ),
-                    )
-                  }}
+                  }
                   maxCount={10}
                   beforeUpload={() => false} // Prevent automatic upload
                 >
@@ -461,6 +490,100 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
                   onChange={(checked) => setIsSlideDeck(checked)}
                 />
               </Form.Item>
+
+              {fileList.length > 0 && (
+                <div className={'mt-2 flex flex-col gap-1'}>
+                  <p className={'font-semibold'}>Uploaded Files</p>
+                  <List<UploadedFile>
+                    dataSource={fileList}
+                    bordered={false}
+                    renderItem={(item: UploadedFile) => (
+                      <List.Item>
+                        <div className={'flex gap-2'}>
+                          <div
+                            className={cn(
+                              item.status === 'uploaded'
+                                ? 'text-yellow-300'
+                                : '',
+                              item.status === 'error' ? 'text-red-600' : '',
+                              item.status === 'uploading'
+                                ? 'text-blue-500'
+                                : '',
+                              item.status === 'done' ? 'text-green-500' : '',
+                            )}
+                          >
+                            <Tooltip
+                              className={'flex gap-2'}
+                              title={(() => {
+                                switch (item.status) {
+                                  case 'uploaded':
+                                    return 'This document was uploaded but results were unable to be subscribed for.'
+                                  case 'error':
+                                    return 'This document failed to upload or process.'
+                                  case 'uploading':
+                                    return 'This document is in progress of being uploaded'
+                                  case 'done':
+                                    return 'This document successfully finished processing and uploading.'
+                                }
+                                return null
+                              })()}
+                            >
+                              {(item.status === 'uploaded' ||
+                                item.status === 'error') && <WarningOutlined />}
+                              {item.status === 'uploading' && (
+                                <LoadingOutlined />
+                              )}
+                              {item.status === 'done' && <CheckOutlined />}
+                              <span>{item.name}</span>
+                            </Tooltip>
+                          </div>
+                          <div>
+                            {item.status === 'error' && (
+                              <>
+                                <button
+                                  onClick={() => {
+                                    setFileList((prev) => [
+                                      ...prev,
+                                      { ...item, status: 'queued' },
+                                    ])
+                                    if (
+                                      !fileList.some(
+                                        (v) => v.status === 'uploading',
+                                      )
+                                    ) {
+                                      uploadNext()
+                                    }
+                                  }}
+                                >
+                                  <RedoOutlined
+                                    className={'hover:text-helpmeblue'}
+                                  />
+                                </button>
+                              </>
+                            )}
+                            {(item.status === 'queued' ||
+                              item.status === 'error') && (
+                              <>
+                                <button
+                                  onClick={() =>
+                                    setFileList((prev) =>
+                                      prev.filter((v) => v.uid !== item.uid),
+                                    )
+                                  }
+                                >
+                                  <DeleteOutlined
+                                    className={'hover:text-red-500'}
+                                  />
+                                </button>
+                              </>
+                            )}
+                          </div>
+                        </div>
+                      </List.Item>
+                    )}
+                  />
+                </div>
+              )}
             </>
           )}
         </Form>
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
index 3f51f0496..0be6d5594 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
@@ -217,7 +217,6 @@ export default function ChatbotSettings(
     params: UpdateDocumentAggregateBody,
   ) => {
     setLoading((prev) => ({ ...prev, [id]: true }))
-    let subscribed = false
     await API.chatbot.staffOnly
       .updateDocument(courseId, id, params)
       .then(async (resultId: string) => {
@@ -232,7 +231,6 @@ export default function ChatbotSettings(
           )
           return
         }
-        subscribed = true
         setPendingAggregateUpdates((prev) => [
           ...prev,
           { resultId, aggregateId: id },
@@ -343,7 +341,7 @@ export default function ChatbotSettings(
             </Button>
           )}
 
-          {loading && (
+          {Object.keys(loading).some((k) => loading[k]) && (
             <Progress
               percent={Math.round(
                 (countProcessed / selectedRowKeys.length) * 100,
diff --git a/packages/server/src/chatbot/chatbot-api.service.ts b/packages/server/src/chatbot/chatbot-api.service.ts
index c4c1b6f15..903a2c8d0 100644
--- a/packages/server/src/chatbot/chatbot-api.service.ts
+++ b/packages/server/src/chatbot/chatbot-api.service.ts
@@ -112,7 +112,6 @@ export class ChatbotApiService {
       }
 
       const headers: Record<string, string> = {
-        'Content-Type': 'application/json',
         'HMS-API-KEY': this.chatbotApiKey,
       };
       if (userToken) {
@@ -123,11 +122,18 @@ export class ChatbotApiService {
       if (webSocketEvent) {
         id = await this.chatbotResultWebSocket.getUniqueId();
         webSocketEvent['resultId'] = id;
-        data['ws_info'] = webSocketEvent;
+        if (data instanceof FormData) {
+          const asJson = JSON.parse(data.get('body') as string);
+          asJson['ws_info'] = webSocketEvent as any;
+          data.set('body', JSON.stringify(asJson));
+        } else {
+          data['ws_info'] = webSocketEvent;
+        }
       }
 
       let body: BodyInit;
       if (data instanceof FormData) {
+        delete headers['Content-Type'];
         body = data;
       } else if (data != undefined && isObject(data)) {
         body = JSON.stringify(data);
@@ -546,6 +552,7 @@ export class ChatbotApiService {
     try {
       // re-upload the file to the chatbot server while the file is still in memory here
       const formData = new FormData();
+      const body = {};
       // Add the main file with fieldname "file"
       formData.append(
         'file',
@@ -562,9 +569,10 @@ export class ChatbotApiService {
       // Add the JSON data as a separate file with fieldname "source"
       Object.keys(params).forEach((k) => {
         if (params[k] != undefined) {
-          formData.append(k, params[k]);
+          body[k] = params[k];
         }
       });
+      formData.append('body', JSON.stringify(body));
 
       return await this.request(
         'POST',
diff --git a/packages/server/src/chatbot/chatbot.controller.ts b/packages/server/src/chatbot/chatbot.controller.ts
index c103e8070..cdf76b24f 100644
--- a/packages/server/src/chatbot/chatbot.controller.ts
+++ b/packages/server/src/chatbot/chatbot.controller.ts
@@ -833,13 +833,14 @@ export class ChatbotController {
 
     const uploadResultId = await this.chatbotResultWebSocket.getUniqueId();
 
-    this.socket.registerListener(
+    await this.socket.registerListener(
       {
         event: ChatbotResultEvents.POST_RESULT,
         callback: async (data: ChatbotDocumentAggregateResponse) => {
+          console.log('CALLBACK HIT', data);
           try {
             if (data instanceof Error) {
-              this.socket.emit(ChatbotResultEvents.POST_RESULT, {
+              await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
                 uploadResultId,
                 type: ChatbotResultEventName.ADD_AGGREGATE,
                 resultBody: data,
@@ -857,7 +858,7 @@ export class ChatbotController {
               `${file.originalname} (${file.mimetype}) upload chatbot service and save in db completed in ${endTime2 - endTime}ms for a total processing time of ${endTime2 - startTime}ms`,
             );
 
-            this.socket.emit(ChatbotResultEvents.POST_RESULT, {
+            await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
               uploadResultId,
               type: ChatbotResultEventName.ADD_AGGREGATE,
               resultBody: data,
@@ -869,7 +870,7 @@ export class ChatbotController {
             if (chatbotDocPdf && chatbotDocPdf.idHelpMeDB) {
               await ChatbotDocPdfModel.remove(chatbotDocPdf);
             }
-            this.socket.emit(ChatbotResultEvents.POST_RESULT, {
+            await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
               uploadResultId,
               type: ChatbotResultEventName.ADD_AGGREGATE,
               resultBody: err,
diff --git a/packages/server/src/websocket/client-socket.service.ts b/packages/server/src/websocket/client-socket.service.ts
index 463842aef..1dc134e2a 100644
--- a/packages/server/src/websocket/client-socket.service.ts
+++ b/packages/server/src/websocket/client-socket.service.ts
@@ -1,14 +1,24 @@
 import { io, Socket } from 'socket.io-client';
 import { ConfigService } from '@nestjs/config';
 import { Injectable } from '@nestjs/common';
+import { isObject } from '@nestjs/common/utils/shared.utils';
 
 @Injectable()
 export class ClientSocketService {
   private socket: Socket;
 
   constructor(private configService: ConfigService) {
-    this.socket = io({
+    this.socket = io('http://localhost:3002', {
+      forceNew: false,
+      multiplex: true,
+      reconnection: true,
       path: '/api/v1/ws',
+      reconnectionAttempts: Infinity,
+      reconnectionDelay: 1000,
+      reconnectionDelayMax: 5000,
+      randomizationFactor: 0.5,
+      timeout: 5000,
+      autoConnect: false,
       extraHeaders: {
         'hms-api-key': this.configService.get<string>('CHATBOT_API_KEY'),
       },
@@ -19,7 +29,26 @@ export class ClientSocketService {
     [key: string]: ((data: any) => void | Promise<void>)[];
   } = {};
 
-  registerListener<TData>(
+  async connect() {
+    return new Promise((resolve, reject) => {
+      if (this.socket.connected) {
+        resolve(true);
+        return;
+      }
+
+      this.socket.on('connect', () => {
+        resolve(true);
+      });
+
+      this.socket.connect();
+
+      setTimeout(() => {
+        reject(new Error('Connection attempt timed out'));
+      }, 5000);
+    });
+  }
+
+  async registerListener<TData>(
     listener: {
       event: string;
       callback: (data: TData) => void | Promise<void>;
@@ -33,34 +62,54 @@ export class ClientSocketService {
       try {
         await listener.callback(data);
       } finally {
-        this.cleanupListener(
+        await this.cleanupListener(
           listener,
           this.activeListeners[listener.event].find((l) => l == listen),
           subscription,
         );
       }
     };
+
     this.activeListeners[listener.event].push(listen);
     this.socket.on(listener.event, listen);
+
     if (subscription) {
-      this.socket.emit(subscription.event, subscription.args);
+      const subscribed = await this.emitWithAck(
+        subscription.event,
+        subscription.args,
+      );
+      if (isObject(subscribed) && 'error' in subscribed) {
+        throw subscribed;
+      }
     }
   }
 
-  cleanupListener(
+  async cleanupListener(
     listener: { event: string },
     listenerFunction: (data: any) => any,
     subscription?: { event: string; args: object },
-  ): void {
+  ): Promise<void> {
     if (subscription) {
-      this.socket.emit(subscription.event + '/unsubscribe', subscription.args);
+      const unsubscribed = await this.socket.emitWithAck(
+        subscription.event + '/unsubscribe',
+        subscription.args,
+      );
+      if (isObject(unsubscribed) && 'error' in unsubscribed) {
+        throw unsubscribed;
+      }
     }
     if (listener) {
       this.socket.off(listener.event, listenerFunction);
     }
   }
 
-  emit(event: string, args?: any): any {
-    return this.socket.emit(event, args);
+  async emit(event: string, args?: any): Promise<void> {
+    await this.connect();
+    this.socket.emit(event, args);
+  }
+
+  async emitWithAck(event: string, args?: any): Promise<any> {
+    await this.connect();
+    return await this.socket.emitWithAck(event, args);
   }
 }

From 6318f51135853c24e6731cba36cbe24502f0debe Mon Sep 17 00:00:00 2001
From: bhunt02 <bridgette.hunt02@outlook.com>
Date: Thu, 8 Jan 2026 20:51:47 -0800
Subject: [PATCH 7/8] very minor fixes

---
 package.json |  1 -
 yarn.lock    | 14 ++------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index f76e010c4..cd73517af 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,6 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "preinstall": "yarn workspace @koh/server remove lti-typescript && yarn workspace @koh/server add github:bhunt02/lti-typescript#release",
     "postinstall": "rimraf node_modules/@types/react-native",
     "cli": "yarn workspace @koh/server cli",
     "tsc": "yarn workspaces run tsc",
diff --git a/yarn.lock b/yarn.lock
index b166447bf..f9ef22fd6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11859,12 +11859,7 @@ nano-spawn@^2.0.0:
   resolved "https://registry.yarnpkg.com/nano-spawn/-/nano-spawn-2.0.0.tgz#f1250434c09ae18870d4f729fc54b406cf85a3e1"
   integrity sha512-tacvGzUY5o2D8CBh2rrwxyNojUsZNU2zjNTzKQrkgGJQTbGAfArVWXSKMBokBeeg6C7OLRGUEyoFlYbfeWQIqw==
 
-nanoid@^3.3.11, nanoid@^3.3.6:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
-  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
-
-nanoid@^5.1.5:
+nanoid@^3.3.11, nanoid@^3.3.6, nanoid@^5.1.5:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-5.1.6.tgz#30363f664797e7d40429f6c16946d6bd7a3f26c9"
   integrity sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==
@@ -12878,16 +12873,11 @@ pretty-quick@^4.2.2:
     tinyexec "^0.3.2"
     tslib "^2.8.1"
 
-prismjs@^1.30.0:
+prismjs@^1.30.0, prismjs@~1.27.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.30.0.tgz#d9709969d9d4e16403f6f348c63553b19f0975a9"
   integrity sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==
 
-prismjs@~1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.27.0.tgz#bb6ee3138a0b438a3653dd4d6ce0cc6510a45057"
-  integrity sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==
-
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"

From f75c9b30cc5324dd609c15490e53ad1e9965a020 Mon Sep 17 00:00:00 2001
From: bhunt02 <bridgette.hunt02@outlook.com>
Date: Fri, 9 Jan 2026 15:52:46 -0800
Subject: [PATCH 8/8] progress

---
 packages/common/chatbot-api-types.ts          |   4 +
 packages/common/index.ts                      |   3 +
 .../components/UpsertChatbotQuestionModal.tsx |  78 ++++++++--
 .../components/AddChatbotDocumentModal.tsx    |  13 +-
 .../settings/chatbot_settings/page.tsx        |  12 ++
 .../app/lti/(embed)/(pages)/[cid]/page.tsx    |   8 +-
 ...67985902172-chatbot-database-updates-II.ts |  89 +++++++++++
 .../server/src/chatbot/chatbot-api.service.ts |   1 +
 .../src/chatbot/chatbot-doc-pdf.entity.ts     |  24 ++-
 .../server/src/chatbot/chatbot.controller.ts  | 138 ++++++++++-------
 .../chatbot-result.gateway.ts                 |  23 ++-
 .../server/src/course/course.service.spec.ts  |   8 +-
 packages/server/src/course/course.service.ts  |  16 +-
 .../generic-ws-exception.filter.ts            |   5 +-
 .../lmsIntegration/lmsIntegration.service.ts  |  72 ++++++---
 packages/server/src/lti/lti.controller.ts     |   2 -
 .../src/websocket/client-socket.service.ts    | 143 ++++++++++++------
 17 files changed, 464 insertions(+), 175 deletions(-)
 create mode 100644 packages/server/migration/1767985902172-chatbot-database-updates-II.ts

diff --git a/packages/common/chatbot-api-types.ts b/packages/common/chatbot-api-types.ts
index a2c13ac1c..d9bd2a618 100644
--- a/packages/common/chatbot-api-types.ts
+++ b/packages/common/chatbot-api-types.ts
@@ -555,6 +555,10 @@ export class ChatbotDocumentAggregateResponse {
   @Type(() => ChatbotDocumentResponse)
   @ValidateNested({ each: true })
   subDocuments!: ChatbotDocumentResponse[]
+
+  @IsString()
+  @IsOptional()
+  size?: string
 }
 
 export class ChatbotQuestionResponse {
diff --git a/packages/common/index.ts b/packages/common/index.ts
index 49ab69b49..a9f409d3d 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -4210,5 +4210,8 @@ export const ERROR_MESSAGES = {
       malformedToken: 'Authorization token malformed',
       invalidToken: 'Authorization token invalid',
     },
+    operations: {
+      timeout: 'Request timed out',
+    },
   },
 }
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/UpsertChatbotQuestionModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/UpsertChatbotQuestionModal.tsx
index d0682b76f..7ed126b01 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/UpsertChatbotQuestionModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_questions/components/UpsertChatbotQuestionModal.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import {
   Button,
   Form,
@@ -12,6 +12,8 @@ import {
 import {
   ChatbotDocumentResponse,
   ChatbotQuestionResponse,
+  ChatbotResultEventName,
+  ChatbotResultEvents,
   CreateDocumentChunkBody,
   CreateQuestionBody,
   DocumentType,
@@ -28,6 +30,7 @@ import {
 import MarkdownGuideTooltipBody from './MarkdownGuideTooltipBody'
 import { API } from '@/app/api'
 import ChatbotSelectCitations from '../../components/ChatbotSelectCitations'
+import { useWebSocket } from '@/app/contexts/WebSocketContext'
 
 interface FormValues {
   question: string
@@ -56,6 +59,8 @@ const UpsertChatbotQuestionModal: React.FC<UpsertChatbotQuestionModalProps> = ({
   onUpsert,
   deleteQuestion,
 }) => {
+  const webSocket = useWebSocket()
+
   const [form] = Form.useForm()
   const [saveLoading, setSaveLoading] = useState(false)
 
@@ -99,6 +104,56 @@ const UpsertChatbotQuestionModal: React.FC<UpsertChatbotQuestionModalProps> = ({
     }
   }, [editingRecord, form])
 
+  const listener = useCallback(
+    async (data: {
+      params: { resultId: string; type: ChatbotResultEventName }
+      data: ChatbotDocumentResponse[]
+    }) => {
+      if (
+        'params' in data &&
+        'resultId' in data.params &&
+        'type' in data.params
+      ) {
+        if (data.params.type !== ChatbotResultEventName.ADD_CHUNK) {
+          return
+        }
+
+        const response = data.data
+
+        if ('error' in response) {
+          // an error occurred and was transmitted down
+          message.error(`Failed to insert question: ${response}`)
+        } else {
+          // success
+          const docChunks = response as ChatbotDocumentResponse[]
+          message.success(
+            `Document${docChunks.length > 1 ? 's' : ''} inserted successfully. You can now cancel or save the changes you made to the Q&A`,
+            6,
+          )
+          message.success(
+            `Document${docChunks.length > 1 ? 's' : ''} inserted successfully. `,
+          )
+          if (docChunks.length > 1)
+            message.info(
+              `Question text was too large! Inserted document was split into ${docChunks.length} document chunks.`,
+              6,
+            )
+          setSuccessfulQAInsert(true)
+        }
+      }
+    },
+    [],
+  )
+
+  useEffect(() => {
+    if (webSocket) {
+      webSocket.onMessageEvent.on(ChatbotResultEvents.POST_RESULT, listener)
+      return () => {
+        webSocket.onMessageEvent.off(ChatbotResultEvents.POST_RESULT, listener)
+      }
+    }
+  }, [listener, webSocket])
+
   const [successfulQAInsert, setSuccessfulQAInsert] = useState(false)
   // reset successfulQAInsert when the modal is closed
   useEffect(() => {
@@ -122,17 +177,18 @@ const UpsertChatbotQuestionModal: React.FC<UpsertChatbotQuestionModalProps> = ({
 
     await API.chatbot.staffOnly
       .addDocumentChunk(courseId, newChunk)
-      .then(async (docChunks: ChatbotDocumentResponse[]) => {
-        message.success(
-          `Document${docChunks.length > 1 ? 's' : ''} inserted successfully. You can now cancel or save the changes you made to the Q&A`,
-          6,
-        )
-        if (docChunks.length > 1)
-          message.info(
-            `Question text was too large! Inserted document was split into ${docChunks.length} document chunks.`,
-            6,
+      .then(async (resultId: string) => {
+        const res = await webSocket.subscribe(ChatbotResultEvents.GET_RESULT, {
+          type: ChatbotResultEventName.ADD_CHUNK,
+          resultId,
+        })
+        if (!res.success) {
+          message.success(
+            'Document creation successfully queued, but subscription to results failed.',
           )
-        setSuccessfulQAInsert(true)
+          return
+        }
+        message.success('Document creation successfully queued!')
       })
       .catch((e) => {
         const errorMessage = getErrorMessage(e)
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
index d271b2ed4..4a42f4461 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/components/AddChatbotDocumentModal.tsx
@@ -230,6 +230,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
 
   const listener = useCallback(
     async (data: SocketExpectedReturn) => {
+      console.log(data)
       if ('params' in data && 'resultId' in data.params) {
         const { resultId } = data.params
         const response = data.data
@@ -265,7 +266,7 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
         }
       }
     },
-    [fileList, getDocumentsProxy, urlUpload, uploadNextUrl, uploadNextFile],
+    [fileList, getDocumentsProxy, urlUpload],
   )
 
   async function uploadNext() {
@@ -334,15 +335,9 @@ const AddChatbotDocumentModal: React.FC<AddChatbotDocumentModalProps> = ({
 
   useEffect(() => {
     if (webSocket) {
-      webSocket.onMessageEvent.on(
-        ChatbotResultEventName.ADD_AGGREGATE,
-        listener,
-      )
+      webSocket.onMessageEvent.on(ChatbotResultEvents.POST_RESULT, listener)
       return () => {
-        webSocket.onMessageEvent.off(
-          ChatbotResultEventName.ADD_AGGREGATE,
-          listener,
-        )
+        webSocket.onMessageEvent.off(ChatbotResultEvents.POST_RESULT, listener)
       }
     }
     return () => {}
diff --git a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
index 0be6d5594..e6ef11a7a 100644
--- a/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
+++ b/packages/frontend/app/(dashboard)/course/[cid]/(settings)/settings/chatbot_settings/page.tsx
@@ -292,6 +292,18 @@ export default function ChatbotSettings(
         </>
       ),
     },
+    {
+      title: 'Page Count',
+      dataIndex: 'pageCount',
+      key: 'pageCount',
+      width: '10%',
+    },
+    {
+      title: 'Size',
+      dataIndex: 'size',
+      key: 'size',
+      width: '10%',
+    },
     {
       title: 'Type',
       dataIndex: 'type',
diff --git a/packages/frontend/app/lti/(embed)/(pages)/[cid]/page.tsx b/packages/frontend/app/lti/(embed)/(pages)/[cid]/page.tsx
index 4ca92c7ec..7ed31c001 100644
--- a/packages/frontend/app/lti/(embed)/(pages)/[cid]/page.tsx
+++ b/packages/frontend/app/lti/(embed)/(pages)/[cid]/page.tsx
@@ -12,8 +12,8 @@ export default function LtiCoursePage(): ReactElement {
   // chatbot
   const {
     setCid,
-    preDeterminedQuestions,
-    setPreDeterminedQuestions,
+    suggestedQuestions,
+    setSuggestedQuestions,
     questionsLeft,
     setQuestionsLeft,
     messages,
@@ -42,8 +42,8 @@ export default function LtiCoursePage(): ReactElement {
               key={courseId}
               cid={courseId}
               variant="huge"
-              preDeterminedQuestions={preDeterminedQuestions}
-              setPreDeterminedQuestions={setPreDeterminedQuestions}
+              suggestedQuestions={suggestedQuestions}
+              setSuggestedQuestions={setSuggestedQuestions}
               questionsLeft={questionsLeft}
               setQuestionsLeft={setQuestionsLeft}
               messages={messages}
diff --git a/packages/server/migration/1767985902172-chatbot-database-updates-II.ts b/packages/server/migration/1767985902172-chatbot-database-updates-II.ts
new file mode 100644
index 000000000..f25757ff6
--- /dev/null
+++ b/packages/server/migration/1767985902172-chatbot-database-updates-II.ts
@@ -0,0 +1,89 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class ChatbotDatabaseUpdatesII1767985902172 implements MigrationInterface {
+  name = 'Test1767985902172';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_doc_pdf_model" RENAME COLUMN "idHelpMeDB" TO "id"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_doc_pdf_model" RENAME COLUMN "docIdChatbotDB" TO "chatbotId"`,
+    );
+    await queryRunner.query(
+      `CREATE TYPE "public"."chatbot_doc_pdf_model_status_enum" AS ENUM('0', '1')`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_doc_pdf_model" ADD "status" "public"."chatbot_doc_pdf_model_status_enum" NOT NULL DEFAULT '1'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" DROP CONSTRAINT "FK_797cfec9399d72f1b554d7cb56c"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ALTER COLUMN "interactionId" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" DROP CONSTRAINT "FK_2d37ae2602e60432a4bf0c3cb19"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" DROP CONSTRAINT "FK_2b01cc936a843e5efc73f9acf49"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ALTER COLUMN "courseId" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ALTER COLUMN "userId" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ADD CONSTRAINT "FK_797cfec9399d72f1b554d7cb56c" FOREIGN KEY ("interactionId") REFERENCES "chatbot_interactions_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ADD CONSTRAINT "FK_2d37ae2602e60432a4bf0c3cb19" FOREIGN KEY ("courseId") REFERENCES "course_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ADD CONSTRAINT "FK_2b01cc936a843e5efc73f9acf49" FOREIGN KEY ("userId") REFERENCES "user_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" DROP CONSTRAINT "FK_2b01cc936a843e5efc73f9acf49"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" DROP CONSTRAINT "FK_2d37ae2602e60432a4bf0c3cb19"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" DROP CONSTRAINT "FK_797cfec9399d72f1b554d7cb56c"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ALTER COLUMN "userId" DROP NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ALTER COLUMN "courseId" DROP NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ADD CONSTRAINT "FK_2b01cc936a843e5efc73f9acf49" FOREIGN KEY ("userId") REFERENCES "user_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_interactions_model" ADD CONSTRAINT "FK_2d37ae2602e60432a4bf0c3cb19" FOREIGN KEY ("courseId") REFERENCES "course_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ALTER COLUMN "interactionId" DROP NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_questions_model" ADD CONSTRAINT "FK_797cfec9399d72f1b554d7cb56c" FOREIGN KEY ("interactionId") REFERENCES "chatbot_interactions_model"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_doc_pdf_model" DROP COLUMN "status"`,
+    );
+    await queryRunner.query(
+      `DROP TYPE "public"."chatbot_doc_pdf_model_status_enum"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_doc_pdf_model" RENAME COLUMN "id" TO "idHelpMeDB"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "chatbot_doc_pdf_model" RENAME COLUMN "chatbotId" TO "docIdChatbotDB"`,
+    );
+  }
+}
diff --git a/packages/server/src/chatbot/chatbot-api.service.ts b/packages/server/src/chatbot/chatbot-api.service.ts
index 903a2c8d0..32d927b09 100644
--- a/packages/server/src/chatbot/chatbot-api.service.ts
+++ b/packages/server/src/chatbot/chatbot-api.service.ts
@@ -137,6 +137,7 @@ export class ChatbotApiService {
         body = data;
       } else if (data != undefined && isObject(data)) {
         body = JSON.stringify(data);
+        headers['Content-Type'] = 'application/json';
       } else {
         body = data as any;
       }
diff --git a/packages/server/src/chatbot/chatbot-doc-pdf.entity.ts b/packages/server/src/chatbot/chatbot-doc-pdf.entity.ts
index 1e8a17d7c..ed56ccacf 100644
--- a/packages/server/src/chatbot/chatbot-doc-pdf.entity.ts
+++ b/packages/server/src/chatbot/chatbot-doc-pdf.entity.ts
@@ -1,20 +1,25 @@
 import { CourseModel } from '../course/course.entity';
 import {
-  Entity,
   BaseEntity,
-  PrimaryGeneratedColumn,
   Column,
-  ManyToOne,
+  Entity,
   JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
 } from 'typeorm';
 
+export enum ChatbotDocPdfStatus {
+  PENDING,
+  UPLOADED,
+}
+
 @Entity('chatbot_doc_pdf_model')
 export class ChatbotDocPdfModel extends BaseEntity {
   @PrimaryGeneratedColumn()
-  idHelpMeDB: number;
+  id: number;
 
-  @Column({ type: 'text', nullable: true }) // is only null for a brief period during pdf conversion, should be gaurenteed otherwise
-  docIdChatbotDB: string;
+  @Column({ type: 'text', nullable: true }) // is only null for a brief period during pdf conversion, should be guaranteed otherwise
+  chatbotId: string;
 
   @Column({ type: 'text' })
   docName: string;
@@ -33,4 +38,11 @@ export class ChatbotDocPdfModel extends BaseEntity {
 
   @Column({ default: 0 })
   docSizeBytes: number;
+
+  @Column({
+    type: 'enum',
+    enum: ChatbotDocPdfStatus,
+    default: ChatbotDocPdfStatus.UPLOADED,
+  })
+  status: ChatbotDocPdfStatus;
 }
diff --git a/packages/server/src/chatbot/chatbot.controller.ts b/packages/server/src/chatbot/chatbot.controller.ts
index cdf76b24f..1da00a9df 100644
--- a/packages/server/src/chatbot/chatbot.controller.ts
+++ b/packages/server/src/chatbot/chatbot.controller.ts
@@ -364,12 +364,28 @@ export class ChatbotController {
         : pageSize;
 
     // this gets the full chatbot documents (rather than just the chunks)
-    return await this.chatbotApiService.getAllAggregateDocuments(
+    const aggregates = await this.chatbotApiService.getAllAggregateDocuments(
       courseId,
       page,
       pageSize,
       search,
     );
+
+    const ids = aggregates.items.map((v) => v.id);
+    const docSizes = await ChatbotDocPdfModel.createQueryBuilder()
+      .select('"chatbotId"', 'id')
+      .addSelect('pg_size_pretty("docSizeBytes"::bigint)', 'size')
+      .where('"chatbotId" IN (:...aggregateIds)', {
+        aggregateIds: ids,
+      })
+      .getRawMany<{ id: string; size: string }>();
+
+    docSizes.forEach(({ id, size }) => {
+      const agg = aggregates.items.find((v) => v.id === id);
+      agg['size'] = size;
+    });
+
+    return aggregates;
   }
 
   @Get(':courseId/document{/:page}')
@@ -499,7 +515,7 @@ export class ChatbotController {
     await this.chatbotApiService.deleteDocument(docId, courseId);
     // if that succeeded (an error would have been thrown if it didn't), then delete the document from database
     await ChatbotDocPdfModel.delete({
-      docIdChatbotDB: docId,
+      chatbotId: docId,
     });
   }
 
@@ -599,7 +615,7 @@ export class ChatbotController {
           'doc."docName" as "doc_docName"',
           'LENGTH(doc."docData") as "file_size"',
         ])
-        .where('doc."idHelpMeDB" = :docId', { docId })
+        .where('doc."id" = :docId', { docId })
         .getRawOne<{ doc_docName: string; file_size: string }>();
 
       if (!docInfo) {
@@ -668,7 +684,7 @@ export class ChatbotController {
         .select(
           `SUBSTRING(doc."docData" FROM ${start + 1} FOR ${end - start + 1}) as chunk`,
         )
-        .where('doc."idHelpMeDB" = :docId', { docId })
+        .where('doc."id" = :docId', { docId })
         .stream();
 
       // Don't pipe directly - we need to transform each row
@@ -817,9 +833,9 @@ export class ChatbotController {
     chatbotDocPdf.docName = file.originalname;
     chatbotDocPdf.courseId = courseId;
     chatbotDocPdf.docSizeBytes = file.buffer.length;
-    chatbotDocPdf = await chatbotDocPdf.save(); // so that we have an idHelpMeDB to generate the url
+    chatbotDocPdf = await chatbotDocPdf.save(); // so that we have an id to generate the url
     const docUrl =
-      '/api/v1/chatbot/document/' + courseId + '/' + chatbotDocPdf.idHelpMeDB;
+      '/api/v1/chatbot/document/' + courseId + '/' + chatbotDocPdf.id;
     chatbotDocPdf.docData = file.buffer;
     // Save file to database and upload to chatbot service in parallel with error handling
     const resultId = await this.chatbotApiService.uploadDocument(
@@ -833,59 +849,77 @@ export class ChatbotController {
 
     const uploadResultId = await this.chatbotResultWebSocket.getUniqueId();
 
-    await this.socket.registerListener(
-      {
-        event: ChatbotResultEvents.POST_RESULT,
-        callback: async (data: ChatbotDocumentAggregateResponse) => {
-          console.log('CALLBACK HIT', data);
-          try {
-            if (data instanceof Error) {
-              await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
-                uploadResultId,
-                type: ChatbotResultEventName.ADD_AGGREGATE,
-                resultBody: data,
-              });
-              return;
-            }
-
-            if (chatbotDocPdf) {
-              chatbotDocPdf.docIdChatbotDB = data.id;
-              chatbotDocPdf = await chatbotDocPdf.save();
-            }
-
-            const endTime2 = Date.now();
-            console.log(
-              `${file.originalname} (${file.mimetype}) upload chatbot service and save in db completed in ${endTime2 - endTime}ms for a total processing time of ${endTime2 - startTime}ms`,
-            );
+    const subscription = {
+      event: ChatbotResultEvents.GET_RESULT,
+      args: {
+        resultId,
+        type: ChatbotResultEventName.ADD_AGGREGATE,
+      },
+    };
+
+    this.socket
+      .expectReply(
+        subscription,
+        ChatbotResultEvents.POST_RESULT,
+        async (result: {
+          params: { resultId: string; type: ChatbotResultEventName };
+          data: ChatbotDocumentAggregateResponse;
+        }) => {
+          const { params, data } = result;
+
+          if (
+            !params?.resultId ||
+            params?.type !== ChatbotResultEventName.ADD_AGGREGATE ||
+            (params?.resultId && params?.resultId !== resultId)
+          ) {
+            return;
+          }
 
+          if (data instanceof Error) {
             await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
-              uploadResultId,
+              resultId: uploadResultId,
               type: ChatbotResultEventName.ADD_AGGREGATE,
-              resultBody: data,
-            });
-          } catch (err) {
-            if (!(data instanceof Error)) {
-              await this.deleteDocument(courseId, data.id);
-            }
-            if (chatbotDocPdf && chatbotDocPdf.idHelpMeDB) {
-              await ChatbotDocPdfModel.remove(chatbotDocPdf);
-            }
-            await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
-              uploadResultId,
-              type: ChatbotResultEventName.ADD_AGGREGATE,
-              resultBody: err,
+              data,
             });
+            return;
+          }
+
+          if (chatbotDocPdf) {
+            chatbotDocPdf.chatbotId = data.id;
+            chatbotDocPdf = await chatbotDocPdf.save();
           }
+
+          const endTime2 = Date.now();
+          console.log(
+            `${file.originalname} (${file.mimetype}) upload chatbot service and save in db completed in ${endTime2 - endTime}ms for a total processing time of ${endTime2 - startTime}ms`,
+          );
+
+          await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
+            resultId: uploadResultId,
+            type: ChatbotResultEventName.ADD_AGGREGATE,
+            data,
+          });
         },
-      },
-      {
-        event: ChatbotResultEvents.GET_RESULT,
-        args: {
-          resultId,
-          type: ChatbotResultEventName.ADD_AGGREGATE,
+        async (result, err) => {
+          if (
+            result.data &&
+            !(result.data instanceof Error) &&
+            'id' in result.data
+          ) {
+            await this.deleteDocument(courseId, result.data.id);
+          }
+          if (chatbotDocPdf && chatbotDocPdf.id) {
+            await ChatbotDocPdfModel.remove(chatbotDocPdf);
+          }
+          await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
+            resultId: uploadResultId,
+            type: ChatbotResultEventName.ADD_AGGREGATE,
+            data: err,
+          });
         },
-      },
-    );
+        1000 * 60 * 5, // Allow up to 5 minutes before formally timing out
+      )
+      .then();
 
     return uploadResultId;
   }
diff --git a/packages/server/src/chatbot/intermediate-results/chatbot-result.gateway.ts b/packages/server/src/chatbot/intermediate-results/chatbot-result.gateway.ts
index 457c7975d..e34274097 100644
--- a/packages/server/src/chatbot/intermediate-results/chatbot-result.gateway.ts
+++ b/packages/server/src/chatbot/intermediate-results/chatbot-result.gateway.ts
@@ -11,7 +11,6 @@ import {
   SubscribeMessage,
 } from '@nestjs/websockets';
 import { Server, Socket } from 'socket.io';
-import { WsJwtAuthGuard } from '../../guards/websocket/ws-jwt-auth.guard';
 import { WsApiKeyGuard } from '../../guards/websocket/ws-api-key.guard';
 import { WebSocketEvent } from '../../websocket/websocket.event';
 import {
@@ -29,6 +28,7 @@ import {
   ChatbotResultEvents,
   isProd,
 } from '@koh/common';
+import { WsGeneralGuard } from '../../guards/websocket/ws-general.guard';
 
 @Injectable()
 export class ChatbotResultGateway extends WebsocketGateway {
@@ -52,18 +52,21 @@ export class ChatbotResultGateway extends WebsocketGateway {
     super.handleDisconnect(client);
   }
 
-  @UseGuards(WsJwtAuthGuard)
+  @UseGuards(WsGeneralGuard)
   @SubscribeMessage(ChatbotResultEvents.GET_RESULT)
   async subscribeResultEvent(
     @ConnectedSocket() client: Socket,
-    @MessageBody() body: [{ resultId: string; type: ChatbotResultEventName }],
+    @MessageBody()
+    body:
+      | [{ resultId: string; type: ChatbotResultEventName }]
+      | { resultId: string; type: ChatbotResultEventName },
   ): Promise<boolean> {
     if (!isProd()) {
       this.logger.debug(
         `Client ${client.id} subscribe request: ${JSON.stringify(body)}.`,
       );
     }
-    const { resultId, type } = body[0];
+    const { resultId, type } = Array.isArray(body) ? body[0] : body;
     if (!this.events[ChatbotResultEvents.GET_RESULT]) {
       throw new WsNotFoundException();
     }
@@ -81,18 +84,21 @@ export class ChatbotResultGateway extends WebsocketGateway {
     return true;
   }
 
-  @UseGuards(WsJwtAuthGuard)
+  @UseGuards(WsGeneralGuard)
   @SubscribeMessage(ChatbotResultEvents.GET_RESULT + '/unsubscribe')
   async unsubscribeResultEvent(
     @ConnectedSocket() client: Socket,
-    @MessageBody() body: [{ resultId: string; type: ChatbotResultEventName }],
+    @MessageBody()
+    body:
+      | [{ resultId: string; type: ChatbotResultEventName }]
+      | { resultId: string; type: ChatbotResultEventName },
   ): Promise<boolean> {
     if (!isProd()) {
       this.logger.debug(
         `Client ${client.id} unsubscribe: ${JSON.stringify(body)}.`,
       );
     }
-    const { resultId, type } = body[0];
+    const { resultId, type } = Array.isArray(body) ? body[0] : body;
     if (!this.events[ChatbotResultEvents.GET_RESULT]) {
       throw new WsNotFoundException();
     }
@@ -114,8 +120,9 @@ export class ChatbotResultGateway extends WebsocketGateway {
     body: { resultId: string; type: ChatbotResultEventName; data: any },
   ): Promise<any> {
     if (!isProd()) {
+      const bodyStr = JSON.stringify(body);
       this.logger.debug(
-        `Client ${client.id} post data: ${JSON.stringify(body)}.`,
+        `Client ${client.id} post data: ${bodyStr.slice(0, 64) + (bodyStr.length > 64 ? '...' : '')}.`,
       );
     }
     const { resultId, type, data } = body;
diff --git a/packages/server/src/course/course.service.spec.ts b/packages/server/src/course/course.service.spec.ts
index 1dad972cc..9ca3a6bf9 100644
--- a/packages/server/src/course/course.service.spec.ts
+++ b/packages/server/src/course/course.service.spec.ts
@@ -644,20 +644,18 @@ describe('CourseService', () => {
       // Check chatbot document PDFs
       const originalChatbotDocs = await ChatbotDocPdfModel.find({
         where: { courseId: originalCourseId },
-        order: { idHelpMeDB: 'ASC' },
+        order: { id: 'ASC' },
       });
 
       const clonedChatbotDocs = await ChatbotDocPdfModel.find({
         where: { courseId: clonedCourseId },
-        order: { idHelpMeDB: 'ASC' },
+        order: { id: 'ASC' },
       });
 
       expect(clonedChatbotDocs.length).toEqual(originalChatbotDocs.length);
 
       for (let i = 0; i < clonedChatbotDocs.length; i++) {
-        expect(clonedChatbotDocs[i].idHelpMeDB).not.toEqual(
-          originalChatbotDocs[i].idHelpMeDB,
-        );
+        expect(clonedChatbotDocs[i].id).not.toEqual(originalChatbotDocs[i].id);
         expect(clonedChatbotDocs[i].courseId).toEqual(clonedCourseId);
         expect(clonedChatbotDocs[i].docName).toEqual(
           originalChatbotDocs[i].docName,
diff --git a/packages/server/src/course/course.service.ts b/packages/server/src/course/course.service.ts
index c8ebe011e..efcf25883 100644
--- a/packages/server/src/course/course.service.ts
+++ b/packages/server/src/course/course.service.ts
@@ -14,7 +14,6 @@ import {
   TACheckinTimesResponse,
   UserCourse,
   UserPartial,
-  ExtraTAStatus,
 } from '@koh/common';
 import {
   BadRequestException,
@@ -45,7 +44,6 @@ import { QueueModel } from 'queue/queue.entity';
 import { SuperCourseModel } from './super-course.entity';
 import { ChatbotDocPdfModel } from 'chatbot/chatbot-doc-pdf.entity';
 import { URLSearchParams } from 'node:url';
-import { QueueStaffModel } from 'queue/queue-staff/queue-staff.entity';
 import * as crypto from 'crypto';
 
 @Injectable()
@@ -665,18 +663,18 @@ export class CourseService {
            WHERE "courseId" = $2`,
           [clonedCourse.id, courseId],
         );
-        // get all the idHelpMeDB and docIdChatbotDB values from the cloned course
+        // get all the id and chatbotId values from the cloned course
         const clonedCourseDocPdfs = await manager.find(ChatbotDocPdfModel, {
           select: {
             // only need these 2 fields. Don't want the whole documents
-            idHelpMeDB: true,
-            docIdChatbotDB: true, // these are the old ids, we need to update them once the new document aggregates are cloned in the chatbot repo
+            id: true,
+            chatbotId: true, // these are the old ids, we need to update them once the new document aggregates are cloned in the chatbot repo
           },
           where: { courseId: clonedCourse.id },
         });
         for (const doc of clonedCourseDocPdfs) {
-          // map each old docIdChatbotDB to the new idHelpMeDB
-          docIdMap[doc.docIdChatbotDB] = doc.idHelpMeDB.toString();
+          // map each old docIdChatbotDB to the new id
+          docIdMap[doc.chatbotId] = doc.id.toString();
         }
       }
 
@@ -744,8 +742,8 @@ export class CourseService {
             )) {
               await manager.update(
                 ChatbotDocPdfModel,
-                { idHelpMeDB: newHelpmeDocId },
-                { docIdChatbotDB: newAggregateDocId },
+                { id: newHelpmeDocId },
+                { chatbotId: newAggregateDocId },
               );
             }
           }
diff --git a/packages/server/src/exception_filters/generic-ws-exception.filter.ts b/packages/server/src/exception_filters/generic-ws-exception.filter.ts
index 84230ada0..1f6ad960b 100644
--- a/packages/server/src/exception_filters/generic-ws-exception.filter.ts
+++ b/packages/server/src/exception_filters/generic-ws-exception.filter.ts
@@ -43,8 +43,10 @@ export class BaseWsExceptionFilter<
     const status = 'error';
     const result = exception.getError();
 
+    const logger = BaseWsExceptionFilter.logger;
     if (isObject(result)) {
-      return client.emit('exception', result);
+      logger.error(result);
+      return client.emit(cause.pattern, result);
     }
 
     const payload: ErrorPayload<unknown> = {
@@ -52,6 +54,7 @@ export class BaseWsExceptionFilter<
       message: result,
     };
 
+    logger.error(payload);
     client.emit(cause.pattern, payload);
   }
 
diff --git a/packages/server/src/lmsIntegration/lmsIntegration.service.ts b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
index 702211e78..3b0dff41b 100644
--- a/packages/server/src/lmsIntegration/lmsIntegration.service.ts
+++ b/packages/server/src/lmsIntegration/lmsIntegration.service.ts
@@ -1139,18 +1139,37 @@ export class LMSIntegrationService {
       return false;
     }
 
-    let uploadId = '';
-    uploadId = await this.chatbotResultWebSocket.getUniqueId();
+    const uploadId = await this.chatbotResultWebSocket.getUniqueId();
+
+    const subscription = {
+      event: ChatbotResultEvents.GET_RESULT,
+      args: { resultId: result, type: eventType },
+    };
+    this.socket
+      .expectReply(
+        subscription,
+        eventType,
+        async (res: {
+          params: { resultId: string; type: ChatbotResultEventName };
+          data: ChatbotDocumentAggregateResponse;
+        }) => {
+          const { params, data } = res;
+
+          if (
+            !params?.resultId ||
+            params?.type !== eventType ||
+            (params?.resultId && params?.resultId !== result)
+          ) {
+            return;
+          }
 
-    this.socket.registerListener(
-      {
-        event: ChatbotResultEvents.POST_RESULT,
-        callback: async (data: ChatbotDocumentAggregateResponse | Error) => {
           if (data instanceof Error) {
-            this.socket.emit(ChatbotResultEvents.POST_RESULT, {
-              uploadId,
-              type: eventType,
-              resultBody: {
+            await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
+              params: {
+                resultId: uploadId,
+                type: eventType,
+              },
+              data: {
                 success: false,
                 id: item?.id,
               } as LMSFileUploadResponse,
@@ -1165,22 +1184,33 @@ export class LMSIntegrationService {
             adapter,
             model,
           );
-          this.socket.emit(ChatbotResultEvents.POST_RESULT, {
-            uploadId,
-            type: eventType,
-            resultBody: {
+          await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
+            params: {
+              resultId: uploadId,
+              type: eventType,
+            },
+            data: {
               success: !!document,
               id: document?.id,
-              documentId: document.chatbotDocumentId,
+              documentId: document?.chatbotDocumentId,
             } as LMSFileUploadResponse,
           });
         },
-      },
-      {
-        event: ChatbotResultEvents.GET_RESULT,
-        args: { result, type: eventType },
-      },
-    );
+        async () => {
+          await this.socket.emitWithAck(ChatbotResultEvents.POST_RESULT, {
+            params: {
+              resultId: uploadId,
+              type: eventType,
+            },
+            data: {
+              success: false,
+              id: 'id' in item ? item?.id : undefined,
+            } as LMSFileUploadResponse,
+          });
+        },
+        1000 * 60 * 2, // Two minute timeout
+      )
+      .then();
 
     return uploadId;
   }
diff --git a/packages/server/src/lti/lti.controller.ts b/packages/server/src/lti/lti.controller.ts
index ee0a053b3..1058a89d2 100644
--- a/packages/server/src/lti/lti.controller.ts
+++ b/packages/server/src/lti/lti.controller.ts
@@ -229,8 +229,6 @@ export class LtiController {
   ): Promise<LtiPlatform> {
     const platform = await this.ltiService.provider.getPlatformById(kid);
 
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-expect-error
     return await this.ltiService.provider.DynamicRegistration.getRegistration(
       platform,
     );
diff --git a/packages/server/src/websocket/client-socket.service.ts b/packages/server/src/websocket/client-socket.service.ts
index 1dc134e2a..30164fe1c 100644
--- a/packages/server/src/websocket/client-socket.service.ts
+++ b/packages/server/src/websocket/client-socket.service.ts
@@ -2,10 +2,15 @@ import { io, Socket } from 'socket.io-client';
 import { ConfigService } from '@nestjs/config';
 import { Injectable } from '@nestjs/common';
 import { isObject } from '@nestjs/common/utils/shared.utils';
+import { EventEmitter } from 'node:events';
+import { WsException } from '@nestjs/websockets';
+import { ERROR_MESSAGES } from '@koh/common';
 
 @Injectable()
 export class ClientSocketService {
   private socket: Socket;
+  public readonly receiver: EventEmitter;
+  private subscriptions: string[];
 
   constructor(private configService: ConfigService) {
     this.socket = io('http://localhost:3002', {
@@ -23,13 +28,29 @@ export class ClientSocketService {
         'hms-api-key': this.configService.get<string>('CHATBOT_API_KEY'),
       },
     }) as Socket;
+    this.subscriptions = [];
+    this.receiver = new EventEmitter();
+    this.socket.onAny((event, ...args) => {
+      this.receiver.emit(event, args);
+    });
+    (async () => {
+      await this.connect();
+    })().catch((err) => {
+      console.error(err);
+    });
   }
 
-  private activeListeners: {
-    [key: string]: ((data: any) => void | Promise<void>)[];
-  } = {};
+  private async restoreSubscriptions() {
+    for (const sub of this.subscriptions) {
+      try {
+        await this.subscribe(JSON.parse(sub));
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      } catch (ignored) {}
+    }
+  }
 
   async connect() {
+    const initialId = this.socket.id;
     return new Promise((resolve, reject) => {
       if (this.socket.connected) {
         resolve(true);
@@ -37,6 +58,9 @@ export class ClientSocketService {
       }
 
       this.socket.on('connect', () => {
+        if (this.socket.id !== initialId) {
+          this.restoreSubscriptions();
+        }
         resolve(true);
       });
 
@@ -48,59 +72,84 @@ export class ClientSocketService {
     });
   }
 
-  async registerListener<TData>(
-    listener: {
-      event: string;
-      callback: (data: TData) => void | Promise<void>;
-    },
-    subscription?: { event: string; args: object },
+  async expectReply<TResult>(
+    subscription: { event: string; args: object },
+    listenFor: string,
+    callback: (result: TResult) => Promise<void>,
+    onError?: (result: any, err: any) => void,
+    timeout: number = 30000, // default timeout of 30 seconds
   ) {
-    if (!this.activeListeners[listener.event]) {
-      this.activeListeners[listener.event] = [];
-    }
-    const listen = async (data: TData) => {
-      try {
-        await listener.callback(data);
-      } finally {
-        await this.cleanupListener(
-          listener,
-          this.activeListeners[listener.event].find((l) => l == listen),
-          subscription,
-        );
+    let listener;
+    const cleanup = async () => {
+      if (listener) {
+        this.receiver.off(listenFor, listener);
       }
+      try {
+        await this.unsubscribe(subscription);
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      } catch (ignored) {}
     };
+    let t: any;
+    await this.subscribe(subscription);
 
-    this.activeListeners[listener.event].push(listen);
-    this.socket.on(listener.event, listen);
+    return new Promise<void>((resolve, reject) => {
+      listener = async (result: TResult) => {
+        try {
+          result = Array.isArray(result) ? result[0] : result;
+          await callback(result);
+          resolve();
+        } catch (err) {
+          if (onError) {
+            onError(result, err);
+            reject(err);
+          }
+        } finally {
+          if (t) {
+            clearTimeout(t);
+          }
+          await cleanup();
+        }
+      };
+      this.receiver.on(listenFor, listener);
 
-    if (subscription) {
-      const subscribed = await this.emitWithAck(
-        subscription.event,
-        subscription.args,
-      );
-      if (isObject(subscribed) && 'error' in subscribed) {
-        throw subscribed;
-      }
-    }
+      t = setTimeout(async () => {
+        reject(new WsException(ERROR_MESSAGES.webSocket.operations.timeout));
+        clearTimeout(t);
+        await cleanup();
+      }, timeout);
+    });
   }
 
-  async cleanupListener(
-    listener: { event: string },
-    listenerFunction: (data: any) => any,
-    subscription?: { event: string; args: object },
-  ): Promise<void> {
-    if (subscription) {
-      const unsubscribed = await this.socket.emitWithAck(
-        subscription.event + '/unsubscribe',
-        subscription.args,
-      );
-      if (isObject(unsubscribed) && 'error' in unsubscribed) {
-        throw unsubscribed;
-      }
+  async subscribe(subscription: { event: string; args: object }) {
+    const key = JSON.stringify(subscription);
+    const subscribed = await this.emitWithAck(
+      subscription.event,
+      subscription.args,
+    );
+    const result = Array.isArray(subscribed) ? subscribed[0] : subscribed;
+
+    if (isObject(result) && 'error' in result) {
+      throw result;
+    }
+    if (!this.subscriptions.includes(key)) {
+      this.subscriptions.push(key);
     }
-    if (listener) {
-      this.socket.off(listener.event, listenerFunction);
+  }
+
+  async unsubscribe(subscription: {
+    event: string;
+    args: object;
+  }): Promise<void> {
+    const key = JSON.stringify(subscription);
+    const unsubscribed = await this.socket.emitWithAck(
+      subscription.event + '/unsubscribe',
+      subscription.args,
+    );
+    const result = Array.isArray(unsubscribed) ? unsubscribed[0] : unsubscribed;
+    if (isObject(result) && 'error' in result) {
+      throw result;
     }
+    this.subscriptions = this.subscriptions.filter((s) => s !== key);
   }
 
   async emit(event: string, args?: any): Promise<void> {