From 8e3b5688d56576b1444c07f72e7d0d1860f827f9 Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Fri, 5 Dec 2025 16:27:08 -0500
Subject: [PATCH 01/10] allow server admins to generate password reset code

---
 messages/en-US.json                           |   7 +-
 server/routers/external.ts                    |   5 +
 .../user/adminGeneratePasswordResetCode.ts    | 125 ++++++++++
 server/routers/user/index.ts                  |   1 +
 src/app/auth/reset-password/page.tsx          |  53 -----
 src/components/AdminUsersTable.tsx            | 118 ++++++++-
 src/components/CopyToClipboard.tsx            |  11 +-
 src/components/Credenza.tsx                   |   2 +-
 src/components/ResetPasswordForm.tsx          | 225 +++++++++++-------
 9 files changed, 395 insertions(+), 152 deletions(-)
 create mode 100644 server/routers/user/adminGeneratePasswordResetCode.ts

diff --git a/messages/en-US.json b/messages/en-US.json
index 7726dbcf..895c8b3f 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -924,6 +924,10 @@
     "passwordResetSent": "We'll send a password reset code to this email address.",
     "passwordResetCode": "Reset Code",
     "passwordResetCodeDescription": "Check your email for the reset code.",
+    "generatePasswordResetCode": "Generate Password Reset Code",
+    "passwordResetCodeGenerated": "Password Reset Code Generated",
+    "passwordResetCodeGeneratedDescription": "Share this code with the user. They can use it to reset their password.",
+    "passwordResetUrl": "Reset URL",
     "passwordNew": "New Password",
     "passwordNewConfirm": "Confirm New Password",
     "changePassword": "Change Password",
@@ -941,8 +945,9 @@
     "pincodeAuth": "Authenticator Code",
     "pincodeSubmit2": "Submit Code",
     "passwordResetSubmit": "Request Reset",
+    "passwordResetAlreadyHaveCode": "Enter Password Reset Code",
     "passwordResetSmtpRequired": "Please contact your administrator",
-    "passwordResetSmtpRequiredDescription": "Password reset is not available because no SMTP server is configured. Please contact your administrator for assistance.",
+    "passwordResetSmtpRequiredDescription": "A password reset code is required to reset your password. Please contact your administrator for assistance.",
     "passwordBack": "Back to Password",
     "loginBack": "Go back to log in",
     "signup": "Sign up",
diff --git a/server/routers/external.ts b/server/routers/external.ts
index 857a99b3..188654bc 100644
--- a/server/routers/external.ts
+++ b/server/routers/external.ts
@@ -715,6 +715,11 @@ unauthenticated.get("/my-device", verifySessionMiddleware, user.myDevice);
 
 authenticated.get("/users", verifyUserIsServerAdmin, user.adminListUsers);
 authenticated.get("/user/:userId", verifyUserIsServerAdmin, user.adminGetUser);
+authenticated.post(
+    "/user/:userId/generate-password-reset-code",
+    verifyUserIsServerAdmin,
+    user.adminGeneratePasswordResetCode
+);
 authenticated.delete(
     "/user/:userId",
     verifyUserIsServerAdmin,
diff --git a/server/routers/user/adminGeneratePasswordResetCode.ts b/server/routers/user/adminGeneratePasswordResetCode.ts
new file mode 100644
index 00000000..5d283c5c
--- /dev/null
+++ b/server/routers/user/adminGeneratePasswordResetCode.ts
@@ -0,0 +1,125 @@
+import { Request, Response, NextFunction } from "express";
+import createHttpError from "http-errors";
+import { z } from "zod";
+import { fromError } from "zod-validation-error";
+import HttpCode from "@server/types/HttpCode";
+import { response } from "@server/lib/response";
+import { db } from "@server/db";
+import { passwordResetTokens, users } from "@server/db";
+import { eq } from "drizzle-orm";
+import { alphabet, generateRandomString } from "oslo/crypto";
+import { createDate } from "oslo";
+import logger from "@server/logger";
+import { TimeSpan } from "oslo";
+import { hashPassword } from "@server/auth/password";
+import { UserType } from "@server/types/UserTypes";
+import config from "@server/lib/config";
+
+const adminGeneratePasswordResetCodeSchema = z.strictObject({
+    userId: z.string().min(1)
+});
+
+export type AdminGeneratePasswordResetCodeBody = z.infer<typeof adminGeneratePasswordResetCodeSchema>;
+
+export type AdminGeneratePasswordResetCodeResponse = {
+    token: string;
+    email: string;
+    url: string;
+};
+
+export async function adminGeneratePasswordResetCode(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    const parsedParams = adminGeneratePasswordResetCodeSchema.safeParse(req.params);
+
+    if (!parsedParams.success) {
+        return next(
+            createHttpError(
+                HttpCode.BAD_REQUEST,
+                fromError(parsedParams.error).toString()
+            )
+        );
+    }
+
+    const { userId } = parsedParams.data;
+
+    try {
+        const existingUser = await db
+            .select()
+            .from(users)
+            .where(eq(users.userId, userId));
+
+        if (!existingUser || !existingUser.length) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    "User not found"
+                )
+            );
+        }
+
+        if (existingUser[0].type !== UserType.Internal) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "Password reset codes can only be generated for internal users"
+                )
+            );
+        }
+
+        if (!existingUser[0].email) {
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    "User does not have an email address"
+                )
+            );
+        }
+
+        const token = generateRandomString(8, alphabet("0-9", "A-Z", "a-z"));
+
+        await db.transaction(async (trx) => {
+            await trx
+                .delete(passwordResetTokens)
+                .where(eq(passwordResetTokens.userId, existingUser[0].userId));
+
+            const tokenHash = await hashPassword(token);
+
+            await trx.insert(passwordResetTokens).values({
+                userId: existingUser[0].userId,
+                email: existingUser[0].email!,
+                tokenHash,
+                expiresAt: createDate(new TimeSpan(2, "h")).getTime()
+            });
+        });
+
+        const url = `${config.getRawConfig().app.dashboard_url}/auth/reset-password?email=${existingUser[0].email}&token=${token}`;
+
+        logger.info(
+            `Admin generated password reset code for user ${existingUser[0].email} (${userId})`
+        );
+
+        return response<AdminGeneratePasswordResetCodeResponse>(res, {
+            data: {
+                token,
+                email: existingUser[0].email!,
+                url
+            },
+            success: true,
+            error: false,
+            message: "Password reset code generated successfully",
+            status: HttpCode.OK
+        });
+    } catch (e) {
+        logger.error(e);
+        return next(
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "Failed to generate password reset code"
+            )
+        );
+    }
+}
+
diff --git a/server/routers/user/index.ts b/server/routers/user/index.ts
index 78587f3d..35c5c4a7 100644
--- a/server/routers/user/index.ts
+++ b/server/routers/user/index.ts
@@ -8,6 +8,7 @@ export * from "./getOrgUser";
 export * from "./adminListUsers";
 export * from "./adminRemoveUser";
 export * from "./adminGetUser";
+export * from "./adminGeneratePasswordResetCode";
 export * from "./listInvitations";
 export * from "./removeInvitation";
 export * from "./createOrgUser";
diff --git a/src/app/auth/reset-password/page.tsx b/src/app/auth/reset-password/page.tsx
index 79b9e53e..1245ca09 100644
--- a/src/app/auth/reset-password/page.tsx
+++ b/src/app/auth/reset-password/page.tsx
@@ -7,16 +7,6 @@ import { cleanRedirect } from "@app/lib/cleanRedirect";
 import { getTranslations } from "next-intl/server";
 import { internal } from "@app/lib/api";
 import { authCookieHeader } from "@app/lib/api/cookies";
-import { pullEnv } from "@app/lib/pullEnv";
-import { Alert, AlertDescription, AlertTitle } from "@app/components/ui/alert";
-import { InfoIcon } from "lucide-react";
-import {
-    Card,
-    CardContent,
-    CardDescription,
-    CardHeader,
-    CardTitle
-} from "@/components/ui/card";
 
 export const dynamic = "force-dynamic";
 
@@ -32,7 +22,6 @@ export default async function Page(props: {
     const getUser = cache(verifySession);
     const user = await getUser();
     const t = await getTranslations();
-    const env = pullEnv();
 
     if (user) {
         let loggedOut = false;
@@ -55,48 +44,6 @@ export default async function Page(props: {
         redirectUrl = cleanRedirect(searchParams.redirect);
     }
 
-    // If email is not enabled, show a message instead of the form
-    if (!env.email.emailEnabled) {
-        return (
-            <>
-                <div className="w-full max-w-md">
-                    <Card>
-                        <CardHeader>
-                            <CardTitle>{t("passwordReset")}</CardTitle>
-                            <CardDescription>
-                                {t("passwordResetDescription")}
-                            </CardDescription>
-                        </CardHeader>
-                        <CardContent>
-                            <Alert variant="neutral">
-                                <InfoIcon className="h-4 w-4" />
-                                <AlertTitle className="font-semibold">
-                                    {t("passwordResetSmtpRequired")}
-                                </AlertTitle>
-                                <AlertDescription>
-                                    {t("passwordResetSmtpRequiredDescription")}
-                                </AlertDescription>
-                            </Alert>
-                        </CardContent>
-                    </Card>
-                </div>
-
-                <p className="text-center text-muted-foreground mt-4">
-                    <Link
-                        href={
-                            !searchParams.redirect
-                                ? `/auth/login`
-                                : `/auth/login?redirect=${redirectUrl}`
-                        }
-                        className="underline"
-                    >
-                        {t("loginBack")}
-                    </Link>
-                </p>
-            </>
-        );
-    }
-
     return (
         <>
             <ResetPasswordForm
diff --git a/src/components/AdminUsersTable.tsx b/src/components/AdminUsersTable.tsx
index ef373443..9c741cee 100644
--- a/src/components/AdminUsersTable.tsx
+++ b/src/components/AdminUsersTable.tsx
@@ -19,6 +19,18 @@ import {
     DropdownMenuContent,
     DropdownMenuTrigger
 } from "@app/components/ui/dropdown-menu";
+import {
+    Credenza,
+    CredenzaContent,
+    CredenzaDescription,
+    CredenzaHeader,
+    CredenzaTitle,
+    CredenzaBody,
+    CredenzaFooter,
+    CredenzaClose
+} from "@app/components/Credenza";
+import CopyToClipboard from "@app/components/CopyToClipboard";
+import { AxiosResponse } from "axios";
 
 export type GlobalUserRow = {
     id: string;
@@ -37,6 +49,12 @@ type Props = {
     users: GlobalUserRow[];
 };
 
+type AdminGeneratePasswordResetCodeResponse = {
+    token: string;
+    email: string;
+    url: string;
+};
+
 export default function UsersTable({ users }: Props) {
     const router = useRouter();
     const t = useTranslations();
@@ -48,6 +66,11 @@ export default function UsersTable({ users }: Props) {
     const api = createApiClient(useEnvContext());
 
     const [isRefreshing, setIsRefreshing] = useState(false);
+    const [isPasswordResetCodeDialogOpen, setIsPasswordResetCodeDialogOpen] =
+        useState(false);
+    const [passwordResetCodeData, setPasswordResetCodeData] =
+        useState<AdminGeneratePasswordResetCodeResponse | null>(null);
+    const [isGeneratingCode, setIsGeneratingCode] = useState(false);
 
     const refreshData = async () => {
         console.log("Data refreshed");
@@ -86,6 +109,29 @@ export default function UsersTable({ users }: Props) {
             });
     };
 
+    const generatePasswordResetCode = async (userId: string) => {
+        setIsGeneratingCode(true);
+        try {
+            const res = await api.post<
+                AxiosResponse<AdminGeneratePasswordResetCodeResponse>
+            >(`/user/${userId}/generate-password-reset-code`);
+
+            if (res.data?.data) {
+                setPasswordResetCodeData(res.data.data);
+                setIsPasswordResetCodeDialogOpen(true);
+            }
+        } catch (e) {
+            console.error("Failed to generate password reset code", e);
+            toast({
+                variant: "destructive",
+                title: t("error"),
+                description: formatAxiosError(e, t("errorOccurred"))
+            });
+        } finally {
+            setIsGeneratingCode(false);
+        }
+    };
+
     const columns: ExtendedColumnDef<GlobalUserRow>[] = [
         {
             accessorKey: "id",
@@ -195,7 +241,7 @@ export default function UsersTable({ users }: Props) {
                     <div className="flex flex-row items-center gap-2">
                         <span>
                             {userRow.twoFactorEnabled ||
-                                userRow.twoFactorSetupRequested ? (
+                            userRow.twoFactorSetupRequested ? (
                                 <span className="text-green-500">
                                     {t("enabled")}
                                 </span>
@@ -217,17 +263,21 @@ export default function UsersTable({ users }: Props) {
                     <div className="flex items-center gap-2 justify-end">
                         <DropdownMenu>
                             <DropdownMenuTrigger asChild>
-                                <Button
-                                    variant="ghost"
-                                    className="h-8 w-8 p-0"
-                                >
-                                    <span className="sr-only">
-                                        Open menu
-                                    </span>
+                                <Button variant="ghost" className="h-8 w-8 p-0">
+                                    <span className="sr-only">Open menu</span>
                                     <MoreHorizontal className="h-4 w-4" />
                                 </Button>
                             </DropdownMenuTrigger>
                             <DropdownMenuContent align="end">
+                                {r.type !== "internal" && (
+                                    <DropdownMenuItem
+                                        onClick={() => {
+                                            generatePasswordResetCode(r.id);
+                                        }}
+                                    >
+                                        {t("generatePasswordResetCode")}
+                                    </DropdownMenuItem>
+                                )}
                                 <DropdownMenuItem
                                     onClick={() => {
                                         setSelected(r);
@@ -295,6 +345,58 @@ export default function UsersTable({ users }: Props) {
                 onRefresh={refreshData}
                 isRefreshing={isRefreshing}
             />
+
+            <Credenza
+                open={isPasswordResetCodeDialogOpen}
+                onOpenChange={setIsPasswordResetCodeDialogOpen}
+            >
+                <CredenzaContent>
+                    <CredenzaHeader>
+                        <CredenzaTitle>
+                            {t("passwordResetCodeGenerated")}
+                        </CredenzaTitle>
+                        <CredenzaDescription>
+                            {t("passwordResetCodeGeneratedDescription")}
+                        </CredenzaDescription>
+                    </CredenzaHeader>
+                    <CredenzaBody>
+                        {passwordResetCodeData && (
+                            <div className="space-y-4">
+                                <div>
+                                    <label className="text-sm font-medium mb-2 block">
+                                        {t("email")}
+                                    </label>
+                                    <CopyToClipboard
+                                        text={passwordResetCodeData.email}
+                                    />
+                                </div>
+                                <div>
+                                    <label className="text-sm font-medium mb-2 block">
+                                        {t("passwordResetCode")}
+                                    </label>
+                                    <CopyToClipboard
+                                        text={passwordResetCodeData.token}
+                                    />
+                                </div>
+                                <div>
+                                    <label className="text-sm font-medium mb-2 block">
+                                        {t("passwordResetUrl")}
+                                    </label>
+                                    <CopyToClipboard
+                                        text={passwordResetCodeData.url}
+                                        isLink={true}
+                                    />
+                                </div>
+                            </div>
+                        )}
+                    </CredenzaBody>
+                    <CredenzaFooter>
+                        <CredenzaClose asChild>
+                            <Button variant="outline">{t("close")}</Button>
+                        </CredenzaClose>
+                    </CredenzaFooter>
+                </CredenzaContent>
+            </Credenza>
         </>
     );
 }
diff --git a/src/components/CopyToClipboard.tsx b/src/components/CopyToClipboard.tsx
index b187e6c6..5cdeed55 100644
--- a/src/components/CopyToClipboard.tsx
+++ b/src/components/CopyToClipboard.tsx
@@ -26,24 +26,21 @@ const CopyToClipboard = ({ text, displayText, isLink }: CopyToClipboardProps) =>
     const t = useTranslations();
 
     return (
-        <div className="flex items-center space-x-2 max-w-full">
+        <div className="flex items-center space-x-2 min-w-0 max-w-full">
             {isLink ? (
                 <Link
                     href={text}
                     target="_blank"
                     rel="noopener noreferrer"
-                    className="truncate hover:underline text-sm"
-                    style={{ maxWidth: "100%" }} // Ensures truncation works within parent
+                    className="truncate hover:underline text-sm min-w-0 max-w-full"
                     title={text} // Shows full text on hover
                 >
                     {displayValue}
                 </Link>
             ) : (
                 <span
-                    className="truncate text-sm"
+                    className="truncate text-sm min-w-0 max-w-full"
                     style={{
-                        maxWidth: "100%",
-                        display: "block",
                         whiteSpace: "nowrap",
                         overflow: "hidden",
                         textOverflow: "ellipsis"
@@ -55,7 +52,7 @@ const CopyToClipboard = ({ text, displayText, isLink }: CopyToClipboardProps) =>
             )}
             <button
                 type="button"
-                className="h-6 w-6 p-0 flex items-center justify-center cursor-pointer"
+                className="h-6 w-6 p-0 flex items-center justify-center cursor-pointer flex-shrink-0"
                 onClick={handleCopy}
             >
                 {!copied ? (
diff --git a/src/components/Credenza.tsx b/src/components/Credenza.tsx
index 75f3a236..6b80b3d3 100644
--- a/src/components/Credenza.tsx
+++ b/src/components/Credenza.tsx
@@ -155,7 +155,7 @@ const CredenzaBody = ({ className, children, ...props }: CredenzaProps) => {
     // );
 
     return (
-        <div className={cn("px-0 mb-4 space-y-4", className)} {...props}>
+        <div className={cn("px-0 mb-4 space-y-4 overflow-x-hidden min-w-0", className)} {...props}>
             {children}
         </div>
     );
diff --git a/src/components/ResetPasswordForm.tsx b/src/components/ResetPasswordForm.tsx
index 570a87ec..d5a2cc37 100644
--- a/src/components/ResetPasswordForm.tsx
+++ b/src/components/ResetPasswordForm.tsx
@@ -34,8 +34,8 @@ import {
     ResetPasswordBody,
     ResetPasswordResponse
 } from "@server/routers/auth";
-import { Loader2 } from "lucide-react";
-import { Alert, AlertDescription } from "./ui/alert";
+import { Loader2, InfoIcon } from "lucide-react";
+import { Alert, AlertDescription, AlertTitle } from "./ui/alert";
 import { toast } from "@app/hooks/useToast";
 import { useRouter } from "next/navigation";
 import { formatAxiosError } from "@app/lib/api";
@@ -84,22 +84,23 @@ export default function ResetPasswordForm({
 
     const [state, setState] = useState<"request" | "reset" | "mfa">(getState());
 
-    const api = createApiClient(useEnvContext());
+    const { env } = useEnvContext();
+    const api = createApiClient({ env });
 
     const formSchema = z
         .object({
-            email: z.email({ message: t('emailInvalid') }),
-            token: z.string().min(8, { message: t('tokenInvalid') }),
+            email: z.email({ message: t("emailInvalid") }),
+            token: z.string().min(8, { message: t("tokenInvalid") }),
             password: passwordSchema,
             confirmPassword: passwordSchema
         })
         .refine((data) => data.password === data.confirmPassword, {
             path: ["confirmPassword"],
-            message: t('passwordNotMatch')
+            message: t("passwordNotMatch")
         });
 
     const mfaSchema = z.object({
-        code: z.string().length(6, { message: t('pincodeInvalid') })
+        code: z.string().length(6, { message: t("pincodeInvalid") })
     });
 
     const form = useForm({
@@ -139,8 +140,8 @@ export default function ResetPasswordForm({
                 } as RequestPasswordResetBody
             )
             .catch((e) => {
-                setError(formatAxiosError(e, t('errorOccurred')));
-                console.error(t('passwordErrorRequestReset'), e);
+                setError(formatAxiosError(e, t("errorOccurred")));
+                console.error(t("passwordErrorRequestReset"), e);
                 setIsSubmitting(false);
             });
 
@@ -169,8 +170,8 @@ export default function ResetPasswordForm({
                 } as ResetPasswordBody
             )
             .catch((e) => {
-                setError(formatAxiosError(e, t('errorOccurred')));
-                console.error(t('passwordErrorReset'), e);
+                setError(formatAxiosError(e, t("errorOccurred")));
+                console.error(t("passwordErrorReset"), e);
                 setIsSubmitting(false);
             });
 
@@ -186,7 +187,11 @@ export default function ResetPasswordForm({
                 return;
             }
 
-            setSuccessMessage(quickstart ? t('accountSetupSuccess') : t('passwordResetSuccess'));
+            setSuccessMessage(
+                quickstart
+                    ? t("accountSetupSuccess")
+                    : t("passwordResetSuccess")
+            );
 
             // Auto-login after successful password reset
             try {
@@ -208,7 +213,10 @@ export default function ResetPasswordForm({
                     try {
                         await api.post("/auth/verify-email/request");
                     } catch (verificationError) {
-                        console.error("Failed to send verification code:", verificationError);
+                        console.error(
+                            "Failed to send verification code:",
+                            verificationError
+                        );
                     }
 
                     if (redirect) {
@@ -229,7 +237,6 @@ export default function ResetPasswordForm({
                     }
                     setIsSubmitting(false);
                 }, 1500);
-
             } catch (loginError) {
                 // Auto-login failed, but password reset was successful
                 console.error("Auto-login failed:", loginError);
@@ -251,47 +258,70 @@ export default function ResetPasswordForm({
             <Card className="w-full max-w-md">
                 <CardHeader>
                     <CardTitle>
-                        {quickstart ? t('completeAccountSetup') : t('passwordReset')}
+                        {quickstart
+                            ? t("completeAccountSetup")
+                            : t("passwordReset")}
                     </CardTitle>
                     <CardDescription>
                         {quickstart
-                            ? t('completeAccountSetupDescription')
-                            : t('passwordResetDescription')
-                        }
+                            ? t("completeAccountSetupDescription")
+                            : t("passwordResetDescription")}
                     </CardDescription>
                 </CardHeader>
                 <CardContent>
                     <div className="space-y-4">
                         {state === "request" && (
-                            <Form {...requestForm}>
-                                <form
-                                    onSubmit={requestForm.handleSubmit(
-                                        onRequest
-                                    )}
-                                    className="space-y-4"
-                                    id="form"
-                                >
-                                    <FormField
-                                        control={requestForm.control}
-                                        name="email"
-                                        render={({ field }) => (
-                                            <FormItem>
-                                                <FormLabel>{t('email')}</FormLabel>
-                                                <FormControl>
-                                                    <Input {...field} />
-                                                </FormControl>
-                                                <FormMessage />
-                                                <FormDescription>
-                                                    {quickstart
-                                                        ? t('accountSetupSent')
-                                                        : t('passwordResetSent')
-                                                    }
-                                                </FormDescription>
-                                            </FormItem>
-                                        )}
-                                    />
-                                </form>
-                            </Form>
+                            <>
+                                {!env.email.emailEnabled && (
+                                    <Alert variant="neutral">
+                                        <InfoIcon className="h-4 w-4" />
+                                        <AlertTitle className="font-semibold">
+                                            {t("passwordResetSmtpRequired")}
+                                        </AlertTitle>
+                                        <AlertDescription>
+                                            {t(
+                                                "passwordResetSmtpRequiredDescription"
+                                            )}
+                                        </AlertDescription>
+                                    </Alert>
+                                )}
+                                {env.email.emailEnabled && (
+                                    <Form {...requestForm}>
+                                        <form
+                                            onSubmit={requestForm.handleSubmit(
+                                                onRequest
+                                            )}
+                                            className="space-y-4"
+                                            id="form"
+                                        >
+                                            <FormField
+                                                control={requestForm.control}
+                                                name="email"
+                                                render={({ field }) => (
+                                                    <FormItem>
+                                                        <FormLabel>
+                                                            {t("email")}
+                                                        </FormLabel>
+                                                        <FormControl>
+                                                            <Input {...field} />
+                                                        </FormControl>
+                                                        <FormMessage />
+                                                        <FormDescription>
+                                                            {quickstart
+                                                                ? t(
+                                                                      "accountSetupSent"
+                                                                  )
+                                                                : t(
+                                                                      "passwordResetSent"
+                                                                  )}
+                                                        </FormDescription>
+                                                    </FormItem>
+                                                )}
+                                            />
+                                        </form>
+                                    </Form>
+                                )}
+                            </>
                         )}
 
                         {state === "reset" && (
@@ -306,11 +336,13 @@ export default function ResetPasswordForm({
                                         name="email"
                                         render={({ field }) => (
                                             <FormItem>
-                                                <FormLabel>{t('email')}</FormLabel>
+                                                <FormLabel>
+                                                    {t("email")}
+                                                </FormLabel>
                                                 <FormControl>
                                                     <Input
                                                         {...field}
-                                                        disabled
+                                                        disabled={env.email.emailEnabled}
                                                     />
                                                 </FormControl>
                                                 <FormMessage />
@@ -326,9 +358,12 @@ export default function ResetPasswordForm({
                                                 <FormItem>
                                                     <FormLabel>
                                                         {quickstart
-                                                            ? t('accountSetupCode')
-                                                            : t('passwordResetCode')
-                                                        }
+                                                            ? t(
+                                                                  "accountSetupCode"
+                                                              )
+                                                            : t(
+                                                                  "passwordResetCode"
+                                                              )}
                                                     </FormLabel>
                                                     <FormControl>
                                                         <Input
@@ -337,12 +372,17 @@ export default function ResetPasswordForm({
                                                         />
                                                     </FormControl>
                                                     <FormMessage />
-                                                    <FormDescription>
-                                                        {quickstart
-                                                            ? t('accountSetupCodeDescription')
-                                                            : t('passwordResetCodeDescription')
-                                                        }
-                                                    </FormDescription>
+                                                    {env.email.emailEnabled && (
+                                                        <FormDescription>
+                                                            {quickstart
+                                                                ? t(
+                                                                      "accountSetupCodeDescription"
+                                                                  )
+                                                                : t(
+                                                                      "passwordResetCodeDescription"
+                                                                  )}
+                                                        </FormDescription>
+                                                    )}
                                                 </FormItem>
                                             )}
                                         />
@@ -355,9 +395,8 @@ export default function ResetPasswordForm({
                                             <FormItem>
                                                 <FormLabel>
                                                     {quickstart
-                                                        ? t('passwordCreate')
-                                                        : t('passwordNew')
-                                                    }
+                                                        ? t("passwordCreate")
+                                                        : t("passwordNew")}
                                                 </FormLabel>
                                                 <FormControl>
                                                     <Input
@@ -376,9 +415,12 @@ export default function ResetPasswordForm({
                                             <FormItem>
                                                 <FormLabel>
                                                     {quickstart
-                                                        ? t('passwordCreateConfirm')
-                                                        : t('passwordNewConfirm')
-                                                    }
+                                                        ? t(
+                                                              "passwordCreateConfirm"
+                                                          )
+                                                        : t(
+                                                              "passwordNewConfirm"
+                                                          )}
                                                 </FormLabel>
                                                 <FormControl>
                                                     <Input
@@ -407,7 +449,7 @@ export default function ResetPasswordForm({
                                         render={({ field }) => (
                                             <FormItem>
                                                 <FormLabel>
-                                                    {t('pincodeAuth')}
+                                                    {t("pincodeAuth")}
                                                 </FormLabel>
                                                 <FormControl>
                                                     <div className="flex justify-center">
@@ -475,26 +517,45 @@ export default function ResetPasswordForm({
                                         <Loader2 className="mr-2 h-4 w-4 animate-spin" />
                                     )}
                                     {state === "reset"
-                                        ? (quickstart ? t('completeSetup') : t('passwordReset'))
-                                        : t('pincodeSubmit2')}
+                                        ? quickstart
+                                            ? t("completeSetup")
+                                            : t("passwordReset")
+                                        : t("pincodeSubmit2")}
                                 </Button>
                             )}
 
                             {state === "request" && (
-                                <Button
-                                    type="submit"
-                                    form="form"
-                                    className="w-full"
-                                    disabled={isSubmitting}
-                                >
-                                    {isSubmitting && (
-                                        <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                                <div className="flex flex-col gap-2">
+                                    {env.email.emailEnabled && (
+                                        <Button
+                                            type="submit"
+                                            form="form"
+                                            className="w-full"
+                                            disabled={isSubmitting}
+                                        >
+                                            {isSubmitting && (
+                                                <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                                            )}
+                                            {quickstart
+                                                ? t("accountSetupSubmit")
+                                                : t("passwordResetSubmit")}
+                                        </Button>
                                     )}
-                                    {quickstart
-                                        ? t('accountSetupSubmit')
-                                        : t('passwordResetSubmit')
-                                    }
-                                </Button>
+                                    <Button
+                                        type="button"
+                                        className="w-full"
+                                        onClick={() => {
+                                            const email =
+                                                requestForm.getValues("email");
+                                            if (email) {
+                                                form.setValue("email", email);
+                                            }
+                                            setState("reset");
+                                        }}
+                                    >
+                                        {t("passwordResetAlreadyHaveCode")}
+                                    </Button>
+                                </div>
                             )}
 
                             {state === "mfa" && (
@@ -507,7 +568,7 @@ export default function ResetPasswordForm({
                                         mfaForm.reset();
                                     }}
                                 >
-                                    {t('passwordBack')}
+                                    {t("passwordBack")}
                                 </Button>
                             )}
 
@@ -521,7 +582,7 @@ export default function ResetPasswordForm({
                                         form.reset();
                                     }}
                                 >
-                                    {t('backToEmail')}
+                                    {t("backToEmail")}
                                 </Button>
                             )}
                         </div>

From 149f4c13323fecc43acc588520b1dabbc4bb2981 Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Fri, 5 Dec 2025 16:28:34 -0500
Subject: [PATCH 02/10] remove org id from olm command

---
 src/app/[orgId]/settings/clients/machine/create/page.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/[orgId]/settings/clients/machine/create/page.tsx b/src/app/[orgId]/settings/clients/machine/create/page.tsx
index 2f1d5f8b..a0489f30 100644
--- a/src/app/[orgId]/settings/clients/machine/create/page.tsx
+++ b/src/app/[orgId]/settings/clients/machine/create/page.tsx
@@ -140,7 +140,7 @@ export default function Page() {
                     },
                     {
                         title: t("run"),
-                        command: `sudo olm --id ${id} --secret ${secret} --endpoint ${endpoint} --org ${orgId}`
+                        command: `sudo olm --id ${id} --secret ${secret} --endpoint ${endpoint}`
                     }
                 ]
             },
@@ -152,7 +152,7 @@ export default function Page() {
                     },
                     {
                         title: t("run"),
-                        command: `olm.exe --id ${id} --secret ${secret} --endpoint ${endpoint} --org ${orgId}`
+                        command: `olm.exe --id ${id} --secret ${secret} --endpoint ${endpoint}`
                     }
                 ]
             }

From d90f3bb6beee426933888c94b3281305bc0f411c Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Fri, 5 Dec 2025 16:34:44 -0500
Subject: [PATCH 03/10] remember sidebar expand

---
 src/components/SidebarNav.tsx | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/components/SidebarNav.tsx b/src/components/SidebarNav.tsx
index edc6dcdb..17a2a5e8 100644
--- a/src/components/SidebarNav.tsx
+++ b/src/components/SidebarNav.tsx
@@ -71,20 +71,42 @@ function CollapsibleNavItem({
     build,
     isUnlocked
 }: CollapsibleNavItemProps) {
-    const [isOpen, setIsOpen] = React.useState(isChildActive);
+    const storageKey = `pangolin-sidebar-expanded-${item.title}`;
+    
+    // Get initial state from localStorage or use isChildActive
+    const getInitialState = (): boolean => {
+        if (typeof window === "undefined") {
+            return isChildActive;
+        }
+        const saved = localStorage.getItem(storageKey);
+        if (saved !== null) {
+            return saved === "true";
+        }
+        return isChildActive;
+    };
 
-    // Update open state when child active state changes
+    const [isOpen, setIsOpen] = React.useState(getInitialState);
+
+    // Update open state when child active state changes (but don't override user preference)
     React.useEffect(() => {
         if (isChildActive) {
             setIsOpen(true);
         }
     }, [isChildActive]);
 
+    // Save state to localStorage when it changes
+    const handleOpenChange = (open: boolean) => {
+        setIsOpen(open);
+        if (typeof window !== "undefined") {
+            localStorage.setItem(storageKey, String(open));
+        }
+    };
+
     return (
         <Collapsible
             key={item.title}
             open={isOpen}
-            onOpenChange={setIsOpen}
+            onOpenChange={handleOpenChange}
             className="group/collapsible"
         >
             <CollapsibleTrigger asChild>

From 1ee70e04ed77ebef89f9054aafb3bed2ec4604ad Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Fri, 5 Dec 2025 16:40:43 -0500
Subject: [PATCH 04/10] Fix a couple things wiht destinations

---
 .../siteResource/createSiteResource.ts        |  6 +-
 .../siteResource/updateSiteResource.ts        | 70 ++++++++++++++-----
 2 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/server/routers/siteResource/createSiteResource.ts b/server/routers/siteResource/createSiteResource.ts
index 27280f7a..b2e4b0cb 100644
--- a/server/routers/siteResource/createSiteResource.ts
+++ b/server/routers/siteResource/createSiteResource.ts
@@ -55,7 +55,7 @@ const createSiteResourceSchema = z
                     .safeParse(data.destination).success;
 
                 if (isValidIP) {
-                    return true
+                    return true;
                 }
 
                 // Check if it's a valid domain (hostname pattern, TLD not required)
@@ -64,13 +64,13 @@ const createSiteResourceSchema = z
                 const isValidDomain = domainRegex.test(data.destination);
                 const isValidAlias = data.alias && domainRegex.test(data.alias);
 
-                return isValidDomain && isValidAlias;  // require the alias to be set in the case of domain
+                return isValidDomain && isValidAlias; // require the alias to be set in the case of domain
             }
             return true;
         },
         {
             message:
-                "Destination must be a valid IP address or domain name for host mode"
+                "Destination must be a valid IP address or valid domain AND alias is required"
         }
     )
     .refine(
diff --git a/server/routers/siteResource/updateSiteResource.ts b/server/routers/siteResource/updateSiteResource.ts
index 63013164..f7fda549 100644
--- a/server/routers/siteResource/updateSiteResource.ts
+++ b/server/routers/siteResource/updateSiteResource.ts
@@ -59,23 +59,27 @@ const updateSiteResourceSchema = z
     .refine(
         (data) => {
             if (data.mode === "host" && data.destination) {
-                // Check if it's a valid IP address using zod (v4 or v6)
                 const isValidIP = z
                     .union([z.ipv4(), z.ipv6()])
                     .safeParse(data.destination).success;
 
+                if (isValidIP) {
+                    return true;
+                }
+
                 // Check if it's a valid domain (hostname pattern, TLD not required)
                 const domainRegex =
                     /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$/;
                 const isValidDomain = domainRegex.test(data.destination);
+                const isValidAlias = data.alias && domainRegex.test(data.alias);
 
-                return isValidIP || isValidDomain;
+                return isValidDomain && isValidAlias; // require the alias to be set in the case of domain
             }
             return true;
         },
         {
             message:
-                "Destination must be a valid IP address or domain name for host mode"
+                "Destination must be a valid IP address or valid domain AND alias is required"
         }
     )
     .refine(
@@ -317,6 +321,7 @@ export async function updateSiteResource(
                     );
                 }
 
+                let oldDestinationStillInUseByASite = false;
                 // Only update targets on newt if destination changed
                 if (destinationChanged) {
                     const oldTargets = generateSubnetProxyTargets(
@@ -332,6 +337,26 @@ export async function updateSiteResource(
                         oldTargets: oldTargets,
                         newTargets: newTargets
                     });
+
+                    const oldDestinationStillInUseSites = await trx
+                        .select()
+                        .from(siteResources)
+                        .where(
+                            and(
+                                eq(siteResources.siteId, site.siteId),
+                                eq(
+                                    siteResources.destination,
+                                    existingSiteResource.destination
+                                ),
+                                ne(
+                                    siteResources.siteResourceId,
+                                    existingSiteResource.siteResourceId
+                                )
+                            )
+                        );
+
+                    oldDestinationStillInUseByASite =
+                        oldDestinationStillInUseSites.length > 0;
                 }
 
                 const olmJobs: Promise<void>[] = [];
@@ -341,22 +366,29 @@ export async function updateSiteResource(
                         updatePeerData(
                             client.clientId,
                             updatedSiteResource.siteId,
-                            destinationChanged ? {
-                                oldRemoteSubnets: generateRemoteSubnets([
-                                    existingSiteResource
-                                ]),
-                                newRemoteSubnets: generateRemoteSubnets([
-                                    updatedSiteResource
-                                ])
-                            } : undefined,
-                            aliasChanged ? {
-                                oldAliases: generateAliasConfig([
-                                    existingSiteResource
-                                ]),
-                                newAliases: generateAliasConfig([
-                                    updatedSiteResource
-                                ])
-                            } : undefined
+                            destinationChanged
+                                ? {
+                                      oldRemoteSubnets:
+                                          !oldDestinationStillInUseByASite
+                                              ? generateRemoteSubnets([
+                                                    existingSiteResource
+                                                ])
+                                              : [],
+                                      newRemoteSubnets: generateRemoteSubnets([
+                                          updatedSiteResource
+                                      ])
+                                  }
+                                : undefined,
+                            aliasChanged
+                                ? {
+                                      oldAliases: generateAliasConfig([
+                                          existingSiteResource
+                                      ]),
+                                      newAliases: generateAliasConfig([
+                                          updatedSiteResource
+                                      ])
+                                  }
+                                : undefined
                         )
                     );
                 }

From bb1472d25cf3f357426d64420438adfb3d8846ae Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Fri, 5 Dec 2025 17:14:24 -0500
Subject: [PATCH 05/10] prefill alias if enter hostname in destination

---
 .../CreateInternalResourceDialog.tsx          | 35 +++++++++++++++++++
 src/components/EditInternalResourceDialog.tsx | 35 +++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/src/components/CreateInternalResourceDialog.tsx b/src/components/CreateInternalResourceDialog.tsx
index 2e7ee2dc..94238f9d 100644
--- a/src/components/CreateInternalResourceDialog.tsx
+++ b/src/components/CreateInternalResourceDialog.tsx
@@ -232,6 +232,21 @@ export default function CreateInternalResourceDialog({
 
     const mode = form.watch("mode");
 
+    // Helper function to check if destination contains letters (hostname vs IP)
+    const isHostname = (destination: string): boolean => {
+        return /[a-zA-Z]/.test(destination);
+    };
+
+    // Helper function to clean resource name for FQDN format
+    const cleanForFQDN = (name: string): string => {
+        return name
+            .toLowerCase()
+            .replace(/[^a-z0-9.-]/g, "-") // Replace invalid chars with hyphens
+            .replace(/[-]+/g, "-") // Replace multiple hyphens with single hyphen
+            .replace(/^-|-$/g, "") // Remove leading/trailing hyphens
+            .replace(/^\.|\.$/g, ""); // Remove leading/trailing dots
+    };
+
     useEffect(() => {
         if (open && availableSites.length > 0) {
             form.reset({
@@ -253,6 +268,26 @@ export default function CreateInternalResourceDialog({
     const handleSubmit = async (data: FormData) => {
         setIsSubmitting(true);
         try {
+            // Validate: if mode is "host" and destination is a hostname (contains letters),
+            // an alias is required
+            if (data.mode === "host" && isHostname(data.destination)) {
+                const currentAlias = data.alias?.trim() || "";
+                
+                if (!currentAlias) {
+                    // Prefill alias based on destination
+                    let aliasValue = data.destination;
+                    if (data.destination.toLowerCase() === "localhost") {
+                        // Use resource name cleaned for FQDN with .internal suffix
+                        const cleanedName = cleanForFQDN(data.name);
+                        aliasValue = `${cleanedName}.internal`;
+                    }
+                    
+                    // Update the form with the prefilled alias
+                    form.setValue("alias", aliasValue);
+                    data.alias = aliasValue;
+                }
+            }
+
             const response = await api.put<AxiosResponse<any>>(
                 `/org/${orgId}/site/${data.siteId}/resource`,
                 {
diff --git a/src/components/EditInternalResourceDialog.tsx b/src/components/EditInternalResourceDialog.tsx
index ecb0c925..fca54981 100644
--- a/src/components/EditInternalResourceDialog.tsx
+++ b/src/components/EditInternalResourceDialog.tsx
@@ -273,9 +273,44 @@ export default function EditInternalResourceDialog({
 
     const mode = form.watch("mode");
 
+    // Helper function to check if destination contains letters (hostname vs IP)
+    const isHostname = (destination: string): boolean => {
+        return /[a-zA-Z]/.test(destination);
+    };
+
+    // Helper function to clean resource name for FQDN format
+    const cleanForFQDN = (name: string): string => {
+        return name
+            .toLowerCase()
+            .replace(/[^a-z0-9.-]/g, "-") // Replace invalid chars with hyphens
+            .replace(/[-]+/g, "-") // Replace multiple hyphens with single hyphen
+            .replace(/^-|-$/g, "") // Remove leading/trailing hyphens
+            .replace(/^\.|\.$/g, ""); // Remove leading/trailing dots
+    };
+
     const handleSubmit = async (data: FormData) => {
         setIsSubmitting(true);
         try {
+            // Validate: if mode is "host" and destination is a hostname (contains letters),
+            // an alias is required
+            if (data.mode === "host" && isHostname(data.destination)) {
+                const currentAlias = data.alias?.trim() || "";
+                
+                if (!currentAlias) {
+                    // Prefill alias based on destination
+                    let aliasValue = data.destination;
+                    if (data.destination.toLowerCase() === "localhost") {
+                        // Use resource name cleaned for FQDN with .internal suffix
+                        const cleanedName = cleanForFQDN(data.name);
+                        aliasValue = `${cleanedName}.internal`;
+                    }
+                    
+                    // Update the form with the prefilled alias
+                    form.setValue("alias", aliasValue);
+                    data.alias = aliasValue;
+                }
+            }
+
             // Update the site resource
             await api.post(
                 `/org/${orgId}/site/${resource.siteId}/resource/${resource.id}`,

From 26e49ca39d8dca3802851bb85e3694817c514eeb Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Fri, 5 Dec 2025 17:33:30 -0500
Subject: [PATCH 06/10] simplify sidebar titles

---
 messages/en-US.json    | 18 +++++++++---------
 src/app/navigation.tsx |  5 +++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/messages/en-US.json b/messages/en-US.json
index 895c8b3f..30f1f8eb 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -144,9 +144,9 @@
     "expires": "Expires",
     "never": "Never",
     "shareErrorSelectResource": "Please select a resource",
-    "proxyResourceTitle": "Manage Proxy Resources",
+    "proxyResourceTitle": "Manage Public Resources",
     "proxyResourceDescription": "Create and manage resources that are publicly accessible through a web browser",
-    "clientResourceTitle": "Manage Client Resources",
+    "clientResourceTitle": "Manage Private Resources",
     "clientResourceDescription": "Create and manage resources that are only accessible through a connected client",
     "resourcesSearch": "Search resources...",
     "resourceAdd": "Add Resource",
@@ -1176,8 +1176,8 @@
     "sidebarHome": "Home",
     "sidebarSites": "Sites",
     "sidebarResources": "Resources",
-    "sidebarProxyResources": "Proxy Resources",
-    "sidebarClientResources": "Client Resources",
+    "sidebarProxyResources": "Public",
+    "sidebarClientResources": "Private",
     "sidebarAccessControl": "Access Control",
     "sidebarLogsAndAnalytics": "Logs & Analytics",
     "sidebarUsers": "Users",
@@ -1191,14 +1191,14 @@
     "sidebarIdentityProviders": "Identity Providers",
     "sidebarLicense": "License",
     "sidebarClients": "Clients",
-    "sidebarUserDevices": "User Devices",
-    "sidebarMachineClients": "Machine Clients",
+    "sidebarUserDevices": "Users",
+    "sidebarMachineClients": "Machines",
     "sidebarDomains": "Domains",
     "sidebarGeneral": "General",
     "sidebarLogAndAnalytics": "Log & Analytics",
     "sidebarBluePrints": "Blueprints",
     "sidebarOrganization": "Organization",
-    "sidebarLogsAnalytics": "Request Analytics",
+    "sidebarLogsAnalytics": "Analytics",
     "blueprints": "Blueprints",
     "blueprintsDescription": "Apply declarative configurations and view previous runs",
     "blueprintAdd": "Add Blueprint",
@@ -1577,7 +1577,7 @@
     "resourcesTableOffline": "Offline",
     "resourcesTableUnknown": "Unknown",
     "resourcesTableNotMonitored": "Not monitored",
-    "editInternalResourceDialogEditClientResource": "Edit Client Resource",
+    "editInternalResourceDialogEditClientResource": "Edit Private Resource",
     "editInternalResourceDialogUpdateResourceProperties": "Update the resource configuration and access controls for {resourceName}",
     "editInternalResourceDialogResourceProperties": "Resource Properties",
     "editInternalResourceDialogName": "Name",
@@ -1611,7 +1611,7 @@
     "createInternalResourceDialogNoSitesAvailable": "No Sites Available",
     "createInternalResourceDialogNoSitesAvailableDescription": "You need to have at least one Newt site with a subnet configured to create internal resources.",
     "createInternalResourceDialogClose": "Close",
-    "createInternalResourceDialogCreateClientResource": "Create Client Resource",
+    "createInternalResourceDialogCreateClientResource": "Create Private Resource",
     "createInternalResourceDialogCreateClientResourceDescription": "Create a new resource that will only be accessible to clients connected to the organization",
     "createInternalResourceDialogResourceProperties": "Resource Properties",
     "createInternalResourceDialogName": "Name",
diff --git a/src/app/navigation.tsx b/src/app/navigation.tsx
index fbccc042..fabc24b7 100644
--- a/src/app/navigation.tsx
+++ b/src/app/navigation.tsx
@@ -60,7 +60,8 @@ export const orgNavSections = (): SidebarNavSection[] => [
                     {
                         title: "sidebarClientResources",
                         href: "/{orgId}/settings/resources/client",
-                        icon: <GlobeLock className="size-4 flex-none" />
+                        icon: <GlobeLock className="size-4 flex-none" />,
+                        isBeta: true
                     }
                 ]
             },
@@ -104,7 +105,7 @@ export const orgNavSections = (): SidebarNavSection[] => [
         ]
     },
     {
-        heading: "accessControls",
+        heading: "access",
         items: [
             {
                 title: "sidebarUsers",

From 4809b64f7dde5ed121fd21d7d2a3160edced806b Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Fri, 5 Dec 2025 16:43:27 -0500
Subject: [PATCH 07/10] Reset package lock

---
 package-lock.json | 2239 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 1983 insertions(+), 256 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 919730b1..64069c9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -464,47 +464,47 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sesv2/-/client-sesv2-3.943.0.tgz",
-            "integrity": "sha512-Zlyw/y5CbhhRK+ZdN/aMNPA8BYo427ddxkTG5yI/JasO05i7thPkhyqsUjyfsV6Z1tHfwFlLeicW57aLW8fAVw==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sesv2/-/client-sesv2-3.946.0.tgz",
+            "integrity": "sha512-JYj3BPqgyRXgBjZ3Xvo4Abd+vLxcsHe4gb0TvwiSM/k7e6MRgBZoYwDOnwbNDs/62X1sn7MPHqqB3miuO4nR5g==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
                 "@aws-crypto/sha256-js": "5.2.0",
-                "@aws-sdk/core": "3.943.0",
-                "@aws-sdk/credential-provider-node": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
+                "@aws-sdk/credential-provider-node": "3.946.0",
                 "@aws-sdk/middleware-host-header": "3.936.0",
                 "@aws-sdk/middleware-logger": "3.936.0",
                 "@aws-sdk/middleware-recursion-detection": "3.936.0",
-                "@aws-sdk/middleware-user-agent": "3.943.0",
+                "@aws-sdk/middleware-user-agent": "3.946.0",
                 "@aws-sdk/region-config-resolver": "3.936.0",
-                "@aws-sdk/signature-v4-multi-region": "3.943.0",
+                "@aws-sdk/signature-v4-multi-region": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@aws-sdk/util-endpoints": "3.936.0",
                 "@aws-sdk/util-user-agent-browser": "3.936.0",
-                "@aws-sdk/util-user-agent-node": "3.943.0",
+                "@aws-sdk/util-user-agent-node": "3.946.0",
                 "@smithy/config-resolver": "^4.4.3",
-                "@smithy/core": "^3.18.5",
+                "@smithy/core": "^3.18.7",
                 "@smithy/fetch-http-handler": "^5.3.6",
                 "@smithy/hash-node": "^4.2.5",
                 "@smithy/invalid-dependency": "^4.2.5",
                 "@smithy/middleware-content-length": "^4.2.5",
-                "@smithy/middleware-endpoint": "^4.3.12",
-                "@smithy/middleware-retry": "^4.4.12",
+                "@smithy/middleware-endpoint": "^4.3.14",
+                "@smithy/middleware-retry": "^4.4.14",
                 "@smithy/middleware-serde": "^4.2.6",
                 "@smithy/middleware-stack": "^4.2.5",
                 "@smithy/node-config-provider": "^4.3.5",
                 "@smithy/node-http-handler": "^4.4.5",
                 "@smithy/protocol-http": "^5.3.5",
-                "@smithy/smithy-client": "^4.9.8",
+                "@smithy/smithy-client": "^4.9.10",
                 "@smithy/types": "^4.9.0",
                 "@smithy/url-parser": "^4.2.5",
                 "@smithy/util-base64": "^4.3.0",
                 "@smithy/util-body-length-browser": "^4.2.0",
                 "@smithy/util-body-length-node": "^4.2.1",
-                "@smithy/util-defaults-mode-browser": "^4.3.11",
-                "@smithy/util-defaults-mode-node": "^4.2.14",
+                "@smithy/util-defaults-mode-browser": "^4.3.13",
+                "@smithy/util-defaults-mode-node": "^4.2.16",
                 "@smithy/util-endpoints": "^3.2.5",
                 "@smithy/util-middleware": "^4.2.5",
                 "@smithy/util-retry": "^4.2.5",
@@ -516,45 +516,45 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/client-sso": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.943.0.tgz",
-            "integrity": "sha512-kOTO2B8Ks2qX73CyKY8PAajtf5n39aMe2spoiOF5EkgSzGV7hZ/HONRDyADlyxwfsX39Q2F2SpPUaXzon32IGw==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.946.0.tgz",
+            "integrity": "sha512-kGAs5iIVyUz4p6TX3pzG5q3cNxXnVpC4pwRC6DCSaSv9ozyPjc2d74FsK4fZ+J+ejtvCdJk72uiuQtWJc86Wuw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
                 "@aws-crypto/sha256-js": "5.2.0",
-                "@aws-sdk/core": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
                 "@aws-sdk/middleware-host-header": "3.936.0",
                 "@aws-sdk/middleware-logger": "3.936.0",
                 "@aws-sdk/middleware-recursion-detection": "3.936.0",
-                "@aws-sdk/middleware-user-agent": "3.943.0",
+                "@aws-sdk/middleware-user-agent": "3.946.0",
                 "@aws-sdk/region-config-resolver": "3.936.0",
                 "@aws-sdk/types": "3.936.0",
                 "@aws-sdk/util-endpoints": "3.936.0",
                 "@aws-sdk/util-user-agent-browser": "3.936.0",
-                "@aws-sdk/util-user-agent-node": "3.943.0",
+                "@aws-sdk/util-user-agent-node": "3.946.0",
                 "@smithy/config-resolver": "^4.4.3",
-                "@smithy/core": "^3.18.5",
+                "@smithy/core": "^3.18.7",
                 "@smithy/fetch-http-handler": "^5.3.6",
                 "@smithy/hash-node": "^4.2.5",
                 "@smithy/invalid-dependency": "^4.2.5",
                 "@smithy/middleware-content-length": "^4.2.5",
-                "@smithy/middleware-endpoint": "^4.3.12",
-                "@smithy/middleware-retry": "^4.4.12",
+                "@smithy/middleware-endpoint": "^4.3.14",
+                "@smithy/middleware-retry": "^4.4.14",
                 "@smithy/middleware-serde": "^4.2.6",
                 "@smithy/middleware-stack": "^4.2.5",
                 "@smithy/node-config-provider": "^4.3.5",
                 "@smithy/node-http-handler": "^4.4.5",
                 "@smithy/protocol-http": "^5.3.5",
-                "@smithy/smithy-client": "^4.9.8",
+                "@smithy/smithy-client": "^4.9.10",
                 "@smithy/types": "^4.9.0",
                 "@smithy/url-parser": "^4.2.5",
                 "@smithy/util-base64": "^4.3.0",
                 "@smithy/util-body-length-browser": "^4.2.0",
                 "@smithy/util-body-length-node": "^4.2.1",
-                "@smithy/util-defaults-mode-browser": "^4.3.11",
-                "@smithy/util-defaults-mode-node": "^4.2.14",
+                "@smithy/util-defaults-mode-browser": "^4.3.13",
+                "@smithy/util-defaults-mode-node": "^4.2.16",
                 "@smithy/util-endpoints": "^3.2.5",
                 "@smithy/util-middleware": "^4.2.5",
                 "@smithy/util-retry": "^4.2.5",
@@ -566,20 +566,20 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/core": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.943.0.tgz",
-            "integrity": "sha512-8CBy2hI9ABF7RBVQuY1bgf/ue+WPmM/hl0adrXFlhnhkaQP0tFY5zhiy1Y+n7V+5f3/ORoHBmCCQmcHDDYJqJQ==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.946.0.tgz",
+            "integrity": "sha512-u2BkbLLVbMFrEiXrko2+S6ih5sUZPlbVyRPtXOqMHlCyzr70sE8kIiD6ba223rQeIFPcYfW/wHc6k4ihW2xxVg==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-sdk/types": "3.936.0",
                 "@aws-sdk/xml-builder": "3.930.0",
-                "@smithy/core": "^3.18.5",
+                "@smithy/core": "^3.18.7",
                 "@smithy/node-config-provider": "^4.3.5",
                 "@smithy/property-provider": "^4.2.5",
                 "@smithy/protocol-http": "^5.3.5",
                 "@smithy/signature-v4": "^5.3.5",
-                "@smithy/smithy-client": "^4.9.8",
+                "@smithy/smithy-client": "^4.9.10",
                 "@smithy/types": "^4.9.0",
                 "@smithy/util-base64": "^4.3.0",
                 "@smithy/util-middleware": "^4.2.5",
@@ -591,13 +591,13 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/credential-provider-env": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.943.0.tgz",
-            "integrity": "sha512-WnS5w9fK9CTuoZRVSIHLOMcI63oODg9qd1vXMYb7QGLGlfwUm4aG3hdu7i9XvYrpkQfE3dzwWLtXF4ZBuL1Tew==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.946.0.tgz",
+            "integrity": "sha512-P4l+K6wX1tf8LmWUvZofdQ+BgCNyk6Tb9u1H10npvqpuCD+dCM4pXIBq3PQcv/juUBOvLGGREo+Govuh3lfD0Q==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/property-provider": "^4.2.5",
                 "@smithy/types": "^4.9.0",
@@ -608,19 +608,19 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/credential-provider-http": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.943.0.tgz",
-            "integrity": "sha512-SA8bUcYDEACdhnhLpZNnWusBpdmj4Vl67Vxp3Zke7SvoWSYbuxa+tiDiC+c92Z4Yq6xNOuLPW912ZPb9/NsSkA==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.946.0.tgz",
+            "integrity": "sha512-/zeOJ6E7dGZQ/l2k7KytEoPJX0APIhwt0A79hPf/bUpMF4dDs2P6JmchDrotk0a0Y/MIdNF8sBQ/MEOPnBiYoQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/fetch-http-handler": "^5.3.6",
                 "@smithy/node-http-handler": "^4.4.5",
                 "@smithy/property-provider": "^4.2.5",
                 "@smithy/protocol-http": "^5.3.5",
-                "@smithy/smithy-client": "^4.9.8",
+                "@smithy/smithy-client": "^4.9.10",
                 "@smithy/types": "^4.9.0",
                 "@smithy/util-stream": "^4.5.6",
                 "tslib": "^2.6.2"
@@ -630,20 +630,20 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/credential-provider-ini": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.943.0.tgz",
-            "integrity": "sha512-BcLDb8l4oVW+NkuqXMlO7TnM6lBOWW318ylf4FRED/ply5eaGxkQYqdGvHSqGSN5Rb3vr5Ek0xpzSjeYD7C8Kw==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.946.0.tgz",
+            "integrity": "sha512-Pdgcra3RivWj/TuZmfFaHbqsvvgnSKO0CxlRUMMr0PgBiCnUhyl+zBktdNOeGsOPH2fUzQpYhcUjYUgVSdcSDQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
-                "@aws-sdk/credential-provider-env": "3.943.0",
-                "@aws-sdk/credential-provider-http": "3.943.0",
-                "@aws-sdk/credential-provider-login": "3.943.0",
-                "@aws-sdk/credential-provider-process": "3.943.0",
-                "@aws-sdk/credential-provider-sso": "3.943.0",
-                "@aws-sdk/credential-provider-web-identity": "3.943.0",
-                "@aws-sdk/nested-clients": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
+                "@aws-sdk/credential-provider-env": "3.946.0",
+                "@aws-sdk/credential-provider-http": "3.946.0",
+                "@aws-sdk/credential-provider-login": "3.946.0",
+                "@aws-sdk/credential-provider-process": "3.946.0",
+                "@aws-sdk/credential-provider-sso": "3.946.0",
+                "@aws-sdk/credential-provider-web-identity": "3.946.0",
+                "@aws-sdk/nested-clients": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/credential-provider-imds": "^4.2.5",
                 "@smithy/property-provider": "^4.2.5",
@@ -656,18 +656,18 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/credential-provider-node": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.943.0.tgz",
-            "integrity": "sha512-14eddaH/gjCWoLSAELVrFOQNyswUYwWphIt+PdsJ/FqVfP4ay2HsiZVEIYbQtmrKHaoLJhiZKwBQRjcqJDZG0w==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.946.0.tgz",
+            "integrity": "sha512-I7URUqnBPng1a5y81OImxrwERysZqMBREG6svhhGeZgxmqcpAZ8z5ywILeQXdEOCuuES8phUp/ojzxFjPXp/eA==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/credential-provider-env": "3.943.0",
-                "@aws-sdk/credential-provider-http": "3.943.0",
-                "@aws-sdk/credential-provider-ini": "3.943.0",
-                "@aws-sdk/credential-provider-process": "3.943.0",
-                "@aws-sdk/credential-provider-sso": "3.943.0",
-                "@aws-sdk/credential-provider-web-identity": "3.943.0",
+                "@aws-sdk/credential-provider-env": "3.946.0",
+                "@aws-sdk/credential-provider-http": "3.946.0",
+                "@aws-sdk/credential-provider-ini": "3.946.0",
+                "@aws-sdk/credential-provider-process": "3.946.0",
+                "@aws-sdk/credential-provider-sso": "3.946.0",
+                "@aws-sdk/credential-provider-web-identity": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/credential-provider-imds": "^4.2.5",
                 "@smithy/property-provider": "^4.2.5",
@@ -680,13 +680,13 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/credential-provider-process": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.943.0.tgz",
-            "integrity": "sha512-GIY/vUkthL33AdjOJ8r9vOosKf/3X+X7LIiACzGxvZZrtoOiRq0LADppdiKIB48vTL63VvW+eRIOFAxE6UDekw==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.946.0.tgz",
+            "integrity": "sha512-GtGHX7OGqIeVQ3DlVm5RRF43Qmf3S1+PLJv9svrdvAhAdy2bUb044FdXXqrtSsIfpzTKlHgQUiRo5MWLd35Ntw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/property-provider": "^4.2.5",
                 "@smithy/shared-ini-file-loader": "^4.4.0",
@@ -698,15 +698,15 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/credential-provider-sso": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.943.0.tgz",
-            "integrity": "sha512-1c5G11syUrru3D9OO6Uk+ul5e2lX1adb+7zQNyluNaLPXP6Dina6Sy6DFGRLu7tM8+M7luYmbS3w63rpYpaL+A==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.946.0.tgz",
+            "integrity": "sha512-LeGSSt2V5iwYey1ENGY75RmoDP3bA2iE/py8QBKW8EDA8hn74XBLkprhrK5iccOvU3UGWY8WrEKFAFGNjJOL9g==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/client-sso": "3.943.0",
-                "@aws-sdk/core": "3.943.0",
-                "@aws-sdk/token-providers": "3.943.0",
+                "@aws-sdk/client-sso": "3.946.0",
+                "@aws-sdk/core": "3.946.0",
+                "@aws-sdk/token-providers": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/property-provider": "^4.2.5",
                 "@smithy/shared-ini-file-loader": "^4.4.0",
@@ -718,14 +718,14 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/credential-provider-web-identity": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.943.0.tgz",
-            "integrity": "sha512-VtyGKHxICSb4kKGuaqotxso8JVM8RjCS3UYdIMOxUt9TaFE/CZIfZKtjTr+IJ7M0P7t36wuSUb/jRLyNmGzUUA==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.946.0.tgz",
+            "integrity": "sha512-ocBCvjWfkbjxElBI1QUxOnHldsNhoU0uOICFvuRDAZAoxvypJHN3m5BJkqb7gqorBbcv3LRgmBdEnWXOAvq+7Q==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
-                "@aws-sdk/nested-clients": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
+                "@aws-sdk/nested-clients": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/property-provider": "^4.2.5",
                 "@smithy/shared-ini-file-loader": "^4.4.0",
@@ -785,20 +785,20 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/middleware-sdk-s3": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.943.0.tgz",
-            "integrity": "sha512-kd2mALfthU+RS9NsPS+qvznFcPnVgVx9mgmStWCPn5Qc5BTnx4UAtm+HPA+XZs+zxOopp+zmAfE4qxDHRVONBA==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.946.0.tgz",
+            "integrity": "sha512-0UTFmFd8PX2k/jLu/DBmR+mmLQWAtUGHYps9Rjx3dcXNwaMLaa/39NoV3qn7Dwzfpqc6JZlZzBk+NDOCJIHW9g==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@aws-sdk/util-arn-parser": "3.893.0",
-                "@smithy/core": "^3.18.5",
+                "@smithy/core": "^3.18.7",
                 "@smithy/node-config-provider": "^4.3.5",
                 "@smithy/protocol-http": "^5.3.5",
                 "@smithy/signature-v4": "^5.3.5",
-                "@smithy/smithy-client": "^4.9.8",
+                "@smithy/smithy-client": "^4.9.10",
                 "@smithy/types": "^4.9.0",
                 "@smithy/util-config-provider": "^4.2.0",
                 "@smithy/util-middleware": "^4.2.5",
@@ -811,16 +811,16 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/middleware-user-agent": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.943.0.tgz",
-            "integrity": "sha512-956n4kVEwFNXndXfhSAN5wO+KRgqiWEEY+ECwLvxmmO8uQ0NWOa8l6l65nTtyuiWzMX81c9BvlyNR5EgUeeUvA==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.946.0.tgz",
+            "integrity": "sha512-7QcljCraeaWQNuqmOoAyZs8KpZcuhPiqdeeKoRd397jVGNRehLFsZbIMOvwaluUDFY11oMyXOkQEERe1Zo2fCw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@aws-sdk/util-endpoints": "3.936.0",
-                "@smithy/core": "^3.18.5",
+                "@smithy/core": "^3.18.7",
                 "@smithy/protocol-http": "^5.3.5",
                 "@smithy/types": "^4.9.0",
                 "tslib": "^2.6.2"
@@ -830,45 +830,45 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/nested-clients": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.943.0.tgz",
-            "integrity": "sha512-anFtB0p2FPuyUnbOULwGmKYqYKSq1M73c9uZ08jR/NCq6Trjq9cuF5TFTeHwjJyPRb4wMf2Qk859oiVfFqnQiw==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.946.0.tgz",
+            "integrity": "sha512-rjAtEguukeW8mlyEQMQI56vxFoyWlaNwowmz1p1rav948SUjtrzjHAp4TOQWhibb7AR7BUTHBCgIcyCRjBEf4g==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
                 "@aws-crypto/sha256-js": "5.2.0",
-                "@aws-sdk/core": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
                 "@aws-sdk/middleware-host-header": "3.936.0",
                 "@aws-sdk/middleware-logger": "3.936.0",
                 "@aws-sdk/middleware-recursion-detection": "3.936.0",
-                "@aws-sdk/middleware-user-agent": "3.943.0",
+                "@aws-sdk/middleware-user-agent": "3.946.0",
                 "@aws-sdk/region-config-resolver": "3.936.0",
                 "@aws-sdk/types": "3.936.0",
                 "@aws-sdk/util-endpoints": "3.936.0",
                 "@aws-sdk/util-user-agent-browser": "3.936.0",
-                "@aws-sdk/util-user-agent-node": "3.943.0",
+                "@aws-sdk/util-user-agent-node": "3.946.0",
                 "@smithy/config-resolver": "^4.4.3",
-                "@smithy/core": "^3.18.5",
+                "@smithy/core": "^3.18.7",
                 "@smithy/fetch-http-handler": "^5.3.6",
                 "@smithy/hash-node": "^4.2.5",
                 "@smithy/invalid-dependency": "^4.2.5",
                 "@smithy/middleware-content-length": "^4.2.5",
-                "@smithy/middleware-endpoint": "^4.3.12",
-                "@smithy/middleware-retry": "^4.4.12",
+                "@smithy/middleware-endpoint": "^4.3.14",
+                "@smithy/middleware-retry": "^4.4.14",
                 "@smithy/middleware-serde": "^4.2.6",
                 "@smithy/middleware-stack": "^4.2.5",
                 "@smithy/node-config-provider": "^4.3.5",
                 "@smithy/node-http-handler": "^4.4.5",
                 "@smithy/protocol-http": "^5.3.5",
-                "@smithy/smithy-client": "^4.9.8",
+                "@smithy/smithy-client": "^4.9.10",
                 "@smithy/types": "^4.9.0",
                 "@smithy/url-parser": "^4.2.5",
                 "@smithy/util-base64": "^4.3.0",
                 "@smithy/util-body-length-browser": "^4.2.0",
                 "@smithy/util-body-length-node": "^4.2.1",
-                "@smithy/util-defaults-mode-browser": "^4.3.11",
-                "@smithy/util-defaults-mode-node": "^4.2.14",
+                "@smithy/util-defaults-mode-browser": "^4.3.13",
+                "@smithy/util-defaults-mode-node": "^4.2.16",
                 "@smithy/util-endpoints": "^3.2.5",
                 "@smithy/util-middleware": "^4.2.5",
                 "@smithy/util-retry": "^4.2.5",
@@ -897,13 +897,13 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/signature-v4-multi-region": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.943.0.tgz",
-            "integrity": "sha512-KKvmxNQ/FZbM6ml6nKd8ltDulsUojsXnMJNgf1VHTcJEbADC/6mVWOq0+e9D0WP1qixUBEuMjlS2HqD5KoqwEg==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.946.0.tgz",
+            "integrity": "sha512-61FZ685lKiJuQ06g6U7K3PL9EwKCxNm51wNlxyKV57nnl1GrLD0NC8O3/hDNkCQLNBArT9y3IXl2H7TtIxP8Jg==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/middleware-sdk-s3": "3.943.0",
+                "@aws-sdk/middleware-sdk-s3": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/protocol-http": "^5.3.5",
                 "@smithy/signature-v4": "^5.3.5",
@@ -915,14 +915,14 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/token-providers": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.943.0.tgz",
-            "integrity": "sha512-cRKyIzwfkS+XztXIFPoWORuaxlIswP+a83BJzelX4S1gUZ7FcXB4+lj9Jxjn8SbQhR4TPU3Owbpu+S7pd6IRbQ==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.946.0.tgz",
+            "integrity": "sha512-a5c+rM6CUPX2ExmUZ3DlbLlS5rQr4tbdoGcgBsjnAHiYx8MuMNAI+8M7wfjF13i2yvUQj5WEIddvLpayfEZj9g==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
-                "@aws-sdk/nested-clients": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
+                "@aws-sdk/nested-clients": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/property-provider": "^4.2.5",
                 "@smithy/shared-ini-file-loader": "^4.4.0",
@@ -978,13 +978,13 @@
             }
         },
         "node_modules/@aws-sdk/client-sesv2/node_modules/@aws-sdk/util-user-agent-node": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.943.0.tgz",
-            "integrity": "sha512-gn+ILprVRrgAgTIBk2TDsJLRClzIOdStQFeFTcN0qpL8Z4GBCqMFhw7O7X+MM55Stt5s4jAauQ/VvoqmCADnQg==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.946.0.tgz",
+            "integrity": "sha512-a2UwwvzbK5AxHKUBupfg4s7VnkqRAHjYsuezHnKCniczmT4HZfP1NnfwwvLKEH8qaTrwenxjKSfq4UWmWkvG+Q==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/middleware-user-agent": "3.943.0",
+                "@aws-sdk/middleware-user-agent": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/node-config-provider": "^4.3.5",
                 "@smithy/types": "^4.9.0",
@@ -1162,14 +1162,14 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-login": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.943.0.tgz",
-            "integrity": "sha512-9iCOVkiRW+evxiJE94RqosCwRrzptAVPhRhGWv4osfYDhjNAvUMyrnZl3T1bjqCoKNcETRKEZIU3dqYHnUkcwQ==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.946.0.tgz",
+            "integrity": "sha512-5iqLNc15u2Zx+7jOdQkIbP62N7n2031tw5hkmIG0DLnozhnk64osOh2CliiOE9x3c4P9Pf4frAwgyy9GzNTk2g==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
-                "@aws-sdk/nested-clients": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
+                "@aws-sdk/nested-clients": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/property-provider": "^4.2.5",
                 "@smithy/protocol-http": "^5.3.5",
@@ -1182,20 +1182,20 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/core": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.943.0.tgz",
-            "integrity": "sha512-8CBy2hI9ABF7RBVQuY1bgf/ue+WPmM/hl0adrXFlhnhkaQP0tFY5zhiy1Y+n7V+5f3/ORoHBmCCQmcHDDYJqJQ==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.946.0.tgz",
+            "integrity": "sha512-u2BkbLLVbMFrEiXrko2+S6ih5sUZPlbVyRPtXOqMHlCyzr70sE8kIiD6ba223rQeIFPcYfW/wHc6k4ihW2xxVg==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-sdk/types": "3.936.0",
                 "@aws-sdk/xml-builder": "3.930.0",
-                "@smithy/core": "^3.18.5",
+                "@smithy/core": "^3.18.7",
                 "@smithy/node-config-provider": "^4.3.5",
                 "@smithy/property-provider": "^4.2.5",
                 "@smithy/protocol-http": "^5.3.5",
                 "@smithy/signature-v4": "^5.3.5",
-                "@smithy/smithy-client": "^4.9.8",
+                "@smithy/smithy-client": "^4.9.10",
                 "@smithy/types": "^4.9.0",
                 "@smithy/util-base64": "^4.3.0",
                 "@smithy/util-middleware": "^4.2.5",
@@ -1255,16 +1255,16 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/middleware-user-agent": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.943.0.tgz",
-            "integrity": "sha512-956n4kVEwFNXndXfhSAN5wO+KRgqiWEEY+ECwLvxmmO8uQ0NWOa8l6l65nTtyuiWzMX81c9BvlyNR5EgUeeUvA==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.946.0.tgz",
+            "integrity": "sha512-7QcljCraeaWQNuqmOoAyZs8KpZcuhPiqdeeKoRd397jVGNRehLFsZbIMOvwaluUDFY11oMyXOkQEERe1Zo2fCw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/core": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@aws-sdk/util-endpoints": "3.936.0",
-                "@smithy/core": "^3.18.5",
+                "@smithy/core": "^3.18.7",
                 "@smithy/protocol-http": "^5.3.5",
                 "@smithy/types": "^4.9.0",
                 "tslib": "^2.6.2"
@@ -1274,45 +1274,45 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/nested-clients": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.943.0.tgz",
-            "integrity": "sha512-anFtB0p2FPuyUnbOULwGmKYqYKSq1M73c9uZ08jR/NCq6Trjq9cuF5TFTeHwjJyPRb4wMf2Qk859oiVfFqnQiw==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.946.0.tgz",
+            "integrity": "sha512-rjAtEguukeW8mlyEQMQI56vxFoyWlaNwowmz1p1rav948SUjtrzjHAp4TOQWhibb7AR7BUTHBCgIcyCRjBEf4g==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@aws-crypto/sha256-browser": "5.2.0",
                 "@aws-crypto/sha256-js": "5.2.0",
-                "@aws-sdk/core": "3.943.0",
+                "@aws-sdk/core": "3.946.0",
                 "@aws-sdk/middleware-host-header": "3.936.0",
                 "@aws-sdk/middleware-logger": "3.936.0",
                 "@aws-sdk/middleware-recursion-detection": "3.936.0",
-                "@aws-sdk/middleware-user-agent": "3.943.0",
+                "@aws-sdk/middleware-user-agent": "3.946.0",
                 "@aws-sdk/region-config-resolver": "3.936.0",
                 "@aws-sdk/types": "3.936.0",
                 "@aws-sdk/util-endpoints": "3.936.0",
                 "@aws-sdk/util-user-agent-browser": "3.936.0",
-                "@aws-sdk/util-user-agent-node": "3.943.0",
+                "@aws-sdk/util-user-agent-node": "3.946.0",
                 "@smithy/config-resolver": "^4.4.3",
-                "@smithy/core": "^3.18.5",
+                "@smithy/core": "^3.18.7",
                 "@smithy/fetch-http-handler": "^5.3.6",
                 "@smithy/hash-node": "^4.2.5",
                 "@smithy/invalid-dependency": "^4.2.5",
                 "@smithy/middleware-content-length": "^4.2.5",
-                "@smithy/middleware-endpoint": "^4.3.12",
-                "@smithy/middleware-retry": "^4.4.12",
+                "@smithy/middleware-endpoint": "^4.3.14",
+                "@smithy/middleware-retry": "^4.4.14",
                 "@smithy/middleware-serde": "^4.2.6",
                 "@smithy/middleware-stack": "^4.2.5",
                 "@smithy/node-config-provider": "^4.3.5",
                 "@smithy/node-http-handler": "^4.4.5",
                 "@smithy/protocol-http": "^5.3.5",
-                "@smithy/smithy-client": "^4.9.8",
+                "@smithy/smithy-client": "^4.9.10",
                 "@smithy/types": "^4.9.0",
                 "@smithy/url-parser": "^4.2.5",
                 "@smithy/util-base64": "^4.3.0",
                 "@smithy/util-body-length-browser": "^4.2.0",
                 "@smithy/util-body-length-node": "^4.2.1",
-                "@smithy/util-defaults-mode-browser": "^4.3.11",
-                "@smithy/util-defaults-mode-node": "^4.2.14",
+                "@smithy/util-defaults-mode-browser": "^4.3.13",
+                "@smithy/util-defaults-mode-node": "^4.2.16",
                 "@smithy/util-endpoints": "^3.2.5",
                 "@smithy/util-middleware": "^4.2.5",
                 "@smithy/util-retry": "^4.2.5",
@@ -1385,13 +1385,13 @@
             }
         },
         "node_modules/@aws-sdk/credential-provider-login/node_modules/@aws-sdk/util-user-agent-node": {
-            "version": "3.943.0",
-            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.943.0.tgz",
-            "integrity": "sha512-gn+ILprVRrgAgTIBk2TDsJLRClzIOdStQFeFTcN0qpL8Z4GBCqMFhw7O7X+MM55Stt5s4jAauQ/VvoqmCADnQg==",
+            "version": "3.946.0",
+            "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.946.0.tgz",
+            "integrity": "sha512-a2UwwvzbK5AxHKUBupfg4s7VnkqRAHjYsuezHnKCniczmT4HZfP1NnfwwvLKEH8qaTrwenxjKSfq4UWmWkvG+Q==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@aws-sdk/middleware-user-agent": "3.943.0",
+                "@aws-sdk/middleware-user-agent": "3.946.0",
                 "@aws-sdk/types": "3.936.0",
                 "@smithy/node-config-provider": "^4.3.5",
                 "@smithy/types": "^4.9.0",
@@ -2315,7 +2315,6 @@
                 "@noble/ciphers": "^1.0.0"
             }
         },
-<<<<<<< HEAD
         "node_modules/@emnapi/core": {
             "version": "1.7.1",
             "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.1.tgz",
@@ -2347,8 +2346,6 @@
                 "tslib": "^2.4.0"
             }
         },
-=======
->>>>>>> dev
         "node_modules/@esbuild-kit/core-utils": {
             "version": "3.3.2",
             "resolved": "https://registry.npmjs.org/@esbuild-kit/core-utils/-/core-utils-3.3.2.tgz",
@@ -3614,6 +3611,154 @@
                 "node": ">=18"
             }
         },
+        "node_modules/@img/sharp-darwin-arm64": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.4.tgz",
+            "integrity": "sha512-sitdlPzDVyvmINUdJle3TNHl+AG9QcwiAMsXmccqsCOMZNIdW2/7S26w0LyU8euiLVzFBL3dXPwVCq/ODnf2vA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            },
+            "optionalDependencies": {
+                "@img/sharp-libvips-darwin-arm64": "1.2.3"
+            }
+        },
+        "node_modules/@img/sharp-darwin-x64": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.4.tgz",
+            "integrity": "sha512-rZheupWIoa3+SOdF/IcUe1ah4ZDpKBGWcsPX6MT0lYniH9micvIU7HQkYTfrx5Xi8u+YqwLtxC/3vl8TQN6rMg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            },
+            "optionalDependencies": {
+                "@img/sharp-libvips-darwin-x64": "1.2.3"
+            }
+        },
+        "node_modules/@img/sharp-libvips-darwin-arm64": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.3.tgz",
+            "integrity": "sha512-QzWAKo7kpHxbuHqUC28DZ9pIKpSi2ts2OJnoIGI26+HMgq92ZZ4vk8iJd4XsxN+tYfNJxzH6W62X5eTcsBymHw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-libvips-darwin-x64": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.3.tgz",
+            "integrity": "sha512-Ju+g2xn1E2AKO6YBhxjj+ACcsPQRHT0bhpglxcEf+3uyPY+/gL8veniKoo96335ZaPo03bdDXMv0t+BBFAbmRA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-libvips-linux-arm": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.3.tgz",
+            "integrity": "sha512-x1uE93lyP6wEwGvgAIV0gP6zmaL/a0tGzJs/BIDDG0zeBhMnuUPm7ptxGhUbcGs4okDJrk4nxgrmxpib9g6HpA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-libvips-linux-arm64": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.3.tgz",
+            "integrity": "sha512-I4RxkXU90cpufazhGPyVujYwfIm9Nk1QDEmiIsaPwdnm013F7RIceaCc87kAH+oUB1ezqEvC6ga4m7MSlqsJvQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-libvips-linux-ppc64": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.3.tgz",
+            "integrity": "sha512-Y2T7IsQvJLMCBM+pmPbM3bKT/yYJvVtLJGfCs4Sp95SjvnFIjynbjzsa7dY1fRJX45FTSfDksbTp6AGWudiyCg==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-libvips-linux-s390x": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.3.tgz",
+            "integrity": "sha512-RgWrs/gVU7f+K7P+KeHFaBAJlNkD1nIZuVXdQv6S+fNA6syCcoboNjsV2Pou7zNlVdNQoQUpQTk8SWDHUA3y/w==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "license": "LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
         "node_modules/@img/sharp-libvips-linux-x64": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.3.tgz",
@@ -3631,6 +3776,132 @@
                 "url": "https://opencollective.com/libvips"
             }
         },
+        "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.3.tgz",
+            "integrity": "sha512-F9q83RZ8yaCwENw1GieztSfj5msz7GGykG/BA+MOUefvER69K/ubgFHNeSyUu64amHIYKGDs4sRCMzXVj8sEyw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-libvips-linuxmusl-x64": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.3.tgz",
+            "integrity": "sha512-U5PUY5jbc45ANM6tSJpsgqmBF/VsL6LnxJmIf11kB7J5DctHgqm0SkuXzVWtIY90GnJxKnC/JT251TDnk1fu/g==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-linux-arm": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.4.tgz",
+            "integrity": "sha512-Xyam4mlqM0KkTHYVSuc6wXRmM7LGN0P12li03jAnZ3EJWZqj83+hi8Y9UxZUbxsgsK1qOEwg7O0Bc0LjqQVtxA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            },
+            "optionalDependencies": {
+                "@img/sharp-libvips-linux-arm": "1.2.3"
+            }
+        },
+        "node_modules/@img/sharp-linux-arm64": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.4.tgz",
+            "integrity": "sha512-YXU1F/mN/Wu786tl72CyJjP/Ngl8mGHN1hST4BGl+hiW5jhCnV2uRVTNOcaYPs73NeT/H8Upm3y9582JVuZHrQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            },
+            "optionalDependencies": {
+                "@img/sharp-libvips-linux-arm64": "1.2.3"
+            }
+        },
+        "node_modules/@img/sharp-linux-ppc64": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.4.tgz",
+            "integrity": "sha512-F4PDtF4Cy8L8hXA2p3TO6s4aDt93v+LKmpcYFLAVdkkD3hSxZzee0rh6/+94FpAynsuMpLX5h+LRsSG3rIciUQ==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            },
+            "optionalDependencies": {
+                "@img/sharp-libvips-linux-ppc64": "1.2.3"
+            }
+        },
+        "node_modules/@img/sharp-linux-s390x": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.4.tgz",
+            "integrity": "sha512-qVrZKE9Bsnzy+myf7lFKvng6bQzhNUAYcVORq2P7bDlvmF6u2sCmK2KyEQEBdYk+u3T01pVsPrkj943T1aJAsw==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            },
+            "optionalDependencies": {
+                "@img/sharp-libvips-linux-s390x": "1.2.3"
+            }
+        },
         "node_modules/@img/sharp-linux-x64": {
             "version": "0.34.4",
             "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.4.tgz",
@@ -3654,6 +3925,132 @@
                 "@img/sharp-libvips-linux-x64": "1.2.3"
             }
         },
+        "node_modules/@img/sharp-linuxmusl-arm64": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.4.tgz",
+            "integrity": "sha512-8hDVvW9eu4yHWnjaOOR8kHVrew1iIX+MUgwxSuH2XyYeNRtLUe4VNioSqbNkB7ZYQJj9rUTT4PyRscyk2PXFKA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            },
+            "optionalDependencies": {
+                "@img/sharp-libvips-linuxmusl-arm64": "1.2.3"
+            }
+        },
+        "node_modules/@img/sharp-linuxmusl-x64": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.4.tgz",
+            "integrity": "sha512-lU0aA5L8QTlfKjpDCEFOZsTYGn3AEiO6db8W5aQDxj0nQkVrZWmN3ZP9sYKWJdtq3PWPhUNlqehWyXpYDcI9Sg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "Apache-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            },
+            "optionalDependencies": {
+                "@img/sharp-libvips-linuxmusl-x64": "1.2.3"
+            }
+        },
+        "node_modules/@img/sharp-wasm32": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.4.tgz",
+            "integrity": "sha512-33QL6ZO/qpRyG7woB/HUALz28WnTMI2W1jgX3Nu2bypqLIKx/QKMILLJzJjI+SIbvXdG9fUnmrxR7vbi1sTBeA==",
+            "cpu": [
+                "wasm32"
+            ],
+            "dev": true,
+            "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/runtime": "^1.5.0"
+            },
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-win32-arm64": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.4.tgz",
+            "integrity": "sha512-2Q250do/5WXTwxW3zjsEuMSv5sUU4Tq9VThWKlU2EYLm4MB7ZeMwF+SFJutldYODXF6jzc6YEOC+VfX0SZQPqA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "Apache-2.0 AND LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-win32-ia32": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.4.tgz",
+            "integrity": "sha512-3ZeLue5V82dT92CNL6rsal6I2weKw1cYu+rGKm8fOCCtJTR2gYeUfY3FqUnIJsMUPIH68oS5jmZ0NiJ508YpEw==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "Apache-2.0 AND LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
+        "node_modules/@img/sharp-win32-x64": {
+            "version": "0.34.4",
+            "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.4.tgz",
+            "integrity": "sha512-xIyj4wpYs8J18sVN3mSQjwrw7fKUqRw+Z5rnHNCy5fYTxigBz81u5mOMPmFumwjcn8+ld1ppptMBCLic1nz6ig==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "Apache-2.0 AND LGPL-3.0-or-later",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/libvips"
+            }
+        },
         "node_modules/@ioredis/commands": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.4.0.tgz",
@@ -3804,6 +4201,18 @@
                 "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
             }
         },
+        "node_modules/@napi-rs/wasm-runtime": {
+            "version": "0.2.12",
+            "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+            "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "^1.4.3",
+                "@emnapi/runtime": "^1.4.3",
+                "@tybys/wasm-util": "^0.10.0"
+            }
+        },
         "node_modules/@next/env": {
             "version": "15.5.7",
             "resolved": "https://registry.npmjs.org/@next/env/-/env-15.5.7.tgz",
@@ -3819,7 +4228,6 @@
                 "fast-glob": "3.3.1"
             }
         },
-<<<<<<< HEAD
         "node_modules/@next/swc-darwin-arm64": {
             "version": "15.5.7",
             "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.7.tgz",
@@ -3884,8 +4292,6 @@
                 "node": ">= 10"
             }
         },
-=======
->>>>>>> dev
         "node_modules/@next/swc-linux-x64-gnu": {
             "version": "15.5.7",
             "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.7.tgz",
@@ -3902,7 +4308,6 @@
                 "node": ">= 10"
             }
         },
-<<<<<<< HEAD
         "node_modules/@next/swc-linux-x64-musl": {
             "version": "15.5.7",
             "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.7.tgz",
@@ -3951,8 +4356,6 @@
                 "node": ">= 10"
             }
         },
-=======
->>>>>>> dev
         "node_modules/@noble/ciphers": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.3.0.tgz",
@@ -4020,6 +4423,134 @@
                 "@node-rs/argon2-win32-x64-msvc": "2.0.2"
             }
         },
+        "node_modules/@node-rs/argon2-android-arm-eabi": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-android-arm-eabi/-/argon2-android-arm-eabi-2.0.2.tgz",
+            "integrity": "sha512-DV/H8p/jt40lrao5z5g6nM9dPNPGEHL+aK6Iy/og+dbL503Uj0AHLqj1Hk9aVUSCNnsDdUEKp4TVMi0YakDYKw==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-android-arm64": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-android-arm64/-/argon2-android-arm64-2.0.2.tgz",
+            "integrity": "sha512-1LKwskau+8O1ktKx7TbK7jx1oMOMt4YEXZOdSNIar1TQKxm6isZ0cRXgHLibPHEcNHgYRsJWDE9zvDGBB17QDg==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-darwin-arm64": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-darwin-arm64/-/argon2-darwin-arm64-2.0.2.tgz",
+            "integrity": "sha512-3TTNL/7wbcpNju5YcqUrCgXnXUSbD7ogeAKatzBVHsbpjZQbNb1NDxDjqqrWoTt6XL3z9mJUMGwbAk7zQltHtA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-darwin-x64": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-darwin-x64/-/argon2-darwin-x64-2.0.2.tgz",
+            "integrity": "sha512-vNPfkLj5Ij5111UTiYuwgxMqE7DRbOS2y58O2DIySzSHbcnu+nipmRKg+P0doRq6eKIJStyBK8dQi5Ic8pFyDw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-freebsd-x64": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-freebsd-x64/-/argon2-freebsd-x64-2.0.2.tgz",
+            "integrity": "sha512-M8vQZk01qojQfCqQU0/O1j1a4zPPrz93zc9fSINY7Q/6RhQRBCYwDw7ltDCZXg5JRGlSaeS8cUXWyhPGar3cGg==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-linux-arm-gnueabihf": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-arm-gnueabihf/-/argon2-linux-arm-gnueabihf-2.0.2.tgz",
+            "integrity": "sha512-7EmmEPHLzcu0G2GDh30L6G48CH38roFC2dqlQJmtRCxs6no3tTE/pvgBGatTp/o2n2oyOJcfmgndVFcUpwMnww==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-linux-arm64-gnu": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-arm64-gnu/-/argon2-linux-arm64-gnu-2.0.2.tgz",
+            "integrity": "sha512-6lsYh3Ftbk+HAIZ7wNuRF4SZDtxtFTfK+HYFAQQyW7Ig3LHqasqwfUKRXVSV5tJ+xTnxjqgKzvZSUJCAyIfHew==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-linux-arm64-musl": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-arm64-musl/-/argon2-linux-arm64-musl-2.0.2.tgz",
+            "integrity": "sha512-p3YqVMNT/4DNR67tIHTYGbedYmXxW9QlFmF39SkXyEbGQwpgSf6pH457/fyXBIYznTU/smnG9EH+C1uzT5j4hA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
         "node_modules/@node-rs/argon2-linux-x64-gnu": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-x64-gnu/-/argon2-linux-x64-gnu-2.0.2.tgz",
@@ -4036,6 +4567,86 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/@node-rs/argon2-linux-x64-musl": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-x64-musl/-/argon2-linux-x64-musl-2.0.2.tgz",
+            "integrity": "sha512-of5uPqk7oCRF/44a89YlWTEfjsftPywyTULwuFDKyD8QtVZoonrJR6ZWvfFE/6jBT68S0okAkAzzMEdBVWdxWw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-wasm32-wasi": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-wasm32-wasi/-/argon2-wasm32-wasi-2.0.2.tgz",
+            "integrity": "sha512-U3PzLYKSQYzTERstgtHLd4ZTkOF9co57zTXT77r0cVUsleGZOrd6ut7rHzeWwoJSiHOVxxa0OhG1JVQeB7lLoQ==",
+            "cpu": [
+                "wasm32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@napi-rs/wasm-runtime": "^0.2.5"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@node-rs/argon2-win32-arm64-msvc": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-win32-arm64-msvc/-/argon2-win32-arm64-msvc-2.0.2.tgz",
+            "integrity": "sha512-Eisd7/NM0m23ijrGr6xI2iMocdOuyl6gO27gfMfya4C5BODbUSP7ljKJ7LrA0teqZMdYHesRDzx36Js++/vhiQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-win32-ia32-msvc": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-win32-ia32-msvc/-/argon2-win32-ia32-msvc-2.0.2.tgz",
+            "integrity": "sha512-GsE2ezwAYwh72f9gIjbGTZOf4HxEksb5M2eCaj+Y5rGYVwAdt7C12Q2e9H5LRYxWcFvLH4m4jiSZpQQ4upnPAQ==",
+            "cpu": [
+                "ia32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/argon2-win32-x64-msvc": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-win32-x64-msvc/-/argon2-win32-x64-msvc-2.0.2.tgz",
+            "integrity": "sha512-cJxWXanH4Ew9CfuZ4IAEiafpOBCe97bzoKowHCGk5lG/7kR4WF/eknnBlHW9m8q7t10mKq75kruPLtbSDqgRTw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
         "node_modules/@node-rs/bcrypt": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@node-rs/bcrypt/-/bcrypt-1.9.0.tgz",
@@ -4065,6 +4676,134 @@
                 "@node-rs/bcrypt-win32-x64-msvc": "1.9.0"
             }
         },
+        "node_modules/@node-rs/bcrypt-android-arm-eabi": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-android-arm-eabi/-/bcrypt-android-arm-eabi-1.9.0.tgz",
+            "integrity": "sha512-nOCFISGtnodGHNiLrG0WYLWr81qQzZKYfmwHc7muUeq+KY0sQXyHOwZk9OuNQAWv/lnntmtbwkwT0QNEmOyLvA==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-android-arm64": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-android-arm64/-/bcrypt-android-arm64-1.9.0.tgz",
+            "integrity": "sha512-+ZrIAtigVmjYkqZQTThHVlz0+TG6D+GDHWhVKvR2DifjtqJ0i+mb9gjo++hN+fWEQdWNGxKCiBBjwgT4EcXd6A==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-darwin-arm64": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-darwin-arm64/-/bcrypt-darwin-arm64-1.9.0.tgz",
+            "integrity": "sha512-CQiS+F9Pa0XozvkXR1g7uXE9QvBOPOplDg0iCCPRYTN9PqA5qYxhwe48G3o+v2UeQceNRrbnEtWuANm7JRqIhw==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-darwin-x64": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-darwin-x64/-/bcrypt-darwin-x64-1.9.0.tgz",
+            "integrity": "sha512-4pTKGawYd7sNEjdJ7R/R67uwQH1VvwPZ0SSUMmeNHbxD5QlwAPXdDH11q22uzVXsvNFZ6nGQBg8No5OUGpx6Ug==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-freebsd-x64": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-freebsd-x64/-/bcrypt-freebsd-x64-1.9.0.tgz",
+            "integrity": "sha512-UmWzySX4BJhT/B8xmTru6iFif3h0Rpx3TqxRLCcbgmH43r7k5/9QuhpiyzpvKGpKHJCFNm4F3rC2wghvw5FCIg==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-linux-arm-gnueabihf": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm-gnueabihf/-/bcrypt-linux-arm-gnueabihf-1.9.0.tgz",
+            "integrity": "sha512-8qoX4PgBND2cVwsbajoAWo3NwdfJPEXgpCsZQZURz42oMjbGyhhSYbovBCskGU3EBLoC8RA2B1jFWooeYVn5BA==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-linux-arm64-gnu": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-gnu/-/bcrypt-linux-arm64-gnu-1.9.0.tgz",
+            "integrity": "sha512-TuAC6kx0SbcIA4mSEWPi+OCcDjTQUMl213v5gMNlttF+D4ieIZx6pPDGTaMO6M2PDHTeCG0CBzZl0Lu+9b0c7Q==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-linux-arm64-musl": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-musl/-/bcrypt-linux-arm64-musl-1.9.0.tgz",
+            "integrity": "sha512-/sIvKDABOI8QOEnLD7hIj02BVaNOuCIWBKvxcJOt8+TuwJ6zmY1UI5kSv9d99WbiHjTp97wtAUbZQwauU4b9ew==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
         "node_modules/@node-rs/bcrypt-linux-x64-gnu": {
             "version": "1.9.0",
             "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-gnu/-/bcrypt-linux-x64-gnu-1.9.0.tgz",
@@ -4081,6 +4820,119 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/@node-rs/bcrypt-linux-x64-musl": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-musl/-/bcrypt-linux-x64-musl-1.9.0.tgz",
+            "integrity": "sha512-duIiuqQ+Lew8ASSAYm6ZRqcmfBGWwsi81XLUwz86a2HR7Qv6V4yc3ZAUQovAikhjCsIqe8C11JlAZSK6+PlXYg==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-wasm32-wasi": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-wasm32-wasi/-/bcrypt-wasm32-wasi-1.9.0.tgz",
+            "integrity": "sha512-ylaGmn9Wjwv/D5lxtawttx3H6Uu2WTTR7lWlRHGT6Ga/MB1Vj4OjSGUW8G8zIVnKuXpGbZ92pgHlt4HUpSLctw==",
+            "cpu": [
+                "wasm32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "^0.45.0",
+                "@emnapi/runtime": "^0.45.0",
+                "@tybys/wasm-util": "^0.8.1",
+                "memfs-browser": "^3.4.13000"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-wasm32-wasi/node_modules/@emnapi/core": {
+            "version": "0.45.0",
+            "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-0.45.0.tgz",
+            "integrity": "sha512-DPWjcUDQkCeEM4VnljEOEcXdAD7pp8zSZsgOujk/LGIwCXWbXJngin+MO4zbH429lzeC3WbYLGjE2MaUOwzpyw==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-wasm32-wasi/node_modules/@emnapi/runtime": {
+            "version": "0.45.0",
+            "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-0.45.0.tgz",
+            "integrity": "sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-wasm32-wasi/node_modules/@tybys/wasm-util": {
+            "version": "0.8.3",
+            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.8.3.tgz",
+            "integrity": "sha512-Z96T/L6dUFFxgFJ+pQtkPpne9q7i6kIPYCFnQBHSgSPV9idTsKfIhCss0h5iM9irweZCatkrdeP8yi5uM1eX6Q==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-win32-arm64-msvc": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-win32-arm64-msvc/-/bcrypt-win32-arm64-msvc-1.9.0.tgz",
+            "integrity": "sha512-2h86gF7QFyEzODuDFml/Dp1MSJoZjxJ4yyT2Erf4NkwsiA5MqowUhUsorRwZhX6+2CtlGa7orbwi13AKMsYndw==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-win32-ia32-msvc": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-win32-ia32-msvc/-/bcrypt-win32-ia32-msvc-1.9.0.tgz",
+            "integrity": "sha512-kqxalCvhs4FkN0+gWWfa4Bdy2NQAkfiqq/CEf6mNXC13RSV673Ev9V8sRlQyNpCHCNkeXfOT9pgoBdJmMs9muA==",
+            "cpu": [
+                "ia32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@node-rs/bcrypt-win32-x64-msvc": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/bcrypt-win32-x64-msvc/-/bcrypt-win32-x64-msvc-1.9.0.tgz",
+            "integrity": "sha512-2y0Tuo6ZAT2Cz8V7DHulSlv1Bip3zbzeXyeur+uR25IRNYXKvI/P99Zl85Fbuu/zzYAZRLLlGTRe6/9IHofe/w==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
         "node_modules/@nodelib/fs.scandir": {
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -7449,6 +8301,74 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@react-email/preview-server/node_modules/@next/swc-darwin-arm64": {
+            "version": "15.5.2",
+            "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.5.2.tgz",
+            "integrity": "sha512-8bGt577BXGSd4iqFygmzIfTYizHb0LGWqH+qgIF/2EDxS5JsSdERJKA8WgwDyNBZgTIIA4D8qUtoQHmxIIquoQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@react-email/preview-server/node_modules/@next/swc-darwin-x64": {
+            "version": "15.5.2",
+            "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.5.2.tgz",
+            "integrity": "sha512-2DjnmR6JHK4X+dgTXt5/sOCu/7yPtqpYt8s8hLkHFK3MGkka2snTv3yRMdHvuRtJVkPwCGsvBSwmoQCHatauFQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@react-email/preview-server/node_modules/@next/swc-linux-arm64-gnu": {
+            "version": "15.5.2",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.5.2.tgz",
+            "integrity": "sha512-3j7SWDBS2Wov/L9q0mFJtEvQ5miIqfO4l7d2m9Mo06ddsgUK8gWfHGgbjdFlCp2Ek7MmMQZSxpGFqcC8zGh2AA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@react-email/preview-server/node_modules/@next/swc-linux-arm64-musl": {
+            "version": "15.5.2",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.5.2.tgz",
+            "integrity": "sha512-s6N8k8dF9YGc5T01UPQ08yxsK6fUow5gG1/axWc1HVVBYQBgOjca4oUZF7s4p+kwhkB1bDSGR8QznWrFZ/Rt5g==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
         "node_modules/@react-email/preview-server/node_modules/@next/swc-linux-x64-gnu": {
             "version": "15.5.2",
             "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.5.2.tgz",
@@ -7466,6 +8386,57 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/@react-email/preview-server/node_modules/@next/swc-linux-x64-musl": {
+            "version": "15.5.2",
+            "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.5.2.tgz",
+            "integrity": "sha512-/VUnh7w8RElYZ0IV83nUcP/J4KJ6LLYliiBIri3p3aW2giF+PAVgZb6mk8jbQSB3WlTai8gEmCAr7kptFa1H6g==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@react-email/preview-server/node_modules/@next/swc-win32-arm64-msvc": {
+            "version": "15.5.2",
+            "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.5.2.tgz",
+            "integrity": "sha512-sMPyTvRcNKXseNQ/7qRfVRLa0VhR0esmQ29DD6pqvG71+JdVnESJaHPA8t7bc67KD5spP3+DOCNLhqlEI2ZgQg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@react-email/preview-server/node_modules/@next/swc-win32-x64-msvc": {
+            "version": "15.5.2",
+            "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.5.2.tgz",
+            "integrity": "sha512-W5VvyZHnxG/2ukhZF/9Ikdra5fdNftxI6ybeVKYvBPDtyx7x4jPPSNduUkfH5fo3zG0JQ0bPxgy41af2JX5D4Q==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
         "node_modules/@react-email/preview-server/node_modules/@radix-ui/react-slot": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
@@ -8783,7 +9754,6 @@
             "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
             "license": "MIT"
         },
-<<<<<<< HEAD
         "node_modules/@swc/core": {
             "version": "1.15.3",
             "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.3.tgz",
@@ -8902,8 +9872,6 @@
                 "node": ">=10"
             }
         },
-=======
->>>>>>> dev
         "node_modules/@swc/core-linux-x64-gnu": {
             "version": "1.15.3",
             "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.3.tgz",
@@ -8920,7 +9888,6 @@
                 "node": ">=10"
             }
         },
-<<<<<<< HEAD
         "node_modules/@swc/core-linux-x64-musl": {
             "version": "1.15.3",
             "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.3.tgz",
@@ -8985,8 +9952,6 @@
                 "node": ">=10"
             }
         },
-=======
->>>>>>> dev
         "node_modules/@swc/counter": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
@@ -9063,6 +10028,125 @@
                 "@tailwindcss/oxide-win32-x64-msvc": "4.1.17"
             }
         },
+        "node_modules/@tailwindcss/oxide-android-arm64": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.17.tgz",
+            "integrity": "sha512-BMqpkJHgOZ5z78qqiGE6ZIRExyaHyuxjgrJ6eBO5+hfrfGkuya0lYfw8fRHG77gdTjWkNWEEm+qeG2cDMxArLQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-darwin-arm64": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.17.tgz",
+            "integrity": "sha512-EquyumkQweUBNk1zGEU/wfZo2qkp/nQKRZM8bUYO0J+Lums5+wl2CcG1f9BgAjn/u9pJzdYddHWBiFXJTcxmOg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-darwin-x64": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.17.tgz",
+            "integrity": "sha512-gdhEPLzke2Pog8s12oADwYu0IAw04Y2tlmgVzIN0+046ytcgx8uZmCzEg4VcQh+AHKiS7xaL8kGo/QTiNEGRog==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-freebsd-x64": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.17.tgz",
+            "integrity": "sha512-hxGS81KskMxML9DXsaXT1H0DyA+ZBIbyG/sSAjWNe2EDl7TkPOBI42GBV3u38itzGUOmFfCzk1iAjDXds8Oh0g==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.17.tgz",
+            "integrity": "sha512-k7jWk5E3ldAdw0cNglhjSgv501u7yrMf8oeZ0cElhxU6Y2o7f8yqelOp3fhf7evjIS6ujTI3U8pKUXV2I4iXHQ==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.17.tgz",
+            "integrity": "sha512-HVDOm/mxK6+TbARwdW17WrgDYEGzmoYayrCgmLEw7FxTPLcp/glBisuyWkFz/jb7ZfiAXAXUACfyItn+nTgsdQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
+            "version": "4.1.17",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.17.tgz",
+            "integrity": "sha512-HvZLfGr42i5anKtIeQzxdkw/wPqIbpeZqe7vd3V9vI3RQxe3xU1fLjss0TjyhxWcBaipk7NYwSrwTwK1hJARMg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
         "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
             "version": "4.1.17",
             "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.17.tgz",
@@ -9080,7 +10164,6 @@
                 "node": ">= 10"
             }
         },
-<<<<<<< HEAD
         "node_modules/@tailwindcss/oxide-linux-x64-musl": {
             "version": "4.1.17",
             "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.17.tgz",
@@ -9162,8 +10245,6 @@
                 "node": ">= 10"
             }
         },
-=======
->>>>>>> dev
         "node_modules/@tailwindcss/postcss": {
             "version": "4.1.17",
             "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.17.tgz",
@@ -9293,6 +10374,16 @@
                 "url": "https://github.com/sponsors/tannerlinsley"
             }
         },
+        "node_modules/@tybys/wasm-util": {
+            "version": "0.10.1",
+            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
+            "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
         "node_modules/@types/better-sqlite3": {
             "version": "7.6.12",
             "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.12.tgz",
@@ -10211,6 +11302,175 @@
                 "url": "https://opencollective.com/typescript-eslint"
             }
         },
+        "node_modules/@unrs/resolver-binding-android-arm-eabi": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm-eabi/-/resolver-binding-android-arm-eabi-1.11.1.tgz",
+            "integrity": "sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-android-arm64": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-android-arm64/-/resolver-binding-android-arm64-1.11.1.tgz",
+            "integrity": "sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-darwin-arm64": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-arm64/-/resolver-binding-darwin-arm64-1.11.1.tgz",
+            "integrity": "sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-darwin-x64": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-darwin-x64/-/resolver-binding-darwin-x64-1.11.1.tgz",
+            "integrity": "sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-freebsd-x64": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-freebsd-x64/-/resolver-binding-freebsd-x64-1.11.1.tgz",
+            "integrity": "sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-linux-arm-gnueabihf": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-gnueabihf/-/resolver-binding-linux-arm-gnueabihf-1.11.1.tgz",
+            "integrity": "sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-linux-arm-musleabihf": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm-musleabihf/-/resolver-binding-linux-arm-musleabihf-1.11.1.tgz",
+            "integrity": "sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-linux-arm64-gnu": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-gnu/-/resolver-binding-linux-arm64-gnu-1.11.1.tgz",
+            "integrity": "sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-linux-arm64-musl": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-arm64-musl/-/resolver-binding-linux-arm64-musl-1.11.1.tgz",
+            "integrity": "sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-linux-ppc64-gnu": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-ppc64-gnu/-/resolver-binding-linux-ppc64-gnu-1.11.1.tgz",
+            "integrity": "sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==",
+            "cpu": [
+                "ppc64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-linux-riscv64-gnu": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-gnu/-/resolver-binding-linux-riscv64-gnu-1.11.1.tgz",
+            "integrity": "sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==",
+            "cpu": [
+                "riscv64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-linux-riscv64-musl": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-riscv64-musl/-/resolver-binding-linux-riscv64-musl-1.11.1.tgz",
+            "integrity": "sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==",
+            "cpu": [
+                "riscv64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-linux-s390x-gnu": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-s390x-gnu/-/resolver-binding-linux-s390x-gnu-1.11.1.tgz",
+            "integrity": "sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==",
+            "cpu": [
+                "s390x"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
         "node_modules/@unrs/resolver-binding-linux-x64-gnu": {
             "version": "1.11.1",
             "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-gnu/-/resolver-binding-linux-x64-gnu-1.11.1.tgz",
@@ -10224,6 +11484,74 @@
                 "linux"
             ]
         },
+        "node_modules/@unrs/resolver-binding-linux-x64-musl": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-linux-x64-musl/-/resolver-binding-linux-x64-musl-1.11.1.tgz",
+            "integrity": "sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-wasm32-wasi": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-wasm32-wasi/-/resolver-binding-wasm32-wasi-1.11.1.tgz",
+            "integrity": "sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==",
+            "cpu": [
+                "wasm32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@napi-rs/wasm-runtime": "^0.2.11"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@unrs/resolver-binding-win32-arm64-msvc": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-arm64-msvc/-/resolver-binding-win32-arm64-msvc-1.11.1.tgz",
+            "integrity": "sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-win32-ia32-msvc": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-ia32-msvc/-/resolver-binding-win32-ia32-msvc-1.11.1.tgz",
+            "integrity": "sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==",
+            "cpu": [
+                "ia32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@unrs/resolver-binding-win32-x64-msvc": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmjs.org/@unrs/resolver-binding-win32-x64-msvc/-/resolver-binding-win32-x64-msvc-1.11.1.tgz",
+            "integrity": "sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
         "node_modules/@webassemblyjs/ast": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
@@ -10942,9 +12270,9 @@
             }
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.9.2",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.2.tgz",
-            "integrity": "sha512-PxSsosKQjI38iXkmb3d0Y32efqyA0uW4s41u4IVBsLlWLhCiYNpH/AfNOVWRqCQBlD8TFJTz6OUWNd4DFJCnmw==",
+            "version": "2.9.3",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.3.tgz",
+            "integrity": "sha512-8QdH6czo+G7uBsNo0GiUfouPN1lRzKdJTGnKXwe12gkFbnnOUaUKGN55dMkfy+mnxmvjwl9zcI4VncczcVXDhA==",
             "license": "Apache-2.0",
             "bin": {
                 "baseline-browser-mapping": "dist/cli.js"
@@ -11016,7 +12344,6 @@
             "funding": {
                 "type": "opencollective",
                 "url": "https://opencollective.com/express"
-<<<<<<< HEAD
             }
         },
         "node_modules/body-parser/node_modules/iconv-lite": {
@@ -11033,8 +12360,6 @@
             "funding": {
                 "type": "opencollective",
                 "url": "https://opencollective.com/express"
-=======
->>>>>>> dev
             }
         },
         "node_modules/boolbase": {
@@ -11940,18 +13265,6 @@
                 "node": ">= 10"
             }
         },
-        "node_modules/d3-dsv/node_modules/iconv-lite": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-            "license": "MIT",
-            "dependencies": {
-                "safer-buffer": ">= 2.1.2 < 3.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/d3-ease": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
@@ -13260,9 +14573,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.265",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.265.tgz",
-            "integrity": "sha512-B7IkLR1/AE+9jR2LtVF/1/6PFhY5TlnEHnlrKmGk7PvkJibg5jr+mLXLLzq3QYl6PA1T/vLDthQPqIPAlS/PPA==",
+            "version": "1.5.266",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.266.tgz",
+            "integrity": "sha512-kgWEglXvkEfMH7rxP5OSZZwnaDWT7J9EoZCujhnpLbfi0bbNtRkgdX2E3gt0Uer11c61qCYktB3hwkAS325sJg==",
             "license": "ISC"
         },
         "node_modules/emoji-regex": {
@@ -14789,6 +16102,13 @@
             "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
             "license": "MIT"
         },
+        "node_modules/fs-monkey": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.1.0.tgz",
+            "integrity": "sha512-QMUezzXWII9EV5aTFXW1UBVUO77wYPpjqIF8/AviUCThNeSYZykpoTixUeaNNBwmCev0AMDWMAni+f8Hxb1IFw==",
+            "license": "Unlicense",
+            "optional": true
+        },
         "node_modules/fsevents": {
             "version": "2.3.3",
             "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -15094,7 +16414,6 @@
             "version": "4.2.11",
             "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
             "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-            "dev": true,
             "license": "ISC"
         },
         "node_modules/graphemer": {
@@ -15303,19 +16622,15 @@
             }
         },
         "node_modules/iconv-lite": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz",
-            "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==",
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
             "license": "MIT",
             "dependencies": {
                 "safer-buffer": ">= 2.1.2 < 3.0.0"
             },
             "engines": {
                 "node": ">=0.10.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/express"
             }
         },
         "node_modules/ieee754": {
@@ -15920,7 +17235,6 @@
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
             "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
-            "dev": true,
             "license": "ISC",
             "engines": {
                 "node": ">=16"
@@ -16048,7 +17362,6 @@
             "version": "2.3.1",
             "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
             "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/json-schema-traverse": {
@@ -16241,6 +17554,153 @@
                 "lightningcss-win32-x64-msvc": "1.30.2"
             }
         },
+        "node_modules/lightningcss-android-arm64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz",
+            "integrity": "sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-darwin-arm64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz",
+            "integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-darwin-x64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz",
+            "integrity": "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-freebsd-x64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz",
+            "integrity": "sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm-gnueabihf": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz",
+            "integrity": "sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm64-gnu": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz",
+            "integrity": "sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm64-musl": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz",
+            "integrity": "sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
         "node_modules/lightningcss-linux-x64-gnu": {
             "version": "1.30.2",
             "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz",
@@ -16262,6 +17722,69 @@
                 "url": "https://opencollective.com/parcel"
             }
         },
+        "node_modules/lightningcss-linux-x64-musl": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz",
+            "integrity": "sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-win32-arm64-msvc": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz",
+            "integrity": "sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-win32-x64-msvc": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz",
+            "integrity": "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
         "node_modules/lilconfig": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
@@ -16492,6 +18015,29 @@
                 "node": ">= 0.8"
             }
         },
+        "node_modules/memfs": {
+            "version": "3.5.3",
+            "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+            "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+            "license": "Unlicense",
+            "optional": true,
+            "dependencies": {
+                "fs-monkey": "^1.0.4"
+            },
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/memfs-browser": {
+            "version": "3.5.10302",
+            "resolved": "https://registry.npmjs.org/memfs-browser/-/memfs-browser-3.5.10302.tgz",
+            "integrity": "sha512-JJTc/nh3ig05O0gBBGZjTCPOyydaTxNF0uHYBrcc1gHNnO+KIHIvo0Y1FKCJsaei6FCl8C6xfQomXqu+cuzkIw==",
+            "license": "Unlicense",
+            "optional": true,
+            "dependencies": {
+                "memfs": "3.5.3"
+            }
+        },
         "node_modules/merge-descriptors": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-2.0.0.tgz",
@@ -16902,58 +18448,6 @@
             "integrity": "sha512-hscCKUv+5GQ0CCNbvqZ8gaxnAGToCgDTbL++jgCq8SCk/ljtZDEeQZcMk46Nm6Ynn49Q/JKF4Npo/Sq1mpbusA==",
             "license": "MIT"
         },
-<<<<<<< HEAD
-=======
-        "node_modules/next-intl/node_modules/@swc/core": {
-            "version": "1.15.3",
-            "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.3.tgz",
-            "integrity": "sha512-Qd8eBPkUFL4eAONgGjycZXj1jFCBW8Fd+xF0PzdTlBCWQIV1xnUT7B93wUANtW3KGjl3TRcOyxwSx/u/jyKw/Q==",
-            "hasInstallScript": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@swc/counter": "^0.1.3",
-                "@swc/types": "^0.1.25"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/swc"
-            },
-            "optionalDependencies": {
-                "@swc/core-darwin-arm64": "1.15.3",
-                "@swc/core-darwin-x64": "1.15.3",
-                "@swc/core-linux-arm-gnueabihf": "1.15.3",
-                "@swc/core-linux-arm64-gnu": "1.15.3",
-                "@swc/core-linux-arm64-musl": "1.15.3",
-                "@swc/core-linux-x64-gnu": "1.15.3",
-                "@swc/core-linux-x64-musl": "1.15.3",
-                "@swc/core-win32-arm64-msvc": "1.15.3",
-                "@swc/core-win32-ia32-msvc": "1.15.3",
-                "@swc/core-win32-x64-msvc": "1.15.3"
-            },
-            "peerDependencies": {
-                "@swc/helpers": ">=0.5.17"
-            },
-            "peerDependenciesMeta": {
-                "@swc/helpers": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/next-intl/node_modules/@swc/helpers": {
-            "version": "0.5.17",
-            "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.17.tgz",
-            "integrity": "sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==",
-            "license": "Apache-2.0",
-            "optional": true,
-            "peer": true,
-            "dependencies": {
-                "tslib": "^2.8.0"
-            }
-        },
->>>>>>> dev
         "node_modules/next-themes": {
             "version": "0.4.6",
             "resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.4.6.tgz",
@@ -19424,6 +20918,26 @@
                 "@node-rs/bcrypt": "1.9.0"
             }
         },
+        "node_modules/oslo/node_modules/@emnapi/core": {
+            "version": "0.45.0",
+            "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-0.45.0.tgz",
+            "integrity": "sha512-DPWjcUDQkCeEM4VnljEOEcXdAD7pp8zSZsgOujk/LGIwCXWbXJngin+MO4zbH429lzeC3WbYLGjE2MaUOwzpyw==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/oslo/node_modules/@emnapi/runtime": {
+            "version": "0.45.0",
+            "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-0.45.0.tgz",
+            "integrity": "sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
         "node_modules/oslo/node_modules/@node-rs/argon2": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/@node-rs/argon2/-/argon2-1.7.0.tgz",
@@ -19449,6 +20963,134 @@
                 "@node-rs/argon2-win32-x64-msvc": "1.7.0"
             }
         },
+        "node_modules/oslo/node_modules/@node-rs/argon2-android-arm-eabi": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-android-arm-eabi/-/argon2-android-arm-eabi-1.7.0.tgz",
+            "integrity": "sha512-udDqkr5P9E+wYX1SZwAVPdyfYvaF4ry9Tm+R9LkfSHbzWH0uhU6zjIwNRp7m+n4gx691rk+lqqDAIP8RLKwbhg==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-android-arm64": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-android-arm64/-/argon2-android-arm64-1.7.0.tgz",
+            "integrity": "sha512-s9j/G30xKUx8WU50WIhF0fIl1EdhBGq0RQ06lEhZ0Gi0ap8lhqbE2Bn5h3/G2D1k0Dx+yjeVVNmt/xOQIRG38A==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-darwin-arm64": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-darwin-arm64/-/argon2-darwin-arm64-1.7.0.tgz",
+            "integrity": "sha512-ZIz4L6HGOB9U1kW23g+m7anGNuTZ0RuTw0vNp3o+2DWpb8u8rODq6A8tH4JRL79S+Co/Nq608m9uackN2pe0Rw==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-darwin-x64": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-darwin-x64/-/argon2-darwin-x64-1.7.0.tgz",
+            "integrity": "sha512-5oi/pxqVhODW/pj1+3zElMTn/YukQeywPHHYDbcAW3KsojFjKySfhcJMd1DjKTc+CHQI+4lOxZzSUzK7mI14Hw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-freebsd-x64": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-freebsd-x64/-/argon2-freebsd-x64-1.7.0.tgz",
+            "integrity": "sha512-Ify08683hA4QVXYoIm5SUWOY5DPIT/CMB0CQT+IdxQAg/F+qp342+lUkeAtD5bvStQuCx/dFO3bnnzoe2clMhA==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-linux-arm-gnueabihf": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-arm-gnueabihf/-/argon2-linux-arm-gnueabihf-1.7.0.tgz",
+            "integrity": "sha512-7DjDZ1h5AUHAtRNjD19RnQatbhL+uuxBASuuXIBu4/w6Dx8n7YPxwTP4MXfsvuRgKuMWiOb/Ub/HJ3kXVCXRkg==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-linux-arm64-gnu": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-arm64-gnu/-/argon2-linux-arm64-gnu-1.7.0.tgz",
+            "integrity": "sha512-nJDoMP4Y3YcqGswE4DvP080w6O24RmnFEDnL0emdI8Nou17kNYBzP2546Nasx9GCyLzRcYQwZOUjrtUuQ+od2g==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-linux-arm64-musl": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-arm64-musl/-/argon2-linux-arm64-musl-1.7.0.tgz",
+            "integrity": "sha512-BKWS8iVconhE3jrb9mj6t1J9vwUqQPpzCbUKxfTGJfc+kNL58F1SXHBoe2cDYGnHrFEHTY0YochzXoAfm4Dm/A==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
         "node_modules/oslo/node_modules/@node-rs/argon2-linux-x64-gnu": {
             "version": "1.7.0",
             "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-x64-gnu/-/argon2-linux-x64-gnu-1.7.0.tgz",
@@ -19465,6 +21107,99 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/oslo/node_modules/@node-rs/argon2-linux-x64-musl": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-linux-x64-musl/-/argon2-linux-x64-musl-1.7.0.tgz",
+            "integrity": "sha512-/o1efYCYIxjfuoRYyBTi2Iy+1iFfhqHCvvVsnjNSgO1xWiWrX0Rrt/xXW5Zsl7vS2Y+yu8PL8KFWRzZhaVxfKA==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-wasm32-wasi": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-wasm32-wasi/-/argon2-wasm32-wasi-1.7.0.tgz",
+            "integrity": "sha512-Evmk9VcxqnuwQftfAfYEr6YZYSPLzmKUsbFIMep5nTt9PT4XYRFAERj7wNYp+rOcBenF3X4xoB+LhwcOMTNE5w==",
+            "cpu": [
+                "wasm32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "^0.45.0",
+                "@emnapi/runtime": "^0.45.0",
+                "@tybys/wasm-util": "^0.8.1",
+                "memfs-browser": "^3.4.13000"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-win32-arm64-msvc": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-win32-arm64-msvc/-/argon2-win32-arm64-msvc-1.7.0.tgz",
+            "integrity": "sha512-qgsU7T004COWWpSA0tppDqDxbPLgg8FaU09krIJ7FBl71Sz8SFO40h7fDIjfbTT5w7u6mcaINMQ5bSHu75PCaA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-win32-ia32-msvc": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-win32-ia32-msvc/-/argon2-win32-ia32-msvc-1.7.0.tgz",
+            "integrity": "sha512-JGafwWYQ/HpZ3XSwP4adQ6W41pRvhcdXvpzIWtKvX+17+xEXAe2nmGWM6s27pVkg1iV2ZtoYLRDkOUoGqZkCcg==",
+            "cpu": [
+                "ia32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@node-rs/argon2-win32-x64-msvc": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@node-rs/argon2-win32-x64-msvc/-/argon2-win32-x64-msvc-1.7.0.tgz",
+            "integrity": "sha512-9oq4ShyFakw8AG3mRls0AoCpxBFcimYx7+jvXeAf2OqKNO+mSA6eZ9z7KQeVCi0+SOEUYxMGf5UiGiDb9R6+9Q==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/oslo/node_modules/@tybys/wasm-util": {
+            "version": "0.8.3",
+            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.8.3.tgz",
+            "integrity": "sha512-Z96T/L6dUFFxgFJ+pQtkPpne9q7i6kIPYCFnQBHSgSPV9idTsKfIhCss0h5iM9irweZCatkrdeP8yi5uM1eX6Q==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
         "node_modules/own-keys": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
@@ -20240,7 +21975,6 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
             "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
-<<<<<<< HEAD
             "license": "MIT",
             "dependencies": {
                 "depd": "~2.0.0",
@@ -20261,18 +21995,12 @@
             "version": "0.7.0",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz",
             "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==",
-=======
->>>>>>> dev
             "license": "MIT",
             "dependencies": {
-                "depd": "~2.0.0",
-                "inherits": "~2.0.4",
-                "setprototypeof": "~1.2.0",
-                "statuses": "~2.0.2",
-                "toidentifier": "~1.0.1"
+                "safer-buffer": ">= 2.1.2 < 3.0.0"
             },
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=0.10.0"
             },
             "funding": {
                 "type": "opencollective",
@@ -22883,9 +24611,9 @@
             }
         },
         "node_modules/terser-webpack-plugin": {
-            "version": "5.3.14",
-            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
-            "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
+            "version": "5.3.15",
+            "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.15.tgz",
+            "integrity": "sha512-PGkOdpRFK+rb1TzVz+msVhw4YMRT9txLF4kRqvJhGhCM324xuR3REBSHALN+l+sAhKUmz0aotnjp5D+P83mLhQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -24292,7 +26020,6 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
             "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
-            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "isexe": "^3.1.1"

From c8ec94c3079835b55d981c2618bef278d87ad09f Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Fri, 5 Dec 2025 17:18:05 -0500
Subject: [PATCH 08/10] Fix session test for olm and show proper alert for ee

---
 messages/en-US.json                           |  1 -
 server/db/pg/driver.ts                        |  2 +-
 server/routers/olm/handleOlmPingMessage.ts    |  2 +-
 .../routers/olm/handleOlmRegisterMessage.ts   |  2 +-
 .../siteResource/updateSiteResource.ts        | 23 +++--
 .../[remoteExitNodeId]/credentials/page.tsx   | 80 +++++++++---------
 .../machine/[clientId]/credentials/page.tsx   | 58 ++++++-------
 .../sites/[niceId]/credentials/page.tsx       | 83 +++++++++----------
 8 files changed, 123 insertions(+), 128 deletions(-)

diff --git a/messages/en-US.json b/messages/en-US.json
index 30f1f8eb..f8a1f973 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -2235,7 +2235,6 @@
     "endpoint": "Endpoint",
     "Id": "Id",
     "SecretKey": "Secret Key",
-    "featureDisabledTooltip": "This feature is only available in the enterprise plan and require a license to use it.",
     "niceId": "Nice ID",
     "niceIdUpdated": "Nice ID Updated",
     "niceIdUpdatedSuccessfully": "Nice ID Updated Successfully",
diff --git a/server/db/pg/driver.ts b/server/db/pg/driver.ts
index 35378961..e0f08ee6 100644
--- a/server/db/pg/driver.ts
+++ b/server/db/pg/driver.ts
@@ -73,7 +73,7 @@ function createDb() {
 
     return withReplicas(
         DrizzlePostgres(primaryPool, {
-            logger: process.env.QUERY_LOGGING === "true"
+            logger: process.env.QUERY_LOGGING == "true"
         }),
         replicas as any
     );
diff --git a/server/routers/olm/handleOlmPingMessage.ts b/server/routers/olm/handleOlmPingMessage.ts
index 632b0f3f..42b37940 100644
--- a/server/routers/olm/handleOlmPingMessage.ts
+++ b/server/routers/olm/handleOlmPingMessage.ts
@@ -136,7 +136,7 @@ export const handleOlmPingMessage: MessageHandler = async (context) => {
         const policyCheck = await checkOrgAccessPolicy({
             orgId: client.orgId,
             userId: olm.userId,
-            session: userToken // this is the user token passed in the message
+            sessionId: userToken // this is the user token passed in the message
         });
 
         if (!policyCheck.allowed) {
diff --git a/server/routers/olm/handleOlmRegisterMessage.ts b/server/routers/olm/handleOlmRegisterMessage.ts
index 2b30cbcf..cd7a308f 100644
--- a/server/routers/olm/handleOlmRegisterMessage.ts
+++ b/server/routers/olm/handleOlmRegisterMessage.ts
@@ -97,7 +97,7 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
         const policyCheck = await checkOrgAccessPolicy({
             orgId: orgId,
             userId: olm.userId,
-            session: userToken // this is the user token passed in the message
+            sessionId: userToken // this is the user token passed in the message
         });
 
         if (!policyCheck.allowed) {
diff --git a/server/routers/siteResource/updateSiteResource.ts b/server/routers/siteResource/updateSiteResource.ts
index f7fda549..857080b0 100644
--- a/server/routers/siteResource/updateSiteResource.ts
+++ b/server/routers/siteResource/updateSiteResource.ts
@@ -2,6 +2,7 @@ import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
 import {
     clientSiteResources,
+    clientSiteResourcesAssociationsCache,
     db,
     newts,
     roles,
@@ -321,7 +322,6 @@ export async function updateSiteResource(
                     );
                 }
 
-                let oldDestinationStillInUseByASite = false;
                 // Only update targets on newt if destination changed
                 if (destinationChanged) {
                     const oldTargets = generateSubnetProxyTargets(
@@ -337,12 +337,28 @@ export async function updateSiteResource(
                         oldTargets: oldTargets,
                         newTargets: newTargets
                     });
+                }
 
+                const olmJobs: Promise<void>[] = [];
+                for (const client of mergedAllClients) {
+                    // does this client have access to another resource on this site that has the same destination still? if so we dont want to remove it from their olm yet
+                    // todo: optimize this query if needed
                     const oldDestinationStillInUseSites = await trx
                         .select()
                         .from(siteResources)
+                        .innerJoin(
+                            clientSiteResourcesAssociationsCache,
+                            eq(
+                                clientSiteResourcesAssociationsCache.siteResourceId,
+                                siteResources.siteResourceId
+                            )
+                        )
                         .where(
                             and(
+                                eq(
+                                    clientSiteResourcesAssociationsCache.clientId,
+                                    client.clientId
+                                ),
                                 eq(siteResources.siteId, site.siteId),
                                 eq(
                                     siteResources.destination,
@@ -355,12 +371,9 @@ export async function updateSiteResource(
                             )
                         );
 
-                    oldDestinationStillInUseByASite =
+                    const oldDestinationStillInUseByASite =
                         oldDestinationStillInUseSites.length > 0;
-                }
 
-                const olmJobs: Promise<void>[] = [];
-                for (const client of mergedAllClients) {
                     // we also need to update the remote subnets on the olms for each client that has access to this site
                     olmJobs.push(
                         updatePeerData(
diff --git a/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx b/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx
index 115b1bd3..1dd626a8 100644
--- a/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx
+++ b/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx
@@ -25,7 +25,13 @@ import RegenerateCredentialsModal from "@app/components/RegenerateCredentialsMod
 import { useSubscriptionStatusContext } from "@app/hooks/useSubscriptionStatusContext";
 import { useLicenseStatusContext } from "@app/hooks/useLicenseStatusContext";
 import { build } from "@server/build";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@app/components/ui/tooltip";
+import {
+    Tooltip,
+    TooltipContent,
+    TooltipProvider,
+    TooltipTrigger
+} from "@app/components/ui/tooltip";
+import { SecurityFeaturesAlert } from "@app/components/SecurityFeaturesAlert";
 
 export default function CredentialsPage() {
     const { env } = useEnvContext();
@@ -36,7 +42,8 @@ export default function CredentialsPage() {
     const { remoteExitNode } = useRemoteExitNodeContext();
 
     const [modalOpen, setModalOpen] = useState(false);
-    const [credentials, setCredentials] = useState<PickRemoteExitNodeDefaultsResponse | null>(null);
+    const [credentials, setCredentials] =
+        useState<PickRemoteExitNodeDefaultsResponse | null>(null);
 
     const { licenseStatus, isUnlocked } = useLicenseStatusContext();
     const subscription = useSubscriptionStatusContext();
@@ -48,12 +55,10 @@ export default function CredentialsPage() {
         return isEnterpriseNotLicensed || isSaasNotSubscribed;
     };
 
-
     const handleConfirmRegenerate = async () => {
-
-        const response = await api.get<AxiosResponse<PickRemoteExitNodeDefaultsResponse>>(
-            `/org/${orgId}/pick-remote-exit-node-defaults`
-        );
+        const response = await api.get<
+            AxiosResponse<PickRemoteExitNodeDefaultsResponse>
+        >(`/org/${orgId}/pick-remote-exit-node-defaults`);
 
         const data = response.data.data;
         setCredentials(data);
@@ -62,7 +67,7 @@ export default function CredentialsPage() {
             `/re-key/${orgId}/reGenerate-remote-exit-node-secret`,
             {
                 remoteExitNodeId: remoteExitNode.remoteExitNodeId,
-                secret: data.secret,
+                secret: data.secret
             }
         );
 
@@ -85,40 +90,29 @@ export default function CredentialsPage() {
     };
 
     return (
-        <SettingsContainer>
-            <SettingsSection>
-                <SettingsSectionHeader>
-                    <SettingsSectionTitle>
-                        {t("generatedcredentials")}
-                    </SettingsSectionTitle>
-                    <SettingsSectionDescription>
-                        {t("regenerateCredentials")}
-                    </SettingsSectionDescription>
-                </SettingsSectionHeader>
+        <>
+            <SettingsContainer>
+                <SettingsSection>
+                    <SettingsSectionHeader>
+                        <SettingsSectionTitle>
+                            {t("generatedcredentials")}
+                        </SettingsSectionTitle>
+                        <SettingsSectionDescription>
+                            {t("regenerateCredentials")}
+                        </SettingsSectionDescription>
+                    </SettingsSectionHeader>
 
-                <SettingsSectionBody>
-                    <TooltipProvider>
-                        <Tooltip>
-                            <TooltipTrigger asChild>
-                                <div className="inline-block">
-                                    <Button
-                                        onClick={() => setModalOpen(true)}
-                                        disabled={isSecurityFeatureDisabled()}
-                                    >
-                                        {t("regeneratecredentials")}
-                                    </Button>
-                                </div>
-                            </TooltipTrigger>
-
-                            {isSecurityFeatureDisabled() && (
-                                <TooltipContent side="top">
-                                    {t("featureDisabledTooltip")}
-                                </TooltipContent>
-                            )}
-                        </Tooltip>
-                    </TooltipProvider>
-                </SettingsSectionBody>
-            </SettingsSection>
+                    <SettingsSectionBody>
+                        <SecurityFeaturesAlert />
+                        <Button
+                            onClick={() => setModalOpen(true)}
+                            disabled={isSecurityFeatureDisabled()}
+                        >
+                            {t("regeneratecredentials")}
+                        </Button>
+                    </SettingsSectionBody>
+                </SettingsSection>
+            </SettingsContainer>
 
             <RegenerateCredentialsModal
                 open={modalOpen}
@@ -128,6 +122,6 @@ export default function CredentialsPage() {
                 dashboardUrl={env.app.dashboardUrl}
                 credentials={getCredentials()}
             />
-        </SettingsContainer>
+        </>
     );
-}
\ No newline at end of file
+}
diff --git a/src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx b/src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx
index 42120319..d228027a 100644
--- a/src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx
+++ b/src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import RegenerateCredentialsModal from "@app/components/RegenerateCredentialsModal";
+import { SecurityFeaturesAlert } from "@app/components/SecurityFeaturesAlert";
 import {
     SettingsContainer,
     SettingsSection,
@@ -84,40 +85,29 @@ export default function CredentialsPage() {
     };
 
     return (
-        <SettingsContainer>
-            <SettingsSection>
-                <SettingsSectionHeader>
-                    <SettingsSectionTitle>
-                        {t("generatedcredentials")}
-                    </SettingsSectionTitle>
-                    <SettingsSectionDescription>
-                        {t("regenerateCredentials")}
-                    </SettingsSectionDescription>
-                </SettingsSectionHeader>
+        <>
+            <SettingsContainer>
+                <SettingsSection>
+                    <SettingsSectionHeader>
+                        <SettingsSectionTitle>
+                            {t("generatedcredentials")}
+                        </SettingsSectionTitle>
+                        <SettingsSectionDescription>
+                            {t("regenerateCredentials")}
+                        </SettingsSectionDescription>
+                    </SettingsSectionHeader>
 
-                <SettingsSectionBody>
-                    <TooltipProvider>
-                        <Tooltip>
-                            <TooltipTrigger asChild>
-                                <div className="inline-block">
-                                    <Button
-                                        onClick={() => setModalOpen(true)}
-                                        disabled={isSecurityFeatureDisabled()}
-                                    >
-                                        {t("regeneratecredentials")}
-                                    </Button>
-                                </div>
-                            </TooltipTrigger>
-
-                            {isSecurityFeatureDisabled() && (
-                                <TooltipContent side="top">
-                                    {t("featureDisabledTooltip")}
-                                </TooltipContent>
-                            )}
-                        </Tooltip>
-                    </TooltipProvider>
-                </SettingsSectionBody>
-            </SettingsSection>
+                    <SettingsSectionBody>
+                        <SecurityFeaturesAlert />
+                        <Button
+                            onClick={() => setModalOpen(true)}
+                            disabled={isSecurityFeatureDisabled()}
+                        >
+                            {t("regeneratecredentials")}
+                        </Button>
+                    </SettingsSectionBody>
+                </SettingsSection>
+            </SettingsContainer>
 
             <RegenerateCredentialsModal
                 open={modalOpen}
@@ -127,6 +117,6 @@ export default function CredentialsPage() {
                 dashboardUrl={env.app.dashboardUrl}
                 credentials={getCredentials()}
             />
-        </SettingsContainer>
+        </>
     );
 }
diff --git a/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx b/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx
index 6dcee413..c6bf88a5 100644
--- a/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx
@@ -22,7 +22,13 @@ import RegenerateCredentialsModal from "@app/components/RegenerateCredentialsMod
 import { useLicenseStatusContext } from "@app/hooks/useLicenseStatusContext";
 import { useSubscriptionStatusContext } from "@app/hooks/useSubscriptionStatusContext";
 import { build } from "@server/build";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@app/components/ui/tooltip";
+import {
+    Tooltip,
+    TooltipContent,
+    TooltipProvider,
+    TooltipTrigger
+} from "@app/components/ui/tooltip";
+import { SecurityFeaturesAlert } from "@app/components/SecurityFeaturesAlert";
 
 export default function CredentialsPage() {
     const { env } = useEnvContext();
@@ -33,7 +39,8 @@ export default function CredentialsPage() {
     const { site } = useSiteContext();
 
     const [modalOpen, setModalOpen] = useState(false);
-    const [siteDefaults, setSiteDefaults] = useState<PickSiteDefaultsResponse | null>(null);
+    const [siteDefaults, setSiteDefaults] =
+        useState<PickSiteDefaultsResponse | null>(null);
     const [wgConfig, setWgConfig] = useState("");
     const [publicKey, setPublicKey] = useState("");
 
@@ -47,7 +54,6 @@ export default function CredentialsPage() {
         return isEnterpriseNotLicensed || isSaasNotSubscribed;
     };
 
-
     const hydrateWireGuardConfig = (
         privateKey: string,
         publicKey: string,
@@ -109,11 +115,14 @@ PersistentKeepalive = 5`;
                 const data = res.data.data;
                 setSiteDefaults(data);
 
-                await api.post(`/re-key/${site?.siteId}/regenerate-site-secret`, {
-                    type: "newt",
-                    newtId: data.newtId,
-                    newtSecret: data.newtSecret
-                });
+                await api.post(
+                    `/re-key/${site?.siteId}/regenerate-site-secret`,
+                    {
+                        type: "newt",
+                        newtId: data.newtId,
+                        newtSecret: data.newtSecret
+                    }
+                );
             }
         }
 
@@ -145,40 +154,30 @@ PersistentKeepalive = 5`;
     };
 
     return (
-        <SettingsContainer>
-            <SettingsSection>
-                <SettingsSectionHeader>
-                    <SettingsSectionTitle>
-                        {t("generatedcredentials")}
-                    </SettingsSectionTitle>
-                    <SettingsSectionDescription>
-                        {t("regenerateCredentials")}
-                    </SettingsSectionDescription>
-                </SettingsSectionHeader>
+        <>
+            <SettingsContainer>
+                <SettingsSection>
+                    <SettingsSectionHeader>
+                        <SettingsSectionTitle>
+                            {t("generatedcredentials")}
+                        </SettingsSectionTitle>
+                        <SettingsSectionDescription>
+                            {t("regenerateCredentials")}
+                        </SettingsSectionDescription>
+                    </SettingsSectionHeader>
 
-                <SettingsSectionBody>
-                    <TooltipProvider>
-                        <Tooltip>
-                            <TooltipTrigger asChild>
-                                <div className="inline-block">
-                                    <Button
-                                        onClick={() => setModalOpen(true)}
-                                        disabled={isSecurityFeatureDisabled()}
-                                    >
-                                        {t("regeneratecredentials")}
-                                    </Button>
-                                </div>
-                            </TooltipTrigger>
+                    <SecurityFeaturesAlert />
 
-                            {isSecurityFeatureDisabled() && (
-                                <TooltipContent side="top">
-                                    {t("featureDisabledTooltip")}
-                                </TooltipContent>
-                            )}
-                        </Tooltip>
-                    </TooltipProvider>
-                </SettingsSectionBody>
-            </SettingsSection>
+                    <SettingsSectionBody>
+                        <Button
+                            onClick={() => setModalOpen(true)}
+                            disabled={isSecurityFeatureDisabled()}
+                        >
+                            {t("regeneratecredentials")}
+                        </Button>
+                    </SettingsSectionBody>
+                </SettingsSection>
+            </SettingsContainer>
 
             <RegenerateCredentialsModal
                 open={modalOpen}
@@ -188,6 +187,6 @@ PersistentKeepalive = 5`;
                 dashboardUrl={env.app.dashboardUrl}
                 credentials={getCredentials()}
             />
-        </SettingsContainer>
+        </>
     );
-}
\ No newline at end of file
+}

From 313d3c72dac9e49749e051e792d54f465bda34f1 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Fri, 5 Dec 2025 17:31:46 -0500
Subject: [PATCH 09/10] Fix query logging

---
 server/db/pg/driver.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/db/pg/driver.ts b/server/db/pg/driver.ts
index e0f08ee6..9456effb 100644
--- a/server/db/pg/driver.ts
+++ b/server/db/pg/driver.ts
@@ -51,7 +51,7 @@ function createDb() {
     if (!replicaConnections.length) {
         replicas.push(
             DrizzlePostgres(primaryPool, {
-                logger: process.env.NODE_ENV === "development"
+                logger: process.env.QUERY_LOGGING == "true"
             })
         );
     } else {
@@ -65,7 +65,7 @@ function createDb() {
             });
             replicas.push(
                 DrizzlePostgres(replicaPool, {
-                    logger: process.env.NODE_ENV === "development"
+                    logger: process.env.QUERY_LOGGING == "true"
                 })
             );
         }

From d1c7832e4099ed8d39bfbc569cc01dfe9d7cc6e7 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Fri, 5 Dec 2025 18:30:32 -0500
Subject: [PATCH 10/10] Update rekey endpoints and pages

---
 server/cleanup.ts                             |   2 +-
 server/private/routers/external.ts            |  11 +-
 .../routers/re-key/reGenerateClientSecret.ts  |  74 ++++---
 .../re-key/reGenerateExitNodeSecret.ts        |  29 +--
 .../routers/re-key/reGenerateSiteSecret.ts    | 202 ++++++++++++------
 server/routers/olm/getOlmToken.ts             |  60 +++---
 .../[remoteExitNodeId]/credentials/page.tsx   |   2 +-
 .../machine/[clientId]/credentials/page.tsx   |   1 -
 .../sites/[niceId]/credentials/page.tsx       |   5 +-
 9 files changed, 238 insertions(+), 148 deletions(-)

diff --git a/server/cleanup.ts b/server/cleanup.ts
index de54ed77..a8985439 100644
--- a/server/cleanup.ts
+++ b/server/cleanup.ts
@@ -1,4 +1,4 @@
-import { cleanup as wsCleanup } from "@server/routers/ws";
+import { cleanup as wsCleanup } from "#dynamic/routers/ws";
 
 async function cleanup() {
     await wsCleanup();
diff --git a/server/private/routers/external.ts b/server/private/routers/external.ts
index 3e297df5..568f2b35 100644
--- a/server/private/routers/external.ts
+++ b/server/private/routers/external.ts
@@ -30,7 +30,7 @@ import {
     verifyUserHasAction,
     verifyUserIsServerAdmin,
     verifySiteAccess,
-    verifyClientAccess,
+    verifyClientAccess
 } from "@server/middlewares";
 import { ActionsEnum } from "@server/auth/actions";
 import {
@@ -409,6 +409,8 @@ authenticated.get(
 
 authenticated.post(
     "/re-key/:clientId/regenerate-client-secret",
+    verifyValidLicense,
+    verifyValidSubscription,
     verifyClientAccess,
     verifyUserHasAction(ActionsEnum.reGenerateSecret),
     reKey.reGenerateClientSecret
@@ -416,15 +418,18 @@ authenticated.post(
 
 authenticated.post(
     "/re-key/:siteId/regenerate-site-secret",
+    verifyValidLicense,
+    verifyValidSubscription,
     verifySiteAccess,
     verifyUserHasAction(ActionsEnum.reGenerateSecret),
     reKey.reGenerateSiteSecret
 );
 
 authenticated.put(
-    "/re-key/:orgId/reGenerate-remote-exit-node-secret",
+    "/re-key/:orgId/regenerate-remote-exit-node-secret",
     verifyValidLicense,
+    verifyValidSubscription,
     verifyOrgAccess,
-    verifyUserHasAction(ActionsEnum.updateRemoteExitNode),
+    verifyUserHasAction(ActionsEnum.reGenerateSecret),
     reKey.reGenerateExitNodeSecret
 );
diff --git a/server/private/routers/re-key/reGenerateClientSecret.ts b/server/private/routers/re-key/reGenerateClientSecret.ts
index 85b3f4a6..1eb99e8b 100644
--- a/server/private/routers/re-key/reGenerateClientSecret.ts
+++ b/server/private/routers/re-key/reGenerateClientSecret.ts
@@ -13,7 +13,7 @@
 
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db, olms, } from "@server/db";
+import { db, olms } from "@server/db";
 import { clients } from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -23,16 +23,16 @@ import { eq, and } from "drizzle-orm";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 import { hashPassword } from "@server/auth/password";
+import { disconnectClient, sendToClient } from "#dynamic/routers/ws";
 
 const reGenerateSecretParamsSchema = z.strictObject({
-        clientId: z.string().transform(Number).pipe(z.int().positive())
-    });
+    clientId: z.string().transform(Number).pipe(z.int().positive())
+});
 
 const reGenerateSecretBodySchema = z.strictObject({
-        olmId: z.string().min(1).optional(),
-        secret: z.string().min(1).optional(),
-
-    });
+    // olmId: z.string().min(1).optional(),
+    secret: z.string().min(1)
+});
 
 export type ReGenerateSecretBody = z.infer<typeof reGenerateSecretBodySchema>;
 
@@ -54,7 +54,6 @@ registry.registerPath({
     responses: {}
 });
 
-
 export async function reGenerateClientSecret(
     req: Request,
     res: Response,
@@ -71,7 +70,7 @@ export async function reGenerateClientSecret(
             );
         }
 
-        const { olmId, secret } = parsedBody.data;
+        const { secret } = parsedBody.data;
 
         const parsedParams = reGenerateSecretParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
@@ -85,11 +84,7 @@ export async function reGenerateClientSecret(
 
         const { clientId } = parsedParams.data;
 
-        let secretHash = undefined;
-        if (secret) {
-            secretHash = await hashPassword(secret);
-        }
-
+        const secretHash = await hashPassword(secret);
 
         // Fetch the client to make sure it exists and the user has access to it
         const [client] = await db
@@ -107,24 +102,51 @@ export async function reGenerateClientSecret(
             );
         }
 
-        const [existingOlm] = await db
+        const existingOlms = await db
             .select()
             .from(olms)
-            .where(eq(olms.clientId, clientId))
-            .limit(1);
+            .where(eq(olms.clientId, clientId));
 
-        if (existingOlm && olmId && secretHash) {
-            await db
-                .update(olms)
-                .set({
-                    olmId,
-                    secretHash
-                })
-                .where(eq(olms.clientId, clientId));
+        if (existingOlms.length === 0) {
+            return next(
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    `No OLM found for client ID ${clientId}`
+                )
+            );
         }
 
+        if (existingOlms.length > 1) {
+            return next(
+                createHttpError(
+                    HttpCode.INTERNAL_SERVER_ERROR,
+                    `Multiple OLM entries found for client ID ${clientId}`
+                )
+            );
+        }
+
+        await db
+            .update(olms)
+            .set({
+                secretHash
+            })
+            .where(eq(olms.olmId, existingOlms[0].olmId));
+
+        const payload = {
+            type: `olm/terminate`,
+            data: {}
+        };
+        // Don't await this to prevent blocking the response
+        sendToClient(existingOlms[0].olmId, payload).catch((error) => {
+            logger.error("Failed to send termination message to olm:", error);
+        });
+
+        disconnectClient(existingOlms[0].olmId).catch((error) => {
+            logger.error("Failed to disconnect olm after re-key:", error);
+        });
+
         return response(res, {
-            data: existingOlm,
+            data: existingOlms,
             success: true,
             error: false,
             message: "Credentials regenerated successfully",
diff --git a/server/private/routers/re-key/reGenerateExitNodeSecret.ts b/server/private/routers/re-key/reGenerateExitNodeSecret.ts
index ee3a7a87..d0445aec 100644
--- a/server/private/routers/re-key/reGenerateExitNodeSecret.ts
+++ b/server/private/routers/re-key/reGenerateExitNodeSecret.ts
@@ -24,16 +24,16 @@ import logger from "@server/logger";
 import { and, eq } from "drizzle-orm";
 import { UpdateRemoteExitNodeResponse } from "@server/routers/remoteExitNode/types";
 import { OpenAPITags, registry } from "@server/openApi";
+import { disconnectClient } from "@server/routers/ws";
 
 export const paramsSchema = z.object({
     orgId: z.string()
 });
 
 const bodySchema = z.strictObject({
-        remoteExitNodeId: z.string().length(15),
-        secret: z.string().length(48)
-    });
-
+    remoteExitNodeId: z.string().length(15),
+    secret: z.string().length(48)
+});
 
 registry.registerPath({
     method: "post",
@@ -81,12 +81,6 @@ export async function reGenerateExitNodeSecret(
 
         const { remoteExitNodeId, secret } = parsedBody.data;
 
-        if (req.user && !req.userOrgRoleId) {
-            return next(
-                createHttpError(HttpCode.FORBIDDEN, "User does not have a role")
-            );
-        }
-
         const [existingRemoteExitNode] = await db
             .select()
             .from(remoteExitNodes)
@@ -94,7 +88,10 @@ export async function reGenerateExitNodeSecret(
 
         if (!existingRemoteExitNode) {
             return next(
-                createHttpError(HttpCode.NOT_FOUND, "Remote Exit Node does not exist")
+                createHttpError(
+                    HttpCode.NOT_FOUND,
+                    "Remote Exit Node does not exist"
+                )
             );
         }
 
@@ -105,15 +102,21 @@ export async function reGenerateExitNodeSecret(
             .set({ secretHash })
             .where(eq(remoteExitNodes.remoteExitNodeId, remoteExitNodeId));
 
+        disconnectClient(existingRemoteExitNode.remoteExitNodeId).catch(
+            (error) => {
+                logger.error("Failed to disconnect newt after re-key:", error);
+            }
+        );
+
         return response<UpdateRemoteExitNodeResponse>(res, {
             data: {
                 remoteExitNodeId,
-                secret,
+                secret
             },
             success: true,
             error: false,
             message: "Remote Exit Node secret updated successfully",
-            status: HttpCode.OK,
+            status: HttpCode.OK
         });
     } catch (e) {
         logger.error("Failed to update remoteExitNode", e);
diff --git a/server/private/routers/re-key/reGenerateSiteSecret.ts b/server/private/routers/re-key/reGenerateSiteSecret.ts
index bfa5df9d..0b53cc92 100644
--- a/server/private/routers/re-key/reGenerateSiteSecret.ts
+++ b/server/private/routers/re-key/reGenerateSiteSecret.ts
@@ -13,7 +13,7 @@
 
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { db, newts, sites } from "@server/db";
+import { db, Newt, newts, sites } from "@server/db";
 import { eq } from "drizzle-orm";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -22,38 +22,37 @@ import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 import { hashPassword } from "@server/auth/password";
-import { addPeer } from "@server/routers/gerbil/peers";
-
+import { addPeer, deletePeer } from "@server/routers/gerbil/peers";
+import { getAllowedIps } from "@server/routers/target/helpers";
+import { disconnectClient, sendToClient } from "#dynamic/routers/ws";
 
 const updateSiteParamsSchema = z.strictObject({
-        siteId: z.string().transform(Number).pipe(z.int().positive())
-    });
+    siteId: z.string().transform(Number).pipe(z.int().positive())
+});
 
 const updateSiteBodySchema = z.strictObject({
-        type: z.enum(["newt", "wireguard"]),
-        newtId: z.string().min(1).max(255).optional(),
-        newtSecret: z.string().min(1).max(255).optional(),
-        exitNodeId: z.int().positive().optional(),
-        pubKey: z.string().optional(),
-        subnet: z.string().optional(),
-    });
+    type: z.enum(["newt", "wireguard"]),
+    secret: z.string().min(1).max(255).optional(),
+    pubKey: z.string().optional()
+});
 
 registry.registerPath({
     method: "post",
     path: "/re-key/{siteId}/regenerate-site-secret",
-    description: "Regenerate a site's Newt or WireGuard credentials by its site ID.",
+    description:
+        "Regenerate a site's Newt or WireGuard credentials by its site ID.",
     tags: [OpenAPITags.Site],
     request: {
         params: updateSiteParamsSchema,
         body: {
             content: {
                 "application/json": {
-                    schema: updateSiteBodySchema,
-                },
-            },
-        },
+                    schema: updateSiteBodySchema
+                }
+            }
+        }
     },
-    responses: {},
+    responses: {}
 });
 
 export async function reGenerateSiteSecret(
@@ -65,74 +64,141 @@ export async function reGenerateSiteSecret(
         const parsedParams = updateSiteParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
             return next(
-                createHttpError(HttpCode.BAD_REQUEST, fromError(parsedParams.error).toString())
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedParams.error).toString()
+                )
             );
         }
 
         const parsedBody = updateSiteBodySchema.safeParse(req.body);
         if (!parsedBody.success) {
             return next(
-                createHttpError(HttpCode.BAD_REQUEST, fromError(parsedBody.error).toString())
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedBody.error).toString()
+                )
             );
         }
 
         const { siteId } = parsedParams.data;
-        const { type, exitNodeId, pubKey, subnet, newtId, newtSecret } = parsedBody.data;
-
-        let updatedSite = undefined;
+        const { type, pubKey, secret } = parsedBody.data;
 
+        let existingNewt: Newt | null = null;
         if (type === "newt") {
-            if (!newtSecret) {
-                return next(
-                    createHttpError(HttpCode.BAD_REQUEST, "newtSecret is required for newt sites")
-                );
-            }
-
-            const secretHash = await hashPassword(newtSecret);
-
-            updatedSite = await db
-                .update(newts)
-                .set({
-                    newtId,
-                    secretHash,
-                })
-                .where(eq(newts.siteId, siteId))
-                .returning();
-
-            logger.info(`Regenerated Newt credentials for site ${siteId}`);
-
-        } else if (type === "wireguard") {
-            if (!pubKey) {
-                return next(
-                    createHttpError(HttpCode.BAD_REQUEST, "Public key is required for wireguard sites")
-                );
-            }
-
-            if (!exitNodeId) {
+            if (!secret) {
                 return next(
                     createHttpError(
                         HttpCode.BAD_REQUEST,
-                        "Exit node ID is required for wireguard sites"
+                        "newtSecret is required for newt sites"
+                    )
+                );
+            }
+
+            const secretHash = await hashPassword(secret);
+
+            // get the newt to verify it exists
+             const existingNewts = await db
+                .select()
+                .from(newts)
+                .where(eq(newts.siteId, siteId));
+
+            if (existingNewts.length === 0) {
+                return next(
+                    createHttpError(
+                        HttpCode.NOT_FOUND,
+                        `No Newt found for site ID ${siteId}`
+                    )
+                );
+            }
+
+            if (existingNewts.length > 1) {
+                return next(
+                    createHttpError(
+                        HttpCode.INTERNAL_SERVER_ERROR,
+                        `Multiple Newts found for site ID ${siteId}`
+                    )
+                );
+            }
+
+            existingNewt = existingNewts[0];
+
+            // update the secret on the existing newt
+            await db
+                .update(newts)
+                .set({
+                    secretHash
+                })
+                .where(eq(newts.newtId, existingNewts[0].newtId));
+
+            const payload = {
+                type: `newt/wg/terminate`,
+                data: {}
+            };
+            // Don't await this to prevent blocking the response
+            sendToClient(existingNewts[0].newtId, payload).catch((error) => {
+                logger.error(
+                    "Failed to send termination message to newt:",
+                    error
+                );
+            });
+
+            disconnectClient(existingNewts[0].newtId).catch((error) => {
+                logger.error("Failed to disconnect newt after re-key:", error);
+            });
+
+            logger.info(`Regenerated Newt credentials for site ${siteId}`);
+        } else if (type === "wireguard") {
+            if (!pubKey) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "Public key is required for wireguard sites"
                     )
                 );
             }
 
             try {
-                updatedSite = await db.transaction(async (tx) => {
-                    await addPeer(exitNodeId, {
+                const [site] = await db
+                    .select()
+                    .from(sites)
+                    .where(eq(sites.siteId, siteId))
+                    .limit(1);
+
+                if (!site) {
+                    return next(
+                        createHttpError(
+                            HttpCode.NOT_FOUND,
+                            `Site with ID ${siteId} not found`
+                        )
+                    );
+                }
+
+                await db
+                    .update(sites)
+                    .set({ pubKey })
+                    .where(eq(sites.siteId, siteId));
+
+                if (!site) {
+                    return next(
+                        createHttpError(
+                            HttpCode.NOT_FOUND,
+                            `Site with ID ${siteId} not found`
+                        )
+                    );
+                }
+
+                if (site.exitNodeId && site.subnet) {
+                    await deletePeer(site.exitNodeId, site.pubKey!); // the old pubkey
+                    await addPeer(site.exitNodeId, {
                         publicKey: pubKey,
-                        allowedIps: subnet ? [subnet] : [],
+                        allowedIps: await getAllowedIps(site.siteId)
                     });
-                    const result = await tx
-                        .update(sites)
-                        .set({ pubKey })
-                        .where(eq(sites.siteId, siteId))
-                        .returning();
+                }
 
-                    return result;
-                });
-
-                logger.info(`Regenerated WireGuard credentials for site ${siteId}`);
+                logger.info(
+                    `Regenerated WireGuard credentials for site ${siteId}`
+                );
             } catch (err) {
                 logger.error(
                     `Transaction failed while regenerating WireGuard secret for site ${siteId}`,
@@ -148,17 +214,19 @@ export async function reGenerateSiteSecret(
         }
 
         return response(res, {
-            data: updatedSite,
+            data: existingNewt,
             success: true,
             error: false,
             message: "Credentials regenerated successfully",
-            status: HttpCode.OK,
+            status: HttpCode.OK
         });
-
     } catch (error) {
         logger.error("Unexpected error in reGenerateSiteSecret", error);
         return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An unexpected error occurred")
+            createHttpError(
+                HttpCode.INTERNAL_SERVER_ERROR,
+                "An unexpected error occurred"
+            )
         );
     }
 }
diff --git a/server/routers/olm/getOlmToken.ts b/server/routers/olm/getOlmToken.ts
index 8e82dc94..9cd77c89 100644
--- a/server/routers/olm/getOlmToken.ts
+++ b/server/routers/olm/getOlmToken.ts
@@ -104,43 +104,13 @@ export async function getOlmToken(
         const resToken = generateSessionToken();
         await createOlmSession(resToken, existingOlm.olmId);
 
-        let orgIdToUse = orgId;
         let clientIdToUse;
-        if (!orgIdToUse) {
-            if (!existingOlm.clientId) {
-                return next(
-                    createHttpError(
-                        HttpCode.BAD_REQUEST,
-                        "Olm is not associated with a client, orgId is required"
-                    )
-                );
-            }
-
-            const [client] = await db
-                .select()
-                .from(clients)
-                .where(eq(clients.clientId, existingOlm.clientId))
-                .limit(1);
-
-            if (!client) {
-                return next(
-                    createHttpError(
-                        HttpCode.BAD_REQUEST,
-                        "Olm's associated client not found, orgId is required"
-                    )
-                );
-            }
-
-            orgIdToUse = client.orgId;
-            clientIdToUse = client.clientId;
-        } else {
+        if (orgId) {
             // we did provide the org
             const [client] = await db
                 .select()
                 .from(clients)
-                .where(
-                    and(eq(clients.orgId, orgIdToUse), eq(clients.olmId, olmId))
-                ) // we want to lock on to the client with this olmId otherwise it can get assigned to a random one
+                .where(and(eq(clients.orgId, orgId), eq(clients.olmId, olmId))) // we want to lock on to the client with this olmId otherwise it can get assigned to a random one
                 .limit(1);
 
             if (!client) {
@@ -167,6 +137,32 @@ export async function getOlmToken(
                     .where(eq(olms.olmId, existingOlm.olmId));
             }
 
+            clientIdToUse = client.clientId;
+        } else {
+            if (!existingOlm.clientId) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "Olm is not associated with a client, orgId is required"
+                    )
+                );
+            }
+
+            const [client] = await db
+                .select()
+                .from(clients)
+                .where(eq(clients.clientId, existingOlm.clientId))
+                .limit(1);
+
+            if (!client) {
+                return next(
+                    createHttpError(
+                        HttpCode.BAD_REQUEST,
+                        "Olm's associated client not found, orgId is required"
+                    )
+                );
+            }
+
             clientIdToUse = client.clientId;
         }
 
diff --git a/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx b/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx
index 1dd626a8..085651fb 100644
--- a/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx
+++ b/src/app/[orgId]/settings/(private)/remote-exit-nodes/[remoteExitNodeId]/credentials/page.tsx
@@ -64,7 +64,7 @@ export default function CredentialsPage() {
         setCredentials(data);
 
         await api.put<AxiosResponse<QuickStartRemoteExitNodeResponse>>(
-            `/re-key/${orgId}/reGenerate-remote-exit-node-secret`,
+            `/re-key/${orgId}/regenerate-remote-exit-node-secret`,
             {
                 remoteExitNodeId: remoteExitNode.remoteExitNodeId,
                 secret: data.secret
diff --git a/src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx b/src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx
index d228027a..9f0e3d0f 100644
--- a/src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx
+++ b/src/app/[orgId]/settings/clients/machine/[clientId]/credentials/page.tsx
@@ -60,7 +60,6 @@ export default function CredentialsPage() {
             await api.post(
                 `/re-key/${client?.clientId}/regenerate-client-secret`,
                 {
-                    olmId: data.olmId,
                     secret: data.olmSecret
                 }
             );
diff --git a/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx b/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx
index c6bf88a5..0133d3c0 100644
--- a/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx
+++ b/src/app/[orgId]/settings/sites/[niceId]/credentials/page.tsx
@@ -103,8 +103,6 @@ PersistentKeepalive = 5`;
 
             await api.post(`/re-key/${site?.siteId}/regenerate-site-secret`, {
                 type: "wireguard",
-                subnet: res.data.data.subnet,
-                exitNodeId: res.data.data.exitNodeId,
                 pubKey: generatedPublicKey
             });
         }
@@ -119,8 +117,7 @@ PersistentKeepalive = 5`;
                     `/re-key/${site?.siteId}/regenerate-site-secret`,
                     {
                         type: "newt",
-                        newtId: data.newtId,
-                        newtSecret: data.newtSecret
+                        secret: data.newtSecret
                     }
                 );
             }