@dragonmastery/dragoncore-api 0.0.2 → 0.0.5

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { drizzle } from "drizzle-orm/d1";
 import { container, inject, injectable } from "tsyringe";
 import { and, asc, desc, eq, getTableColumns, getTableName, gt, gte, inArray, isNotNull, isNull, lt, lte, ne, notInArray, or, sql } from "drizzle-orm";
 import { customAlphabet } from "nanoid";
-import { AddCreditsSchema, ApproveSupportTicketSchema, AttachmentFiltersSchema, AttachmentFolderReadSchema, AttachmentPageSchema, CompleteSupportTicketSchema, CreditBalanceSchema, CreditTransactionFiltersSchema, CreditTransactionPageSchema, CustomerSupportTicketCreateSchema, CustomerSupportTicketFiltersSchema, CustomerSupportTicketPageSchema, CustomerSupportTicketReadSchema, CustomerSupportTicketUpdateSchema, NoteCreateSchema, NoteFiltersSchema, NoteReadSchema, NoteUpdateSchema, OPERATORS, ReadNotificationEmailsSchema, RecordConst, RecordConst as RecordConst$1, RejectSupportTicketSchema, RevertSupportTicketSchema, SetMonthlyAllocationSchema, StaffSupportTicketCreateSchema, StaffSupportTicketFiltersSchema, StaffSupportTicketPageSchema, StaffSupportTicketReadSchema, StaffSupportTicketUpdateSchema, SupportTicketApprovalEnum, SupportTicketDevLifecycleEnum, SupportTicketPriorityEnum, SupportTicketTypeEnum, TeamCreateSchema, TeamFiltersSchema, TeamMemberCreateSchema, TeamMemberFiltersSchema, TeamMemberReadSchema, TeamMemberUpdateSchema, TeamPageSchema, TeamReadSchema, TeamUpdateSchema, USER_TYPES, UpdateNotificationEmailsSchema, UserProfileReadSchema, UserProfileUpdateSchema, UserReadSchema, UserTeamMembersSchema, UserTeamsSchema, UserUpdateSchema, changePasswordSchema, createPaginatedSchema, createUserSchema, createUserSchemaOutput, loginResponseSchema, loginSchema, recordVersionFiltersInputBreadcrumbSchema, recordVersionFiltersInputSchema, recordVersionPageBreadcrumbSchema, recordVersionPageSchema, recordVersionSchema, resetPasswordSchema, sanitizeFileName, signupSchema, userSessionSchema } from "@dragonmastery/dragoncore-shared";
+import { AddCreditsSchema, ApproveSupportTicketSchema, ArchiveSupportTicketSchema, AttachmentFiltersSchema, AttachmentFolderReadSchema, AttachmentPageSchema, CompleteSupportTicketSchema, CreditBalanceSchema, CreditTransactionFiltersSchema, CreditTransactionPageSchema, CustomerSupportTicketCreateSchema, CustomerSupportTicketFiltersSchema, CustomerSupportTicketPageSchema, CustomerSupportTicketReadSchema, CustomerSupportTicketUpdateSchema, DEFAULT_USER_TYPE, MAX_PRESETS_PER_CONTEXT, NoteCreateSchema, NoteFiltersSchema, NoteReadSchema, NoteUpdateSchema, OPERATORS, RecordConst, RecordConst as RecordConst$1, RecordSubscriberReadSchema, RejectSupportTicketSchema, RevertSupportTicketSchema, SUPPORT_TICKET_PRIORITY_TO_NUMBER, SavedFilterCreateSchema, SavedFilterReadSchema, SavedFilterUpdateSchema, SetMonthlyAllocationSchema, StaffSupportTicketCreateSchema, StaffSupportTicketFiltersSchema, StaffSupportTicketPageSchema, StaffSupportTicketReadSchema, StaffSupportTicketUpdateSchema, SupportTicketApprovalEnum, SupportTicketDevLifecycleEnum, SupportTicketSubscriberCreateSchema, SupportTicketTypeEnum, TeamCreateSchema, TeamFiltersSchema, TeamMemberCreateSchema, TeamMemberFiltersSchema, TeamMemberReadSchema, TeamMemberUpdateSchema, TeamPageSchema, TeamReadSchema, TeamUpdateSchema, USER_TYPES, UserProfileReadSchema, UserProfileUpdateSchema, UserReadSchema, UserTeamMembersSchema, UserTeamsSchema, UserUpdateSchema, changePasswordSchema, createPaginatedSchema, createUserSchema, createUserSchemaOutput, loginResponseSchema, loginSchema, recordVersionFiltersInputBreadcrumbSchema, recordVersionFiltersInputSchema, recordVersionPageBreadcrumbSchema, recordVersionPageSchema, recordVersionSchema, recordVersionTrackerActivityInputSchema, resetPasswordSchema, sanitizeFileName, signupSchema, supportTicketNumberToPriority, userSessionSchema } from "@dragonmastery/dragoncore-shared";
 import { blob, index, integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 import { parseSigned, serializeSigned } from "hono/utils/cookie";
 import { hashPassword, verifyPassword } from "worker-password-auth";
@@ -329,6 +329,139 @@ const OperationConst = {
 	INSERT: "insert"
 };
 
+//#endregion
+//#region src/db/schemas/app_setting/app_settings_table.ts
+/**
+* Application settings table for storing global configuration
+* that doesn't need to be sharded.
+*
+* This includes default rates and other application-wide settings.
+*/
+const app_settings_table = sqliteTable("app_settings", {
+	key: text("key").primaryKey(),
+	value: text("value", { mode: "json" }).$type().notNull(),
+	created_at: text("created_at").notNull(),
+	created_by: text("created_by").notNull(),
+	updated_at: text("updated_at").notNull(),
+	updated_by: text("updated_by")
+}, (table) => ({
+	created_at_idx: index("app_settings_created_at_idx").on(table.created_at),
+	updated_at_idx: index("app_settings_updated_at_idx").on(table.updated_at)
+}));
+/**
+* Known setting keys for type safety
+*/
+const AppSettingKey = {
+	GLOBAL_TAX_SETTINGS: "global_tax_settings",
+	DEFAULT_PRICING_LEVEL: "default_pricing_level",
+	TERMS_OF_SERVICE: "terms_of_service",
+	PRIVACY_POLICY: "privacy_policy",
+	MAX_SUPPORT_TICKET_ITEMS: "max_support_ticket_items",
+	CUSTOMER_MONTHLY_BALANCE: "customer_monthly_balance",
+	CUSTOMER_ROLLOVER_BALANCE: "customer_rollover_balance",
+	CUSTOMER_MONTHLY_ALLOCATION: "customer_monthly_allocation",
+	LAST_SUPPORT_TICKET_ASSIGNEE: "last_support_ticket_assignee"
+};
+
+//#endregion
+//#region src/db/schemas/app_setting/app_settings_repo.ts
+let AppSettingsRepo = class AppSettingsRepo$1 {
+	constructor(appSettingsDb) {
+		this.appSettingsDb = appSettingsDb;
+	}
+	/**
+	* Get a setting value by key
+	* @param key Setting key
+	* @returns The setting value or undefined if not found
+	*/
+	async readSetting(key) {
+		const [setting] = await this.appSettingsDb.select().from(app_settings_table).where(eq(app_settings_table.key, key)).limit(1);
+		return setting;
+	}
+	/**
+	* Save a setting value
+	* @param key Setting key
+	* @param value Setting value
+	* @param user User making the change
+	*/
+	async createSetting(key, value, user) {
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		await this.appSettingsDb.insert(app_settings_table).values({
+			key,
+			value,
+			created_at: now,
+			created_by: user.userId,
+			updated_at: now,
+			updated_by: user.userId
+		});
+	}
+	async updateSetting(key, value, user) {
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const [updated] = await this.appSettingsDb.update(app_settings_table).set({
+			value,
+			updated_at: now,
+			updated_by: user.userId
+		}).where(eq(app_settings_table.key, key)).returning();
+		if (!updated) {
+			const [inserted] = await this.appSettingsDb.insert(app_settings_table).values({
+				key,
+				value,
+				created_at: now,
+				created_by: user.userId,
+				updated_at: now,
+				updated_by: user.userId
+			}).returning();
+			return inserted?.value;
+		}
+		return updated.value;
+	}
+	/**
+	* Delete a setting
+	* @param key Setting key
+	* @returns True if the setting was deleted, false if it didn't exist
+	*/
+	async deleteSetting(key) {
+		return (await this.appSettingsDb.delete(app_settings_table).where(eq(app_settings_table.key, key)).returning()).length > 0;
+	}
+	/**
+	* Get all settings
+	* @returns All settings as a map of key to value
+	*/
+	async getAllSettings() {
+		const settings = await this.appSettingsDb.select().from(app_settings_table);
+		const settingsMap = /* @__PURE__ */ new Map();
+		for (const setting of settings) settingsMap.set(setting.key, setting.value);
+		return settingsMap;
+	}
+	async readMultipleSettings(keys) {
+		const settings = await this.appSettingsDb.select().from(app_settings_table).where(inArray(app_settings_table.key, keys));
+		const settingsMap = /* @__PURE__ */ new Map();
+		for (const setting of settings) settingsMap.set(setting.key, setting.value);
+		return settingsMap;
+	}
+	async getNextSequentialId(recordType, userId) {
+		const counterKey = `${recordType}:counter`;
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const [result] = await this.appSettingsDb.insert(app_settings_table).values({
+			key: counterKey,
+			value: 1,
+			created_at: now,
+			created_by: userId,
+			updated_at: now,
+			updated_by: userId
+		}).onConflictDoUpdate({
+			target: app_settings_table.key,
+			set: {
+				value: sql`json(json_extract(${app_settings_table.value}, '$') + 1)`,
+				updated_at: now,
+				updated_by: userId
+			}
+		}).returning({ value: app_settings_table.value });
+		return String(result.value);
+	}
+};
+AppSettingsRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IAppSettingsDb))], AppSettingsRepo);
+
 //#endregion
 //#region src/slices/record_version/db/record_version_table.ts
 const record_version_table = sqliteTable("record_version", {
@@ -481,18 +614,81 @@ const note_table = sqliteTable("note", {
 	archived_at: text("archived_at"),
 	deleted_by: text("deleted_by"),
 	deleted_at: text("deleted_at")
+}, (table) => [
+	index("note_record_id_idx").on(table.record_id),
+	index("note_record_type_idx").on(table.record_type),
+	index("note_tag_idx").on(table.tag),
+	index("note_title_idx").on(table.title),
+	index("note_is_internal_idx").on(table.is_internal),
+	index("note_created_at_idx").on(table.created_at),
+	index("note_updated_at_idx").on(table.updated_at),
+	index("note_deleted_at_idx").on(table.deleted_at),
+	index("note_deleted_updated_idx").on(table.deleted_at, table.updated_at)
+]);
+
+//#endregion
+//#region src/slices/saved_filter/db/saved_filter_table.ts
+const saved_filter_table = sqliteTable("saved_filter", {
+	id: text("id").primaryKey(),
+	user_id: text("user_id").notNull(),
+	name: text("name").notNull(),
+	context: text("context").notNull(),
+	route_path: text("route_path").notNull(),
+	filters: text("filters").notNull(),
+	sort_by: text("sort_by"),
+	sort_direction: text("sort_direction"),
+	created_at: text("created_at").notNull(),
+	updated_at: text("updated_at").notNull()
+}, (table) => [
+	index("saved_filter_user_id_idx").on(table.user_id),
+	index("saved_filter_context_idx").on(table.context),
+	index("saved_filter_user_context_idx").on(table.user_id, table.context)
+]);
+
+//#endregion
+//#region src/slices/saved_filter/db/user_pinned_preset_table.ts
+const MAX_PINNED_PRESETS = 5;
+const user_pinned_preset_table = sqliteTable("user_pinned_preset", {
+	id: text("id").primaryKey(),
+	user_id: text("user_id").notNull(),
+	preset_id: text("preset_id").notNull(),
+	position: integer("position").notNull()
+}, (table) => [index("user_pinned_preset_user_id_idx").on(table.user_id), index("user_pinned_preset_preset_id_idx").on(table.preset_id)]);
+
+//#endregion
+//#region src/slices/record_subscriber/db/record_subscriber_table.ts
+/**
+* Generic record subscribers - users who receive notifications on record events.
+* Reusable for support_ticket, tracker, and other record types.
+* Email address comes from user's notification_email (user_profile) or user.email if not set.
+*/
+const record_subscriber_table = sqliteTable("record_subscriber", {
+	id: text("id").primaryKey(),
+	record_type: text("record_type").$type().notNull(),
+	record_id: text("record_id").notNull(),
+	user_id: text("user_id").notNull(),
+	subscribed_events: text("subscribed_events", { mode: "json" }).$type(),
+	created_at: text("created_at").notNull(),
+	created_by: text("created_by").notNull()
 }, (table) => ({
-	record_id_idx: index("note_record_id_idx").on(table.record_id),
-	record_type_idx: index("note_record_type_idx").on(table.record_type),
-	tag_idx: index("note_tag_idx").on(table.tag),
-	title_idx: index("note_title_idx").on(table.title),
-	is_internal_idx: index("note_is_internal_idx").on(table.is_internal),
-	created_at_idx: index("note_created_at_idx").on(table.created_at),
-	updated_at_idx: index("note_updated_at_idx").on(table.updated_at),
-	deleted_at_idx: index("note_deleted_at_idx").on(table.deleted_at),
-	deletedUpdatedIdx: index("note_deleted_updated_idx").on(table.deleted_at, table.updated_at)
+	recordTypeIdIdx: index("record_subscriber_record_type_id_idx").on(table.record_type, table.record_id),
+	userIdIdx: index("record_subscriber_user_id_idx").on(table.user_id),
+	uniqueSubscriberIdx: index("record_subscriber_unique_idx").on(table.record_type, table.record_id, table.user_id)
 }));
 
+//#endregion
+//#region src/slices/support_staff/db/support_staff_table.ts
+/**
+* Support staff - users who can triage support tickets.
+* Small table instead of flagging every user with can_triage.
+*/
+const support_staff_table = sqliteTable("support_staff", {
+	id: text("id").primaryKey(),
+	user_id: text("user_id").notNull().unique(),
+	created_at: text("created_at").notNull(),
+	created_by: text("created_by").notNull()
+}, (table) => ({ userIdIdx: index("support_staff_user_id_idx").on(table.user_id) }));
+
 //#endregion
 //#region src/slices/support_ticket/db/support_ticket_table.ts
 /**
@@ -504,10 +700,9 @@ const support_ticket_table = sqliteTable("support_ticket", {
 	title: text("title").notNull(),
 	description: text("description").notNull(),
 	type: text("type", { enum: SupportTicketTypeEnum }).notNull().default("FEATURE_REQUEST"),
-	priority: text("priority", { enum: SupportTicketPriorityEnum }).notNull().default("MEDIUM"),
+	priority: integer("priority", { mode: "number" }).notNull().default(2),
 	approval_status: text("approval_status", { enum: SupportTicketApprovalEnum }).notNull().default("PENDING"),
-	requester_email: text("requester_email").notNull(),
-	requester_name: text("requester_name").notNull(),
+	assigned_to: text("assigned_to"),
 	credit_value: text("credit_value"),
 	delivered_value: text("delivered_value"),
 	dev_lifecycle: text("dev_lifecycle", { enum: SupportTicketDevLifecycleEnum }),
@@ -531,8 +726,7 @@ const support_ticket_table = sqliteTable("support_ticket", {
 	priorityIdx: index("support_ticket_priority_idx").on(table.priority),
 	approvalStatusIdx: index("support_ticket_approval_status_idx").on(table.approval_status),
 	devLifecycleIdx: index("support_ticket_dev_lifecycle_idx").on(table.dev_lifecycle),
-	requesterEmailIdx: index("support_ticket_requester_email_idx").on(table.requester_email),
-	requesterNameIdx: index("support_ticket_requester_name_idx").on(table.requester_name),
+	assignedToIdx: index("support_ticket_assigned_to_idx").on(table.assigned_to),
 	creditValueIdx: index("support_ticket_credit_value_idx").on(table.credit_value),
 	deliveredValueIdx: index("support_ticket_delivered_value_idx").on(table.delivered_value),
 	createdAtIdx: index("support_ticket_created_at_idx").on(table.created_at),
@@ -659,6 +853,7 @@ const user_profile_table = sqliteTable("user_profile", {
 	last_name: text("last_name", { length: 255 }),
 	additional_name: text("additional_name", { length: 255 }),
 	avatar_url: text("avatar_url"),
+	notification_email: text("notification_email"),
 	gender: text("gender", { length: 255 }),
 	bio: text("bio"),
 	birthday: text("birthday"),
@@ -1351,6 +1546,14 @@ function resolveTeamAccess(userTeamIds, teamFilter) {
 		};
 		return { denied: true };
 	}
+	if (teamFilter?.operator === "in" && teamFilter.values?.length) {
+		const allowed = teamFilter.values.filter((id) => userTeamIds.includes(id));
+		if (allowed.length === 0) return { denied: true };
+		return {
+			denied: false,
+			effectiveTeamIds: allowed
+		};
+	}
 	return {
 		denied: false,
 		effectiveTeamIds: userTeamIds
@@ -1616,6 +1819,11 @@ var CursorUtils = class {
 	* Get items AFTER this cursor position in the sorted order
 	*/
 	static buildAfterCondition(table, column, sortValue, id, isDesc) {
+		if (sortValue === null || sortValue === void 0) {
+			const sortCol = column.column;
+			if (isDesc) return [and(isNull(sortCol), lt(table.id, id))];
+			else return [and(isNull(sortCol), gt(table.id, id))];
+		}
 		const { sortColumn, processedValue } = this.processSortColumn(column, sortValue);
 		if (isDesc) return [or(lt(sortColumn, processedValue), and(eq(sortColumn, processedValue), lt(table.id, id)))];
 		else return [or(gt(sortColumn, processedValue), and(eq(sortColumn, processedValue), gt(table.id, id)))];
@@ -1739,7 +1947,7 @@ var PaginationUtils = class {
 			responseState = BreadcrumbUtils.navigateNext(state, nextPageCursor);
 			responseState.currentPageIndex = state.currentPageIndex;
 		}
-		const prevPageCursor = BreadcrumbUtils.canNavigatePrevious(state) ? state.cursors[state.currentPageIndex - 1] || void 0 : void 0;
+		const prevPageCursor = BreadcrumbUtils.canNavigatePrevious(state) ? state.cursors[state.currentPageIndex - 1] : void 0;
 		return {
 			items,
 			pageInfo: {
@@ -2727,214 +2935,41 @@ function createIsAuthenticatedMiddleware(options) {
 }
 
 //#endregion
-//#region src/db/schemas/app_setting/app_settings_table.ts
-/**
-* Application settings table for storing global configuration
-* that doesn't need to be sharded.
-*
-* This includes default rates and other application-wide settings.
-*/
-const app_settings_table = sqliteTable("app_settings", {
-	key: text("key").primaryKey(),
-	value: text("value", { mode: "json" }).$type().notNull(),
-	created_at: text("created_at").notNull(),
-	created_by: text("created_by").notNull(),
-	updated_at: text("updated_at").notNull(),
-	updated_by: text("updated_by")
-}, (table) => ({
-	created_at_idx: index("app_settings_created_at_idx").on(table.created_at),
-	updated_at_idx: index("app_settings_updated_at_idx").on(table.updated_at)
-}));
-/**
-* Known setting keys for type safety
-*/
-const AppSettingKey = {
-	GLOBAL_TAX_SETTINGS: "global_tax_settings",
-	DEFAULT_PRICING_LEVEL: "default_pricing_level",
-	TERMS_OF_SERVICE: "terms_of_service",
-	PRIVACY_POLICY: "privacy_policy",
-	MAX_SUPPORT_TICKET_ITEMS: "max_support_ticket_items",
-	CUSTOMER_MONTHLY_BALANCE: "customer_monthly_balance",
-	CUSTOMER_ROLLOVER_BALANCE: "customer_rollover_balance",
-	CUSTOMER_MONTHLY_ALLOCATION: "customer_monthly_allocation",
-	SUPPORT_TICKET_NOTIFICATION_EMAILS: "support_ticket_notification_emails"
+//#region src/slices/app_settings/app_settings_container.ts
+function registerAppSettingsContainer() {}
+
+//#endregion
+//#region src/slices/attachment/attachment_interfaces.ts
+const ATTACHMENT_TOKENS = {
+	IAttachmentRepo: Symbol("IAttachmentRepo"),
+	IReadAllAttachmentsByRecord: Symbol("IReadAllAttachmentsByRecord"),
+	IReadAttachment: Symbol("IReadAttachment"),
+	ICreateAttachment: Symbol("ICreateAttachment"),
+	IUpdateAttachment: Symbol("IUpdateAttachment"),
+	IDeleteAttachment: Symbol("IDeleteAttachment")
+};
+const ATTACHMENT_FOLDER_TOKENS = {
+	IAttachmentFolderRepo: Symbol("IAttachmentFolderRepo"),
+	ICreateAttachmentFolder: Symbol("ICreateAttachmentFolder")
 };
 
 //#endregion
-//#region src/db/schemas/app_setting/app_settings_repo.ts
-let AppSettingsRepo = class AppSettingsRepo$1 {
-	constructor(appSettingsDb) {
-		this.appSettingsDb = appSettingsDb;
+//#region src/slices/attachment/db/attachment_folder_repo.ts
+let AttachmentFolderRepo = class AttachmentFolderRepo$1 {
+	constructor(router) {
+		this.router = router;
 	}
-	/**
-	* Get a setting value by key
-	* @param key Setting key
-	* @returns The setting value or undefined if not found
-	*/
-	async readSetting(key) {
-		const [setting] = await this.appSettingsDb.select().from(app_settings_table).where(eq(app_settings_table.key, key)).limit(1);
-		return setting;
+	async create_folder(folder) {
+		const id = await this.router.generateId(RecordConst.ATTACHMENT_FOLDER);
+		return (await this.router.queryLatest((db) => db.insert(attachment_folder_table).values({
+			id,
+			...folder
+		}).returning()))[0];
 	}
-	/**
-	* Save a setting value
-	* @param key Setting key
-	* @param value Setting value
-	* @param user User making the change
-	*/
-	async createSetting(key, value, user) {
-		const now = (/* @__PURE__ */ new Date()).toISOString();
-		await this.appSettingsDb.insert(app_settings_table).values({
-			key,
-			value,
-			created_at: now,
-			created_by: user.email,
-			updated_at: now,
-			updated_by: user.email
-		});
-	}
-	async updateSetting(key, value, user) {
-		const now = (/* @__PURE__ */ new Date()).toISOString();
-		const [updated] = await this.appSettingsDb.update(app_settings_table).set({
-			value,
-			updated_at: now,
-			updated_by: user.email
-		}).where(eq(app_settings_table.key, key)).returning();
-		if (!updated) {
-			const [inserted] = await this.appSettingsDb.insert(app_settings_table).values({
-				key,
-				value,
-				created_at: now,
-				created_by: user.email,
-				updated_at: now,
-				updated_by: user.email
-			}).returning();
-			return inserted?.value;
-		}
-		return updated.value;
-	}
-	/**
-	* Delete a setting
-	* @param key Setting key
-	* @returns True if the setting was deleted, false if it didn't exist
-	*/
-	async deleteSetting(key) {
-		return (await this.appSettingsDb.delete(app_settings_table).where(eq(app_settings_table.key, key)).returning()).length > 0;
-	}
-	/**
-	* Get all settings
-	* @returns All settings as a map of key to value
-	*/
-	async getAllSettings() {
-		const settings = await this.appSettingsDb.select().from(app_settings_table);
-		const settingsMap = /* @__PURE__ */ new Map();
-		for (const setting of settings) settingsMap.set(setting.key, setting.value);
-		return settingsMap;
-	}
-	async readMultipleSettings(keys) {
-		const settings = await this.appSettingsDb.select().from(app_settings_table).where(inArray(app_settings_table.key, keys));
-		const settingsMap = /* @__PURE__ */ new Map();
-		for (const setting of settings) settingsMap.set(setting.key, setting.value);
-		return settingsMap;
-	}
-	async getNextSequentialId(recordType, userId) {
-		const counterKey = `${recordType}:counter`;
-		const now = (/* @__PURE__ */ new Date()).toISOString();
-		const [result] = await this.appSettingsDb.insert(app_settings_table).values({
-			key: counterKey,
-			value: 1,
-			created_at: now,
-			created_by: userId,
-			updated_at: now,
-			updated_by: userId
-		}).onConflictDoUpdate({
-			target: app_settings_table.key,
-			set: {
-				value: sql`json(json_extract(${app_settings_table.value}, '$') + 1)`,
-				updated_at: now,
-				updated_by: userId
-			}
-		}).returning({ value: app_settings_table.value });
-		return String(result.value);
-	}
-};
-AppSettingsRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IAppSettingsDb))], AppSettingsRepo);
-
-//#endregion
-//#region src/slices/app_settings/app_settings_tokens.ts
-const APP_SETTINGS_TOKENS = {
-	IGetNotificationEmailsFeature: Symbol("IGetNotificationEmailsFeature"),
-	IUpdateNotificationEmailsFeature: Symbol("IUpdateNotificationEmailsFeature")
-};
-
-//#endregion
-//#region src/slices/app_settings/features/get_notification_emails_feat.ts
-let GetNotificationEmailsFeat = class GetNotificationEmailsFeat$1 {
-	constructor(appSettingsRepo) {
-		this.appSettingsRepo = appSettingsRepo;
-	}
-	async execute() {
-		return { emails: (await this.appSettingsRepo.readSetting(AppSettingKey.SUPPORT_TICKET_NOTIFICATION_EMAILS))?.value || [] };
-	}
-};
-GetNotificationEmailsFeat = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IAppSettingsRepo))], GetNotificationEmailsFeat);
-
-//#endregion
-//#region src/slices/app_settings/features/update_notification_emails_feat.ts
-let UpdateNotificationEmailsFeat = class UpdateNotificationEmailsFeat$1 {
-	constructor(appSettingsRepo, session) {
-		this.appSettingsRepo = appSettingsRepo;
-		this.session = session;
-	}
-	async execute(input) {
-		await this.appSettingsRepo.updateSetting(AppSettingKey.SUPPORT_TICKET_NOTIFICATION_EMAILS, input.emails.map((email) => email.email), this.session.user);
-		return input;
-	}
-};
-UpdateNotificationEmailsFeat = __decorate([
-	injectable(),
-	__decorateParam(0, inject(TOKENS.IAppSettingsRepo)),
-	__decorateParam(1, injectSession())
-], UpdateNotificationEmailsFeat);
-
-//#endregion
-//#region src/slices/app_settings/app_settings_container.ts
-function registerAppSettingsContainer() {
-	container.registerSingleton(APP_SETTINGS_TOKENS.IGetNotificationEmailsFeature, GetNotificationEmailsFeat);
-	container.registerSingleton(APP_SETTINGS_TOKENS.IUpdateNotificationEmailsFeature, UpdateNotificationEmailsFeat);
-}
-
-//#endregion
-//#region src/slices/attachment/attachment_interfaces.ts
-const ATTACHMENT_TOKENS = {
-	IAttachmentRepo: Symbol("IAttachmentRepo"),
-	IReadAllAttachmentsByRecord: Symbol("IReadAllAttachmentsByRecord"),
-	IReadAttachment: Symbol("IReadAttachment"),
-	ICreateAttachment: Symbol("ICreateAttachment"),
-	IUpdateAttachment: Symbol("IUpdateAttachment"),
-	IDeleteAttachment: Symbol("IDeleteAttachment")
-};
-const ATTACHMENT_FOLDER_TOKENS = {
-	IAttachmentFolderRepo: Symbol("IAttachmentFolderRepo"),
-	ICreateAttachmentFolder: Symbol("ICreateAttachmentFolder")
-};
-
-//#endregion
-//#region src/slices/attachment/db/attachment_folder_repo.ts
-let AttachmentFolderRepo = class AttachmentFolderRepo$1 {
-	constructor(router) {
-		this.router = router;
-	}
-	async create_folder(folder) {
-		const id = await this.router.generateId(RecordConst.ATTACHMENT_FOLDER);
-		return (await this.router.queryLatest((db) => db.insert(attachment_folder_table).values({
-			id,
-			...folder
-		}).returning()))[0];
-	}
-	async read_folder(id) {
-		const { ...rest } = getTableColumns(attachment_folder_table);
-		const result = await this.router.queryById(id, (db) => db.select({ ...rest }).from(attachment_folder_table).where(and(eq(attachment_folder_table.id, id), isNull(attachment_folder_table.deleted_at))).limit(1));
-		return result.length > 0 ? result[0] : null;
+	async read_folder(id) {
+		const { ...rest } = getTableColumns(attachment_folder_table);
+		const result = await this.router.queryById(id, (db) => db.select({ ...rest }).from(attachment_folder_table).where(and(eq(attachment_folder_table.id, id), isNull(attachment_folder_table.deleted_at))).limit(1));
+		return result.length > 0 ? result[0] : null;
 	}
 	async delete_folder(id) {
 		return (await this.router.queryById(id, (db) => db.update(attachment_folder_table).set({ deleted_at: (/* @__PURE__ */ new Date()).toISOString() }).where(eq(attachment_folder_table.id, id)).returning())).length > 0;
@@ -3037,17 +3072,74 @@ let AttachmentRepo = class AttachmentRepo$1 {
 };
 AttachmentRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], AttachmentRepo);
 
+//#endregion
+//#region src/slices/record_version/record_version_interfaces.ts
+const RECORD_VERSION_TOKENS = {
+	IRecordVersionsRepo: Symbol("IRecordVersionsRepo"),
+	IReadAllRecordVersionsByRecord: Symbol("IReadAllRecordVersionsByRecord"),
+	IReadAllRecordVersionsByRecordPaginated: Symbol("IReadAllRecordVersionsByRecordPaginated"),
+	IReadAllRecordVersionsByRecordPaginatedCustomer: Symbol("IReadAllRecordVersionsByRecordPaginatedCustomer"),
+	IReadTrackerActivityVersions: Symbol("IReadTrackerActivityVersions"),
+	IReadRecordVersion: Symbol("IReadRecordVersion"),
+	ICreateRecordVersion: Symbol("ICreateRecordVersion"),
+	ICreateRecordVersionsBatch: Symbol("ICreateRecordVersionsBatch"),
+	IUpdateRecordVersion: Symbol("IUpdateRecordVersion"),
+	IDeleteRecordVersion: Symbol("IDeleteRecordVersion")
+};
+
+//#endregion
+//#region src/slices/support_ticket/support_ticket_tokens.ts
+/**
+* Tokens for dependency injection
+* Organized by customer vs staff features
+*/
+const SUPPORT_TICKET_TOKENS = {
+	ISupportTicketRepo: "ISupportTicketRepo",
+	ISupportTicketNotificationService: "ISupportTicketNotificationService",
+	ISupportTicketTriageService: "ISupportTicketTriageService",
+	ICreateSupportTicketFeature: "ICreateSupportTicketFeature",
+	IUpdateSupportTicketCustomerFeature: "IUpdateSupportTicketCustomerFeature",
+	IGetSupportTicketCustomerFeature: "IGetSupportTicketCustomerFeature",
+	IGetSupportTicketsCustomerFeature: "IGetSupportTicketsCustomerFeature",
+	ICustomerToggleSubscriptionFeature: "ICustomerToggleSubscriptionFeature",
+	IApproveSupportTicketFeature: "IApproveSupportTicketFeature",
+	IRejectSupportTicketFeature: "IRejectSupportTicketFeature",
+	IRevertSupportTicketFeature: "IRevertSupportTicketFeature",
+	ICompleteSupportTicketFeature: "ICompleteSupportTicketFeature",
+	IConvertToInternalFeature: "IConvertToInternalFeature",
+	IConvertToCustomerFeature: "IConvertToCustomerFeature",
+	IDeleteSupportTicketFeature: "IDeleteSupportTicketFeature",
+	IArchiveSupportTicketFeature: "IArchiveSupportTicketFeature",
+	ICancelInternalTaskFeature: "ICancelInternalTaskFeature",
+	IReactivateInternalTaskFeature: "IReactivateInternalTaskFeature",
+	ICreateSupportTicketAdminFeature: "ICreateSupportTicketAdminFeature",
+	IUpdateSupportTicketAdminFeature: "IUpdateSupportTicketAdminFeature",
+	IGetSupportTicketAdminFeature: "IGetSupportTicketAdminFeature",
+	IGetSupportTicketsAdminFeature: "IGetSupportTicketsAdminFeature",
+	IGetRequestorsForActiveSupportTicketsFeature: "IGetRequestorsForActiveSupportTicketsFeature",
+	IGetSupportTicketNotesFeature: "IGetSupportTicketNotesFeature",
+	IAddSupportTicketSubscriberFeature: "IAddSupportTicketSubscriberFeature",
+	IListSupportTicketSubscribersFeature: "IListSupportTicketSubscribersFeature",
+	IRemoveSupportTicketSubscriberFeature: "IRemoveSupportTicketSubscriberFeature",
+	IFixSupportTicketUserIdsFeature: "IFixSupportTicketUserIdsFeature"
+};
+
 //#endregion
 //#region src/slices/attachment/features/create_attachment.ts
 let CreateAttachment = class CreateAttachment$1 {
-	constructor(session, attachment_repo, attachment_folder_repo, env, logger$1) {
+	constructor(session, attachment_repo, attachment_folder_repo, support_ticket_repo, create_record_version, env, logger$1) {
 		this.session = session;
 		this.attachment_repo = attachment_repo;
 		this.attachment_folder_repo = attachment_folder_repo;
+		this.support_ticket_repo = support_ticket_repo;
+		this.create_record_version = create_record_version;
 		this.env = env;
 		this.logger = logger$1;
 	}
 	async execute(attachment) {
+		if (attachment.record_type === RecordConst$1.SUPPORT_TICKET) {
+			if ((await this.support_ticket_repo.read(attachment.record_id))?.archived_at) throw new BusinessError("Cannot add attachments to an archived support ticket.");
+		}
 		this.logger.debug("[CreateAttachment] Starting file upload");
 		if (!attachment.file) throw new Error("File is required");
 		const envWithOptional = this.env;
@@ -3090,6 +3182,17 @@ let CreateAttachment = class CreateAttachment$1 {
 			this.logger.debug("[CreateAttachment] Failed to upload file to R2");
 			throw new Error("Failed to upload file to storage");
 		} else this.logger.debug(`[CreateAttachment] File uploaded to R2 with etag: ${r2_res.etag}`);
+		if (attachment.record_type === RecordConst$1.SUPPORT_TICKET) await this.create_record_version.execute({
+			record_id: attachment.record_id,
+			operation: OperationConst.UPDATE,
+			recorded_at: now,
+			record_type: RecordConst$1.SUPPORT_TICKET_ACTIVITY,
+			record: { attachment_added: attachment.file_name },
+			old_record: {},
+			auth_uid: this.session.user.userId,
+			auth_role: this.session.user.user_type ?? void 0,
+			auth_username: this.session.user.username ?? void 0
+		});
 		this.logger.debug("[CreateAttachment] Attachment created successfully");
 		return new_attachment;
 	}
@@ -3099,19 +3202,25 @@ CreateAttachment = __decorate([
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(ATTACHMENT_TOKENS.IAttachmentRepo)),
 	__decorateParam(2, inject(ATTACHMENT_FOLDER_TOKENS.IAttachmentFolderRepo)),
-	__decorateParam(3, inject(TOKENS.ENV)),
-	__decorateParam(4, inject(TOKENS.LOGGER))
+	__decorateParam(3, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(4, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(5, inject(TOKENS.ENV)),
+	__decorateParam(6, inject(TOKENS.LOGGER))
 ], CreateAttachment);
 
 //#endregion
 //#region src/slices/attachment/features/create_attachment_folder.ts
 let CreateAttachmentFolder = class CreateAttachmentFolder$1 {
-	constructor(session, attachment_folder_repo, logger$1) {
+	constructor(session, attachment_folder_repo, support_ticket_repo, logger$1) {
 		this.session = session;
 		this.attachment_folder_repo = attachment_folder_repo;
+		this.support_ticket_repo = support_ticket_repo;
 		this.logger = logger$1;
 	}
 	async execute(input) {
+		if (input.record_type === RecordConst$1.SUPPORT_TICKET) {
+			if ((await this.support_ticket_repo.read(input.record_id))?.archived_at) throw new BusinessError("Cannot add folders to an archived support ticket.");
+		}
 		this.logger.debug("[CreateAttachmentFolder] Starting folder creation");
 		if (!input.folder_name) throw new Error("Folder name is required");
 		const sanitized_name = sanitizeFileName(input.folder_name);
@@ -3159,28 +3268,52 @@ CreateAttachmentFolder = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(ATTACHMENT_FOLDER_TOKENS.IAttachmentFolderRepo)),
-	__decorateParam(2, inject(TOKENS.LOGGER))
+	__decorateParam(2, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(3, inject(TOKENS.LOGGER))
 ], CreateAttachmentFolder);
 
 //#endregion
 //#region src/slices/attachment/features/delete_attachment.ts
 let DeleteAttachment = class DeleteAttachment$1 {
-	constructor(attachment_repo, attachment_folder_repo) {
+	constructor(session, attachment_repo, attachment_folder_repo, support_ticket_repo, create_record_version) {
+		this.session = session;
 		this.attachment_repo = attachment_repo;
 		this.attachment_folder_repo = attachment_folder_repo;
+		this.support_ticket_repo = support_ticket_repo;
+		this.create_record_version = create_record_version;
 	}
 	async execute(id) {
 		const attachment = await this.attachment_repo.read_attachment(id);
 		if (!attachment) return false;
+		if (attachment.record_type === RecordConst$1.SUPPORT_TICKET) {
+			if ((await this.support_ticket_repo.read(attachment.record_id))?.archived_at) throw new BusinessError("Cannot delete attachments from an archived support ticket.");
+		}
 		const deleted = await this.attachment_repo.delete_attachment(id);
+		if (deleted && attachment.record_type === RecordConst$1.SUPPORT_TICKET) {
+			const now = (/* @__PURE__ */ new Date()).toISOString();
+			await this.create_record_version.execute({
+				record_id: attachment.record_id,
+				operation: OperationConst.UPDATE,
+				recorded_at: now,
+				record_type: RecordConst$1.SUPPORT_TICKET_ACTIVITY,
+				record: { attachment_removed: attachment.original_name },
+				old_record: {},
+				auth_uid: this.session.user.userId,
+				auth_role: this.session.user.user_type ?? void 0,
+				auth_username: this.session.user.username ?? void 0
+			});
+		}
 		if (deleted && attachment.folder_id) await this.attachment_folder_repo.recompute_file_count(attachment.folder_id);
 		return deleted;
 	}
 };
 DeleteAttachment = __decorate([
 	injectable(),
-	__decorateParam(0, inject(ATTACHMENT_TOKENS.IAttachmentRepo)),
-	__decorateParam(1, inject(ATTACHMENT_FOLDER_TOKENS.IAttachmentFolderRepo))
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(ATTACHMENT_TOKENS.IAttachmentRepo)),
+	__decorateParam(2, inject(ATTACHMENT_FOLDER_TOKENS.IAttachmentFolderRepo)),
+	__decorateParam(3, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(4, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
 ], DeleteAttachment);
 
 //#endregion
@@ -3474,7 +3607,7 @@ let CreditService = class CreditService$1 {
 			type: "DEDUCTION",
 			balance_after: CreditMath.toString(newMonthlyBalance + newRolloverBalance),
 			created_at: (/* @__PURE__ */ new Date()).toISOString(),
-			created_by: this.systemUser.email
+			created_by: this.systemUser.userId
 		};
 		await this.transactionRepo.createCreditTransaction(transaction);
 		return true;
@@ -3489,7 +3622,7 @@ let CreditService = class CreditService$1 {
 			type: "REFUND",
 			balance_after: CreditMath.toString(monthlyBalance + newRolloverBalance),
 			created_at: (/* @__PURE__ */ new Date()).toISOString(),
-			created_by: this.systemUser.email
+			created_by: this.systemUser.userId
 		};
 		await this.transactionRepo.createCreditTransaction(transaction);
 	}
@@ -3527,7 +3660,7 @@ let CreditService = class CreditService$1 {
 			type: "PURCHASE_ONETIME",
 			balance_after: CreditMath.toString(monthlyBalance + newRolloverBalance),
 			created_at: (/* @__PURE__ */ new Date()).toISOString(),
-			created_by: this.systemUser.email
+			created_by: this.systemUser.userId
 		};
 		await this.transactionRepo.createCreditTransaction(transaction);
 	}
@@ -3600,34 +3733,6 @@ BusinessLogicRouter = __decorate([
 	__decorateParam(3, inject("DeleteNoteSupportTicketProcessor"))
 ], BusinessLogicRouter);
 
-//#endregion
-//#region src/slices/support_ticket/support_ticket_tokens.ts
-/**
-* Tokens for dependency injection
-* Organized by customer vs staff features
-*/
-const SUPPORT_TICKET_TOKENS = {
-	ISupportTicketRepo: "ISupportTicketRepo",
-	ICreateSupportTicketFeature: "ICreateSupportTicketFeature",
-	IUpdateSupportTicketCustomerFeature: "IUpdateSupportTicketCustomerFeature",
-	IGetSupportTicketCustomerFeature: "IGetSupportTicketCustomerFeature",
-	IGetSupportTicketsCustomerFeature: "IGetSupportTicketsCustomerFeature",
-	IApproveSupportTicketFeature: "IApproveSupportTicketFeature",
-	IRejectSupportTicketFeature: "IRejectSupportTicketFeature",
-	IRevertSupportTicketFeature: "IRevertSupportTicketFeature",
-	ICompleteSupportTicketFeature: "ICompleteSupportTicketFeature",
-	IConvertToInternalFeature: "IConvertToInternalFeature",
-	IConvertToCustomerFeature: "IConvertToCustomerFeature",
-	IDeleteSupportTicketFeature: "IDeleteSupportTicketFeature",
-	ICancelInternalTaskFeature: "ICancelInternalTaskFeature",
-	IReactivateInternalTaskFeature: "IReactivateInternalTaskFeature",
-	ICreateSupportTicketAdminFeature: "ICreateSupportTicketAdminFeature",
-	IUpdateSupportTicketAdminFeature: "IUpdateSupportTicketAdminFeature",
-	IGetSupportTicketAdminFeature: "IGetSupportTicketAdminFeature",
-	IGetSupportTicketsAdminFeature: "IGetSupportTicketsAdminFeature",
-	IGetSupportTicketNotesFeature: "IGetSupportTicketNotesFeature"
-};
-
 //#endregion
 //#region src/slices/note/business_logic/support_ticket/create_note_support_ticket_processor.ts
 let CreateNoteSupportTicketProcessor = class CreateNoteSupportTicketProcessor$1 {
@@ -3638,18 +3743,18 @@ let CreateNoteSupportTicketProcessor = class CreateNoteSupportTicketProcessor$1
 	async process(input) {
 		const supportTicket = await this.supportTicketRepo.read(input.record_id);
 		if (!supportTicket) throw new Error("Support ticket not found");
+		if (supportTicket.archived_at) throw new Error("Cannot add comments to an archived ticket.");
 		const user = this.session.user;
 		if (user.user_type === "staff" || user.user_type === "super_admin") return await this.processStaffRequest(input, supportTicket);
-		else if (user.user_type === "consumer") return await this.processConsumerRequest(input, supportTicket);
-		else throw new Error("Invalid user type");
+		else if (user.user_type === "consumer" || user.user_type === "lead") return await this.processConsumerRequest(input, supportTicket);
+		else throw new BusinessError("Invalid user type");
 	}
 	async processStaffRequest(input, _supportTicket) {
 		return input;
 	}
 	async processConsumerRequest(input, supportTicket) {
-		const user = this.session.user;
-		if (supportTicket.created_by !== user.userId) throw new Error("You do not have access to this support ticket");
-		if (input.is_internal) throw new Error("Consumers cannot create internal notes");
+		if (supportTicket.approval_status === "INTERNAL") throw new BusinessError("You do not have access to this support ticket");
+		if (input.is_internal) throw new BusinessError("Consumers cannot create internal notes");
 		return {
 			...input,
 			is_internal: false
@@ -3674,7 +3779,7 @@ const NOTE_TOKENS = {
 	IUpdateNoteFeature: "IUpdateNoteFeature",
 	IGetNotesFeature: "IGetNotesFeature",
 	IDeleteNoteFeature: "IDeleteNoteFeature",
-	IBusinessLogicRouter: "IBusinessLogicRouter",
+	IBusinessLogicRouter: "Note.IBusinessLogicRouter",
 	CreateNoteSupportTicketProcessor: "CreateNoteSupportTicketProcessor",
 	UpdateNoteSupportTicketProcessor: "UpdateNoteSupportTicketProcessor",
 	GetNotesSupportTicketProcessor: "GetNotesSupportTicketProcessor",
@@ -3691,21 +3796,27 @@ let DeleteNoteSupportTicketProcessor = class DeleteNoteSupportTicketProcessor$1
 	}
 	async process(id) {
 		const existingNote = await this.noteRepo.read(id);
-		if (!existingNote) throw new Error("Note not found");
-		if (existingNote.record_type !== "support_ticket") throw new Error("This note does not belong to a support ticket");
+		if (!existingNote) throw new BusinessError("Note not found");
+		if (existingNote.record_type !== "support_ticket") throw new BusinessError("This note does not belong to a support ticket");
 		const supportTicket = await this.supportTicketRepo.read(existingNote.record_id);
-		if (!supportTicket) throw new Error("Support ticket not found");
+		if (!supportTicket) throw new BusinessError("Support ticket not found");
 		const user = this.session.user;
 		if (user.user_type === "staff" || user.user_type === "super_admin") return await this.processStaffRequest(id, existingNote, supportTicket);
-		else if (user.user_type === "consumer") return await this.processConsumerRequest(id, existingNote, supportTicket);
-		else throw new Error("Invalid user type");
+		else if (user.user_type === "consumer" || user.user_type === "lead") return await this.processConsumerRequest(id, existingNote, supportTicket);
+		else throw new BusinessError("Invalid user type");
 	}
-	async processStaffRequest(_id, _existingNote, supportTicket) {
-		if (supportTicket.dev_lifecycle === "DEPLOYED" || supportTicket.approval_status === "REJECTED") throw new Error("Cannot delete notes on completed or cancelled support tickets");
-		return _id;
+	async processStaffRequest(id, existingNote, supportTicket) {
+		if (existingNote.created_by !== this.session.user.userId) throw new BusinessError("You can only delete notes that you created");
+		if (supportTicket.dev_lifecycle === "DEPLOYED" || supportTicket.approval_status === "REJECTED") throw new BusinessError("Cannot delete notes on completed or cancelled support tickets");
+		if (supportTicket.archived_at) throw new BusinessError("Cannot delete comments on an archived ticket.");
+		return id;
 	}
-	async processConsumerRequest(_id, _existingNote, _supportTicket) {
-		throw new Error("Only staff can delete notes");
+	async processConsumerRequest(id, existingNote, supportTicket) {
+		const user = this.session.user;
+		if (supportTicket.approval_status === "INTERNAL") throw new BusinessError("You do not have access to this support ticket");
+		if (existingNote.created_by !== user.userId) throw new BusinessError("You can only delete notes that you created");
+		if (supportTicket.archived_at) throw new BusinessError("Cannot delete comments on an archived ticket.");
+		return id;
 	}
 };
 DeleteNoteSupportTicketProcessor = __decorate([
@@ -3729,8 +3840,8 @@ let GetNotesSupportTicketProcessor = class GetNotesSupportTicketProcessor$1 {
 			const supportTicket = await this.supportTicketRepo.read(recordIdValue);
 			if (!supportTicket) throw new Error("Support ticket not found");
 			if (user.user_type === "staff" || user.user_type === "super_admin") return await this.processStaffRequest(filters, supportTicket);
-			else if (user.user_type === "consumer") return await this.processConsumerRequest(filters, supportTicket);
-			else throw new Error("Invalid user type");
+			else if (user.user_type === "consumer" || user.user_type === "lead") return await this.processConsumerRequest(filters, supportTicket);
+			else throw new BusinessError("Invalid user type");
 		}
 		return await this.applyVisibilityRules(filters);
 	}
@@ -3738,8 +3849,7 @@ let GetNotesSupportTicketProcessor = class GetNotesSupportTicketProcessor$1 {
 		return filters;
 	}
 	async processConsumerRequest(filters, supportTicket) {
-		const user = this.session.user;
-		if (supportTicket.created_by !== user.userId) throw new Error("You do not have access to this support ticket");
+		if (supportTicket.approval_status === "INTERNAL") throw new BusinessError("You do not have access to this support ticket");
 		return {
 			...filters,
 			is_internal: {
@@ -3749,7 +3859,8 @@ let GetNotesSupportTicketProcessor = class GetNotesSupportTicketProcessor$1 {
 		};
 	}
 	async applyVisibilityRules(filters) {
-		if (this.session.user.user_type === "consumer") return {
+		const user = this.session.user;
+		if (user.user_type === "consumer" || user.user_type === "lead") return {
 			...filters,
 			is_internal: {
 				operator: OPERATORS.EQUALS,
@@ -3775,25 +3886,26 @@ let UpdateNoteSupportTicketProcessor = class UpdateNoteSupportTicketProcessor$1
 	}
 	async process(input) {
 		const existingNote = await this.noteRepo.read(input.id);
-		if (!existingNote) throw new Error("Note not found");
-		if (existingNote.record_type !== "support_ticket") throw new Error("This note does not belong to a support ticket");
+		if (!existingNote) throw new BusinessError("Note not found");
+		if (existingNote.record_type !== "support_ticket") throw new BusinessError("This note does not belong to a support ticket");
 		const supportTicket = await this.supportTicketRepo.read(existingNote.record_id);
-		if (!supportTicket) throw new Error("Support ticket not found");
+		if (!supportTicket) throw new BusinessError("Support ticket not found");
+		if (supportTicket.archived_at) throw new BusinessError("Cannot edit comments on an archived ticket.");
 		const user = this.session.user;
 		if (user.user_type === "staff" || user.user_type === "super_admin") return await this.processStaffRequest(input, existingNote, supportTicket);
-		else if (user.user_type === "consumer") return await this.processConsumerRequest(input, existingNote, supportTicket);
-		else throw new Error("Invalid user type");
+		else if (user.user_type === "consumer" || user.user_type === "lead") return await this.processConsumerRequest(input, existingNote, supportTicket);
+		else throw new BusinessError("Invalid user type");
 	}
 	async processStaffRequest(input, existingNote, _supportTicket) {
-		if (existingNote.created_by !== this.session.user.userId) throw new Error("You can only update notes that you created");
+		if (existingNote.created_by !== this.session.user.userId) throw new BusinessError("You can only update notes that you created");
 		return input;
 	}
 	async processConsumerRequest(input, existingNote, supportTicket) {
 		const user = this.session.user;
-		if (supportTicket.created_by !== user.userId) throw new Error("You do not have access to this support ticket");
-		if (existingNote.created_by !== user.userId) throw new Error("You can only update notes you created");
-		if (existingNote.is_internal) throw new Error("Consumers cannot update internal notes");
-		if (input.is_internal !== void 0 && input.is_internal !== existingNote.is_internal) throw new Error("Consumers cannot change note visibility");
+		if (supportTicket.approval_status === "INTERNAL") throw new BusinessError("You do not have access to this support ticket");
+		if (existingNote.created_by !== user.userId) throw new BusinessError("You can only update notes you created");
+		if (existingNote.is_internal) throw new BusinessError("Consumers cannot update internal notes");
+		if (input.is_internal !== void 0 && input.is_internal !== existingNote.is_internal) throw new BusinessError("Consumers cannot change note visibility");
 		return input;
 	}
 };
@@ -3949,6 +4061,15 @@ let NoteRepo = class NoteRepo$1 {
 		return result[0];
 	}
 	/**
+	* Get all note IDs for records (e.g. tracker + its followups).
+	* Used to include note activity in tracker activity timeline.
+	*/
+	async readAllIdsForRecords(records) {
+		if (records.length === 0) return [];
+		const conditions = [isNull(note_table.deleted_at), or(...records.map((r) => and(eq(note_table.record_id, r.record_id), eq(note_table.record_type, r.record_type))))];
+		return (await this.router.queryLatest((db) => db.select({ id: note_table.id }).from(note_table).where(and(...conditions)))).map((r) => r.id);
+	}
+	/**
 	* Get unique tags for notes
 	*/
 	async getUniqueTags() {
@@ -3963,28 +4084,34 @@ let NoteRepo = class NoteRepo$1 {
 NoteRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], NoteRepo);
 
 //#endregion
-//#region src/slices/record_version/record_version_interfaces.ts
-const RECORD_VERSION_TOKENS = {
-	IRecordVersionsRepo: Symbol("IRecordVersionsRepo"),
-	IReadAllRecordVersionsByRecord: Symbol("IReadAllRecordVersionsByRecord"),
-	IReadAllRecordVersionsByRecordPaginated: Symbol("IReadAllRecordVersionsByRecordPaginated"),
-	IReadAllRecordVersionsByRecordPaginatedCustomer: Symbol("IReadAllRecordVersionsByRecordPaginatedCustomer"),
-	IReadRecordVersion: Symbol("IReadRecordVersion"),
-	ICreateRecordVersion: Symbol("ICreateRecordVersion"),
-	ICreateRecordVersionsBatch: Symbol("ICreateRecordVersionsBatch"),
-	IUpdateRecordVersion: Symbol("IUpdateRecordVersion"),
-	IDeleteRecordVersion: Symbol("IDeleteRecordVersion")
+//#region src/slices/user/user_interfaces.ts
+const USER_TOKENS = {
+	IUserDisplayLookup: Symbol("IUserDisplayLookup"),
+	IUsersRepo: Symbol("IUsersRepo"),
+	ISignUpUser: Symbol("ISignUpUser"),
+	IReadAllUsers: Symbol("IReadAllUsers"),
+	IReadUser: Symbol("IReadUser"),
+	ICreateUser: Symbol("ICreateUser"),
+	IDeleteUser: Symbol("IDeleteUser"),
+	IReadConsumers: Symbol("IReadConsumers"),
+	IGetAllUsersFeature: "IGetAllUsersFeature",
+	IGetUserFeature: "IGetUserFeature",
+	IUpdateUserFeature: "IUpdateUserFeature",
+	IGetUsersForSelectionFeature: "IGetUsersForSelectionFeature",
+	IGetTriageUsersFeature: "IGetTriageUsersFeature"
 };
 
 //#endregion
 //#region src/slices/note/features/create_note_feat.ts
 let CreateNoteFeat = class CreateNoteFeat$1 {
-	constructor(session, noteRepo, businessLogicRouter, create_record_version, supportTicketRepo) {
+	constructor(session, noteRepo, businessLogicRouter, create_record_version, userDisplayLookup, supportTicketRepo, notificationService) {
 		this.session = session;
 		this.noteRepo = noteRepo;
 		this.businessLogicRouter = businessLogicRouter;
 		this.create_record_version = create_record_version;
+		this.userDisplayLookup = userDisplayLookup;
 		this.supportTicketRepo = supportTicketRepo;
+		this.notificationService = notificationService;
 	}
 	async execute(input) {
 		const processor = this.businessLogicRouter.getCreateProcessor(input.record_type);
@@ -4014,7 +4141,13 @@ let CreateNoteFeat = class CreateNoteFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		return noteCreated;
+		await this.notifySupportTicketSubscribers(processedInput.record_type, processedInput.record_id, noteCreated.is_internal, noteCreated.body ?? "");
+		const displayMap = await this.userDisplayLookup.lookupDisplayNames([noteCreated.created_by]);
+		return {
+			...noteCreated,
+			created_by_display_name: displayMap.get(noteCreated.created_by) ?? noteCreated.created_by,
+			updated_by_display_name: displayMap.get(noteCreated.updated_by ?? "") ?? noteCreated.updated_by ?? null
+		};
 	}
 	/**
 	* Bumps parent record's updated_at timestamp when note is created
@@ -4036,6 +4169,21 @@ let CreateNoteFeat = class CreateNoteFeat$1 {
 			default: break;
 		}
 	}
+	/**
+	* Notify support ticket subscribers when a note is added (best-effort)
+	*/
+	async notifySupportTicketSubscribers(recordType, recordId, isInternal, noteBody) {
+		if (recordType !== RecordConst.SUPPORT_TICKET || !this.supportTicketRepo || !this.notificationService) return;
+		try {
+			const ticket = await this.supportTicketRepo.read(recordId);
+			if (!ticket) return;
+			const eventType = isInternal ? "NEW_INTERNAL_NOTE" : "NEW_CUSTOMER_NOTE";
+			await this.notificationService.notifyFollowers(recordId, ticket, eventType, {
+				noteBody: noteBody || void 0,
+				actorUserId: this.session.user.userId
+			});
+		} catch {}
+	}
 };
 CreateNoteFeat = __decorate([
 	injectable(),
@@ -4043,7 +4191,9 @@ CreateNoteFeat = __decorate([
 	__decorateParam(1, inject(NOTE_TOKENS.INoteRepo)),
 	__decorateParam(2, inject(NOTE_TOKENS.IBusinessLogicRouter)),
 	__decorateParam(3, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(4, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo))
+	__decorateParam(4, inject(USER_TOKENS.IUserDisplayLookup)),
+	__decorateParam(5, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(6, inject(SUPPORT_TICKET_TOKENS.ISupportTicketNotificationService))
 ], CreateNoteFeat);
 
 //#endregion
@@ -4087,10 +4237,19 @@ DeleteNoteFeat = __decorate([
 
 //#endregion
 //#region src/slices/note/features/get_notes_feat.ts
+function collectUserIdsFromNotes(notes) {
+	const ids = [];
+	for (const n of notes) {
+		if (n.created_by) ids.push(n.created_by);
+		if (n.updated_by) ids.push(n.updated_by);
+	}
+	return ids;
+}
 let GetNotesFeat = class GetNotesFeat$1 {
-	constructor(noteRepo, businessLogicRouter) {
+	constructor(noteRepo, businessLogicRouter, userDisplayLookup) {
 		this.noteRepo = noteRepo;
 		this.businessLogicRouter = businessLogicRouter;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(filters) {
 		let processedFilters = filters;
@@ -4101,23 +4260,36 @@ let GetNotesFeat = class GetNotesFeat$1 {
 				if (processor) processedFilters = await processor.process(filters);
 			}
 		}
-		return await this.noteRepo.read_all(processedFilters);
+		const result = await this.noteRepo.read_all(processedFilters);
+		const userIds = collectUserIdsFromNotes(result.items);
+		const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
+		const enrichedItems = result.items.map((n) => ({
+			...n,
+			created_by_display_name: n.created_by ? displayMap.get(n.created_by) ?? n.created_by : null,
+			updated_by_display_name: n.updated_by ? displayMap.get(n.updated_by) ?? n.updated_by : null
+		}));
+		return {
+			...result,
+			items: enrichedItems
+		};
 	}
 };
 GetNotesFeat = __decorate([
 	injectable(),
 	__decorateParam(0, inject(NOTE_TOKENS.INoteRepo)),
-	__decorateParam(1, inject(NOTE_TOKENS.IBusinessLogicRouter))
+	__decorateParam(1, inject(NOTE_TOKENS.IBusinessLogicRouter)),
+	__decorateParam(2, inject(USER_TOKENS.IUserDisplayLookup))
 ], GetNotesFeat);
 
 //#endregion
 //#region src/slices/note/features/update_note_feat.ts
 let UpdateNoteFeat = class UpdateNoteFeat$1 {
-	constructor(session, noteRepo, businessLogicRouter, create_record_version) {
+	constructor(session, noteRepo, businessLogicRouter, create_record_version, userDisplayLookup) {
 		this.session = session;
 		this.noteRepo = noteRepo;
 		this.businessLogicRouter = businessLogicRouter;
 		this.create_record_version = create_record_version;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(input) {
 		const existingNote = await this.noteRepo.read(input.id);
@@ -4145,7 +4317,13 @@ let UpdateNoteFeat = class UpdateNoteFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		return noteUpdated;
+		const userIds = [noteUpdated.created_by, noteUpdated.updated_by].filter(Boolean);
+		const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
+		return {
+			...noteUpdated,
+			created_by_display_name: noteUpdated.created_by ? displayMap.get(noteUpdated.created_by) ?? noteUpdated.created_by : null,
+			updated_by_display_name: noteUpdated.updated_by ? displayMap.get(noteUpdated.updated_by) ?? noteUpdated.updated_by : null
+		};
 	}
 };
 UpdateNoteFeat = __decorate([
@@ -4153,7 +4331,8 @@ UpdateNoteFeat = __decorate([
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(NOTE_TOKENS.INoteRepo)),
 	__decorateParam(2, inject(NOTE_TOKENS.IBusinessLogicRouter)),
-	__decorateParam(3, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
+	__decorateParam(3, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(4, inject(USER_TOKENS.IUserDisplayLookup))
 ], UpdateNoteFeat);
 
 //#endregion
@@ -4200,22 +4379,6 @@ let PasswordResetTokenVerifier = class PasswordResetTokenVerifier$1 {
 };
 PasswordResetTokenVerifier = __decorate([injectable()], PasswordResetTokenVerifier);
 
-//#endregion
-//#region src/slices/user/user_interfaces.ts
-const USER_TOKENS = {
-	IUsersRepo: Symbol("IUsersRepo"),
-	ISignUpUser: Symbol("ISignUpUser"),
-	IReadAllUsers: Symbol("IReadAllUsers"),
-	IReadUser: Symbol("IReadUser"),
-	ICreateUser: Symbol("ICreateUser"),
-	IDeleteUser: Symbol("IDeleteUser"),
-	IReadConsumers: Symbol("IReadConsumers"),
-	IGetAllUsersFeature: "IGetAllUsersFeature",
-	IGetUserFeature: "IGetUserFeature",
-	IUpdateUserFeature: "IUpdateUserFeature",
-	IGetUsersForSelectionFeature: "IGetUsersForSelectionFeature"
-};
-
 //#endregion
 //#region src/slices/password_reset/features/change_password.ts
 let ChangeUserPassword = class ChangeUserPassword$1 {
@@ -4360,6 +4523,51 @@ function registerPasswordResetContainer() {
 	container.registerSingleton(PASSWORD_RESET_TOKENS.IChangeUserPassword, ChangeUserPassword);
 }
 
+//#endregion
+//#region src/slices/record_subscriber/db/record_subscriber_repo.ts
+let RecordSubscriberRepo = class RecordSubscriberRepo$1 {
+	constructor(router) {
+		this.router = router;
+	}
+	async create(entity) {
+		const id = await this.router.generateId(RecordConst.RECORD_SUBSCRIBER);
+		const [result] = await this.router.queryLatest((db) => db.insert(record_subscriber_table).values({
+			id,
+			...entity
+		}).returning());
+		return result;
+	}
+	async ensureSubscriber(entity) {
+		const existing = await this.readByRecordAndUser(entity.record_type, entity.record_id, entity.user_id);
+		if (existing) return existing;
+		return this.create(entity);
+	}
+	async readByRecordId(recordType, recordId) {
+		return this.router.queryAll((db) => db.select().from(record_subscriber_table).where(and(eq(record_subscriber_table.record_type, recordType), eq(record_subscriber_table.record_id, recordId))));
+	}
+	async readByRecordAndUser(recordType, recordId, userId) {
+		return (await this.router.queryAll((db) => db.select().from(record_subscriber_table).where(and(eq(record_subscriber_table.record_type, recordType), eq(record_subscriber_table.record_id, recordId), eq(record_subscriber_table.user_id, userId))).limit(1)))[0];
+	}
+	async delete(id) {
+		return (await this.router.queryLatest((db) => db.delete(record_subscriber_table).where(eq(record_subscriber_table.id, id)).returning())).length > 0;
+	}
+	async updateSubscribedEvents(id, subscribedEvents) {
+		const [result] = await this.router.queryLatest((db) => db.update(record_subscriber_table).set({ subscribed_events: subscribedEvents }).where(eq(record_subscriber_table.id, id)).returning());
+		return result;
+	}
+};
+RecordSubscriberRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], RecordSubscriberRepo);
+
+//#endregion
+//#region src/slices/record_subscriber/record_subscriber_tokens.ts
+const RECORD_SUBSCRIBER_TOKENS = { IRecordSubscriberRepo: "IRecordSubscriberRepo" };
+
+//#endregion
+//#region src/slices/record_subscriber/record_subscriber_registration.ts
+function registerRecordSubscriberDependencies() {
+	container.registerSingleton(RECORD_SUBSCRIBER_TOKENS.IRecordSubscriberRepo, RecordSubscriberRepo);
+}
+
 //#endregion
 //#region src/slices/team/team_interfaces.ts
 const TEAM_TOKENS = {
@@ -4407,10 +4615,11 @@ var RecordAccessValidatorRegistry = class {
 	}
 };
 let ValidateRecordAccess = class ValidateRecordAccess$1 {
-	constructor(session, teamRepo, validatorRegistry) {
+	constructor(session, teamRepo, validatorRegistry, logger$1) {
 		this.session = session;
 		this.teamRepo = teamRepo;
 		this.validatorRegistry = validatorRegistry;
+		this.logger = logger$1;
 	}
 	async execute(record_id, record_type) {
 		const user = this.session.user;
@@ -4423,8 +4632,43 @@ let ValidateRecordAccess = class ValidateRecordAccess$1 {
 			case "team":
 				await this.validateTeamAccess(record_id, user.user_type);
 				break;
-			default: if (user.user_type !== "lead" && user.user_type !== "staff" && user.user_type !== "super_admin") throw new Error(`Access denied: Record type '${record_type}' requires lead or staff permissions. Register a custom validator for this record type.`);
+			default: if (user.user_type !== "lead" && user.user_type !== "staff" && user.user_type !== "super_admin") {
+				this.logger.warn("[ValidateRecordAccess] Access denied", {
+					record_id,
+					record_type,
+					user_id: user.userId,
+					user_type: user.user_type,
+					reason: "Record type requires lead/staff/admin; no custom validator registered"
+				});
+				throw new BusinessError("Access denied: You do not have permission to view this record.");
+			}
+		}
+	}
+	async filterAllowedRecordTypes(record_id, record_types) {
+		const allowed = (await Promise.all(record_types.map(async (rt) => {
+			try {
+				await this.execute(record_id, rt);
+				return {
+					rt,
+					allowed: true
+				};
+			} catch {
+				return {
+					rt,
+					allowed: false
+				};
+			}
+		}))).filter((r) => r.allowed).map((r) => r.rt);
+		if (allowed.length === 0) {
+			this.logger.warn("[ValidateRecordAccess] Access denied - no requested record types allowed", {
+				record_id,
+				requested_record_types: record_types,
+				user_id: this.session.user.userId,
+				user_type: this.session.user.user_type
+			});
+			throw new BusinessError("Access denied: You do not have permission to access any of the requested record types.");
 		}
+		return allowed;
 	}
 	/**
 	* Validates access to a team record
@@ -4432,16 +4676,24 @@ let ValidateRecordAccess = class ValidateRecordAccess$1 {
 	* Consumers cannot access team records
 	*/
 	async validateTeamAccess(record_id, user_type) {
-		if (!await this.teamRepo.read(record_id)) throw new Error("Team not found");
+		if (!await this.teamRepo.read(record_id)) {
+			this.logger.warn("[ValidateRecordAccess] Team not found", { record_id });
+			throw new BusinessError("Team not found");
+		}
 		if (user_type === "lead" || user_type === "staff" || user_type === "super_admin") return;
-		throw new Error("Access denied: Team records require lead or staff permissions");
+		this.logger.warn("[ValidateRecordAccess] Access denied - team requires lead/staff", {
+			record_id,
+			user_type
+		});
+		throw new BusinessError("Access denied: Team records require lead or staff permissions");
 	}
 };
 ValidateRecordAccess = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(TEAM_TOKENS.ITeamRepository)),
-	__decorateParam(2, inject(RECORD_VERSION_VALIDATION_TOKENS.ValidatorRegistry))
+	__decorateParam(2, inject(RECORD_VERSION_VALIDATION_TOKENS.ValidatorRegistry)),
+	__decorateParam(3, inject(TOKENS.LOGGER))
 ], ValidateRecordAccess);
 
 //#endregion
@@ -4515,9 +4767,13 @@ let RecordVersionRepo = class RecordVersionRepo$1 {
 	/**
 	* NEW: Breadcrumb pagination for record versions
 	* Use this for new implementations requiring bidirectional navigation
+	* Supports single record_type or multiple record_types (merged results)
 	*/
-	async read_all_record_versions_paginated(record_id, record_type, filters) {
-		const baseConditions = [eq(record_version_table.record_type, record_type), eq(record_version_table.record_id, record_id)];
+	async read_all_record_versions_paginated(record_id, record_type_or_types, filters) {
+		const record_types = Array.isArray(record_type_or_types) ? record_type_or_types : [record_type_or_types];
+		const recordTypeCondition = record_types.length === 1 ? eq(record_version_table.record_type, record_types[0]) : inArray(record_version_table.record_type, record_types);
+		const record_ids = filters?.record_ids;
+		const baseConditions = [recordTypeCondition, record_ids && record_ids.length > 0 ? inArray(record_version_table.record_id, record_ids) : eq(record_version_table.record_id, record_id)];
 		if (filters?.start_date) baseConditions.push(gte(record_version_table.recorded_at, filters.start_date));
 		if (filters?.end_date) baseConditions.push(lte(record_version_table.recorded_at, filters.end_date));
 		return PaginationUtils.findAllPaginated({
@@ -4647,19 +4903,49 @@ ReadAllRecordVersionsByRecord = __decorate([
 
 //#endregion
 //#region src/slices/record_version/features/read_all_record_versions_by_record_paginated_customer_feat.ts
+const USER_ID_FIELDS$1 = new Set([
+	"assigned_to",
+	"created_by",
+	"updated_by",
+	"archived_by",
+	"deleted_by"
+]);
+function collectUserIdsFromRecordVersions$1(items) {
+	const ids = /* @__PURE__ */ new Set();
+	for (const item of items) for (const raw of [item.record, item.old_record]) {
+		if (!raw || typeof raw !== "string") continue;
+		try {
+			const rec = JSON.parse(raw);
+			for (const [key, val] of Object.entries(rec)) if (USER_ID_FIELDS$1.has(key) && typeof val === "string" && val.trim()) ids.add(val);
+		} catch {}
+	}
+	return [...ids];
+}
 let ReadAllRecordVersionsByRecordPaginatedCustomer = class ReadAllRecordVersionsByRecordPaginatedCustomer$1 {
-	constructor(record_version_repo) {
+	constructor(record_version_repo, userDisplayLookup) {
 		this.record_version_repo = record_version_repo;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(record_id, record_type, filters) {
-		const records = await this.record_version_repo.read_all_record_versions_paginated(record_id, record_type, filters);
-		records.items = records.items.map((record) => {
+		const record_types = filters?.record_types ?? [record_type];
+		const records = await this.record_version_repo.read_all_record_versions_paginated(record_id, record_types, filters);
+		const mappedRecords = records.items.map((record) => {
+			const recordType = record.record_type;
 			return {
 				...record,
-				record: this.filterFieldsByRecordType(JSON.stringify(record.record), record_type),
-				old_record: this.filterFieldsByRecordType(JSON.stringify(record.old_record), record_type)
+				record: this.filterFieldsByRecordType(JSON.stringify(record.record), recordType),
+				old_record: this.filterFieldsByRecordType(JSON.stringify(record.old_record), recordType)
 			};
 		});
+		records.items = mappedRecords;
+		const userIds = collectUserIdsFromRecordVersions$1(mappedRecords);
+		if (userIds.length > 0) {
+			const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
+			return {
+				...records,
+				user_display_map: Object.fromEntries(displayMap)
+			};
+		}
 		return records;
 	}
 	/**
@@ -4669,7 +4955,9 @@ let ReadAllRecordVersionsByRecordPaginatedCustomer = class ReadAllRecordVersions
 	filterFieldsByRecordType(recordData, recordType) {
 		if (!recordData) return recordData;
 		switch (recordType) {
-			case "support_ticket": return this.filterSupportTicketFields(recordData);
+			case RecordConst$1.SUPPORT_TICKET: return this.filterSupportTicketFields(recordData);
+			case RecordConst$1.SUPPORT_TICKET_ACTIVITY: return recordData;
+			case RecordConst$1.TRACKER_ACTIVITY: return recordData;
 			default: return recordData;
 		}
 	}
@@ -4704,26 +4992,60 @@ let ReadAllRecordVersionsByRecordPaginatedCustomer = class ReadAllRecordVersions
 		}
 	}
 };
-ReadAllRecordVersionsByRecordPaginatedCustomer = __decorate([injectable(), __decorateParam(0, inject(RECORD_VERSION_TOKENS.IRecordVersionsRepo))], ReadAllRecordVersionsByRecordPaginatedCustomer);
+ReadAllRecordVersionsByRecordPaginatedCustomer = __decorate([
+	injectable(),
+	__decorateParam(0, inject(RECORD_VERSION_TOKENS.IRecordVersionsRepo)),
+	__decorateParam(1, inject(USER_TOKENS.IUserDisplayLookup))
+], ReadAllRecordVersionsByRecordPaginatedCustomer);
 
 //#endregion
 //#region src/slices/record_version/features/read_all_record_versions_by_record_paginated_feat.ts
+const USER_ID_FIELDS = new Set([
+	"assigned_to",
+	"created_by",
+	"updated_by",
+	"archived_by",
+	"deleted_by"
+]);
+function collectUserIdsFromRecordVersions(items) {
+	const ids = /* @__PURE__ */ new Set();
+	for (const item of items) for (const raw of [item.record, item.old_record]) {
+		if (!raw || typeof raw !== "string") continue;
+		try {
+			const rec = JSON.parse(raw);
+			for (const [key, val] of Object.entries(rec)) if (USER_ID_FIELDS.has(key) && typeof val === "string" && val.trim()) ids.add(val);
+		} catch {}
+	}
+	return [...ids];
+}
 let ReadAllRecordVersionsByRecordPaginated = class ReadAllRecordVersionsByRecordPaginated$1 {
-	constructor(record_version_repo, validateRecordAccess, session) {
+	constructor(record_version_repo, validateRecordAccess, userDisplayLookup, session) {
 		this.record_version_repo = record_version_repo;
 		this.validateRecordAccess = validateRecordAccess;
+		this.userDisplayLookup = userDisplayLookup;
 		this.session = session;
 	}
 	async execute(record_id, record_type, filters) {
-		await this.validateRecordAccess.execute(record_id, record_type);
-		const records = await this.record_version_repo.read_all_record_versions_paginated(record_id, record_type, filters);
-		records.items = records.items.map((record) => {
+		const requested_types = filters?.record_types ?? [record_type];
+		const allowed_record_types = await this.validateRecordAccess.filterAllowedRecordTypes(record_id, requested_types);
+		const records = await this.record_version_repo.read_all_record_versions_paginated(record_id, allowed_record_types, filters);
+		const mappedRecords = records.items.map((record) => {
+			const recordType = record.record_type;
 			return {
 				...record,
-				record: this.filterFieldsByRecordType(JSON.stringify(record.record), record_type),
-				old_record: this.filterFieldsByRecordType(JSON.stringify(record.old_record), record_type)
+				record: this.filterFieldsByRecordType(JSON.stringify(record.record), recordType),
+				old_record: this.filterFieldsByRecordType(JSON.stringify(record.old_record), recordType)
 			};
 		});
+		records.items = mappedRecords;
+		const userIds = collectUserIdsFromRecordVersions(mappedRecords);
+		if (userIds.length > 0) {
+			const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
+			return {
+				...records,
+				user_display_map: Object.fromEntries(displayMap)
+			};
+		}
 		return records;
 	}
 	/**
@@ -4734,7 +5056,9 @@ let ReadAllRecordVersionsByRecordPaginated = class ReadAllRecordVersionsByRecord
 		if (!recordData) return recordData;
 		if (this.session.user.user_type === "staff" || this.session.user.user_type === "super_admin") return recordData;
 		switch (recordType) {
-			case "support_ticket": return this.filterSupportTicketFields(recordData);
+			case RecordConst$1.SUPPORT_TICKET: return this.filterSupportTicketFields(recordData);
+			case RecordConst$1.SUPPORT_TICKET_ACTIVITY: return recordData;
+			case RecordConst$1.TRACKER_ACTIVITY: return recordData;
 			default: return recordData;
 		}
 	}
@@ -4773,7 +5097,8 @@ ReadAllRecordVersionsByRecordPaginated = __decorate([
 	injectable(),
 	__decorateParam(0, inject(RECORD_VERSION_TOKENS.IRecordVersionsRepo)),
 	__decorateParam(1, inject(RECORD_VERSION_VALIDATION_TOKENS.IValidateRecordAccess)),
-	__decorateParam(2, injectSession())
+	__decorateParam(2, inject(USER_TOKENS.IUserDisplayLookup)),
+	__decorateParam(3, injectSession())
 ], ReadAllRecordVersionsByRecordPaginated);
 
 //#endregion
@@ -4808,9 +5133,492 @@ function registerRecordVersionContainer() {
 	container.registerSingleton(RECORD_VERSION_VALIDATION_TOKENS.IValidateRecordAccess, ValidateRecordAccess);
 }
 
+//#endregion
+//#region src/slices/saved_filter/saved_filter_interfaces.ts
+const SAVED_FILTER_TOKENS = {
+	ISavedFilterRepo: Symbol("ISavedFilterRepo"),
+	IListSavedFilters: Symbol("IListSavedFilters"),
+	IListAllSavedFilters: Symbol("IListAllSavedFilters"),
+	ICreateSavedFilter: Symbol("ICreateSavedFilter"),
+	IUpdateSavedFilter: Symbol("IUpdateSavedFilter"),
+	IDeleteSavedFilter: Symbol("IDeleteSavedFilter")
+};
+
+//#endregion
+//#region src/slices/saved_filter/db/saved_filter_mapper.ts
+function mapSavedFilterEntityToDto(entity) {
+	let filters;
+	try {
+		filters = JSON.parse(entity.filters);
+	} catch {
+		filters = {};
+	}
+	return {
+		id: entity.id,
+		user_id: entity.user_id,
+		name: entity.name,
+		context: entity.context,
+		route_path: entity.route_path,
+		filters,
+		sort_by: entity.sort_by ?? void 0,
+		sort_direction: entity.sort_direction ?? void 0,
+		created_at: entity.created_at,
+		updated_at: entity.updated_at
+	};
+}
+
+//#endregion
+//#region src/slices/saved_filter/features/create_saved_filter_feat.ts
+let CreateSavedFilterFeature = class CreateSavedFilterFeature$1 {
+	constructor(session, repo) {
+		this.session = session;
+		this.repo = repo;
+	}
+	async execute(input) {
+		const userId = this.session.user.userId;
+		if ((await this.repo.listByUserAndContext(userId, input.context)).length >= MAX_PRESETS_PER_CONTEXT) throw new BusinessError(`You can have at most ${MAX_PRESETS_PER_CONTEXT} presets per page. Delete one to save a new preset.`);
+		return mapSavedFilterEntityToDto(await this.repo.create({
+			user_id: userId,
+			name: input.name,
+			context: input.context,
+			route_path: input.route_path,
+			filters: JSON.stringify(input.filters),
+			sort_by: input.sort_by ?? null,
+			sort_direction: input.sort_direction ?? null
+		}));
+	}
+};
+CreateSavedFilterFeature = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(SAVED_FILTER_TOKENS.ISavedFilterRepo))
+], CreateSavedFilterFeature);
+
+//#endregion
+//#region src/slices/saved_filter/user_pinned_preset_interfaces.ts
+const USER_PINNED_PRESET_TOKENS = {
+	IUserPinnedPresetRepo: Symbol("IUserPinnedPresetRepo"),
+	IListPinnedPresets: Symbol("IListPinnedPresets"),
+	IAddPinnedPreset: Symbol("IAddPinnedPreset"),
+	IRemovePinnedPreset: Symbol("IRemovePinnedPreset"),
+	IReorderPinnedPresets: Symbol("IRearrangePinnedPresets")
+};
+
+//#endregion
+//#region src/slices/saved_filter/features/delete_saved_filter_feat.ts
+let DeleteSavedFilterFeature = class DeleteSavedFilterFeature$1 {
+	constructor(session, repo, pinnedRepo) {
+		this.session = session;
+		this.repo = repo;
+		this.pinnedRepo = pinnedRepo;
+	}
+	async execute(id) {
+		const existing = await this.repo.read(id);
+		if (!existing) return false;
+		if (existing.user_id !== this.session.user.userId) throw new BusinessError("You can only delete your own saved filters");
+		await this.pinnedRepo.deleteByPresetId(id);
+		return await this.repo.delete(id);
+	}
+};
+DeleteSavedFilterFeature = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(SAVED_FILTER_TOKENS.ISavedFilterRepo)),
+	__decorateParam(2, inject(USER_PINNED_PRESET_TOKENS.IUserPinnedPresetRepo))
+], DeleteSavedFilterFeature);
+
+//#endregion
+//#region src/slices/saved_filter/features/list_saved_filters_feat.ts
+let ListSavedFiltersFeature = class ListSavedFiltersFeature$1 {
+	constructor(session, repo) {
+		this.session = session;
+		this.repo = repo;
+	}
+	async execute(context) {
+		const userId = this.session.user.userId;
+		return (await this.repo.listByUserAndContext(userId, context)).map(mapSavedFilterEntityToDto);
+	}
+};
+ListSavedFiltersFeature = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(SAVED_FILTER_TOKENS.ISavedFilterRepo))
+], ListSavedFiltersFeature);
+
+//#endregion
+//#region src/slices/saved_filter/features/update_saved_filter_feat.ts
+let UpdateSavedFilterFeature = class UpdateSavedFilterFeature$1 {
+	constructor(session, repo) {
+		this.session = session;
+		this.repo = repo;
+	}
+	async execute(input) {
+		const existing = await this.repo.read(input.id);
+		if (!existing) return null;
+		if (existing.user_id !== this.session.user.userId) throw new BusinessError("You can only update your own saved filters");
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		return mapSavedFilterEntityToDto(await this.repo.update({
+			id: input.id,
+			...input.name !== void 0 && { name: input.name },
+			...input.route_path !== void 0 && { route_path: input.route_path },
+			...input.filters !== void 0 && { filters: JSON.stringify(input.filters) },
+			...input.sort_by !== void 0 && { sort_by: input.sort_by },
+			...input.sort_direction !== void 0 && { sort_direction: input.sort_direction },
+			updated_at: now
+		}));
+	}
+};
+UpdateSavedFilterFeature = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(SAVED_FILTER_TOKENS.ISavedFilterRepo))
+], UpdateSavedFilterFeature);
+
+//#endregion
+//#region src/slices/saved_filter/features/add_pinned_preset_feat.ts
+let AddPinnedPresetFeature = class AddPinnedPresetFeature$1 {
+	constructor(session, pinnedRepo, savedFilterRepo) {
+		this.session = session;
+		this.pinnedRepo = pinnedRepo;
+		this.savedFilterRepo = savedFilterRepo;
+	}
+	async execute(presetId) {
+		const userId = this.session.user.userId;
+		const preset = await this.savedFilterRepo.read(presetId);
+		if (!preset) return null;
+		if (preset.user_id !== userId) throw new BusinessError("You can only pin your own presets");
+		if (await this.pinnedRepo.findByUserAndPreset(userId, presetId)) return mapSavedFilterEntityToDto(preset);
+		const pins = await this.pinnedRepo.listByUser(userId);
+		if (pins.length >= MAX_PINNED_PRESETS) throw new BusinessError(`You can pin at most ${MAX_PINNED_PRESETS} presets. Unpin one to add another.`);
+		const position = pins.length;
+		await this.pinnedRepo.create(userId, presetId, position);
+		return mapSavedFilterEntityToDto(preset);
+	}
+};
+AddPinnedPresetFeature = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(USER_PINNED_PRESET_TOKENS.IUserPinnedPresetRepo)),
+	__decorateParam(2, inject(SAVED_FILTER_TOKENS.ISavedFilterRepo))
+], AddPinnedPresetFeature);
+
+//#endregion
+//#region src/slices/saved_filter/features/list_all_saved_filters_feat.ts
+let ListAllSavedFiltersFeature = class ListAllSavedFiltersFeature$1 {
+	constructor(session, repo) {
+		this.session = session;
+		this.repo = repo;
+	}
+	async execute() {
+		const userId = this.session.user.userId;
+		return (await this.repo.listByUser(userId)).map(mapSavedFilterEntityToDto);
+	}
+};
+ListAllSavedFiltersFeature = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(SAVED_FILTER_TOKENS.ISavedFilterRepo))
+], ListAllSavedFiltersFeature);
+
+//#endregion
+//#region src/slices/saved_filter/features/list_pinned_presets_feat.ts
+let ListPinnedPresetsFeature = class ListPinnedPresetsFeature$1 {
+	constructor(session, pinnedRepo, savedFilterRepo) {
+		this.session = session;
+		this.pinnedRepo = pinnedRepo;
+		this.savedFilterRepo = savedFilterRepo;
+	}
+	async execute() {
+		const userId = this.session.user.userId;
+		const pins = await this.pinnedRepo.listByUser(userId);
+		if (pins.length === 0) return [];
+		const presetIds = pins.map((p) => p.preset_id);
+		const presets = await this.savedFilterRepo.readByIds(presetIds);
+		const presetMap = new Map(presets.map((p) => [p.id, p]));
+		const result = [];
+		for (const pin of pins) {
+			const preset = presetMap.get(pin.preset_id);
+			if (preset && preset.user_id === userId) result.push(mapSavedFilterEntityToDto(preset));
+		}
+		return result;
+	}
+};
+ListPinnedPresetsFeature = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(USER_PINNED_PRESET_TOKENS.IUserPinnedPresetRepo)),
+	__decorateParam(2, inject(SAVED_FILTER_TOKENS.ISavedFilterRepo))
+], ListPinnedPresetsFeature);
+
+//#endregion
+//#region src/slices/saved_filter/features/remove_pinned_preset_feat.ts
+let RemovePinnedPresetFeature = class RemovePinnedPresetFeature$1 {
+	constructor(session, pinnedRepo) {
+		this.session = session;
+		this.pinnedRepo = pinnedRepo;
+	}
+	async execute(presetId) {
+		const userId = this.session.user.userId;
+		const pin = await this.pinnedRepo.findByUserAndPreset(userId, presetId);
+		if (!pin) return false;
+		return await this.pinnedRepo.delete(pin.id);
+	}
+};
+RemovePinnedPresetFeature = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(USER_PINNED_PRESET_TOKENS.IUserPinnedPresetRepo))
+], RemovePinnedPresetFeature);
+
+//#endregion
+//#region src/slices/saved_filter/features/reorder_pinned_presets_feat.ts
+let ReorderPinnedPresetsFeature = class ReorderPinnedPresetsFeature$1 {
+	constructor(session, pinnedRepo) {
+		this.session = session;
+		this.pinnedRepo = pinnedRepo;
+	}
+	async execute(presetIds) {
+		const userId = this.session.user.userId;
+		for (let i = 0; i < presetIds.length; i++) {
+			const presetId = presetIds[i];
+			const pin = await this.pinnedRepo.findByUserAndPreset(userId, presetId);
+			if (pin) await this.pinnedRepo.updatePosition(pin.id, i);
+		}
+	}
+};
+ReorderPinnedPresetsFeature = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(USER_PINNED_PRESET_TOKENS.IUserPinnedPresetRepo))
+], ReorderPinnedPresetsFeature);
+
+//#endregion
+//#region src/slices/saved_filter/db/saved_filter_repo.ts
+let SavedFilterRepository = class SavedFilterRepository$1 {
+	constructor(router) {
+		this.router = router;
+	}
+	async create(entity) {
+		const id = await this.router.generateId(RecordConst.SAVED_FILTER);
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const [result] = await this.router.queryLatest((db) => db.insert(saved_filter_table).values({
+			id,
+			user_id: entity.user_id,
+			name: entity.name,
+			context: entity.context,
+			route_path: entity.route_path,
+			filters: entity.filters,
+			sort_by: entity.sort_by ?? null,
+			sort_direction: entity.sort_direction ?? null,
+			created_at: now,
+			updated_at: now
+		}).returning());
+		return result;
+	}
+	async read(id) {
+		return (await this.router.queryById(id, (db) => db.select().from(saved_filter_table).where(eq(saved_filter_table.id, id)).limit(1)))[0] ?? null;
+	}
+	async readByIds(ids) {
+		if (ids.length === 0) return [];
+		return this.router.queryByIds(ids, (db, idsForShard) => db.select().from(saved_filter_table).where(inArray(saved_filter_table.id, idsForShard)));
+	}
+	async listByUser(userId) {
+		return await this.router.queryAll((db) => db.select().from(saved_filter_table).where(eq(saved_filter_table.user_id, userId)));
+	}
+	async listByUserAndContext(userId, context) {
+		return await this.router.queryAll((db) => db.select().from(saved_filter_table).where(and(eq(saved_filter_table.user_id, userId), eq(saved_filter_table.context, context))));
+	}
+	async update(entity) {
+		const updated = (await this.router.queryById(entity.id, (db) => db.update(saved_filter_table).set({
+			...entity.name !== void 0 && { name: entity.name },
+			...entity.route_path !== void 0 && { route_path: entity.route_path },
+			...entity.filters !== void 0 && { filters: entity.filters },
+			...entity.sort_by !== void 0 && { sort_by: entity.sort_by },
+			...entity.sort_direction !== void 0 && { sort_direction: entity.sort_direction },
+			updated_at: entity.updated_at
+		}).where(eq(saved_filter_table.id, entity.id)).returning()))[0];
+		if (!updated) throw new Error("Saved filter not found or update failed");
+		return updated;
+	}
+	async delete(id) {
+		return (await this.router.queryById(id, (db) => db.delete(saved_filter_table).where(eq(saved_filter_table.id, id)).returning({ id: saved_filter_table.id }))).length > 0;
+	}
+};
+SavedFilterRepository = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], SavedFilterRepository);
+
+//#endregion
+//#region src/slices/saved_filter/db/user_pinned_preset_repo.ts
+let UserPinnedPresetRepository = class UserPinnedPresetRepository$1 {
+	constructor(router) {
+		this.router = router;
+	}
+	async create(userId, presetId, position) {
+		const id = await this.router.generateId(RecordConst.USER_PINNED_PRESET);
+		const [result] = await this.router.queryLatest((db) => db.insert(user_pinned_preset_table).values({
+			id,
+			user_id: userId,
+			preset_id: presetId,
+			position
+		}).returning());
+		return result;
+	}
+	async listByUser(userId) {
+		return (await this.router.queryAll((db) => db.select().from(user_pinned_preset_table).where(eq(user_pinned_preset_table.user_id, userId)))).sort((a, b) => a.position - b.position);
+	}
+	async findByUserAndPreset(userId, presetId) {
+		return (await this.router.queryAll((db) => db.select().from(user_pinned_preset_table).where(and(eq(user_pinned_preset_table.user_id, userId), eq(user_pinned_preset_table.preset_id, presetId))).limit(1)))[0] ?? null;
+	}
+	async updatePosition(id, position) {
+		await this.router.queryById(id, (db) => db.update(user_pinned_preset_table).set({ position }).where(eq(user_pinned_preset_table.id, id)).returning({ id: user_pinned_preset_table.id }));
+	}
+	async delete(id) {
+		return (await this.router.queryById(id, (db) => db.delete(user_pinned_preset_table).where(eq(user_pinned_preset_table.id, id)).returning({ id: user_pinned_preset_table.id }))).length > 0;
+	}
+	async deleteByPresetId(presetId) {
+		const pins = await this.router.queryAll((db) => db.select().from(user_pinned_preset_table).where(eq(user_pinned_preset_table.preset_id, presetId)));
+		let deleted = 0;
+		for (const pin of pins) if (await this.delete(pin.id)) deleted++;
+		return deleted;
+	}
+};
+UserPinnedPresetRepository = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], UserPinnedPresetRepository);
+
+//#endregion
+//#region src/slices/saved_filter/saved_filter_container.ts
+function registerSavedFilterContainer() {
+	container.registerSingleton(SAVED_FILTER_TOKENS.ISavedFilterRepo, SavedFilterRepository);
+	container.registerSingleton(USER_PINNED_PRESET_TOKENS.IUserPinnedPresetRepo, UserPinnedPresetRepository);
+	container.registerSingleton(SAVED_FILTER_TOKENS.IListSavedFilters, ListSavedFiltersFeature);
+	container.registerSingleton(SAVED_FILTER_TOKENS.IListAllSavedFilters, ListAllSavedFiltersFeature);
+	container.registerSingleton(SAVED_FILTER_TOKENS.ICreateSavedFilter, CreateSavedFilterFeature);
+	container.registerSingleton(SAVED_FILTER_TOKENS.IUpdateSavedFilter, UpdateSavedFilterFeature);
+	container.registerSingleton(SAVED_FILTER_TOKENS.IDeleteSavedFilter, DeleteSavedFilterFeature);
+	container.registerSingleton(USER_PINNED_PRESET_TOKENS.IListPinnedPresets, ListPinnedPresetsFeature);
+	container.registerSingleton(USER_PINNED_PRESET_TOKENS.IAddPinnedPreset, AddPinnedPresetFeature);
+	container.registerSingleton(USER_PINNED_PRESET_TOKENS.IRemovePinnedPreset, RemovePinnedPresetFeature);
+	container.registerSingleton(USER_PINNED_PRESET_TOKENS.IReorderPinnedPresets, ReorderPinnedPresetsFeature);
+}
+
+//#endregion
+//#region src/slices/support_staff/db/support_staff_repo.ts
+let SupportStaffRepo = class SupportStaffRepo$1 {
+	constructor(router) {
+		this.router = router;
+	}
+	async readAll() {
+		return this.router.queryAll((db) => db.select().from(support_staff_table).orderBy(support_staff_table.user_id));
+	}
+	async readSupportStaffMembers() {
+		return this.router.queryAll((db) => db.select({
+			id: support_staff_table.id,
+			user_id: support_staff_table.user_id,
+			email: user_table.email,
+			created_at: support_staff_table.created_at
+		}).from(support_staff_table).innerJoin(user_table, eq(support_staff_table.user_id, user_table.id)).orderBy(support_staff_table.user_id));
+	}
+	async readTriageUsers() {
+		return this.router.queryAll((db) => db.select({
+			id: user_table.id,
+			email: user_table.email
+		}).from(support_staff_table).innerJoin(user_table, eq(support_staff_table.user_id, user_table.id)).orderBy(support_staff_table.user_id));
+	}
+	async add(userId, createdBy) {
+		const id = await this.router.generateId(RecordConst.SUPPORT_STAFF);
+		const entity = {
+			user_id: userId,
+			created_at: (/* @__PURE__ */ new Date()).toISOString(),
+			created_by: createdBy
+		};
+		const [result] = await this.router.queryLatest((db) => db.insert(support_staff_table).values({
+			id,
+			...entity
+		}).returning());
+		return result;
+	}
+	async remove(userId) {
+		return (await this.router.queryLatest((db) => db.delete(support_staff_table).where(eq(support_staff_table.user_id, userId)).returning({ id: support_staff_table.id }))).length > 0;
+	}
+};
+SupportStaffRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], SupportStaffRepo);
+
+//#endregion
+//#region src/slices/support_staff/support_staff_tokens.ts
+const SUPPORT_STAFF_TOKENS = {
+	ISupportStaffRepo: Symbol("ISupportStaffRepo"),
+	IListSupportStaffFeature: Symbol("IListSupportStaffFeature"),
+	IAddSupportStaffFeature: Symbol("IAddSupportStaffFeature"),
+	IRemoveSupportStaffFeature: Symbol("IRemoveSupportStaffFeature")
+};
+
+//#endregion
+//#region src/slices/support_staff/features/add_support_staff_feat.ts
+let AddSupportStaffFeat = class AddSupportStaffFeat$1 {
+	constructor(supportStaffRepo, userRepo, session) {
+		this.supportStaffRepo = supportStaffRepo;
+		this.userRepo = userRepo;
+		this.session = session;
+	}
+	async execute(userId) {
+		const user = await this.userRepo.read_user(userId);
+		if (!user) throw new Error("User not found");
+		if (!["staff", "super_admin"].includes(user.user_type)) throw new BusinessError("Only staff and super_admin users can be added to support staff");
+		if ((await this.supportStaffRepo.readAll()).some((s) => s.user_id === userId)) throw new Error("User is already support staff");
+		const created = await this.supportStaffRepo.add(userId, this.session.user.userId);
+		const member = (await this.supportStaffRepo.readSupportStaffMembers()).find((m) => m.id === created.id);
+		if (!member) throw new Error("Failed to fetch created support staff member");
+		return member;
+	}
+};
+AddSupportStaffFeat = __decorate([
+	injectable(),
+	__decorateParam(0, inject(SUPPORT_STAFF_TOKENS.ISupportStaffRepo)),
+	__decorateParam(1, inject(USER_TOKENS.IUsersRepo)),
+	__decorateParam(2, inject(TOKENS.AUTHENTICATED_SESSION))
+], AddSupportStaffFeat);
+
+//#endregion
+//#region src/slices/support_staff/features/list_support_staff_feat.ts
+let ListSupportStaffFeat = class ListSupportStaffFeat$1 {
+	constructor(supportStaffRepo) {
+		this.supportStaffRepo = supportStaffRepo;
+	}
+	async execute() {
+		return this.supportStaffRepo.readSupportStaffMembers();
+	}
+};
+ListSupportStaffFeat = __decorate([injectable(), __decorateParam(0, inject(SUPPORT_STAFF_TOKENS.ISupportStaffRepo))], ListSupportStaffFeat);
+
+//#endregion
+//#region src/slices/support_staff/features/remove_support_staff_feat.ts
+let RemoveSupportStaffFeat = class RemoveSupportStaffFeat$1 {
+	constructor(supportStaffRepo) {
+		this.supportStaffRepo = supportStaffRepo;
+	}
+	async execute(userId) {
+		if (!await this.supportStaffRepo.remove(userId)) throw new Error("Support staff member not found");
+	}
+};
+RemoveSupportStaffFeat = __decorate([injectable(), __decorateParam(0, inject(SUPPORT_STAFF_TOKENS.ISupportStaffRepo))], RemoveSupportStaffFeat);
+
+//#endregion
+//#region src/slices/support_staff/support_staff_registration.ts
+function registerSupportStaffDependencies() {
+	container.registerSingleton(SUPPORT_STAFF_TOKENS.ISupportStaffRepo, SupportStaffRepo);
+	container.registerSingleton(SUPPORT_STAFF_TOKENS.IListSupportStaffFeature, ListSupportStaffFeat);
+	container.registerSingleton(SUPPORT_STAFF_TOKENS.IAddSupportStaffFeature, AddSupportStaffFeat);
+	container.registerSingleton(SUPPORT_STAFF_TOKENS.IRemoveSupportStaffFeature, RemoveSupportStaffFeat);
+}
+
 //#endregion
 //#region src/slices/support_ticket/db/support_ticket_query_config.ts
 const supportTicketFields = {
+	display_id: {
+		column: support_ticket_table.display_id,
+		type: "number",
+		filterable: false,
+		searchable: true,
+		sortable: true
+	},
 	type: {
 		column: support_ticket_table.type,
 		type: "string",
@@ -4820,9 +5628,9 @@ const supportTicketFields = {
 	},
 	priority: {
 		column: support_ticket_table.priority,
-		type: "string",
+		type: "number",
 		filterable: true,
-		searchable: true,
+		searchable: false,
 		sortable: true
 	},
 	approval_status: {
@@ -4839,18 +5647,11 @@ const supportTicketFields = {
 		searchable: true,
 		sortable: true
 	},
-	requester_email: {
-		column: support_ticket_table.requester_email,
-		type: "string",
-		filterable: true,
-		searchable: true,
-		sortable: false
-	},
-	requester_name: {
-		column: support_ticket_table.requester_name,
+	created_by: {
+		column: support_ticket_table.created_by,
 		type: "string",
 		filterable: true,
-		searchable: true,
+		searchable: false,
 		sortable: false
 	},
 	title: {
@@ -4909,20 +5710,6 @@ const supportTicketFields = {
 		searchable: false,
 		sortable: false
 	},
-	requesterName: {
-		column: support_ticket_table.requester_name,
-		type: "string",
-		filterable: false,
-		searchable: true,
-		sortable: false
-	},
-	requesterEmail: {
-		column: support_ticket_table.requester_email,
-		type: "string",
-		filterable: false,
-		searchable: true,
-		sortable: false
-	},
 	approvalStatus: {
 		column: support_ticket_table.approval_status,
 		type: "string",
@@ -4993,7 +5780,8 @@ const buildFieldFilters$1 = createFilterBuilder({
 	processedSeparately: [
 		"archived_at",
 		"status",
-		"is_locked"
+		"is_locked",
+		"dev_lifecycle"
 	]
 });
 /**
@@ -5007,6 +5795,7 @@ function mapSupportTicketStatusToApprovalStatus(statuses) {
 				case "CANCELLED": return "REJECTED";
 				case "FOLLOWUP": return;
 				case "IN_PROGRESS": return;
+				case "VERIFICATION": return;
 				case "COMPLETED": return;
 				default: throw new Error(`Invalid support ticket status: ${status}`);
 			}
@@ -5017,6 +5806,7 @@ function mapSupportTicketStatusToApprovalStatus(statuses) {
 				case "CANCELLED": return;
 				case "FOLLOWUP": return;
 				case "IN_PROGRESS": return;
+				case "VERIFICATION": return "VERIFICATION";
 				case "COMPLETED": return "DEPLOYED";
 				default: throw new Error(`Invalid support ticket status: ${status}`);
 			}
@@ -5060,7 +5850,21 @@ function buildSupportTicketQuery(filters) {
 			} else if (statusValue === "IN_PROGRESS") {
 				conditions.push(eq(support_ticket_table.approval_status, "APPROVED"));
 				conditions.push(or(eq(support_ticket_table.dev_lifecycle, "DEVELOPMENT"), eq(support_ticket_table.dev_lifecycle, "CODE_REVIEW"), eq(support_ticket_table.dev_lifecycle, "TESTING"), eq(support_ticket_table.dev_lifecycle, "STAGING"), eq(support_ticket_table.dev_lifecycle, "PO_APPROVAL")));
-			} else if (statusValue === "COMPLETED") conditions.push(eq(support_ticket_table.dev_lifecycle, "DEPLOYED"));
+			} else if (statusValue === "VERIFICATION") conditions.push(eq(support_ticket_table.dev_lifecycle, "VERIFICATION"));
+			else if (statusValue === "COMPLETED") conditions.push(eq(support_ticket_table.dev_lifecycle, "DEPLOYED"));
+		}
+	}
+	if (filters?.dev_lifecycle) {
+		const dl = filters.dev_lifecycle;
+		const col = support_ticket_table.dev_lifecycle;
+		const isPending = (v) => v === "PENDING";
+		if (dl.value !== void 0 && isPending(dl.value) && dl.operator === OPERATORS.EQUALS) conditions.push(isNull(col));
+		else if (dl.values?.some(isPending) && dl.operator === OPERATORS.IS_ONE_OF) {
+			const others = dl.values.filter((v) => !isPending(v));
+			conditions.push(others.length ? or(isNull(col), inArray(col, others)) : isNull(col));
+		} else {
+			const cond = applyFilter(col, dl, "string");
+			if (cond) conditions.push(cond);
 		}
 	}
 	if (filters?.is_locked) if (typeof filters.is_locked === "object" ? filters.is_locked.value : filters.is_locked) conditions.push(ne(support_ticket_table.approval_status, "PENDING"));
@@ -5102,7 +5906,7 @@ let SupportTicketRepo = class SupportTicketRepo$1 {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		const [result] = await this.router.queryById(support_ticket.id, (db) => db.update(support_ticket_table).set({
 			...support_ticket,
-			updated_at: support_ticket.updated_at || now
+			updated_at: now
 		}).where(eq(support_ticket_table.id, support_ticket.id)).returning());
 		return result;
 	}
@@ -5157,6 +5961,26 @@ let SupportTicketRepo = class SupportTicketRepo$1 {
 		return PaginationUtils.findAllPaginated(this.paginationConfig, filters || {}, conditions);
 	}
 	/**
+	* Get distinct requestor (created_by) user IDs for active support tickets.
+	* Active = not archived (archived_at IS NULL).
+	* @param excludeInternal - when true, exclude internal tickets (for customer view)
+	* Queries all shards.
+	*/
+	async read_distinct_requestors_for_active_tickets(options) {
+		const conditions = [isNull(support_ticket_table.deleted_at), isNull(support_ticket_table.archived_at)];
+		if (options?.excludeInternal) conditions.push(ne(support_ticket_table.approval_status, "INTERNAL"));
+		const rows = await this.router.queryAll((db) => db.selectDistinct({ created_by: support_ticket_table.created_by }).from(support_ticket_table).where(and(...conditions)));
+		return [...new Set(rows.map((r) => r.created_by).filter(Boolean))];
+	}
+	/**
+	* Find support tickets with invalid user IDs (e.g. emails instead of 32-char universal IDs).
+	* Queries all shards.
+	*/
+	async findWithInvalidUserIds() {
+		const invalidLengthCondition = or(sql`LENGTH(${support_ticket_table.created_by}) != 32`, sql`LENGTH(${support_ticket_table.updated_by}) != 32`, sql`(${support_ticket_table.assigned_to} IS NOT NULL AND LENGTH(${support_ticket_table.assigned_to}) != 32)`, sql`(${support_ticket_table.archived_by} IS NOT NULL AND LENGTH(${support_ticket_table.archived_by}) != 32)`, sql`(${support_ticket_table.deleted_by} IS NOT NULL AND LENGTH(${support_ticket_table.deleted_by}) != 32)`);
+		return this.router.queryAll((db) => db.select().from(support_ticket_table).where(and(isNull(support_ticket_table.deleted_at), invalidLengthCondition)));
+	}
+	/**
 	* Soft delete a support ticket by ID
 	*/
 	async soft_delete(id, deleted_by) {
@@ -5169,7 +5993,237 @@ let SupportTicketRepo = class SupportTicketRepo$1 {
 		return result[0];
 	}
 };
-SupportTicketRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], SupportTicketRepo);
+SupportTicketRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], SupportTicketRepo);
+
+//#endregion
+//#region src/slices/user_profile/user_profile_interfaces.ts
+const USER_PROFILE_TOKENS = {
+	IUserProfilesRepo: Symbol("IUserProfilesRepo"),
+	IReadUserProfilesByUser: Symbol("IReadUserProfilesByUser"),
+	IReadUserProfile: Symbol("IReadUserProfile"),
+	ICreateUserProfile: Symbol("ICreateUserProfile"),
+	IUpdateUserProfile: Symbol("IUpdateUserProfile")
+};
+
+//#endregion
+//#region src/slices/support_ticket/services/support_ticket_notification_service.ts
+const STAFF_USER_TYPES = ["staff", "super_admin"];
+/** Escape HTML for safe inclusion in email body. */
+function escapeHtmlForEmail(s) {
+	return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\n/g, "<br>");
+}
+let SupportTicketNotificationService = class SupportTicketNotificationService$1 {
+	constructor(subscriberRepo, userRepo, userProfileRepo, emailService, env, logger$1) {
+		this.subscriberRepo = subscriberRepo;
+		this.userRepo = userRepo;
+		this.userProfileRepo = userProfileRepo;
+		this.emailService = emailService;
+		this.env = env;
+		this.logger = logger$1;
+	}
+	async notifyAssignee(ticket, eventType, context) {
+		try {
+			const assigneeId = ticket.assigned_to;
+			if (!assigneeId) return;
+			if (context?.actorUserId && assigneeId === context.actorUserId) return;
+			const [email] = await this.getNotificationEmailsForFollowers([assigneeId], context?.actorUserId);
+			if (!email) return;
+			const ticketUrl = `${this.env.WEBSITE_URL}/staff/support/${ticket.id}`;
+			const { subject, bodyText, bodyHtml } = this.buildAssigneeEmailContent(ticket, eventType, ticketUrl, context);
+			await this.emailService.sendBulkEmail([email], subject, bodyText, bodyHtml);
+			this.logger.info(`Sent support ticket ${eventType} notification to assignee`);
+		} catch (error) {
+			this.logger.error("Failed to send support ticket assignee notification", {
+				error,
+				supportTicketId: ticket.id,
+				eventType
+			});
+		}
+	}
+	async notifyFollowers(supportTicketId, ticket, eventType, context) {
+		try {
+			await this.ensureAssigneeIsSubscriber(ticket);
+			const followers = await this.subscriberRepo.readByRecordId(RecordConst$1.SUPPORT_TICKET, supportTicketId);
+			if (followers.length === 0) return;
+			const filteredFollowers = eventType === "NEW_INTERNAL_NOTE" ? await this.filterStaffFollowersOnly(followers) : followers;
+			if (filteredFollowers.length === 0) return;
+			const subscribed = filteredFollowers.filter((f) => {
+				const events = f.subscribed_events;
+				if (!events || events.length === 0) return true;
+				return events.includes(eventType);
+			});
+			if (subscribed.length === 0) return;
+			const assigneeExcluded = eventType === "TICKET_CREATED" || eventType === "TICKET_ASSIGNED" ? subscribed.filter((f) => f.user_id !== ticket.assigned_to) : subscribed;
+			const recipients = await this.getNotificationRecipientsForFollowers(assigneeExcluded.map((f) => f.user_id), context?.actorUserId);
+			if (recipients.length === 0) return;
+			const baseUrl = this.env.WEBSITE_URL;
+			for (const { email, userType } of recipients) {
+				const ticketUrl = STAFF_USER_TYPES.includes(userType) ? `${baseUrl}/staff/support/${ticket.id}` : `${baseUrl}/support/${ticket.id}`;
+				const { subject, bodyText, bodyHtml } = this.buildEmailContent(ticket, eventType, ticketUrl, context);
+				await this.emailService.sendBulkEmail([email], subject, bodyText, bodyHtml);
+			}
+			this.logger.info(`Sent support ticket ${eventType} notification to ${recipients.length} followers`);
+		} catch (error) {
+			this.logger.error("Failed to send support ticket follower notifications", {
+				error,
+				supportTicketId,
+				eventType
+			});
+		}
+	}
+	/**
+	* Ensures the assigned staff member is a subscriber so they receive the same
+	* notifications as other followers (notes, approvals, etc.). Idempotent.
+	*/
+	async ensureAssigneeIsSubscriber(ticket) {
+		const assigneeId = ticket.assigned_to;
+		if (!assigneeId) return;
+		try {
+			const now = (/* @__PURE__ */ new Date()).toISOString();
+			await this.subscriberRepo.ensureSubscriber({
+				record_type: RecordConst$1.SUPPORT_TICKET,
+				record_id: ticket.id,
+				user_id: assigneeId,
+				subscribed_events: null,
+				created_at: now,
+				created_by: assigneeId
+			});
+		} catch (error) {
+			this.logger.error("Failed to ensure assignee is subscriber", {
+				error,
+				supportTicketId: ticket.id,
+				assigneeId
+			});
+		}
+	}
+	async filterStaffFollowersOnly(followers) {
+		if (followers.length === 0) return [];
+		const userIds = followers.map((f) => f.user_id);
+		const users = await this.userRepo.read_users_by_ids(userIds);
+		const staffUserIds = new Set(users.filter((u) => STAFF_USER_TYPES.includes(u.user_type)).map((u) => u.id));
+		return followers.filter((f) => staffUserIds.has(f.user_id));
+	}
+	async getNotificationEmailsForFollowers(userIds, excludeUserId) {
+		return (await this.getNotificationRecipientsForFollowers(userIds, excludeUserId)).map((r) => r.email);
+	}
+	async getNotificationRecipientsForFollowers(userIds, excludeUserId) {
+		const filteredIds = excludeUserId ? userIds.filter((id) => id !== excludeUserId) : userIds;
+		if (filteredIds.length === 0) return [];
+		const [users, profiles] = await Promise.all([this.userRepo.read_users_by_ids(filteredIds), this.userProfileRepo.read_user_profiles_by_user_ids(filteredIds)]);
+		const profileByUserId = new Map(profiles.map((p) => [p.user_id, p]));
+		const seen = /* @__PURE__ */ new Set();
+		const recipients = [];
+		for (const user of users) {
+			const email = profileByUserId.get(user.id)?.notification_email ?? user.email;
+			if (!email || seen.has(email)) continue;
+			seen.add(email);
+			recipients.push({
+				email,
+				userType: user.user_type ?? DEFAULT_USER_TYPE
+			});
+		}
+		return recipients;
+	}
+	buildEmailContent(ticket, eventType, ticketUrl, context) {
+		const eventLabel = eventType.replace(/_/g, " ").toLowerCase();
+		const subject = `Support Ticket #${ticket.display_id || ticket.id}: ${eventLabel}`;
+		const details = [
+			`Ticket #: ${ticket.display_id || ticket.id}`,
+			`Title: ${ticket.title}`,
+			`Priority: ${supportTicketNumberToPriority(ticket.priority)}`
+		];
+		if (context?.noteBody) details.push(`\nNote: ${context.noteBody}`);
+		if (eventType === "TICKET_CREATED" && ticket.description?.trim()) details.push(`\nDescription:\n${ticket.description}`);
+		return {
+			subject,
+			bodyText: `A support ticket you're following has been updated.\n\n${details.join("\n")}\n\nView ticket: ${ticketUrl}`,
+			bodyHtml: `
+<h2>Support Ticket Update</h2>
+<p>A support ticket you're following has been updated (${eventLabel}).</p>
+<ul>
+  <li><strong>Ticket #:</strong> ${ticket.display_id || ticket.id}</li>
+  <li><strong>Title:</strong> ${ticket.title}</li>
+  <li><strong>Priority:</strong> ${supportTicketNumberToPriority(ticket.priority)}</li>
+</ul>
+${eventType === "TICKET_CREATED" && ticket.description?.trim() ? `<p><strong>Description:</strong></p><p>${escapeHtmlForEmail(ticket.description)}</p>` : ""}
+${context?.noteBody ? `<p><strong>Note:</strong></p><p>${context.noteBody}</p>` : ""}
+<p><a href="${ticketUrl}">View Ticket</a></p>
+    `.trim()
+		};
+	}
+	buildAssigneeEmailContent(ticket, eventType, ticketUrl, context) {
+		const eventLabel = eventType.replace(/_/g, " ").toLowerCase();
+		const subject = `Support Ticket #${ticket.display_id || ticket.id}: ${eventLabel}`;
+		const isAssigned = eventType === "TICKET_ASSIGNED";
+		const intro = isAssigned ? "You have been assigned to a support ticket." : "A new support ticket has been assigned to you.";
+		const details = [
+			`Ticket #: ${ticket.display_id || ticket.id}`,
+			`Title: ${ticket.title}`,
+			`Priority: ${supportTicketNumberToPriority(ticket.priority)}`
+		];
+		if (context?.noteBody) details.push(`\nNote: ${context.noteBody}`);
+		if (!isAssigned && ticket.description?.trim()) details.push(`\nDescription:\n${ticket.description}`);
+		return {
+			subject,
+			bodyText: `${intro}\n\n${details.join("\n")}\n\nView ticket: ${ticketUrl}`,
+			bodyHtml: `
+<h2>Support Ticket ${isAssigned ? "Assigned" : "Created"}</h2>
+<p>${intro}</p>
+<ul>
+  <li><strong>Ticket #:</strong> ${ticket.display_id || ticket.id}</li>
+  <li><strong>Title:</strong> ${ticket.title}</li>
+  <li><strong>Priority:</strong> ${supportTicketNumberToPriority(ticket.priority)}</li>
+</ul>
+${!isAssigned && ticket.description?.trim() ? `<p><strong>Description:</strong></p><p>${escapeHtmlForEmail(ticket.description)}</p>` : ""}
+${context?.noteBody ? `<p><strong>Note:</strong></p><p>${context.noteBody}</p>` : ""}
+<p><a href="${ticketUrl}">View Ticket</a></p>
+    `.trim()
+		};
+	}
+};
+SupportTicketNotificationService = __decorate([
+	injectable(),
+	__decorateParam(0, inject(RECORD_SUBSCRIBER_TOKENS.IRecordSubscriberRepo)),
+	__decorateParam(1, inject(USER_TOKENS.IUsersRepo)),
+	__decorateParam(2, inject(USER_PROFILE_TOKENS.IUserProfilesRepo)),
+	__decorateParam(3, inject(TOKENS.IEmailService)),
+	__decorateParam(4, inject(TOKENS.ENV)),
+	__decorateParam(5, inject(TOKENS.LOGGER))
+], SupportTicketNotificationService);
+
+//#endregion
+//#region src/slices/support_ticket/services/support_ticket_triage_service.ts
+let SupportTicketTriageService = class SupportTicketTriageService$1 {
+	constructor(supportStaffRepo, appSettingsRepo, logger$1) {
+		this.supportStaffRepo = supportStaffRepo;
+		this.appSettingsRepo = appSettingsRepo;
+		this.logger = logger$1;
+	}
+	async getNextAssignee(updatedBy) {
+		try {
+			const triageUsers = await this.supportStaffRepo.readTriageUsers();
+			if (triageUsers.length === 0) {
+				this.logger.debug("No triage users found; skipping assignee");
+				return null;
+			}
+			const ids = triageUsers.map((u) => u.id);
+			const lastId = (await this.appSettingsRepo.readSetting(AppSettingKey.LAST_SUPPORT_TICKET_ASSIGNEE))?.value;
+			const lastIndex = lastId ? ids.indexOf(lastId) : -1;
+			const nextUserId = ids[lastIndex < ids.length - 1 ? lastIndex + 1 : 0];
+			await this.appSettingsRepo.updateSetting(AppSettingKey.LAST_SUPPORT_TICKET_ASSIGNEE, nextUserId, updatedBy);
+			return nextUserId;
+		} catch (error) {
+			this.logger.error("Failed to get next triage assignee", { error });
+			return null;
+		}
+	}
+};
+SupportTicketTriageService = __decorate([
+	injectable(),
+	__decorateParam(0, inject(SUPPORT_STAFF_TOKENS.ISupportStaffRepo)),
+	__decorateParam(1, inject(TOKENS.IAppSettingsRepo)),
+	__decorateParam(2, inject(TOKENS.LOGGER))
+], SupportTicketTriageService);
 
 //#endregion
 //#region src/slices/support_ticket/mappers/support_ticket_mapper.ts
@@ -5188,6 +6242,7 @@ function computeStatus(approvalStatus, devLifecycle) {
 		case "TESTING":
 		case "STAGING":
 		case "PO_APPROVAL": return "IN_PROGRESS";
+		case "VERIFICATION": return "VERIFICATION";
 		case "DEPLOYED": return "COMPLETED";
 		default: return "FOLLOWUP";
 	}
@@ -5221,11 +6276,10 @@ function toCustomerSupportTicketReadDto(entity) {
 		title: entity.title,
 		description: entity.description,
 		type: entity.type,
-		priority: entity.priority,
+		priority: supportTicketNumberToPriority(entity.priority),
 		status: computeStatus(entity.approval_status, entity.dev_lifecycle),
 		is_locked: !!entity.approval_status && entity.approval_status !== "PENDING",
-		requester_name: entity.requester_name,
-		requester_email: entity.requester_email,
+		created_by_display_name: null,
 		credit_value: entity.credit_value,
 		start_at: startAt,
 		target_at: targetAt,
@@ -5234,7 +6288,8 @@ function toCustomerSupportTicketReadDto(entity) {
 		created_at: createdAt,
 		created_by: entity.created_by,
 		updated_at: updatedAt,
-		updated_by: entity.updated_by
+		updated_by: entity.updated_by,
+		archived_at: entity.archived_at ?? null
 	};
 }
 /**
@@ -5257,13 +6312,13 @@ function toStaffSupportTicketReadDto(entity) {
 		title: entity.title,
 		description: entity.description,
 		type: entity.type,
-		priority: entity.priority,
+		priority: supportTicketNumberToPriority(entity.priority),
 		status: computeStatus(entity.approval_status, entity.dev_lifecycle),
 		approval_status: entity.approval_status,
 		is_locked: !!entity.approval_status && entity.approval_status !== "PENDING",
 		can_delete: canDelete,
-		requester_name: entity.requester_name,
-		requester_email: entity.requester_email,
+		created_by_display_name: null,
+		assigned_to: entity.assigned_to ?? null,
 		dev_lifecycle: entity.dev_lifecycle || "PENDING",
 		credit_value: entity.credit_value,
 		delivered_value: entity.delivered_value,
@@ -5274,7 +6329,9 @@ function toStaffSupportTicketReadDto(entity) {
 		created_at: createdAt,
 		created_by: entity.created_by,
 		updated_at: updatedAt,
-		updated_by: entity.updated_by
+		updated_by: entity.updated_by,
+		archived_at: entity.archived_at ?? null,
+		archived_by: entity.archived_by ?? null
 	};
 }
 function dateIsValid(date) {
@@ -5286,13 +6343,14 @@ function dateIsValid(date) {
 //#endregion
 //#region src/slices/support_ticket/features/customer/create_support_ticket_feat.ts
 let CreateSupportTicketFeat = class CreateSupportTicketFeat$1 {
-	constructor(session, support_ticketRepo, create_record_version, appSettingsRepo, emailService, env, logger$1) {
+	constructor(session, support_ticketRepo, subscriberRepo, notificationService, triageService, create_record_version, appSettingsRepo, logger$1) {
 		this.session = session;
 		this.support_ticketRepo = support_ticketRepo;
+		this.subscriberRepo = subscriberRepo;
+		this.notificationService = notificationService;
+		this.triageService = triageService;
 		this.create_record_version = create_record_version;
 		this.appSettingsRepo = appSettingsRepo;
-		this.emailService = emailService;
-		this.env = env;
 		this.logger = logger$1;
 	}
 	/**
@@ -5303,9 +6361,8 @@ let CreateSupportTicketFeat = class CreateSupportTicketFeat$1 {
 		const userId = this.session.user.userId;
 		const frEntity = {
 			...input,
+			priority: input.priority ?? SUPPORT_TICKET_PRIORITY_TO_NUMBER.MEDIUM,
 			description: input.description ?? "",
-			requester_email: this.session.user.email,
-			requester_name: this.session.user.username,
 			created_at: now,
 			created_by: userId,
 			updated_at: now,
@@ -5313,7 +6370,11 @@ let CreateSupportTicketFeat = class CreateSupportTicketFeat$1 {
 		};
 		const support_ticketCreated = await this.support_ticketRepo.create(frEntity);
 		support_ticketCreated.display_id = await this.appSettingsRepo.getNextSequentialId(RecordConst.SUPPORT_TICKET, this.session.user.userId);
-		await this.support_ticketRepo.update(support_ticketCreated);
+		const assigneeId = await this.triageService.getNextAssignee(this.session.user);
+		if (assigneeId) {
+			support_ticketCreated.assigned_to = assigneeId;
+			await this.support_ticketRepo.update(support_ticketCreated);
+		} else await this.support_ticketRepo.update(support_ticketCreated);
 		await this.create_record_version.execute({
 			record_id: support_ticketCreated.id,
 			operation: OperationConst.INSERT,
@@ -5324,58 +6385,30 @@ let CreateSupportTicketFeat = class CreateSupportTicketFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		await this.sendNotificationEmails(support_ticketCreated);
-		return toCustomerSupportTicketReadDto(support_ticketCreated);
+		await this.addRequesterAsFollower(support_ticketCreated);
+		await this.notificationService.notifyAssignee(support_ticketCreated, "TICKET_CREATED", { actorUserId: userId });
+		await this.notificationService.notifyFollowers(support_ticketCreated.id, support_ticketCreated, "TICKET_CREATED", { actorUserId: userId });
+		return {
+			...toCustomerSupportTicketReadDto(support_ticketCreated),
+			created_by_display_name: this.session.user.email
+		};
 	}
 	/**
-	* Send email notifications to staff members
+	* Auto-add requester (created_by) as follower
 	*/
-	async sendNotificationEmails(ticket) {
+	async addRequesterAsFollower(ticket) {
 		try {
-			const emailsSetting = await this.appSettingsRepo.readSetting(AppSettingKey.SUPPORT_TICKET_NOTIFICATION_EMAILS);
-			if (!emailsSetting?.value) {
-				this.logger.debug("No notification emails configured for support tickets");
-				return;
-			}
-			const emails = emailsSetting.value;
-			if (!Array.isArray(emails) || emails.length === 0) {
-				this.logger.debug("No valid notification emails found");
-				return;
-			}
-			const ticketUrl = `${this.env.WEBSITE_URL}/support-tickets/${ticket.id}`;
-			const subject = `New Support Ticket Created: ${ticket.title}`;
-			const bodyText = `
-A new support ticket has been created:
-
-Ticket #${ticket.display_id || ticket.id}
-Title: ${ticket.title}
-Type: ${ticket.type}
-Priority: ${ticket.priority}
-Requester: ${ticket.requester_name} (${ticket.requester_email})
-
-Description:
-${ticket.description}
-
-View ticket: ${ticketUrl}
-      `.trim();
-			const bodyHtml = `
-<h2>New Support Ticket Created</h2>
-<p>A new support ticket has been created:</p>
-<ul>
-  <li><strong>Ticket #:</strong> ${ticket.display_id || ticket.id}</li>
-  <li><strong>Title:</strong> ${ticket.title}</li>
-  <li><strong>Type:</strong> ${ticket.type}</li>
-  <li><strong>Priority:</strong> ${ticket.priority}</li>
-  <li><strong>Requester:</strong> ${ticket.requester_name} (${ticket.requester_email})</li>
-</ul>
-<p><strong>Description:</strong></p>
-<p>${ticket.description}</p>
-<p><a href="${ticketUrl}">View Ticket</a></p>
-      `.trim();
-			await this.emailService.sendBulkEmail(emails, subject, bodyText, bodyHtml);
-			this.logger.info(`Sent support ticket notification to ${emails.length} recipients`);
+			const now = (/* @__PURE__ */ new Date()).toISOString();
+			await this.subscriberRepo.ensureSubscriber({
+				record_type: RecordConst.SUPPORT_TICKET,
+				record_id: ticket.id,
+				user_id: ticket.created_by,
+				subscribed_events: null,
+				created_at: now,
+				created_by: ticket.created_by
+			});
 		} catch (error) {
-			this.logger.error("Failed to send support ticket notification emails", { error });
+			this.logger.error("Failed to add requester as follower", { error });
 		}
 	}
 };
@@ -5383,19 +6416,87 @@ CreateSupportTicketFeat = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(3, inject(TOKENS.IAppSettingsRepo)),
-	__decorateParam(4, inject(TOKENS.IEmailService)),
-	__decorateParam(5, inject(TOKENS.ENV)),
-	__decorateParam(6, inject(TOKENS.LOGGER))
+	__decorateParam(2, inject(RECORD_SUBSCRIBER_TOKENS.IRecordSubscriberRepo)),
+	__decorateParam(3, inject(SUPPORT_TICKET_TOKENS.ISupportTicketNotificationService)),
+	__decorateParam(4, inject(SUPPORT_TICKET_TOKENS.ISupportTicketTriageService)),
+	__decorateParam(5, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(6, inject(TOKENS.IAppSettingsRepo)),
+	__decorateParam(7, inject(TOKENS.LOGGER))
 ], CreateSupportTicketFeat);
 
+//#endregion
+//#region src/slices/support_ticket/features/customer/customer_toggle_subscription_feat.ts
+let CustomerToggleSubscriptionFeat = class CustomerToggleSubscriptionFeat$1 {
+	constructor(session, subscriberRepo, supportTicketRepo) {
+		this.session = session;
+		this.subscriberRepo = subscriberRepo;
+		this.supportTicketRepo = supportTicketRepo;
+	}
+	async execute(supportTicketId) {
+		const ticket = await this.supportTicketRepo.read(supportTicketId);
+		if (!ticket) throw new BusinessError("Support ticket not found");
+		if (ticket.approval_status === "INTERNAL") throw new BusinessError("Support ticket not found");
+		const subscription = await this.subscriberRepo.readByRecordAndUser(RecordConst.SUPPORT_TICKET, supportTicketId, this.session.user.userId);
+		if (subscription) {
+			if (!await this.subscriberRepo.delete(subscription.id)) throw new BusinessError("Failed to unsubscribe");
+			return { subscribed: false };
+		}
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const userId = this.session.user.userId;
+		await this.subscriberRepo.ensureSubscriber({
+			record_type: RecordConst.SUPPORT_TICKET,
+			record_id: supportTicketId,
+			user_id: userId,
+			subscribed_events: null,
+			created_at: now,
+			created_by: userId
+		});
+		return { subscribed: true };
+	}
+};
+CustomerToggleSubscriptionFeat = __decorate([
+	injectable(),
+	__decorateParam(0, injectSession()),
+	__decorateParam(1, inject(RECORD_SUBSCRIBER_TOKENS.IRecordSubscriberRepo)),
+	__decorateParam(2, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo))
+], CustomerToggleSubscriptionFeat);
+
+//#endregion
+//#region src/slices/support_ticket/features/customer/enrich_customer_ticket.ts
+/**
+* Enriches a CustomerSupportTicketReadDto with requester info from created_by lookup.
+* Requester name/email are derived from created_by (user display = email).
+*/
+function enrichCustomerTicket(dto, displayMap) {
+	const createdByDisplay = dto.created_by ? displayMap.get(dto.created_by) ?? dto.created_by : null;
+	return {
+		...dto,
+		created_by_display_name: createdByDisplay ?? dto.created_by ?? "—"
+	};
+}
+function collectUserIdsFromCustomerTicket(ticket) {
+	return [ticket.created_by].filter((id) => Boolean(id));
+}
+
 //#endregion
 //#region src/slices/support_ticket/features/customer/get_support_ticket_customer_feat.ts
+function toRecordSubscriberReadDto$2(e) {
+	return {
+		id: e.id,
+		record_type: e.record_type,
+		record_id: e.record_id,
+		user_id: e.user_id,
+		subscribed_events: e.subscribed_events ?? null,
+		created_at: e.created_at,
+		created_by: e.created_by
+	};
+}
 let GetSupportTicketCustomerFeature = class GetSupportTicketCustomerFeature$1 {
-	constructor(session, support_ticketRepo, appSettingsRepo, logger$1) {
+	constructor(session, support_ticketRepo, subscriberRepo, userDisplayLookup, appSettingsRepo, logger$1) {
 		this.session = session;
 		this.support_ticketRepo = support_ticketRepo;
+		this.subscriberRepo = subscriberRepo;
+		this.userDisplayLookup = userDisplayLookup;
 		this.appSettingsRepo = appSettingsRepo;
 		this.logger = logger$1;
 	}
@@ -5413,22 +6514,31 @@ let GetSupportTicketCustomerFeature = class GetSupportTicketCustomerFeature$1 {
 				updated_by: this.session.user.userId
 			});
 		}
-		return toCustomerSupportTicketReadDto(support_ticket);
+		const base = toCustomerSupportTicketReadDto(support_ticket);
+		const enriched = enrichCustomerTicket(base, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromCustomerTicket(base)));
+		const subscription = await this.subscriberRepo.readByRecordAndUser(RecordConst.SUPPORT_TICKET, id, this.session.user.userId);
+		return {
+			...enriched,
+			my_subscription: subscription ? toRecordSubscriberReadDto$2(subscription) : null
+		};
 	}
 };
 GetSupportTicketCustomerFeature = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(2, inject(TOKENS.IAppSettingsRepo)),
-	__decorateParam(3, inject(TOKENS.LOGGER))
+	__decorateParam(2, inject(RECORD_SUBSCRIBER_TOKENS.IRecordSubscriberRepo)),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup)),
+	__decorateParam(4, inject(TOKENS.IAppSettingsRepo)),
+	__decorateParam(5, inject(TOKENS.LOGGER))
 ], GetSupportTicketCustomerFeature);
 
 //#endregion
 //#region src/slices/support_ticket/features/customer/get_support_tickets_customer_feat.ts
 let GetSupportTicketsCustomerFeature = class GetSupportTicketsCustomerFeature$1 {
-	constructor(support_ticketRepo) {
+	constructor(support_ticketRepo, userDisplayLookup) {
 		this.support_ticketRepo = support_ticketRepo;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(filters) {
 		const customerFilters = {
@@ -5439,20 +6549,28 @@ let GetSupportTicketsCustomerFeature = class GetSupportTicketsCustomerFeature$1
 			}
 		};
 		const result = await this.support_ticketRepo.read_all(customerFilters);
+		const dtos = result.items.map(toCustomerSupportTicketReadDto);
+		const userIds = [...new Set(dtos.flatMap(collectUserIdsFromCustomerTicket))];
+		const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
 		return {
-			items: result.items.map(toCustomerSupportTicketReadDto),
+			items: dtos.map((dto) => enrichCustomerTicket(dto, displayMap)),
 			pageInfo: result.pageInfo
 		};
 	}
 };
-GetSupportTicketsCustomerFeature = __decorate([injectable(), __decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo))], GetSupportTicketsCustomerFeature);
+GetSupportTicketsCustomerFeature = __decorate([
+	injectable(),
+	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(1, inject(USER_TOKENS.IUserDisplayLookup))
+], GetSupportTicketsCustomerFeature);
 
 //#endregion
 //#region src/slices/support_ticket/features/customer/update_support_ticket_customer_feat.ts
 let UpdateSupportTicketCustomerFeat = class UpdateSupportTicketCustomerFeat$1 {
-	constructor(session, support_ticketRepo, create_record_version) {
+	constructor(session, support_ticketRepo, userDisplayLookup, create_record_version) {
 		this.session = session;
 		this.support_ticketRepo = support_ticketRepo;
+		this.userDisplayLookup = userDisplayLookup;
 		this.create_record_version = create_record_version;
 	}
 	/**
@@ -5460,8 +6578,9 @@ let UpdateSupportTicketCustomerFeat = class UpdateSupportTicketCustomerFeat$1 {
 	*/
 	async execute(input) {
 		const support_ticket = await this.support_ticketRepo.read(input.id);
-		if (!support_ticket) throw new Error("SupportTicket not found");
-		if (support_ticket.approval_status !== "PENDING") throw new Error("SupportTicket is locked - cannot be edited");
+		if (!support_ticket) throw new BusinessError("SupportTicket not found");
+		if (support_ticket.approval_status !== "PENDING") throw new BusinessError("SupportTicket is locked - cannot be edited");
+		if (support_ticket.archived_at) throw new BusinessError("Cannot edit an archived support ticket.");
 		const frEntity = {
 			...support_ticket,
 			title: input.title,
@@ -5483,24 +6602,102 @@ let UpdateSupportTicketCustomerFeat = class UpdateSupportTicketCustomerFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		return toCustomerSupportTicketReadDto(await this.support_ticketRepo.update(frEntity));
+		const base = toCustomerSupportTicketReadDto(await this.support_ticketRepo.update(frEntity));
+		return enrichCustomerTicket(base, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromCustomerTicket(base)));
 	}
 };
 UpdateSupportTicketCustomerFeat = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
+	__decorateParam(2, inject(USER_TOKENS.IUserDisplayLookup)),
+	__decorateParam(3, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
 ], UpdateSupportTicketCustomerFeat);
 
+//#endregion
+//#region src/slices/support_ticket/features/staff/add_support_ticket_subscriber_feat.ts
+function toRecordSubscriberReadDto$1(e) {
+	return {
+		id: e.id,
+		record_type: e.record_type,
+		record_id: e.record_id,
+		user_id: e.user_id,
+		subscribed_events: e.subscribed_events ?? null,
+		created_at: e.created_at,
+		created_by: e.created_by
+	};
+}
+let AddSupportTicketSubscriberFeat = class AddSupportTicketSubscriberFeat$1 {
+	constructor(subscriberRepo, supportTicketRepo, session, userDisplayLookup) {
+		this.subscriberRepo = subscriberRepo;
+		this.supportTicketRepo = supportTicketRepo;
+		this.session = session;
+		this.userDisplayLookup = userDisplayLookup;
+	}
+	async execute(input) {
+		if (!await this.supportTicketRepo.read(input.support_ticket_id)) throw new BusinessError("Support ticket not found");
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const dto = toRecordSubscriberReadDto$1(await this.subscriberRepo.ensureSubscriber({
+			record_type: RecordConst.SUPPORT_TICKET,
+			record_id: input.support_ticket_id,
+			user_id: input.user_id,
+			subscribed_events: input.subscribed_events ?? null,
+			created_at: now,
+			created_by: this.session.user.userId
+		}));
+		const userIds = [dto.user_id, dto.created_by].filter(Boolean);
+		const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
+		return {
+			...dto,
+			user_id_display_name: dto.user_id ? displayMap.get(dto.user_id) ?? dto.user_id : null,
+			created_by_display_name: dto.created_by ? displayMap.get(dto.created_by) ?? dto.created_by : null
+		};
+	}
+};
+AddSupportTicketSubscriberFeat = __decorate([
+	injectable(),
+	__decorateParam(0, inject(RECORD_SUBSCRIBER_TOKENS.IRecordSubscriberRepo)),
+	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(2, injectSession()),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
+], AddSupportTicketSubscriberFeat);
+
+//#endregion
+//#region src/slices/support_ticket/features/staff/enrich_staff_ticket.ts
+/**
+* Enriches a StaffSupportTicketReadDto with display names from a lookup map.
+* Used by all staff features that return a ticket.
+*/
+function enrichStaffTicket(dto, displayMap) {
+	const createdByDisplay = dto.created_by ? displayMap.get(dto.created_by) ?? dto.created_by : null;
+	return {
+		...dto,
+		assigned_to_display_name: dto.assigned_to ? displayMap.get(dto.assigned_to) ?? dto.assigned_to : null,
+		created_by_display_name: createdByDisplay ?? dto.created_by ?? "—",
+		updated_by_display_name: dto.updated_by ? displayMap.get(dto.updated_by) ?? dto.updated_by : null
+	};
+}
+/**
+* Collects user IDs from a staff ticket for display name lookup.
+*/
+function collectUserIdsFromStaffTicket(ticket) {
+	return [
+		ticket.assigned_to,
+		ticket.created_by,
+		ticket.updated_by
+	].filter((id) => Boolean(id));
+}
+
 //#endregion
 //#region src/slices/support_ticket/features/staff/approve_support_ticket_feat.ts
 let ApproveSupportTicketFeat = class ApproveSupportTicketFeat$1 {
-	constructor(repo, creditService, create_record_version, session) {
+	constructor(repo, notificationService, creditService, create_record_version, session, userDisplayLookup) {
 		this.repo = repo;
+		this.notificationService = notificationService;
 		this.creditService = creditService;
 		this.create_record_version = create_record_version;
 		this.session = session;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	/**
 	* Approves a support_ticket item, deducts credits, and locks it.
@@ -5516,15 +6713,18 @@ let ApproveSupportTicketFeat = class ApproveSupportTicketFeat$1 {
 	* @returns The updated support_ticket with full staff view.
 	*/
 	async execute(args) {
-		const { id } = args;
+		const { id, credit_value: creditValueFromArgs } = args;
 		const support_ticket = await this.repo.read(id);
-		if (!support_ticket) throw new Error(`Support Ticket with ID ${id} not found`);
-		if (support_ticket.approval_status !== "PENDING") throw new Error("Support Ticket must be in PENDING status to be approved.");
-		if (!support_ticket.credit_value) throw new Error("Support Ticket must have an estimated credit cost to be approved.");
-		if (support_ticket.credit_value === null || support_ticket.credit_value === void 0 || support_ticket.credit_value === "") throw new Error("Support Ticket must have an estimated credit cost to be approved.");
-		const creditAmount = parseFloat(support_ticket.credit_value);
-		if (isNaN(creditAmount)) throw new Error("Invalid credit value amount.");
-		if (!await this.creditService.deductCredits(support_ticket.credit_value, support_ticket.id)) throw new Error("Insufficient credits. Customer must purchase more credits or wait for monthly reset.");
+		if (!support_ticket) throw new BusinessError(`Support Ticket with ID ${id} not found`);
+		if (support_ticket.approval_status !== "PENDING") throw new BusinessError("Support Ticket must be in PENDING status to be approved.");
+		const creditAmount = parseFloat(creditValueFromArgs);
+		if (isNaN(creditAmount) || creditAmount < 0) throw new BusinessError("Invalid credit value amount.");
+		const ticketToUpdate = {
+			...support_ticket,
+			credit_value: creditValueFromArgs
+		};
+		if (support_ticket.credit_value?.trim() !== creditValueFromArgs) await this.repo.update(ticketToUpdate);
+		if (!await this.creditService.deductCredits(creditValueFromArgs, support_ticket.id)) throw new BusinessError("Insufficient credits. Customer must purchase more credits or wait for monthly reset.");
 		const lockedAt = (/* @__PURE__ */ new Date()).toISOString();
 		const changed_props = getChangedProperties(support_ticket, {
 			...support_ticket,
@@ -5549,25 +6749,101 @@ let ApproveSupportTicketFeat = class ApproveSupportTicketFeat$1 {
 			dev_lifecycle: "BACKLOG",
 			locked_approval_at: lockedAt
 		});
-		if (!updatedSupportTicket) throw new Error("Failed to approve support_ticket.");
-		return toStaffSupportTicketReadDto(updatedSupportTicket);
+		if (!updatedSupportTicket) throw new BusinessError("Failed to approve support_ticket.");
+		await this.notificationService.notifyFollowers(id, updatedSupportTicket, "APPROVAL_STATUS_CHANGED", { actorUserId: this.session.user.userId });
+		const dto = toStaffSupportTicketReadDto(updatedSupportTicket);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 ApproveSupportTicketFeat = __decorate([
 	injectable(),
 	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(1, inject(CREDIT_SERVICE_TOKEN)),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(3, injectSession())
+	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketNotificationService)),
+	__decorateParam(2, inject(CREDIT_SERVICE_TOKEN)),
+	__decorateParam(3, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(4, injectSession()),
+	__decorateParam(5, inject(USER_TOKENS.IUserDisplayLookup))
 ], ApproveSupportTicketFeat);
 
+//#endregion
+//#region src/slices/support_ticket/features/staff/archive_support_ticket_feat.ts
+let ArchiveSupportTicketFeat = class ArchiveSupportTicketFeat$1 {
+	constructor(repo, create_record_version, session, userDisplayLookup) {
+		this.repo = repo;
+		this.create_record_version = create_record_version;
+		this.session = session;
+		this.userDisplayLookup = userDisplayLookup;
+	}
+	async execute(id) {
+		const support_ticket = await this.repo.read(id);
+		if (!support_ticket) throw new Error(`Support ticket with id ${id} not found`);
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		const userId = this.session.user.userId;
+		if (support_ticket.archived_at) {
+			await this.create_record_version.execute({
+				record_id: id,
+				operation: OperationConst.UPDATE,
+				recorded_at: now,
+				record_type: RecordConst.SUPPORT_TICKET,
+				record: {
+					archived_at: null,
+					archived_by: null
+				},
+				old_record: support_ticket,
+				auth_uid: userId,
+				auth_role: this.session.user.user_type,
+				auth_username: this.session.user.username
+			});
+			const updated$1 = await this.repo.update({
+				...support_ticket,
+				archived_at: null,
+				archived_by: null
+			});
+			if (!updated$1) throw new Error("Failed to unarchive support ticket.");
+			const dto$1 = toStaffSupportTicketReadDto(updated$1);
+			return enrichStaffTicket(dto$1, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto$1)));
+		}
+		if (!(support_ticket.dev_lifecycle === "DEPLOYED" || support_ticket.approval_status === "REJECTED")) throw new Error("Only completed or rejected tickets can be archived. Complete or reject the ticket first.");
+		await this.create_record_version.execute({
+			record_id: id,
+			operation: OperationConst.UPDATE,
+			recorded_at: now,
+			record_type: RecordConst.SUPPORT_TICKET,
+			record: {
+				archived_at: now,
+				archived_by: userId
+			},
+			old_record: support_ticket,
+			auth_uid: userId,
+			auth_role: this.session.user.user_type,
+			auth_username: this.session.user.username
+		});
+		const updated = await this.repo.update({
+			...support_ticket,
+			archived_at: now,
+			archived_by: userId
+		});
+		if (!updated) throw new Error("Failed to archive support ticket.");
+		const dto = toStaffSupportTicketReadDto(updated);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
+	}
+};
+ArchiveSupportTicketFeat = __decorate([
+	injectable(),
+	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(1, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(2, injectSession()),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
+], ArchiveSupportTicketFeat);
+
 //#endregion
 //#region src/slices/support_ticket/features/staff/cancel_internal_task_feat.ts
 let CancelInternalTaskFeat = class CancelInternalTaskFeat$1 {
-	constructor(repo, create_record_version, session) {
+	constructor(repo, create_record_version, session, userDisplayLookup) {
 		this.repo = repo;
 		this.create_record_version = create_record_version;
 		this.session = session;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	/**
 	* Cancels an internal task by setting dev_lifecycle to CANCELLED.
@@ -5612,23 +6888,26 @@ let CancelInternalTaskFeat = class CancelInternalTaskFeat$1 {
 			completed_at: completedAt
 		});
 		if (!updatedSupportTicket) throw new Error("Failed to cancel internal task.");
-		return toStaffSupportTicketReadDto(updatedSupportTicket);
+		const dto = toStaffSupportTicketReadDto(updatedSupportTicket);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 CancelInternalTaskFeat = __decorate([
 	injectable(),
 	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
 	__decorateParam(1, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(2, injectSession())
+	__decorateParam(2, injectSession()),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], CancelInternalTaskFeat);
 
 //#endregion
 //#region src/slices/support_ticket/features/staff/complete_support_ticket_feat.ts
 let CompleteSupportTicketFeat = class CompleteSupportTicketFeat$1 {
-	constructor(repo, create_record_version, session) {
+	constructor(repo, create_record_version, session, userDisplayLookup) {
 		this.repo = repo;
 		this.create_record_version = create_record_version;
 		this.session = session;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	/**
 	* Completes a support_ticket item by setting it to DEPLOYED with delivered value.
@@ -5674,23 +6953,26 @@ let CompleteSupportTicketFeat = class CompleteSupportTicketFeat$1 {
 			completed_at: completedAt
 		});
 		if (!updatedSupportTicket) throw new Error("Failed to complete support_ticket.");
-		return toStaffSupportTicketReadDto(updatedSupportTicket);
+		const dto = toStaffSupportTicketReadDto(updatedSupportTicket);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 CompleteSupportTicketFeat = __decorate([
 	injectable(),
 	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
 	__decorateParam(1, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(2, injectSession())
+	__decorateParam(2, injectSession()),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], CompleteSupportTicketFeat);
 
 //#endregion
 //#region src/slices/support_ticket/features/staff/convert_to_customer_feat.ts
 let ConvertToCustomerFeat = class ConvertToCustomerFeat$1 {
-	constructor(session, support_ticketRepo, create_record_version) {
+	constructor(session, support_ticketRepo, create_record_version, userDisplayLookup) {
 		this.session = session;
 		this.support_ticketRepo = support_ticketRepo;
 		this.create_record_version = create_record_version;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(support_ticket_id) {
 		const existing = await this.support_ticketRepo.read(support_ticket_id);
@@ -5701,7 +6983,7 @@ let ConvertToCustomerFeat = class ConvertToCustomerFeat$1 {
 			approval_status: "PENDING",
 			dev_lifecycle: null,
 			updated_at: (/* @__PURE__ */ new Date()).toISOString(),
-			updated_by: this.session.user.email
+			updated_by: this.session.user.userId
 		};
 		const updated = await this.support_ticketRepo.update(updateEntity);
 		await this.create_record_version.execute({
@@ -5715,23 +6997,26 @@ let ConvertToCustomerFeat = class ConvertToCustomerFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		return toStaffSupportTicketReadDto(updated);
+		const dto = toStaffSupportTicketReadDto(updated);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 ConvertToCustomerFeat = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
+	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], ConvertToCustomerFeat);
 
 //#endregion
 //#region src/slices/support_ticket/features/staff/convert_to_internal_feat.ts
 let ConvertToInternalFeat = class ConvertToInternalFeat$1 {
-	constructor(session, support_ticketRepo, create_record_version) {
+	constructor(session, support_ticketRepo, create_record_version, userDisplayLookup) {
 		this.session = session;
 		this.support_ticketRepo = support_ticketRepo;
 		this.create_record_version = create_record_version;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(support_ticket_id) {
 		const existing = await this.support_ticketRepo.read(support_ticket_id);
@@ -5743,7 +7028,7 @@ let ConvertToInternalFeat = class ConvertToInternalFeat$1 {
 			credit_value: null,
 			dev_lifecycle: "BACKLOG",
 			updated_at: (/* @__PURE__ */ new Date()).toISOString(),
-			updated_by: this.session.user.email
+			updated_by: this.session.user.userId
 		};
 		const updated = await this.support_ticketRepo.update(updateEntity);
 		await this.create_record_version.execute({
@@ -5757,26 +7042,31 @@ let ConvertToInternalFeat = class ConvertToInternalFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		return toStaffSupportTicketReadDto(updated);
+		const dto = toStaffSupportTicketReadDto(updated);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 ConvertToInternalFeat = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
+	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], ConvertToInternalFeat);
 
 //#endregion
 //#region src/slices/support_ticket/features/staff/create_support_ticket_admin_feat.ts
 let CreateSupportTicketAdminFeat = class CreateSupportTicketAdminFeat$1 {
-	constructor(session, support_ticketRepo, create_record_version, appSettingsRepo, emailService, env, logger$1) {
+	constructor(session, support_ticketRepo, subscriberRepo, notificationService, triageService, supportStaffRepo, userDisplayLookup, create_record_version, appSettingsRepo, logger$1) {
 		this.session = session;
 		this.support_ticketRepo = support_ticketRepo;
+		this.subscriberRepo = subscriberRepo;
+		this.notificationService = notificationService;
+		this.triageService = triageService;
+		this.supportStaffRepo = supportStaffRepo;
+		this.userDisplayLookup = userDisplayLookup;
 		this.create_record_version = create_record_version;
 		this.appSettingsRepo = appSettingsRepo;
-		this.emailService = emailService;
-		this.env = env;
 		this.logger = logger$1;
 	}
 	/**
@@ -5789,10 +7079,8 @@ let CreateSupportTicketAdminFeat = class CreateSupportTicketAdminFeat$1 {
 			title: input.title || "",
 			description: input.description || "",
 			type: input.type || "FEATURE_REQUEST",
-			priority: input.priority || "MEDIUM",
+			priority: input.priority ?? SUPPORT_TICKET_PRIORITY_TO_NUMBER.MEDIUM,
 			approval_status: input.is_internal ? "INTERNAL" : "PENDING",
-			requester_email: this.session.user.email,
-			requester_name: this.session.user.username,
 			dev_lifecycle: input.dev_lifecycle || null,
 			credit_value: input.is_internal ? null : formatCreditValue(input.credit_value),
 			delivered_value: input.delivered_value || null,
@@ -5807,6 +7095,12 @@ let CreateSupportTicketAdminFeat = class CreateSupportTicketAdminFeat$1 {
 		};
 		const support_ticketCreated = await this.support_ticketRepo.create(support_ticketEntity);
 		support_ticketCreated.display_id = await this.appSettingsRepo.getNextSequentialId(RecordConst.SUPPORT_TICKET, this.session.user.userId);
+		let assigneeId = null;
+		if (input.assigned_to?.trim()) {
+			if (!(await this.supportStaffRepo.readTriageUsers()).some((u) => u.id === input.assigned_to)) throw new BusinessError("Selected assignee is not a support staff member");
+			assigneeId = input.assigned_to;
+		} else assigneeId = await this.triageService.getNextAssignee(this.session.user);
+		if (assigneeId) support_ticketCreated.assigned_to = assigneeId;
 		await this.support_ticketRepo.update(support_ticketCreated);
 		await this.create_record_version.execute({
 			record_id: support_ticketCreated.id,
@@ -5818,58 +7112,30 @@ let CreateSupportTicketAdminFeat = class CreateSupportTicketAdminFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		if (!input.is_internal) await this.sendNotificationEmails(support_ticketCreated);
-		return toStaffSupportTicketReadDto(support_ticketCreated);
+		if (!input.is_internal) {
+			await this.addRequesterAsFollower(support_ticketCreated);
+			await this.notificationService.notifyAssignee(support_ticketCreated, "TICKET_CREATED", { actorUserId: userId });
+			await this.notificationService.notifyFollowers(support_ticketCreated.id, support_ticketCreated, "TICKET_CREATED", { actorUserId: userId });
+		}
+		const dto = toStaffSupportTicketReadDto(support_ticketCreated);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 	/**
-	* Send email notifications to staff members
+	* Auto-add requester (created_by) as follower
 	*/
-	async sendNotificationEmails(ticket) {
+	async addRequesterAsFollower(ticket) {
 		try {
-			const emailsSetting = await this.appSettingsRepo.readSetting(AppSettingKey.SUPPORT_TICKET_NOTIFICATION_EMAILS);
-			if (!emailsSetting?.value) {
-				this.logger.debug("No notification emails configured for support tickets");
-				return;
-			}
-			const emails = emailsSetting.value;
-			if (!Array.isArray(emails) || emails.length === 0) {
-				this.logger.debug("No valid notification emails found");
-				return;
-			}
-			const ticketUrl = `${this.env.WEBSITE_URL}/support/${ticket.id}`;
-			const subject = `New Support Ticket Created: ${ticket.title}`;
-			const bodyText = `
-A new support ticket has been created:
-
-Ticket #${ticket.display_id || ticket.id}
-Title: ${ticket.title}
-Type: ${ticket.type}
-Priority: ${ticket.priority}
-Requester: ${ticket.requester_name} (${ticket.requester_email})
-
-Description:
-${ticket.description}
-
-View ticket: ${ticketUrl}
-      `.trim();
-			const bodyHtml = `
-<h2>New Support Ticket Created</h2>
-<p>A new support ticket has been created:</p>
-<ul>
-  <li><strong>Ticket #:</strong> ${ticket.display_id || ticket.id}</li>
-  <li><strong>Title:</strong> ${ticket.title}</li>
-  <li><strong>Type:</strong> ${ticket.type}</li>
-  <li><strong>Priority:</strong> ${ticket.priority}</li>
-  <li><strong>Requester:</strong> ${ticket.requester_name} (${ticket.requester_email})</li>
-</ul>
-<p><strong>Description:</strong></p>
-<p>${ticket.description}</p>
-<p><a href="${ticketUrl}">View Ticket</a></p>
-      `.trim();
-			await this.emailService.sendBulkEmail(emails, subject, bodyText, bodyHtml);
-			this.logger.info(`Sent support ticket notification to ${emails.length} recipients`);
+			const now = (/* @__PURE__ */ new Date()).toISOString();
+			await this.subscriberRepo.ensureSubscriber({
+				record_type: RecordConst.SUPPORT_TICKET,
+				record_id: ticket.id,
+				user_id: ticket.created_by,
+				subscribed_events: null,
+				created_at: now,
+				created_by: ticket.created_by
+			});
 		} catch (error) {
-			this.logger.error("Failed to send support ticket notification emails", { error });
+			this.logger.error("Failed to add requester as follower", { error });
 		}
 	}
 };
@@ -5877,11 +7143,14 @@ CreateSupportTicketAdminFeat = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(3, inject(TOKENS.IAppSettingsRepo)),
-	__decorateParam(4, inject(TOKENS.IEmailService)),
-	__decorateParam(5, inject(TOKENS.ENV)),
-	__decorateParam(6, inject(TOKENS.LOGGER))
+	__decorateParam(2, inject(RECORD_SUBSCRIBER_TOKENS.IRecordSubscriberRepo)),
+	__decorateParam(3, inject(SUPPORT_TICKET_TOKENS.ISupportTicketNotificationService)),
+	__decorateParam(4, inject(SUPPORT_TICKET_TOKENS.ISupportTicketTriageService)),
+	__decorateParam(5, inject(SUPPORT_STAFF_TOKENS.ISupportStaffRepo)),
+	__decorateParam(6, inject(USER_TOKENS.IUserDisplayLookup)),
+	__decorateParam(7, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(8, inject(TOKENS.IAppSettingsRepo)),
+	__decorateParam(9, inject(TOKENS.LOGGER))
 ], CreateSupportTicketAdminFeat);
 
 //#endregion
@@ -5928,13 +7197,93 @@ DeleteSupportTicketFeat = __decorate([
 	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
 ], DeleteSupportTicketFeat);
 
+//#endregion
+//#region src/slices/support_ticket/features/staff/fix_support_ticket_user_ids_feat.ts
+const UNIVERSAL_ID_LENGTH = 32;
+let FixSupportTicketUserIdsFeature = class FixSupportTicketUserIdsFeature$1 {
+	constructor(supportTicketRepo, userRepo) {
+		this.supportTicketRepo = supportTicketRepo;
+		this.userRepo = userRepo;
+	}
+	async execute() {
+		const tickets = await this.supportTicketRepo.findWithInvalidUserIds();
+		if (tickets.length === 0) return {
+			ticketsScanned: 0,
+			ticketsFixed: 0,
+			ticketsSkipped: 0
+		};
+		const emailToUserId = await this.buildEmailToUserIdMap(tickets);
+		let ticketsFixed = 0;
+		let ticketsSkipped = 0;
+		for (const ticket of tickets) {
+			const updates = this.buildUpdates(ticket, emailToUserId);
+			if (Object.keys(updates).length === 0) {
+				ticketsSkipped++;
+				continue;
+			}
+			const updated = {
+				...ticket,
+				...updates
+			};
+			await this.supportTicketRepo.update(updated);
+			ticketsFixed++;
+		}
+		return {
+			ticketsScanned: tickets.length,
+			ticketsFixed,
+			ticketsSkipped
+		};
+	}
+	async buildEmailToUserIdMap(tickets) {
+		const fieldsToFix = [
+			"created_by",
+			"updated_by",
+			"assigned_to",
+			"archived_by",
+			"deleted_by"
+		];
+		const emails = /* @__PURE__ */ new Set();
+		for (const ticket of tickets) for (const field of fieldsToFix) {
+			const value = ticket[field];
+			if (value != null && value.length !== UNIVERSAL_ID_LENGTH) emails.add(value);
+		}
+		if (emails.size === 0) return /* @__PURE__ */ new Map();
+		const users = await this.userRepo.read_users_by_emails_case_insensitive([...emails]);
+		const map = /* @__PURE__ */ new Map();
+		for (const u of users) map.set(u.email.toLowerCase(), u.id);
+		return map;
+	}
+	buildUpdates(ticket, emailToUserId) {
+		const updates = {};
+		for (const field of [
+			"created_by",
+			"updated_by",
+			"assigned_to",
+			"archived_by",
+			"deleted_by"
+		]) {
+			const value = ticket[field];
+			if (value == null || value.length === UNIVERSAL_ID_LENGTH) continue;
+			const userId = emailToUserId.get(value.toLowerCase());
+			if (userId) updates[field] = userId;
+		}
+		return updates;
+	}
+};
+FixSupportTicketUserIdsFeature = __decorate([
+	injectable(),
+	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(1, inject(USER_TOKENS.IUsersRepo))
+], FixSupportTicketUserIdsFeature);
+
 //#endregion
 //#region src/slices/support_ticket/features/staff/get_support_ticket_admin_feat.ts
 let GetSupportTicketAdminFeature = class GetSupportTicketAdminFeature$1 {
-	constructor(session, support_ticketRepo, appSettingsRepo) {
+	constructor(session, support_ticketRepo, appSettingsRepo, userDisplayLookup) {
 		this.session = session;
 		this.support_ticketRepo = support_ticketRepo;
 		this.appSettingsRepo = appSettingsRepo;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(id) {
 		let support_ticket = await this.support_ticketRepo.read(id);
@@ -5948,39 +7297,110 @@ let GetSupportTicketAdminFeature = class GetSupportTicketAdminFeature$1 {
 				updated_by: this.session.user.userId
 			});
 		}
-		return toStaffSupportTicketReadDto(support_ticket);
+		const dto = toStaffSupportTicketReadDto(support_ticket);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 GetSupportTicketAdminFeature = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(2, inject(TOKENS.IAppSettingsRepo))
+	__decorateParam(2, inject(TOKENS.IAppSettingsRepo)),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], GetSupportTicketAdminFeature);
 
+//#endregion
+//#region src/slices/support_ticket/features/staff/get_requestors_for_active_support_tickets_feat.ts
+let GetRequestorsForActiveSupportTicketsFeat = class GetRequestorsForActiveSupportTicketsFeat$1 {
+	constructor(supportTicketRepo, userRepo) {
+		this.supportTicketRepo = supportTicketRepo;
+		this.userRepo = userRepo;
+	}
+	async execute(options) {
+		const requestorIds = await this.supportTicketRepo.read_distinct_requestors_for_active_tickets(options);
+		if (requestorIds.length === 0) return [];
+		return (await this.userRepo.read_users_by_ids(requestorIds)).map((u) => ({
+			id: u.id,
+			email: u.email
+		}));
+	}
+};
+GetRequestorsForActiveSupportTicketsFeat = __decorate([
+	injectable(),
+	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(1, inject(USER_TOKENS.IUsersRepo))
+], GetRequestorsForActiveSupportTicketsFeat);
+
 //#endregion
 //#region src/slices/support_ticket/features/staff/get_support_tickets_admin_feat.ts
 let GetSupportTicketsAdminFeature = class GetSupportTicketsAdminFeature$1 {
-	constructor(support_ticketRepo) {
+	constructor(support_ticketRepo, userDisplayLookup) {
 		this.support_ticketRepo = support_ticketRepo;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(filters) {
 		const result = await this.support_ticketRepo.read_all(filters);
+		const dtos = result.items.map(toStaffSupportTicketReadDto);
+		const userIds = [...new Set(dtos.flatMap(collectUserIdsFromStaffTicket))];
+		const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
 		return {
-			items: result.items.map(toStaffSupportTicketReadDto),
+			items: dtos.map((t) => enrichStaffTicket(t, displayMap)),
 			pageInfo: result.pageInfo
 		};
 	}
 };
-GetSupportTicketsAdminFeature = __decorate([injectable(), __decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo))], GetSupportTicketsAdminFeature);
+GetSupportTicketsAdminFeature = __decorate([
+	injectable(),
+	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(1, inject(USER_TOKENS.IUserDisplayLookup))
+], GetSupportTicketsAdminFeature);
+
+//#endregion
+//#region src/slices/support_ticket/features/staff/list_support_ticket_subscribers_feat.ts
+function toRecordSubscriberReadDto(e) {
+	return {
+		id: e.id,
+		record_type: e.record_type,
+		record_id: e.record_id,
+		user_id: e.user_id,
+		subscribed_events: e.subscribed_events ?? null,
+		created_at: e.created_at,
+		created_by: e.created_by
+	};
+}
+let ListSupportTicketSubscribersFeat = class ListSupportTicketSubscribersFeat$1 {
+	constructor(subscriberRepo, supportTicketRepo, userDisplayLookup) {
+		this.subscriberRepo = subscriberRepo;
+		this.supportTicketRepo = supportTicketRepo;
+		this.userDisplayLookup = userDisplayLookup;
+	}
+	async execute(supportTicketId) {
+		if (!await this.supportTicketRepo.read(supportTicketId)) throw new BusinessError("Support ticket not found");
+		const dtos = (await this.subscriberRepo.readByRecordId(RecordConst.SUPPORT_TICKET, supportTicketId)).map(toRecordSubscriberReadDto);
+		const userIds = [...new Set(dtos.flatMap((s) => [s.user_id, s.created_by].filter(Boolean)))];
+		const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
+		return dtos.map((s) => ({
+			...s,
+			user_id_display_name: s.user_id ? displayMap.get(s.user_id) ?? s.user_id : null,
+			created_by_display_name: s.created_by ? displayMap.get(s.created_by) ?? s.created_by : null
+		}));
+	}
+};
+ListSupportTicketSubscribersFeat = __decorate([
+	injectable(),
+	__decorateParam(0, inject(RECORD_SUBSCRIBER_TOKENS.IRecordSubscriberRepo)),
+	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
+	__decorateParam(2, inject(USER_TOKENS.IUserDisplayLookup))
+], ListSupportTicketSubscribersFeat);
 
 //#endregion
 //#region src/slices/support_ticket/features/staff/reactivate_internal_task_feat.ts
 let ReactivateInternalTaskFeat = class ReactivateInternalTaskFeat$1 {
-	constructor(repo, create_record_version, session) {
+	constructor(repo, create_record_version, session, userDisplayLookup) {
 		this.repo = repo;
 		this.create_record_version = create_record_version;
 		this.session = session;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	/**
 	* Reactivates a terminal internal task.
@@ -6028,23 +7448,27 @@ let ReactivateInternalTaskFeat = class ReactivateInternalTaskFeat$1 {
 			completed_at: null
 		});
 		if (!updatedSupportTicket) throw new Error("Failed to reactivate internal task.");
-		return toStaffSupportTicketReadDto(updatedSupportTicket);
+		const dto = toStaffSupportTicketReadDto(updatedSupportTicket);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 ReactivateInternalTaskFeat = __decorate([
 	injectable(),
 	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
 	__decorateParam(1, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(2, injectSession())
+	__decorateParam(2, injectSession()),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], ReactivateInternalTaskFeat);
 
 //#endregion
 //#region src/slices/support_ticket/features/staff/reject_support_ticket_feat.ts
 let RejectSupportTicketFeat = class RejectSupportTicketFeat$1 {
-	constructor(repo, create_record_version, session) {
+	constructor(repo, notificationService, create_record_version, session, userDisplayLookup) {
 		this.repo = repo;
+		this.notificationService = notificationService;
 		this.create_record_version = create_record_version;
 		this.session = session;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	/**
 	* Rejects a support_ticket item and locks it.
@@ -6085,24 +7509,41 @@ let RejectSupportTicketFeat = class RejectSupportTicketFeat$1 {
 			locked_approval_at: lockedAt
 		});
 		if (!updatedSupportTicket) throw new Error("Failed to reject support_ticket.");
-		return toStaffSupportTicketReadDto(updatedSupportTicket);
+		await this.notificationService.notifyFollowers(id, updatedSupportTicket, "APPROVAL_STATUS_CHANGED", { actorUserId: this.session.user.userId });
+		const dto = toStaffSupportTicketReadDto(updatedSupportTicket);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 RejectSupportTicketFeat = __decorate([
 	injectable(),
 	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(1, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(2, injectSession())
+	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketNotificationService)),
+	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(3, injectSession()),
+	__decorateParam(4, inject(USER_TOKENS.IUserDisplayLookup))
 ], RejectSupportTicketFeat);
 
+//#endregion
+//#region src/slices/support_ticket/features/staff/remove_support_ticket_subscriber_feat.ts
+let RemoveSupportTicketSubscriberFeat = class RemoveSupportTicketSubscriberFeat$1 {
+	constructor(subscriberRepo) {
+		this.subscriberRepo = subscriberRepo;
+	}
+	async execute(supportTicketId, subscriberId) {
+		if (!await this.subscriberRepo.delete(subscriberId)) throw new BusinessError("Subscriber not found or already removed");
+	}
+};
+RemoveSupportTicketSubscriberFeat = __decorate([injectable(), __decorateParam(0, inject(RECORD_SUBSCRIBER_TOKENS.IRecordSubscriberRepo))], RemoveSupportTicketSubscriberFeat);
+
 //#endregion
 //#region src/slices/support_ticket/features/staff/revert_support_ticket_feat.ts
 let RevertSupportTicketFeat = class RevertSupportTicketFeat$1 {
-	constructor(repo, creditService, create_record_version, session) {
+	constructor(repo, creditService, create_record_version, session, userDisplayLookup) {
 		this.repo = repo;
 		this.creditService = creditService;
 		this.create_record_version = create_record_version;
 		this.session = session;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	/**
 	* Reverts a support_ticket item back to PENDING status and refunds credits.
@@ -6151,7 +7592,8 @@ let RevertSupportTicketFeat = class RevertSupportTicketFeat$1 {
 			locked_approval_at: null
 		});
 		if (!updatedSupportTicket) throw new Error("Failed to revert support_ticket.");
-		return toStaffSupportTicketReadDto(updatedSupportTicket);
+		const dto = toStaffSupportTicketReadDto(updatedSupportTicket);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 RevertSupportTicketFeat = __decorate([
@@ -6159,7 +7601,8 @@ RevertSupportTicketFeat = __decorate([
 	__decorateParam(0, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
 	__decorateParam(1, inject(CREDIT_SERVICE_TOKEN)),
 	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(3, injectSession())
+	__decorateParam(3, injectSession()),
+	__decorateParam(4, inject(USER_TOKENS.IUserDisplayLookup))
 ], RevertSupportTicketFeat);
 
 //#endregion
@@ -6168,17 +7611,18 @@ RevertSupportTicketFeat = __decorate([
 * Validate business rules for staff updates based on permissions matrix
 */
 const validateBusinessRules = (input, existing) => {
+	if (existing.archived_at) throw new BusinessError("Cannot edit an archived support ticket.");
 	const currentApproval = existing.approval_status;
 	const currentDevLifecycle = existing.dev_lifecycle;
 	if (input.dev_lifecycle !== void 0 && input.dev_lifecycle !== currentDevLifecycle) {
-		if (!currentApproval || !["APPROVED", "INTERNAL"].includes(currentApproval)) throw new Error("Can only set dev lifecycle when support_ticket is APPROVED or INTERNAL");
+		if (!currentApproval || !["APPROVED", "INTERNAL"].includes(currentApproval)) throw new BusinessError("Can only set dev lifecycle when support_ticket is APPROVED or INTERNAL");
 	}
 	if (input.credit_value !== void 0 && input.credit_value !== existing.credit_value) {
-		if (currentApproval === "INTERNAL") throw new Error("Internal support_ticket cannot have credit values");
-		if (currentApproval !== "PENDING") throw new Error("Can only edit credit value when support_ticket is PENDING");
+		if (currentApproval === "INTERNAL") throw new BusinessError("Internal support_ticket cannot have credit values");
+		if (currentApproval !== "PENDING") throw new BusinessError("Can only edit credit value when support_ticket is PENDING");
 	}
 	if (input.delivered_value !== void 0 && input.delivered_value !== existing.delivered_value) {
-		if (currentDevLifecycle !== "DEPLOYED") throw new Error("Can only set delivered value when dev lifecycle is DEPLOYED");
+		if (currentDevLifecycle !== "DEPLOYED") throw new BusinessError("Can only set delivered value when dev lifecycle is DEPLOYED");
 	}
 	const lockedDevStages = [
 		"DEVELOPMENT",
@@ -6186,21 +7630,22 @@ const validateBusinessRules = (input, existing) => {
 		"TESTING",
 		"STAGING",
 		"PO_APPROVAL",
+		"VERIFICATION",
 		"DEPLOYED"
 	];
 	if (input.start_at !== void 0 && input.start_at !== existing.start_at) {
-		if (currentApproval === "REJECTED") throw new Error("Cannot edit start date when support_ticket is REJECTED");
-		if (currentDevLifecycle && lockedDevStages.includes(currentDevLifecycle)) throw new Error("Cannot edit start date once development has started (DEVELOPMENT or higher)");
+		if (currentApproval === "REJECTED") throw new BusinessError("Cannot edit start date when support_ticket is REJECTED");
+		if (currentDevLifecycle && lockedDevStages.includes(currentDevLifecycle)) throw new BusinessError("Cannot edit start date once development has started (DEVELOPMENT or higher)");
 	}
 	if (input.target_at !== void 0 && input.target_at !== existing.target_at) {
-		if (currentApproval === "REJECTED") throw new Error("Cannot edit target date when support_ticket is REJECTED");
-		if (currentDevLifecycle && lockedDevStages.includes(currentDevLifecycle)) throw new Error("Cannot edit target date once development has started (DEVELOPMENT or higher)");
+		if (currentApproval === "REJECTED") throw new BusinessError("Cannot edit target date when support_ticket is REJECTED");
+		if (currentDevLifecycle && lockedDevStages.includes(currentDevLifecycle)) throw new BusinessError("Cannot edit target date once development has started (DEVELOPMENT or higher)");
 	}
 	if (input.completed_at !== void 0 && input.completed_at !== existing.completed_at) {
-		if (!currentApproval || !["APPROVED", "INTERNAL"].includes(currentApproval) || !currentDevLifecycle || !["DEPLOYED", "CANCELLED"].includes(currentDevLifecycle)) throw new Error("Can only set completed date when dev lifecycle is DEPLOYED or CANCELLED");
+		if (!currentApproval || !["APPROVED", "INTERNAL"].includes(currentApproval) || !currentDevLifecycle || !["DEPLOYED", "CANCELLED"].includes(currentDevLifecycle)) throw new BusinessError("Can only set completed date when dev lifecycle is DEPLOYED or CANCELLED");
 	}
 	if (currentApproval === "REJECTED") {
-		if (input.title !== void 0 && input.title !== existing.title || input.description !== void 0 && input.description !== existing.description || input.type !== void 0 && input.type !== existing.type || input.priority !== void 0 && input.priority !== existing.priority || input.dev_lifecycle !== void 0 && input.dev_lifecycle !== existing.dev_lifecycle || input.credit_value !== void 0 && input.credit_value !== existing.credit_value || input.delivered_value !== void 0 && input.delivered_value !== existing.delivered_value) throw new Error("Cannot edit REJECTED support_ticket. Use revert workflow to unlock");
+		if (input.title !== void 0 && input.title !== existing.title || input.description !== void 0 && input.description !== existing.description || input.type !== void 0 && input.type !== existing.type || input.priority !== void 0 && input.priority !== existing.priority || input.dev_lifecycle !== void 0 && input.dev_lifecycle !== existing.dev_lifecycle || input.credit_value !== void 0 && input.credit_value !== existing.credit_value || input.delivered_value !== void 0 && input.delivered_value !== existing.delivered_value) throw new BusinessError("Cannot edit REJECTED support_ticket. Use revert workflow to unlock");
 	}
 };
 
@@ -6213,24 +7658,26 @@ function shouldUpdateCreditsSetAt(oldValue, newValue) {
 	return isCreditValueEmpty(oldValue) !== isCreditValueEmpty(newValue);
 }
 let UpdateSupportTicketAdminFeat = class UpdateSupportTicketAdminFeat$1 {
-	constructor(session, support_ticketRepo, create_record_version) {
+	constructor(session, support_ticketRepo, create_record_version, notificationService, userDisplayLookup) {
 		this.session = session;
 		this.support_ticketRepo = support_ticketRepo;
 		this.create_record_version = create_record_version;
+		this.notificationService = notificationService;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	/**
 	* Update support_ticket - comprehensive update for staff
 	*/
 	async execute(input) {
 		const support_ticket = await this.support_ticketRepo.read(input.id);
-		if (!support_ticket) throw new Error("SupportTicket not found");
+		if (!support_ticket) throw new BusinessError("SupportTicket not found");
 		validateBusinessRules(input, support_ticket);
 		const isoTime = (/* @__PURE__ */ new Date()).toISOString();
 		const frEntity = {
 			...support_ticket,
 			id: input.id,
 			updated_at: isoTime,
-			updated_by: this.session.user.email
+			updated_by: this.session.user.userId
 		};
 		if (input.title !== void 0 && input.title !== null) frEntity.title = input.title;
 		if (input.description !== void 0 && input.description !== null) frEntity.description = input.description;
@@ -6245,6 +7692,7 @@ let UpdateSupportTicketAdminFeat = class UpdateSupportTicketAdminFeat$1 {
 		if (input.start_at !== void 0) frEntity.start_at = input.start_at ?? void 0;
 		if (input.target_at !== void 0) frEntity.target_at = input.target_at ?? void 0;
 		if (input.completed_at !== void 0) frEntity.completed_at = input.completed_at ?? void 0;
+		if (input.assigned_to !== void 0) frEntity.assigned_to = input.assigned_to?.trim() || null;
 		const changed_props = getChangedProperties(support_ticket, frEntity);
 		if (Object.keys(changed_props).length > 0) await this.create_record_version.execute({
 			record_id: frEntity.id,
@@ -6257,14 +7705,22 @@ let UpdateSupportTicketAdminFeat = class UpdateSupportTicketAdminFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		return toStaffSupportTicketReadDto(await this.support_ticketRepo.update(frEntity));
+		const support_ticketUpdated = await this.support_ticketRepo.update(frEntity);
+		if (input.assigned_to !== void 0 && support_ticket.assigned_to !== support_ticketUpdated.assigned_to && support_ticketUpdated.assigned_to) {
+			await this.notificationService.notifyAssignee(support_ticketUpdated, "TICKET_ASSIGNED", { actorUserId: this.session.user.userId });
+			await this.notificationService.notifyFollowers(support_ticketUpdated.id, support_ticketUpdated, "TICKET_ASSIGNED", { actorUserId: this.session.user.userId });
+		}
+		const dto = toStaffSupportTicketReadDto(support_ticketUpdated);
+		return enrichStaffTicket(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromStaffTicket(dto)));
 	}
 };
 UpdateSupportTicketAdminFeat = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(SUPPORT_TICKET_TOKENS.ISupportTicketRepo)),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
+	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(3, inject(SUPPORT_TICKET_TOKENS.ISupportTicketNotificationService)),
+	__decorateParam(4, inject(USER_TOKENS.IUserDisplayLookup))
 ], UpdateSupportTicketAdminFeat);
 
 //#endregion
@@ -6274,12 +7730,16 @@ UpdateSupportTicketAdminFeat = __decorate([
 */
 function registerSupportTicketDependencies() {
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.ISupportTicketRepo, SupportTicketRepo);
+	container.registerSingleton(SUPPORT_TICKET_TOKENS.ISupportTicketNotificationService, SupportTicketNotificationService);
+	container.registerSingleton(SUPPORT_TICKET_TOKENS.ISupportTicketTriageService, SupportTicketTriageService);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.ICreateSupportTicketFeature, CreateSupportTicketFeat);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IUpdateSupportTicketCustomerFeature, UpdateSupportTicketCustomerFeat);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IGetSupportTicketCustomerFeature, GetSupportTicketCustomerFeature);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IGetSupportTicketsCustomerFeature, GetSupportTicketsCustomerFeature);
+	container.registerSingleton(SUPPORT_TICKET_TOKENS.ICustomerToggleSubscriptionFeature, CustomerToggleSubscriptionFeat);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IApproveSupportTicketFeature, ApproveSupportTicketFeat);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IDeleteSupportTicketFeature, DeleteSupportTicketFeat);
+	container.registerSingleton(SUPPORT_TICKET_TOKENS.IArchiveSupportTicketFeature, ArchiveSupportTicketFeat);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IRejectSupportTicketFeature, RejectSupportTicketFeat);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IRevertSupportTicketFeature, RevertSupportTicketFeat);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.ICompleteSupportTicketFeature, CompleteSupportTicketFeat);
@@ -6291,6 +7751,11 @@ function registerSupportTicketDependencies() {
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IUpdateSupportTicketAdminFeature, UpdateSupportTicketAdminFeat);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IGetSupportTicketAdminFeature, GetSupportTicketAdminFeature);
 	container.registerSingleton(SUPPORT_TICKET_TOKENS.IGetSupportTicketsAdminFeature, GetSupportTicketsAdminFeature);
+	container.registerSingleton(SUPPORT_TICKET_TOKENS.IGetRequestorsForActiveSupportTicketsFeature, GetRequestorsForActiveSupportTicketsFeat);
+	container.registerSingleton(SUPPORT_TICKET_TOKENS.IAddSupportTicketSubscriberFeature, AddSupportTicketSubscriberFeat);
+	container.registerSingleton(SUPPORT_TICKET_TOKENS.IListSupportTicketSubscribersFeature, ListSupportTicketSubscribersFeat);
+	container.registerSingleton(SUPPORT_TICKET_TOKENS.IRemoveSupportTicketSubscriberFeature, RemoveSupportTicketSubscriberFeat);
+	container.registerSingleton(SUPPORT_TICKET_TOKENS.IFixSupportTicketUserIdsFeature, FixSupportTicketUserIdsFeature);
 }
 
 //#endregion
@@ -6571,14 +8036,34 @@ function mapTeamEntityToDto(entity) {
 	};
 }
 
+//#endregion
+//#region src/slices/team/features/enrich_team.ts
+/**
+* Enriches a TeamReadDto with display names from a lookup map.
+*/
+function enrichTeam(dto, displayMap) {
+	return {
+		...dto,
+		created_by_display_name: dto.created_by ? displayMap.get(dto.created_by) ?? dto.created_by : null,
+		updated_by_display_name: dto.updated_by ? displayMap.get(dto.updated_by) ?? dto.updated_by : null
+	};
+}
+/**
+* Collects user IDs from a team for display name lookup.
+*/
+function collectUserIdsFromTeam(team) {
+	return [team.created_by, team.updated_by].filter((id) => Boolean(id));
+}
+
 //#endregion
 //#region src/slices/team/features/create_team_feat.ts
 let CreateTeamFeatureImpl = class CreateTeamFeatureImpl$1 {
-	constructor(teamRepo, session, create_record_version, createTeamMemberFeature) {
+	constructor(teamRepo, session, create_record_version, createTeamMemberFeature, userDisplayLookup) {
 		this.teamRepo = teamRepo;
 		this.session = session;
 		this.create_record_version = create_record_version;
 		this.createTeamMemberFeature = createTeamMemberFeature;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(input) {
 		if (await this.teamRepo.findByUniqueName(input.unique_name || "")) throw new Error("Team with this name already exists");
@@ -6633,7 +8118,8 @@ let CreateTeamFeatureImpl = class CreateTeamFeatureImpl$1 {
 			website_address: null,
 			time_zone: null
 		});
-		return mapTeamEntityToDto(teamEntity);
+		const dto = mapTeamEntityToDto(teamEntity);
+		return enrichTeam(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromTeam(dto)));
 	}
 	/**
 	* Compute path from unique name (e.g., "My Team" -> "my-team")
@@ -6647,7 +8133,8 @@ CreateTeamFeatureImpl = __decorate([
 	__decorateParam(0, inject(TEAM_TOKENS.ITeamRepository)),
 	__decorateParam(1, injectSession()),
 	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
-	__decorateParam(3, inject(TEAM_MEMBER_TOKENS.ICreateTeamMemberFeature))
+	__decorateParam(3, inject(TEAM_MEMBER_TOKENS.ICreateTeamMemberFeature)),
+	__decorateParam(4, inject(USER_TOKENS.IUserDisplayLookup))
 ], CreateTeamFeatureImpl);
 
 //#endregion
@@ -6685,16 +8172,20 @@ DeleteTeamFeatureImpl = __decorate([
 //#endregion
 //#region src/slices/team/features/read_all_teams_feat.ts
 let ReadAllTeamsFeatureImpl = class ReadAllTeamsFeatureImpl$1 {
-	constructor(teamRepo, session, teamMemberRepo) {
+	constructor(teamRepo, session, teamMemberRepo, userDisplayLookup) {
 		this.teamRepo = teamRepo;
 		this.session = session;
 		this.teamMemberRepo = teamMemberRepo;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(filters) {
 		const processedFilters = await this.applyConsumerFiltering(filters);
 		const result = await this.teamRepo.read_all(processedFilters);
+		const dtos = result.items.map((teamEntity) => mapTeamEntityToDto(teamEntity));
+		const userIds = [...new Set(dtos.flatMap(collectUserIdsFromTeam))];
+		const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
 		return {
-			items: result.items.map((teamEntity) => mapTeamEntityToDto(teamEntity)),
+			items: dtos.map((t) => enrichTeam(t, displayMap)),
 			pageInfo: result.pageInfo
 		};
 	}
@@ -6721,30 +8212,38 @@ ReadAllTeamsFeatureImpl = __decorate([
 	injectable(),
 	__decorateParam(0, inject(TEAM_TOKENS.ITeamRepository)),
 	__decorateParam(1, injectSession()),
-	__decorateParam(2, inject(TEAM_MEMBER_TOKENS.ITeamMemberRepo))
+	__decorateParam(2, inject(TEAM_MEMBER_TOKENS.ITeamMemberRepo)),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], ReadAllTeamsFeatureImpl);
 
 //#endregion
 //#region src/slices/team/features/read_team_feat.ts
 let ReadTeamFeatureImpl = class ReadTeamFeatureImpl$1 {
-	constructor(teamRepo) {
+	constructor(teamRepo, userDisplayLookup) {
 		this.teamRepo = teamRepo;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(id) {
 		const teamEntity = await this.teamRepo.read(id);
 		if (!teamEntity) return null;
-		return mapTeamEntityToDto(teamEntity);
+		const dto = mapTeamEntityToDto(teamEntity);
+		return enrichTeam(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromTeam(dto)));
 	}
 };
-ReadTeamFeatureImpl = __decorate([injectable(), __decorateParam(0, inject(TEAM_TOKENS.ITeamRepository))], ReadTeamFeatureImpl);
+ReadTeamFeatureImpl = __decorate([
+	injectable(),
+	__decorateParam(0, inject(TEAM_TOKENS.ITeamRepository)),
+	__decorateParam(1, inject(USER_TOKENS.IUserDisplayLookup))
+], ReadTeamFeatureImpl);
 
 //#endregion
 //#region src/slices/team/features/update_team_feat.ts
 let UpdateTeamFeatureImpl = class UpdateTeamFeatureImpl$1 {
-	constructor(teamRepo, session, create_record_version) {
+	constructor(teamRepo, session, create_record_version, userDisplayLookup) {
 		this.teamRepo = teamRepo;
 		this.session = session;
 		this.create_record_version = create_record_version;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(input) {
 		const existingTeam = await this.teamRepo.read(input.id);
@@ -6796,7 +8295,8 @@ let UpdateTeamFeatureImpl = class UpdateTeamFeatureImpl$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		return mapTeamEntityToDto(teamEntity);
+		const dto = mapTeamEntityToDto(teamEntity);
+		return enrichTeam(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromTeam(dto)));
 	}
 	/**
 	* Compute path from unique name (e.g., "My Team" -> "my-team")
@@ -6809,7 +8309,8 @@ UpdateTeamFeatureImpl = __decorate([
 	injectable(),
 	__decorateParam(0, inject(TEAM_TOKENS.ITeamRepository)),
 	__decorateParam(1, injectSession()),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
+	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], UpdateTeamFeatureImpl);
 
 //#endregion
@@ -7027,13 +8528,33 @@ let TeamMemberRepo = class TeamMemberRepo$1 {
 };
 TeamMemberRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], TeamMemberRepo);
 
+//#endregion
+//#region src/slices/team_member/features/enrich_team_member.ts
+/**
+* Enriches a TeamMemberReadDto with display names from a lookup map.
+*/
+function enrichTeamMember(dto, displayMap) {
+	return {
+		...dto,
+		created_by_display_name: dto.created_by ? displayMap.get(dto.created_by) ?? dto.created_by : null,
+		updated_by_display_name: dto.updated_by ? displayMap.get(dto.updated_by) ?? dto.updated_by : null
+	};
+}
+/**
+* Collects user IDs from a team member for display name lookup.
+*/
+function collectUserIdsFromTeamMember(member) {
+	return [member.created_by, member.updated_by].filter((id) => Boolean(id));
+}
+
 //#endregion
 //#region src/slices/team_member/features/create_team_member_feat.ts
 let CreateTeamMemberFeat = class CreateTeamMemberFeat$1 {
-	constructor(session, teamMemberRepo, create_record_version) {
+	constructor(session, teamMemberRepo, create_record_version, userDisplayLookup) {
 		this.session = session;
 		this.teamMemberRepo = teamMemberRepo;
 		this.create_record_version = create_record_version;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(input) {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -7065,14 +8586,16 @@ let CreateTeamMemberFeat = class CreateTeamMemberFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		return teamMemberCreated;
+		const dto = teamMemberCreated;
+		return enrichTeamMember(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromTeamMember(dto)));
 	}
 };
 CreateTeamMemberFeat = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(TEAM_MEMBER_TOKENS.ITeamMemberRepo)),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
+	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], CreateTeamMemberFeat);
 
 //#endregion
@@ -7126,14 +8649,27 @@ DeleteTeamMemberFeat = __decorate([
 //#endregion
 //#region src/slices/team_member/features/get_team_members_feat.ts
 let GetTeamMembersFeat = class GetTeamMembersFeat$1 {
-	constructor(teamMemberRepo) {
+	constructor(teamMemberRepo, userDisplayLookup) {
 		this.teamMemberRepo = teamMemberRepo;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(filters) {
-		return await this.teamMemberRepo.getAll(filters);
+		const result = await this.teamMemberRepo.getAll(filters);
+		const items = result.items;
+		const userIds = [...new Set(items.flatMap(collectUserIdsFromTeamMember))];
+		const displayMap = await this.userDisplayLookup.lookupDisplayNames(userIds);
+		const enrichedItems = items.map((m) => enrichTeamMember(m, displayMap));
+		return {
+			...result,
+			items: enrichedItems
+		};
 	}
 };
-GetTeamMembersFeat = __decorate([injectable(), __decorateParam(0, inject(TEAM_MEMBER_TOKENS.ITeamMemberRepo))], GetTeamMembersFeat);
+GetTeamMembersFeat = __decorate([
+	injectable(),
+	__decorateParam(0, inject(TEAM_MEMBER_TOKENS.ITeamMemberRepo)),
+	__decorateParam(1, inject(USER_TOKENS.IUserDisplayLookup))
+], GetTeamMembersFeat);
 
 //#endregion
 //#region src/slices/team_member/features/get_user_team_members_feat.ts
@@ -7200,10 +8736,11 @@ GetUserTeamsFeat = __decorate([
 //#endregion
 //#region src/slices/team_member/features/update_team_member_feat.ts
 let UpdateTeamMemberFeat = class UpdateTeamMemberFeat$1 {
-	constructor(session, teamMemberRepo, create_record_version) {
+	constructor(session, teamMemberRepo, create_record_version, userDisplayLookup) {
 		this.session = session;
 		this.teamMemberRepo = teamMemberRepo;
 		this.create_record_version = create_record_version;
+		this.userDisplayLookup = userDisplayLookup;
 	}
 	async execute(input) {
 		const existingTeamMember = await this.teamMemberRepo.getById(input.id);
@@ -7254,14 +8791,16 @@ let UpdateTeamMemberFeat = class UpdateTeamMemberFeat$1 {
 			auth_role: this.session.user.user_type,
 			auth_username: this.session.user.username
 		});
-		return teamMemberUpdated;
+		const dto = teamMemberUpdated;
+		return enrichTeamMember(dto, await this.userDisplayLookup.lookupDisplayNames(collectUserIdsFromTeamMember(dto)));
 	}
 };
 UpdateTeamMemberFeat = __decorate([
 	injectable(),
 	__decorateParam(0, injectSession()),
 	__decorateParam(1, inject(TEAM_MEMBER_TOKENS.ITeamMemberRepo)),
-	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion))
+	__decorateParam(2, inject(RECORD_VERSION_TOKENS.ICreateRecordVersion)),
+	__decorateParam(3, inject(USER_TOKENS.IUserDisplayLookup))
 ], UpdateTeamMemberFeat);
 
 //#endregion
@@ -7325,6 +8864,21 @@ let UserRepo = class UserRepo$1 {
 		this.logger.perf(`UserRepo.read_user_by_email: ${queryTime.toFixed(2)}ms for email ${email}`);
 		return result[0];
 	}
+	async read_users_by_emails(emails) {
+		if (emails.length === 0) return [];
+		const { ...rest } = getTableColumns(user_table);
+		return this.router.queryAll((db) => db.select({ ...rest }).from(user_table).where(inArray(user_table.email, emails)));
+	}
+	/**
+	* Case-insensitive email lookup. Use when matching against values that may
+	* differ in casing (e.g. emails stored in other tables).
+	*/
+	async read_users_by_emails_case_insensitive(emails) {
+		if (emails.length === 0) return [];
+		const { ...rest } = getTableColumns(user_table);
+		const lowerEmails = [...new Set(emails.map((e) => e.toLowerCase()))];
+		return this.router.queryAll((db) => db.select({ ...rest }).from(user_table).where(sql`LOWER(${user_table.email}) IN (${sql.join(lowerEmails.map((e) => sql`${e}`), sql`, `)})`));
+	}
 	async read_user_by_username(username) {
 		const { ...rest } = getTableColumns(user_table);
 		return (await this.router.queryAll((db) => db.select({ ...rest }).from(user_table).where(eq(user_table.username, username)).limit(1)))[0];
@@ -7434,6 +8988,26 @@ CreateUser = __decorate([
 	__decorateParam(3, inject(TOKENS.LOGGER))
 ], CreateUser);
 
+//#endregion
+//#region src/slices/user/features/user_display_lookup_feat.ts
+let UserDisplayLookupFeat = class UserDisplayLookupFeat$1 {
+	constructor(userRepo) {
+		this.userRepo = userRepo;
+	}
+	async lookupDisplayNames(userIds) {
+		const validIds = [...new Set(userIds)].filter((id) => !!id?.trim()).filter((id) => id.length === 32);
+		if (validIds.length === 0) return /* @__PURE__ */ new Map();
+		const users = await this.userRepo.read_users_by_ids(validIds);
+		const map = /* @__PURE__ */ new Map();
+		for (const u of users) {
+			const display = u.email ?? u.id;
+			map.set(u.id, display);
+		}
+		return map;
+	}
+};
+UserDisplayLookupFeat = __decorate([injectable(), __decorateParam(0, inject(USER_TOKENS.IUsersRepo))], UserDisplayLookupFeat);
+
 //#endregion
 //#region src/slices/user/features/delete_user.ts
 let DeleteUser = class DeleteUser$1 {
@@ -7511,6 +9085,18 @@ let GetUserFeat = class GetUserFeat$1 {
 };
 GetUserFeat = __decorate([injectable(), __decorateParam(0, inject(USER_TOKENS.IUsersRepo))], GetUserFeat);
 
+//#endregion
+//#region src/slices/user/features/get_triage_users_feat.ts
+let GetTriageUsersFeat = class GetTriageUsersFeat$1 {
+	constructor(supportStaffRepo) {
+		this.supportStaffRepo = supportStaffRepo;
+	}
+	async execute() {
+		return this.supportStaffRepo.readTriageUsers();
+	}
+};
+GetTriageUsersFeat = __decorate([injectable(), __decorateParam(0, inject(SUPPORT_STAFF_TOKENS.ISupportStaffRepo))], GetTriageUsersFeat);
+
 //#endregion
 //#region src/slices/user/features/get_users_for_selection_feat.ts
 let GetUsersForSelectionFeat = class GetUsersForSelectionFeat$1 {
@@ -7518,7 +9104,7 @@ let GetUsersForSelectionFeat = class GetUsersForSelectionFeat$1 {
 		this.repo = repo;
 	}
 	async execute() {
-		return (await this.repo.read_users_by_types(["lead", "consumer"])).map((user) => ({
+		return (await this.repo.read_users_by_types([...USER_TYPES])).map((user) => ({
 			id: user.id,
 			email: user.email
 		}));
@@ -7662,6 +9248,7 @@ UpdateUserFeat = __decorate([injectable(), __decorateParam(0, inject(USER_TOKENS
 //#region src/slices/user/user_container.ts
 function registerUserContainer() {
 	container.registerSingleton(USER_TOKENS.IUsersRepo, UserRepo);
+	container.registerSingleton(USER_TOKENS.IUserDisplayLookup, UserDisplayLookupFeat);
 	container.registerSingleton(USER_TOKENS.IReadAllUsers, ReadAllUsers);
 	container.registerSingleton(USER_TOKENS.ISignUpUser, SignUpUser);
 	container.registerSingleton(USER_TOKENS.IDeleteUser, DeleteUser);
@@ -7672,6 +9259,7 @@ function registerUserContainer() {
 	container.registerSingleton(USER_TOKENS.IGetUserFeature, GetUserFeat);
 	container.registerSingleton(USER_TOKENS.IUpdateUserFeature, UpdateUserFeat);
 	container.registerSingleton(USER_TOKENS.IGetUsersForSelectionFeature, GetUsersForSelectionFeat);
+	container.registerSingleton(USER_TOKENS.IGetTriageUsersFeature, GetTriageUsersFeat);
 }
 
 //#endregion
@@ -7691,6 +9279,11 @@ let UserProfileRepo = class UserProfileRepo$1 {
 		const { ...rest } = getTableColumns(user_profile_table);
 		return (await this.router.queryAll((db) => db.select({ ...rest }).from(user_profile_table).where(eq(user_profile_table.user_id, user_id)).limit(1)))[0];
 	}
+	async read_user_profiles_by_user_ids(user_ids) {
+		if (user_ids.length === 0) return [];
+		const { ...rest } = getTableColumns(user_profile_table);
+		return this.router.queryAll((db) => db.select({ ...rest }).from(user_profile_table).where(inArray(user_profile_table.user_id, user_ids)));
+	}
 	async update_user_profile(user_profileRecord) {
 		user_profileRecord.updated_at = (/* @__PURE__ */ new Date()).toISOString();
 		const { created_at, ...rest } = user_profileRecord;
@@ -7699,16 +9292,6 @@ let UserProfileRepo = class UserProfileRepo$1 {
 };
 UserProfileRepo = __decorate([injectable(), __decorateParam(0, inject(TOKENS.IDatabaseRouter))], UserProfileRepo);
 
-//#endregion
-//#region src/slices/user_profile/user_profile_interfaces.ts
-const USER_PROFILE_TOKENS = {
-	IUserProfilesRepo: Symbol("IUserProfilesRepo"),
-	IReadUserProfilesByUser: Symbol("IReadUserProfilesByUser"),
-	IReadUserProfile: Symbol("IReadUserProfile"),
-	ICreateUserProfile: Symbol("ICreateUserProfile"),
-	IUpdateUserProfile: Symbol("IUpdateUserProfile")
-};
-
 //#endregion
 //#region src/slices/user_profile/features/read_user_profile.ts
 let ReadUserProfile = class ReadUserProfile$1 {
@@ -8271,14 +9854,17 @@ function registerCoreContainer() {
 	container.registerSingleton(DISPLAY_ID_PREFIX_TOKENS.PrefixRegistry, DisplayIdPrefixRegistry);
 	container.registerSingleton(DISPLAY_ID_PREFIX_TOKENS.IDisplayIdPrefixService, DisplayIdPrefixService);
 	registerPasswordResetContainer();
+	registerRecordSubscriberDependencies();
 	registerRecordVersionContainer();
+	registerSavedFilterContainer();
+	registerSupportStaffDependencies();
 	registerUserContainer();
 	registerUserProfileContainer();
 	registerUserSessionContainer();
 	registerCustomerDependencies();
 	registerSupportTicketDependencies();
 	registerAttachmentContainer();
-	registerAppSettingsContainer();
+	/* @__PURE__ */ registerAppSettingsContainer();
 	registerNoteContainer();
 	registerTeamDependencies();
 	registerTeamMemberContainer();
@@ -8315,37 +9901,15 @@ function createRequestContainer(config, additionalRegistrations) {
 //#endregion
 //#region src/slices/app_settings/app-settings-api.server.ts
 var AppSettingsApiServer = class extends RpcTarget {
-	constructor(container$1) {
+	constructor(_container) {
 		super();
-		this.container = container$1;
-	}
-	async getNotificationEmails() {
-		return rpcMethodPartial({
-			auth: "admin",
-			container: this.container,
-			context: "AppSettingsApiServer.getNotificationEmails",
-			input: void 0,
-			outputSchema: ReadNotificationEmailsSchema,
-			execute: async (_, container$1) => {
-				return { emails: (await container$1.resolve(APP_SETTINGS_TOKENS.IGetNotificationEmailsFeature).execute()).emails.map((e) => ({ email: e.email })) };
-			}
-		});
-	}
-	async updateNotificationEmails(input) {
-		return rpcMethod({
-			auth: "admin",
-			container: this.container,
-			context: "AppSettingsApiServer.updateNotificationEmails",
-			input,
-			inputSchema: UpdateNotificationEmailsSchema,
-			outputSchema: UpdateNotificationEmailsSchema,
-			execute: async (input$1, container$1) => {
-				return await container$1.resolve(APP_SETTINGS_TOKENS.IUpdateNotificationEmailsFeature).execute(input$1);
-			}
-		});
 	}
 };
 
+//#endregion
+//#region src/slices/app_settings/app_settings_tokens.ts
+const APP_SETTINGS_TOKENS = {};
+
 //#endregion
 //#region src/slices/attachment/attachment-api.server.ts
 const CreateFolderInputSchema = z.object({
@@ -8669,12 +10233,211 @@ var RecordVersionApiServer = class extends RpcTarget {
 			}
 		});
 	}
+	async listTrackerActivityVersions(trackerId, filters) {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "RecordVersionApiServer.listTrackerActivityVersions",
+			input: {
+				tracker_id: trackerId,
+				filters
+			},
+			inputSchema: recordVersionTrackerActivityInputSchema,
+			outputSchema: recordVersionPageBreadcrumbSchema,
+			execute: async ({ tracker_id, filters: f }, container$1) => {
+				return await container$1.resolve(RECORD_VERSION_TOKENS.IReadTrackerActivityVersions).execute(tracker_id, f || {});
+			}
+		});
+	}
+};
+
+//#endregion
+//#region src/slices/support_staff/support-staff-api.server.ts
+const SupportStaffMemberSchema = z.object({
+	id: z.string(),
+	user_id: z.string(),
+	email: z.string(),
+	created_at: z.string()
+});
+var SupportStaffApiServer = class extends RpcTarget {
+	constructor(container$1) {
+		super();
+		this.container = container$1;
+	}
+	async listSupportStaff() {
+		return rpcMethodPartial({
+			auth: "admin",
+			container: this.container,
+			context: "SupportStaffApiServer.listSupportStaff",
+			input: void 0,
+			outputSchema: z.array(SupportStaffMemberSchema),
+			execute: async (_, container$1) => {
+				return container$1.resolve(SUPPORT_STAFF_TOKENS.IListSupportStaffFeature).execute();
+			}
+		});
+	}
+	async addSupportStaff(userId) {
+		return rpcMethod({
+			auth: "admin",
+			container: this.container,
+			context: "SupportStaffApiServer.addSupportStaff",
+			input: userId,
+			inputSchema: z.string(),
+			outputSchema: SupportStaffMemberSchema,
+			execute: async (userId$1, container$1) => {
+				return container$1.resolve(SUPPORT_STAFF_TOKENS.IAddSupportStaffFeature).execute(userId$1);
+			}
+		});
+	}
+	async removeSupportStaff(userId) {
+		return rpcMethod({
+			auth: "admin",
+			container: this.container,
+			context: "SupportStaffApiServer.removeSupportStaff",
+			input: userId,
+			inputSchema: z.string(),
+			outputSchema: z.void(),
+			execute: async (userId$1, container$1) => {
+				await container$1.resolve(SUPPORT_STAFF_TOKENS.IRemoveSupportStaffFeature).execute(userId$1);
+			}
+		});
+	}
+};
+
+//#endregion
+//#region src/slices/saved_filter/saved-filter-api.server.ts
+var SavedFilterApiServer = class extends RpcTarget {
+	constructor(container$1) {
+		super();
+		this.container = container$1;
+	}
+	async listSavedFilters(context) {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SavedFilterApiServer.listSavedFilters",
+			input: context,
+			inputSchema: z.string(),
+			outputSchema: z.array(SavedFilterReadSchema),
+			execute: async (context$1, container$1) => {
+				return await container$1.resolve(SAVED_FILTER_TOKENS.IListSavedFilters).execute(context$1);
+			}
+		});
+	}
+	async listAllSavedFilters() {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SavedFilterApiServer.listAllSavedFilters",
+			input: void 0,
+			inputSchema: z.undefined(),
+			outputSchema: z.array(SavedFilterReadSchema),
+			execute: async (_input, container$1) => {
+				return await container$1.resolve(SAVED_FILTER_TOKENS.IListAllSavedFilters).execute();
+			}
+		});
+	}
+	async createSavedFilter(input) {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SavedFilterApiServer.createSavedFilter",
+			input,
+			inputSchema: SavedFilterCreateSchema,
+			outputSchema: SavedFilterReadSchema,
+			execute: async (input$1, container$1) => {
+				return await container$1.resolve(SAVED_FILTER_TOKENS.ICreateSavedFilter).execute(input$1);
+			}
+		});
+	}
+	async updateSavedFilter(input) {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SavedFilterApiServer.updateSavedFilter",
+			input,
+			inputSchema: SavedFilterUpdateSchema,
+			outputSchema: SavedFilterReadSchema.nullable(),
+			execute: async (input$1, container$1) => {
+				return await container$1.resolve(SAVED_FILTER_TOKENS.IUpdateSavedFilter).execute(input$1);
+			}
+		});
+	}
+	async deleteSavedFilter(id) {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SavedFilterApiServer.deleteSavedFilter",
+			input: id,
+			inputSchema: z.string(),
+			outputSchema: z.boolean(),
+			execute: async (id$1, container$1) => {
+				return await container$1.resolve(SAVED_FILTER_TOKENS.IDeleteSavedFilter).execute(id$1);
+			}
+		});
+	}
+	async listPinnedPresets() {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SavedFilterApiServer.listPinnedPresets",
+			input: void 0,
+			inputSchema: z.undefined(),
+			outputSchema: z.array(SavedFilterReadSchema),
+			execute: async (_input, container$1) => {
+				return await container$1.resolve(USER_PINNED_PRESET_TOKENS.IListPinnedPresets).execute();
+			}
+		});
+	}
+	async addPinnedPreset(presetId) {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SavedFilterApiServer.addPinnedPreset",
+			input: presetId,
+			inputSchema: z.string(),
+			outputSchema: SavedFilterReadSchema.nullable(),
+			execute: async (presetId$1, container$1) => {
+				return await container$1.resolve(USER_PINNED_PRESET_TOKENS.IAddPinnedPreset).execute(presetId$1);
+			}
+		});
+	}
+	async removePinnedPreset(presetId) {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SavedFilterApiServer.removePinnedPreset",
+			input: presetId,
+			inputSchema: z.string(),
+			outputSchema: z.boolean(),
+			execute: async (presetId$1, container$1) => {
+				return await container$1.resolve(USER_PINNED_PRESET_TOKENS.IRemovePinnedPreset).execute(presetId$1);
+			}
+		});
+	}
+	async reorderPinnedPresets(presetIds) {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SavedFilterApiServer.reorderPinnedPresets",
+			input: presetIds,
+			inputSchema: z.array(z.string()),
+			outputSchema: z.void(),
+			execute: async (presetIds$1, container$1) => {
+				return await container$1.resolve(USER_PINNED_PRESET_TOKENS.IReorderPinnedPresets).execute(presetIds$1);
+			}
+		});
+	}
 };
 
 //#endregion
 //#region src/slices/support_ticket/support-ticket-api.server.ts
 const CancelInternalTaskInputSchema = z.object({ id: z.string() });
 const ReactivateInternalTaskInputSchema = z.object({ id: z.string() });
+const UsersForSelectionSchema$1 = z.array(z.object({
+	id: z.string(),
+	email: z.string()
+}));
 var SupportTicketApiServer = class extends RpcTarget {
 	constructor(container$1) {
 		super();
@@ -8732,6 +10495,31 @@ var SupportTicketApiServer = class extends RpcTarget {
 			}
 		});
 	}
+	async toggleSubscription(supportTicketId) {
+		return rpcMethod({
+			auth: "protected",
+			container: this.container,
+			context: "SupportTicketApiServer.toggleSubscription",
+			input: supportTicketId,
+			inputSchema: z.string(),
+			outputSchema: z.object({ subscribed: z.boolean() }),
+			execute: async (id, container$1) => {
+				return await container$1.resolve(SUPPORT_TICKET_TOKENS.ICustomerToggleSubscriptionFeature).execute(id);
+			}
+		});
+	}
+	async getRequestorsForActiveTickets() {
+		return rpcMethodPartial({
+			auth: "protected",
+			container: this.container,
+			context: "SupportTicketApiServer.getRequestorsForActiveTickets",
+			input: void 0,
+			outputSchema: UsersForSelectionSchema$1,
+			execute: async (_, container$1) => {
+				return await container$1.resolve(SUPPORT_TICKET_TOKENS.IGetRequestorsForActiveSupportTicketsFeature).execute({ excludeInternal: true });
+			}
+		});
+	}
 	async staffCreateTicket(input) {
 		return rpcMethod({
 			auth: "admin",
@@ -8784,6 +10572,18 @@ var SupportTicketApiServer = class extends RpcTarget {
 			}
 		});
 	}
+	async staffGetRequestorsForActiveTickets() {
+		return rpcMethodPartial({
+			auth: "staff",
+			container: this.container,
+			context: "SupportTicketApiServer.staffGetRequestorsForActiveTickets",
+			input: void 0,
+			outputSchema: UsersForSelectionSchema$1,
+			execute: async (_, container$1) => {
+				return await container$1.resolve(SUPPORT_TICKET_TOKENS.IGetRequestorsForActiveSupportTicketsFeature).execute({ excludeInternal: false });
+			}
+		});
+	}
 	async approveTicket(input) {
 		return rpcMethod({
 			auth: "admin",
@@ -8901,6 +10701,78 @@ var SupportTicketApiServer = class extends RpcTarget {
 			}
 		});
 	}
+	async archiveTicket(input) {
+		return rpcMethod({
+			auth: "admin",
+			container: this.container,
+			context: "SupportTicketApiServer.archiveTicket",
+			input,
+			inputSchema: ArchiveSupportTicketSchema,
+			outputSchema: StaffSupportTicketReadSchema,
+			execute: async (input$1, container$1) => {
+				return await container$1.resolve(SUPPORT_TICKET_TOKENS.IArchiveSupportTicketFeature).execute(input$1.id);
+			}
+		});
+	}
+	async staffListSubscribers(supportTicketId) {
+		return rpcMethod({
+			auth: "admin",
+			container: this.container,
+			context: "SupportTicketApiServer.staffListSubscribers",
+			input: supportTicketId,
+			inputSchema: z.string(),
+			outputSchema: z.array(RecordSubscriberReadSchema),
+			execute: async (id, container$1) => {
+				return await container$1.resolve(SUPPORT_TICKET_TOKENS.IListSupportTicketSubscribersFeature).execute(id);
+			}
+		});
+	}
+	async staffAddSubscriber(input) {
+		return rpcMethod({
+			auth: "admin",
+			container: this.container,
+			context: "SupportTicketApiServer.staffAddSubscriber",
+			input,
+			inputSchema: SupportTicketSubscriberCreateSchema,
+			outputSchema: RecordSubscriberReadSchema,
+			execute: async (validated, container$1) => {
+				return await container$1.resolve(SUPPORT_TICKET_TOKENS.IAddSupportTicketSubscriberFeature).execute(validated);
+			}
+		});
+	}
+	async staffRemoveSubscriber(input) {
+		return rpcMethod({
+			auth: "admin",
+			container: this.container,
+			context: "SupportTicketApiServer.staffRemoveSubscriber",
+			input,
+			inputSchema: z.object({
+				supportTicketId: z.string(),
+				subscriberId: z.string()
+			}),
+			outputSchema: z.void(),
+			execute: async (validated, container$1) => {
+				await container$1.resolve(SUPPORT_TICKET_TOKENS.IRemoveSupportTicketSubscriberFeature).execute(validated.supportTicketId, validated.subscriberId);
+			}
+		});
+	}
+	async staffFixSupportTicketUserIds() {
+		return rpcMethod({
+			auth: "admin",
+			container: this.container,
+			context: "SupportTicketApiServer.staffFixSupportTicketUserIds",
+			input: void 0,
+			inputSchema: z.undefined(),
+			outputSchema: z.object({
+				ticketsScanned: z.number(),
+				ticketsFixed: z.number(),
+				ticketsSkipped: z.number()
+			}),
+			execute: async (_input, container$1) => {
+				return await container$1.resolve(SUPPORT_TICKET_TOKENS.IFixSupportTicketUserIdsFeature).execute();
+			}
+		});
+	}
 };
 
 //#endregion
@@ -9189,6 +11061,18 @@ var UserApiServer = class extends RpcTarget {
 			}
 		});
 	}
+	async getTriageUsers() {
+		return rpcMethodPartial({
+			auth: "admin",
+			container: this.container,
+			context: "UserApiServer.getTriageUsers",
+			input: void 0,
+			outputSchema: UsersForSelectionSchema,
+			execute: async (_, container$1) => {
+				return await container$1.resolve(USER_TOKENS.IGetTriageUsersFeature).execute();
+			}
+		});
+	}
 };
 
 //#endregion
@@ -9380,5 +11264,5 @@ var UserSessionApiServer = class extends RpcTarget {
 };
 
 //#endregion
-export { APP_SETTINGS_TOKENS, ATTACHMENT_FOLDER_TOKENS, ATTACHMENT_TOKENS, AalLevel, AddCreditsFeat, AppSettingsApiServer, AttachmentApiServer, AttachmentFolderRepo, AttachmentRepo, AuthErrorCode, AuthenticationError, BreadcrumbUtils, BusinessError, CREDIT_SERVICE_TOKEN, CREDIT_TRANSACTION_REPO_TOKEN, CUSTOMER_TOKENS, ChangeUserPassword, CodeChallengeMethod, CookieService, CreateTeamFeatureImpl, CreateTeamMemberFeat, CreditService, CreditTransactionRepo, CursorUtils, CustomerApiServer, DISPLAY_ID_PREFIX_TOKENS, DatabaseRouter, DeleteTeamFeatureImpl, DeleteTeamMemberFeat, DirectDatabaseAdapter, DisplayIdPrefixRegistry, DisplayIdPrefixService, EXTENSION_INTERVAL_MS, EmailService, FactorStatus, FactorType, ForgotPassword, GetCreditTransactionsFeat, GetTeamMembersFeat, GetUserTeamMembersFeat, GetUserTeamsFeat, ID_ERRORS, INACTIVITY_TIMEOUT_MS, IdComponentType, InternalServerError, InvalidCredentialsError, InvalidRefreshTokenError, JWT_TOKENS, KeyStatus, KeyType, LOG_LEVEL, Logger, LoginUserSession, MAX_SESSION_LIFETIME_MS, NOTE_TOKENS, NoteApiServer, NoteRepo, OperationConst, PASSWORD_RESET_TOKENS, PaginationUtils, PasswordResetApiServer, PasswordService, PricingPlanInterval, PricingType, RECORD_VERSION_TOKENS, RECORD_VERSION_VALIDATION_TOKENS, ReadAllTeamsFeatureImpl, ReadAllUserSessions, RecordAccessValidatorRegistry, RecordConst, RecordVersionApiServer, RefreshTokenRepo, RefreshTokenSession, RequestStatus, ResetMonthlyBalanceFeat, ResetPassword, RevokeRefreshToken, SUPPORT_TICKET_TOKENS, SessionNotFoundError, SetMonthlyAllocationFeat, SubscriptionStatus, SupportTicketApiServer, SupportTicketRepo, TEAM_MEMBER_TOKENS, TEAM_TOKENS, TOKENS, TeamApiServer, TeamMemberApiServer, TeamMemberRepo, TeamRepositoryImpl, TenantContext, TokenFamilyReusedError, TransactionTypeEnum, USER_PROFILE_TOKENS, USER_SESSION_TOKENS, USER_TOKENS, UniversalIdGenerator, UpdateTeamFeatureImpl, UpdateTeamMemberFeat, UserApiServer, UserNotFoundError, UserProfileApiServer, UserRepo, UserSessionApiServer, ValidationError, applyCookiesToResponse, applyFilter, archiveConditions, attachment_folder_table, attachment_table, buildContainerFactories, checkAuth, combineConditions, createAuthenticatedState, createBackendRegistry, createContainerSetupMiddleware, createDefaultContainerFactories, createDefaultContainerSetupConfig, createDefaultSessionValidationConfig, createExpiredState, createFilterBuilder, createHonoErrorFactory, createIsAuthenticatedMiddleware, createLoggerHelpers, createRequestContainer, createRevokedState, createUnauthenticatedState, credit_transaction_table, customNanoid, custom_long_nanoid, deriveColumnMap, findR2Bucket, formatCreditValue, generateAccessToken, generatePasswordResetToken, generateRefreshToken, generateUserDetailsToken, getAuthenticatedSession, getChangedProperties, getR2BucketBindingName, get_aliased_table_columns, injectSession, isCreditValueEmpty, logger, mfa_secret_table, note_table, oauth_provider_table, record_version_table, refresh_token_table, registerAppSettingsContainer, registerAttachmentContainer, registerAuthenticatedSession, registerCoreContainer, registerCustomerDependencies, registerDisplayIdPrefixesFromMap, registerNoteContainer, registerPasswordResetContainer, registerRecordVersionContainer, registerSupportTicketDependencies, registerTeamDependencies, registerTeamMemberContainer, registerUserContainer, registerUserProfileContainer, registerUserSessionContainer, requireAdmin, requireAuthenticated, requireLeadOrStaff, requireStaff, resolveTeamAccess, rpcMethod, rpcMethodPartial, rpcMethodSimple, searchOrCondition, support_ticket_table, teamCondition, team_member_table, team_table, user_oauth_account_table, user_profile_table, user_table, validateInput, validateOutput, validateSessionFromJWT, verifyToken, withErrorHandling };
+export { APP_SETTINGS_TOKENS, ATTACHMENT_FOLDER_TOKENS, ATTACHMENT_TOKENS, AalLevel, AddCreditsFeat, AppSettingKey, AppSettingsApiServer, AppSettingsRepo, AttachmentApiServer, AttachmentFolderRepo, AttachmentRepo, AuthErrorCode, AuthenticationError, BreadcrumbUtils, BusinessError, CREDIT_SERVICE_TOKEN, CREDIT_TRANSACTION_REPO_TOKEN, CUSTOMER_TOKENS, ChangeUserPassword, CodeChallengeMethod, CookieService, CreateTeamFeatureImpl, CreateTeamMemberFeat, CreditService, CreditTransactionRepo, CursorUtils, CustomerApiServer, DISPLAY_ID_PREFIX_TOKENS, DatabaseRouter, DeleteTeamFeatureImpl, DeleteTeamMemberFeat, DirectDatabaseAdapter, DisplayIdPrefixRegistry, DisplayIdPrefixService, EXTENSION_INTERVAL_MS, EmailService, FactorStatus, FactorType, ForgotPassword, GetCreditTransactionsFeat, GetTeamMembersFeat, GetUserTeamMembersFeat, GetUserTeamsFeat, ID_ERRORS, INACTIVITY_TIMEOUT_MS, IdComponentType, InternalServerError, InvalidCredentialsError, InvalidRefreshTokenError, JWT_TOKENS, KeyStatus, KeyType, LOG_LEVEL, Logger, LoginUserSession, MAX_PINNED_PRESETS, MAX_SESSION_LIFETIME_MS, NOTE_TOKENS, NoteApiServer, NoteRepo, OperationConst, PASSWORD_RESET_TOKENS, PaginationUtils, PasswordResetApiServer, PasswordService, PricingPlanInterval, PricingType, RECORD_SUBSCRIBER_TOKENS, RECORD_VERSION_TOKENS, RECORD_VERSION_VALIDATION_TOKENS, ReadAllTeamsFeatureImpl, ReadAllUserSessions, RecordAccessValidatorRegistry, RecordConst, RecordSubscriberRepo, RecordVersionApiServer, RefreshTokenRepo, RefreshTokenSession, RequestStatus, ResetMonthlyBalanceFeat, ResetPassword, RevokeRefreshToken, SAVED_FILTER_TOKENS, SUPPORT_STAFF_TOKENS, SUPPORT_TICKET_TOKENS, SavedFilterApiServer, SavedFilterRepository, SessionNotFoundError, SetMonthlyAllocationFeat, SubscriptionStatus, SupportStaffApiServer, SupportStaffRepo, SupportTicketApiServer, SupportTicketRepo, TEAM_MEMBER_TOKENS, TEAM_TOKENS, TOKENS, TeamApiServer, TeamMemberApiServer, TeamMemberRepo, TeamRepositoryImpl, TenantContext, TokenFamilyReusedError, TransactionTypeEnum, USER_PROFILE_TOKENS, USER_SESSION_TOKENS, USER_TOKENS, UniversalIdGenerator, UpdateTeamFeatureImpl, UpdateTeamMemberFeat, UserApiServer, UserDisplayLookupFeat, UserNotFoundError, UserProfileApiServer, UserRepo, UserSessionApiServer, ValidationError, app_settings_table, applyCookiesToResponse, applyFilter, archiveConditions, attachment_folder_table, attachment_table, buildContainerFactories, checkAuth, combineConditions, createAuthenticatedState, createBackendRegistry, createContainerSetupMiddleware, createDefaultContainerFactories, createDefaultContainerSetupConfig, createDefaultSessionValidationConfig, createExpiredState, createFilterBuilder, createHonoErrorFactory, createIsAuthenticatedMiddleware, createLoggerHelpers, createRequestContainer, createRevokedState, createUnauthenticatedState, credit_transaction_table, customNanoid, custom_long_nanoid, deriveColumnMap, findR2Bucket, formatCreditValue, generateAccessToken, generatePasswordResetToken, generateRefreshToken, generateUserDetailsToken, getAuthenticatedSession, getChangedProperties, getR2BucketBindingName, get_aliased_table_columns, injectSession, isCreditValueEmpty, logger, mfa_secret_table, note_table, oauth_provider_table, record_subscriber_table, record_version_table, refresh_token_table, registerAppSettingsContainer, registerAttachmentContainer, registerAuthenticatedSession, registerCoreContainer, registerCustomerDependencies, registerDisplayIdPrefixesFromMap, registerNoteContainer, registerPasswordResetContainer, registerRecordSubscriberDependencies, registerRecordVersionContainer, registerSupportTicketDependencies, registerTeamDependencies, registerTeamMemberContainer, registerUserContainer, registerUserProfileContainer, registerUserSessionContainer, requireAdmin, requireAuthenticated, requireLeadOrStaff, requireStaff, resolveTeamAccess, rpcMethod, rpcMethodPartial, rpcMethodSimple, saved_filter_table, searchOrCondition, support_staff_table, support_ticket_table, teamCondition, team_member_table, team_table, user_oauth_account_table, user_pinned_preset_table, user_profile_table, user_table, validateInput, validateOutput, validateSessionFromJWT, verifyToken, withErrorHandling };
 //# sourceMappingURL=index.mjs.map