fix: uncook the lock file

.env.example

@@ -147,6 +147,14 @@ NEXT_PUBLIC_USE_INTERNAL_URL_BROWSERLESS=false
 # We only collect: app version, installation ID, and node ID. No personal data is collected.
 DOCUMENSO_DISABLE_TELEMETRY=
 
+# [[AI]]
+# AI Gateway
+AI_GATEWAY_API_KEY=""
+# OPTIONAL: API key for Google Generative AI (Gemini). Get your key from https://ai.google.dev
+GOOGLE_GENERATIVE_AI_API_KEY=""
+# OPTIONAL: Enable AI field detection debug mode to save preview images with bounding boxes
+NEXT_PUBLIC_AI_DEBUG_PREVIEW=
+
 # [[E2E Tests]]
 E2E_TEST_AUTHENTICATE_USERNAME="Test User"
 E2E_TEST_AUTHENTICATE_USER_EMAIL="testuser@mail.com"

.gitignore

@@ -60,3 +60,6 @@ CLAUDE.md
 
 # agents
 .specs
+
+# ai debug previews
+packages/assets/ai-previews/

README.md

@@ -174,11 +174,9 @@ git clone https://github.com/<your-username>/documenso
 
 5. Create the database schema by running `npm run prisma:migrate-dev`
 
-6. Run `npm run translate:compile` in the root directory to compile lingui
+6. Run `npm run dev` in the root directory to start
 
-7. Run `npm run dev` in the root directory to start
-
-8. Register a new user at http://localhost:3000/signup
+7. Register a new user at http://localhost:3000/signup
 
 ---
 

apps/remix/app/app.css

@@ -69,3 +69,4 @@
     --font-noto: 'Noto Sans', 'Noto Sans Korean', 'Noto Sans Japanese', 'Noto Sans Chinese';
   }
 }
+

apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useLingui } from '@lingui/react/macro';
@@ -7,7 +7,9 @@ import {
   DocumentDistributionMethod,
   DocumentStatus,
   EnvelopeType,
+  type Field,
   FieldType,
+  type Recipient,
   RecipientRole,
 } from '@prisma/client';
 import { AnimatePresence, motion } from 'framer-motion';
@@ -17,9 +19,8 @@ import { useNavigate } from 'react-router';
 import { match } from 'ts-pattern';
 import * as z from 'zod';
 
-import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
-import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
+import type { TEnvelope } from '@documenso/lib/types/envelope';
 import { trpc, trpc as trpcReact } from '@documenso/trpc/react';
 import { DocumentSendEmailMessageHelper } from '@documenso/ui/components/document/document-send-email-message-helper';
 import { cn } from '@documenso/ui/lib/utils';
@@ -51,13 +52,16 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@documenso/ui/primitives/select';
-import { SpinnerBox } from '@documenso/ui/primitives/spinner';
 import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
 import { Textarea } from '@documenso/ui/primitives/textarea';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type EnvelopeDistributeDialogProps = {
+  envelope: Pick<TEnvelope, 'id' | 'userId' | 'teamId' | 'status' | 'type' | 'documentMeta'> & {
+    recipients: Recipient[];
+    fields: Pick<Field, 'type' | 'recipientId'>[];
+  };
   onDistribute?: () => Promise<void>;
   documentRootPath: string;
   trigger?: React.ReactNode;
@@ -82,20 +86,20 @@ export const ZEnvelopeDistributeFormSchema = z.object({
 export type TEnvelopeDistributeFormSchema = z.infer<typeof ZEnvelopeDistributeFormSchema>;
 
 export const EnvelopeDistributeDialog = ({
+  envelope,
   trigger,
   documentRootPath,
   onDistribute,
 }: EnvelopeDistributeDialogProps) => {
   const organisation = useCurrentOrganisation();
 
-  const { envelope, syncEnvelope, isAutosaving, autosaveError } = useCurrentEnvelopeEditor();
+  const recipients = envelope.recipients;
 
   const { toast } = useToast();
   const { t } = useLingui();
   const navigate = useNavigate();
 
   const [isOpen, setIsOpen] = useState(false);
-  const [isSyncing, setIsSyncing] = useState(false);
 
   const { mutateAsync: distributeEnvelope } = trpcReact.envelope.distribute.useMutation();
 
@@ -130,44 +134,18 @@ export const EnvelopeDistributeDialog = ({
 
   const distributionMethod = watch('meta.distributionMethod');
 
-  const recipientsWithIndex = useMemo(
-    () =>
-      envelope.recipients.map((recipient, index) => ({
-        ...recipient,
-        index,
-      })),
-    [envelope.recipients],
-  );
-
   const recipientsMissingSignatureFields = useMemo(
     () =>
-      recipientsWithIndex.filter(
+      envelope.recipients.filter(
         (recipient) =>
           recipient.role === RecipientRole.SIGNER &&
           !envelope.fields.some(
             (field) => field.type === FieldType.SIGNATURE && field.recipientId === recipient.id,
           ),
       ),
-    [recipientsWithIndex, envelope.fields],
+    [envelope.recipients, envelope.fields],
   );
 
-  /**
-   * List of recipients who must have an email due to having auth enabled.
-   */
-  const recipientsMissingRequiredEmail = useMemo(() => {
-    return recipientsWithIndex.filter((recipient) => {
-      const auth = extractDocumentAuthMethods({
-        documentAuth: envelope.authOptions,
-        recipientAuth: recipient.authOptions,
-      });
-
-      return (
-        (auth.recipientAccessAuthRequired || auth.recipientActionAuthRequired) &&
-        !recipient.email
-      );
-    });
-  }, [recipientsWithIndex, envelope.authOptions]);
-
   const invalidEnvelopeCode = useMemo(() => {
     if (recipientsMissingSignatureFields.length > 0) {
       return 'MISSING_SIGNATURES';
@@ -177,12 +155,8 @@ export const EnvelopeDistributeDialog = ({
       return 'MISSING_RECIPIENTS';
     }
 
-    if (recipientsMissingRequiredEmail.length > 0) {
-      return 'MISSING_REQUIRED_EMAIL';
-    }
-
     return null;
-  }, [envelope.recipients, recipientsMissingRequiredEmail, recipientsMissingSignatureFields]);
+  }, [envelope.recipients, envelope.fields, recipientsMissingSignatureFields]);
 
   const onFormSubmit = async ({ meta }: TEnvelopeDistributeFormSchema) => {
     try {
@@ -215,29 +189,6 @@ export const EnvelopeDistributeDialog = ({
     }
   };
 
-  const handleSync = async () => {
-    if (isSyncing) {
-      return;
-    }
-
-    setIsSyncing(true);
-
-    try {
-      await syncEnvelope();
-    } catch (err) {
-      console.error(err);
-    }
-
-    setIsSyncing(false);
-  };
-
-  useEffect(() => {
-    // Resync the whole envelope if the envelope is mid saving.
-    if (isOpen && (isAutosaving || autosaveError)) {
-      void handleSync();
-    }
-  }, [isOpen]);
-
   if (envelope.status !== DocumentStatus.DRAFT || envelope.type !== EnvelopeType.DOCUMENT) {
     return null;
   }
@@ -257,7 +208,7 @@ export const EnvelopeDistributeDialog = ({
           </DialogDescription>
         </DialogHeader>
 
-        {!invalidEnvelopeCode || isSyncing ? (
+        {!invalidEnvelopeCode ? (
           <Form {...form}>
             <form onSubmit={handleSubmit(onFormSubmit)}>
               <fieldset disabled={isSubmitting}>
@@ -285,16 +236,7 @@ export const EnvelopeDistributeDialog = ({
                   })}
                 >
                   <AnimatePresence initial={false} mode="wait">
-                    {isSyncing ? (
-                      <motion.div
-                        key={'Flushing'}
-                        initial={{ opacity: 0, y: 5 }}
-                        animate={{ opacity: 1, y: 0, transition: { duration: 0.3 } }}
-                        exit={{ opacity: 0, transition: { duration: 0.15 } }}
-                      >
-                        <SpinnerBox spinnerProps={{ size: 'sm' }} className="h-72" />
-                      </motion.div>
-                    ) : distributionMethod === DocumentDistributionMethod.EMAIL ? (
+                    {distributionMethod === DocumentDistributionMethod.EMAIL && (
                       <motion.div
                         key={'Emails'}
                         initial={{ opacity: 0, y: 5 }}
@@ -397,7 +339,7 @@ export const EnvelopeDistributeDialog = ({
                                       <TooltipTrigger type="button">
                                         <InfoIcon className="mx-2 h-4 w-4" />
                                       </TooltipTrigger>
-                                      <TooltipContent className="p-4 text-muted-foreground">
+                                      <TooltipContent className="text-muted-foreground p-4">
                                         <DocumentSendEmailMessageHelper />
                                       </TooltipContent>
                                     </Tooltip>
@@ -405,7 +347,7 @@ export const EnvelopeDistributeDialog = ({
 
                                   <FormControl>
                                     <Textarea
-                                      className="mt-2 h-16 resize-none bg-background"
+                                      className="bg-background mt-2 h-16 resize-none"
                                       {...field}
                                       maxLength={5000}
                                     />
@@ -417,7 +359,9 @@ export const EnvelopeDistributeDialog = ({
                           </fieldset>
                         </Form>
                       </motion.div>
-                    ) : distributionMethod === DocumentDistributionMethod.NONE ? (
+                    )}
+
+                    {distributionMethod === DocumentDistributionMethod.NONE && (
                       <motion.div
                         key={'Links'}
                         initial={{ opacity: 0, y: 5 }}
@@ -425,7 +369,7 @@ export const EnvelopeDistributeDialog = ({
                         exit={{ opacity: 0, transition: { duration: 0.15 } }}
                         className="min-h-60 rounded-lg border"
                       >
-                        <div className="py-24 text-center text-sm text-muted-foreground">
+                        <div className="text-muted-foreground py-24 text-center text-sm">
                           <p>
                             <Trans>We won't send anything to notify recipients.</Trans>
                           </p>
@@ -438,7 +382,7 @@ export const EnvelopeDistributeDialog = ({
                           </p>
                         </div>
                       </motion.div>
-                    ) : null}
+                    )}
                   </AnimatePresence>
                 </div>
 
@@ -449,7 +393,7 @@ export const EnvelopeDistributeDialog = ({
                     </Button>
                   </DialogClose>
 
-                  <Button loading={isSubmitting} disabled={isSyncing} type="submit">
+                  <Button loading={isSubmitting} type="submit">
                     {distributionMethod === DocumentDistributionMethod.EMAIL ? (
                       <Trans>Send</Trans>
                     ) : (
@@ -475,22 +419,7 @@ export const EnvelopeDistributeDialog = ({
 
                     <ul className="ml-2 mt-1 list-inside list-disc">
                       {recipientsMissingSignatureFields.map((recipient) => (
-                        <li key={recipient.id}>
-                          {recipient.email || recipient.name || `Recipient ${recipient.index + 1}`}
-                        </li>
-                      ))}
-                    </ul>
-                  </AlertDescription>
-                ))
-                .with('MISSING_REQUIRED_EMAIL', () => (
-                  <AlertDescription>
-                    <Trans>The following recipients require an email address:</Trans>
-
-                    <ul className="ml-2 mt-1 list-inside list-disc">
-                      {recipientsMissingRequiredEmail.map((recipient) => (
-                        <li key={recipient.id}>
-                          {recipient.email || recipient.name || `Recipient ${recipient.index + 1}`}
-                        </li>
+                        <li key={recipient.id}>{recipient.email}</li>
                       ))}
                     </ul>
                   </AlertDescription>

apps/remix/app/components/dialogs/organisation-create-dialog.tsx

@@ -367,7 +367,7 @@ const BillingPlanForm = ({
           <div className="w-full text-left">
             <div className="flex items-center justify-between">
               <p className="text-medium">
-                <Trans context="Plan price">Free</Trans>
+                <Trans>Free</Trans>
               </p>
 
               <Badge size="small" variant="neutral" className="ml-1.5">

apps/remix/app/components/dialogs/organisation-email-create-dialog.tsx

@@ -72,7 +72,6 @@ export const OrganisationEmailCreateDialog = ({
   const { mutateAsync: createOrganisationEmail, isPending } =
     trpc.enterprise.organisation.email.create.useMutation();
 
-  // Reset state when dialog closes
   useEffect(() => {
     if (!open) {
       form.reset();

apps/remix/app/components/dialogs/recipient-detection-prompt-dialog.tsx

@@ -0,0 +1,251 @@
+import { useEffect, useState } from 'react';
+
+import { Trans } from '@lingui/react/macro';
+import { match } from 'ts-pattern';
+
+import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@documenso/ui/primitives/dialog';
+
+import type { RecipientForCreation } from '~/utils/detect-document-recipients';
+
+import { SuggestedRecipientsForm } from './suggested-recipients-form';
+
+type RecipientDetectionStep =
+  | 'PROMPT_DETECT_RECIPIENTS'
+  | 'DETECTING_RECIPIENTS'
+  | 'REVIEW_RECIPIENTS'
+  | 'DETECTING_FIELDS';
+
+export type RecipientDetectionPromptDialogProps = {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onAccept: () => Promise<void> | void;
+  onSkip: () => void;
+  recipients: RecipientForCreation[] | null;
+  onRecipientsSubmit: (recipients: RecipientForCreation[]) => Promise<void> | void;
+  onAutoAddFields?: (recipients: RecipientForCreation[]) => Promise<void> | void;
+  isProcessingRecipients?: boolean;
+};
+
+export const RecipientDetectionPromptDialog = ({
+  open,
+  onOpenChange,
+  onAccept,
+  onSkip,
+  recipients,
+  onRecipientsSubmit,
+  onAutoAddFields,
+  isProcessingRecipients = false,
+}: RecipientDetectionPromptDialogProps) => {
+  const [currentStep, setCurrentStep] = useState<RecipientDetectionStep>(
+    'PROMPT_DETECT_RECIPIENTS',
+  );
+  const [currentRecipients, setCurrentRecipients] = useState<RecipientForCreation[] | null>(
+    recipients,
+  );
+
+  useEffect(() => {
+    if (!open) {
+      setCurrentStep('PROMPT_DETECT_RECIPIENTS');
+    }
+  }, [open]);
+
+  useEffect(() => {
+    setCurrentRecipients(recipients);
+  }, [recipients]);
+
+  useEffect(() => {
+    if (recipients && currentStep === 'DETECTING_RECIPIENTS') {
+      setCurrentStep('REVIEW_RECIPIENTS');
+    }
+  }, [recipients, currentStep]);
+
+  const handleStartDetection = (e: React.MouseEvent) => {
+    e.preventDefault();
+    setCurrentStep('DETECTING_RECIPIENTS');
+
+    Promise.resolve(onAccept()).catch(() => {
+      setCurrentStep('PROMPT_DETECT_RECIPIENTS');
+    });
+  };
+
+  const handleSkip = () => {
+    onSkip();
+  };
+
+  const handleAutoAddFields = async (recipients: RecipientForCreation[]) => {
+    if (!onAutoAddFields) {
+      return;
+    }
+
+    // Save the current state of recipients so if we fail and come back,
+    // the form is restored with the user's changes.
+    setCurrentRecipients(recipients);
+    setCurrentStep('DETECTING_FIELDS');
+
+    try {
+      await onAutoAddFields(recipients);
+    } catch {
+      setCurrentStep('REVIEW_RECIPIENTS');
+    }
+  };
+
+  return (
+    <Dialog
+      open={open}
+      onOpenChange={(newOpen) => {
+        // Prevent closing during processing
+        if (
+          !newOpen &&
+          (currentStep === 'DETECTING_RECIPIENTS' ||
+            currentStep === 'DETECTING_FIELDS' ||
+            isProcessingRecipients)
+        ) {
+          return;
+        }
+        onOpenChange(newOpen);
+      }}
+    >
+      <DialogContent
+        className={
+          currentStep === 'REVIEW_RECIPIENTS' ? 'max-h-[90vh] max-w-4xl overflow-y-auto' : ''
+        }
+      >
+        <fieldset
+          disabled={currentStep === 'DETECTING_RECIPIENTS' || currentStep === 'DETECTING_FIELDS'}
+        >
+          <AnimateGenericFadeInOut motionKey={currentStep} className="grid gap-4">
+            {match(currentStep)
+              .with('PROMPT_DETECT_RECIPIENTS', () => (
+                <>
+                  <DialogHeader>
+                    <DialogTitle>
+                      <Trans>Auto-detect recipients?</Trans>
+                    </DialogTitle>
+                    <DialogDescription>
+                      <Trans>
+                        Would you like to automatically detect recipients in your document? This can
+                        save you time in setting up your document.
+                      </Trans>
+                    </DialogDescription>
+                  </DialogHeader>
+
+                  <DialogFooter>
+                    <Button variant="ghost" onClick={handleSkip}>
+                      <Trans>Skip for now</Trans>
+                    </Button>
+                    <Button onClick={handleStartDetection}>
+                      <Trans>Detect recipients</Trans>
+                    </Button>
+                  </DialogFooter>
+                </>
+              ))
+              .with('DETECTING_RECIPIENTS', () => (
+                <div className="flex flex-col items-center justify-center py-4">
+                  <div className="relative mb-4 flex items-center justify-center">
+                    <div
+                      className="border-muted-foreground/20 dark:bg-muted/80 z-10 flex aspect-[3/4] w-24 origin-top-left flex-col gap-y-1 overflow-hidden rounded-lg border px-2 py-4 backdrop-blur-sm"
+                      style={{ transform: 'translateZ(0px)' }}
+                    >
+                      <div className="bg-muted-foreground/20 h-2 w-full rounded-[2px]"></div>
+                      <div className="bg-muted-foreground/20 h-2 w-5/6 rounded-[2px]"></div>
+                      <div className="bg-muted-foreground/20 h-2 w-full rounded-[2px]"></div>
+
+                      <div className="bg-muted-foreground/20 h-2 w-4/5 rounded-[2px]"></div>
+                      <div className="bg-muted-foreground/20 h-2 w-full rounded-[2px]"></div>
+                      <div className="bg-muted-foreground/20 h-2 w-3/4 rounded-[2px]"></div>
+                    </div>
+
+                    <div
+                      className="bg-documenso/80 animate-scan pointer-events-none absolute left-1/2 top-0 z-20 h-0.5 w-24 -translate-x-1/2"
+                      style={{
+                        transform: 'translateX(-50%) translateZ(0px)',
+                      }}
+                    />
+                  </div>
+
+                  <DialogHeader>
+                    <DialogTitle className="text-center">
+                      <Trans>Analyzing your document</Trans>
+                    </DialogTitle>
+                    <DialogDescription className="text-center">
+                      <Trans>
+                        Scanning your document to detect recipient names, emails, and signing order.
+                      </Trans>
+                    </DialogDescription>
+                  </DialogHeader>
+                </div>
+              ))
+              .with('DETECTING_FIELDS', () => (
+                <div className="flex flex-col items-center justify-center py-4">
+                  <div className="relative mb-4 flex items-center justify-center">
+                    <div
+                      className="border-muted-foreground/20 dark:bg-muted/80 z-10 flex aspect-[3/4] w-24 origin-top-left flex-col gap-y-1 overflow-hidden rounded-lg border px-2 py-4 backdrop-blur-sm"
+                      style={{ transform: 'translateZ(0px)' }}
+                    >
+                      <div className="bg-muted-foreground/20 h-2 w-full rounded-[2px]"></div>
+                      <div className="bg-muted-foreground/20 h-2 w-5/6 rounded-[2px]"></div>
+                      <div className="bg-muted-foreground/20 h-2 w-full rounded-[2px]"></div>
+
+                      <div className="bg-muted-foreground/20 h-2 w-4/5 rounded-[2px]"></div>
+                      <div className="bg-muted-foreground/20 h-2 w-full rounded-[2px]"></div>
+                      <div className="bg-muted-foreground/20 h-2 w-3/4 rounded-[2px]"></div>
+                    </div>
+
+                    <div
+                      className="bg-documenso/80 animate-scan pointer-events-none absolute left-1/2 top-0 z-20 h-0.5 w-24 -translate-x-1/2"
+                      style={{
+                        transform: 'translateX(-50%) translateZ(0px)',
+                      }}
+                    />
+                  </div>
+
+                  <DialogHeader>
+                    <DialogTitle className="text-center">
+                      <Trans>Detecting fields</Trans>
+                    </DialogTitle>
+                    <DialogDescription className="text-center">
+                      <Trans>
+                        Scanning your document to intelligently place fields for your recipients.
+                      </Trans>
+                    </DialogDescription>
+                  </DialogHeader>
+                </div>
+              ))
+              .with('REVIEW_RECIPIENTS', () => (
+                <>
+                  <DialogHeader>
+                    <DialogTitle>
+                      <Trans>Review detected recipients</Trans>
+                    </DialogTitle>
+                    <DialogDescription>
+                      <Trans>
+                        Confirm, edit, or add recipients before continuing. You can adjust any
+                        information below before importing it into your document.
+                      </Trans>
+                    </DialogDescription>
+                  </DialogHeader>
+                  <SuggestedRecipientsForm
+                    recipients={currentRecipients}
+                    onCancel={handleSkip}
+                    onSubmit={onRecipientsSubmit}
+                    onAutoAddFields={onAutoAddFields ? handleAutoAddFields : undefined}
+                    isProcessing={isProcessingRecipients}
+                  />
+                </>
+              ))
+              .exhaustive()}
+          </AnimateGenericFadeInOut>
+        </fieldset>
+      </DialogContent>
+    </Dialog>
+  );
+};

apps/remix/app/components/dialogs/suggested-recipients-form.tsx

@@ -0,0 +1,408 @@
+import { useEffect, useMemo, useState } from 'react';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { RecipientRole } from '@prisma/client';
+import { PlusIcon, TrashIcon } from 'lucide-react';
+import { type FieldError, useFieldArray, useForm } from 'react-hook-form';
+import { z } from 'zod';
+
+import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
+import { nanoid } from '@documenso/lib/universal/id';
+import { trpc } from '@documenso/trpc/react';
+import { RecipientAutoCompleteInput } from '@documenso/ui/components/recipient/recipient-autocomplete-input';
+import type { RecipientAutoCompleteOption } from '@documenso/ui/components/recipient/recipient-autocomplete-input';
+import { RecipientRoleSelect } from '@documenso/ui/components/recipient/recipient-role-select';
+import { cn } from '@documenso/ui/lib/utils';
+import { Button } from '@documenso/ui/primitives/button';
+import { DialogFooter } from '@documenso/ui/primitives/dialog';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { FormErrorMessage } from '@documenso/ui/primitives/form/form-error-message';
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from '@documenso/ui/primitives/tooltip';
+
+import type { RecipientForCreation } from '~/utils/detect-document-recipients';
+
+const ZSuggestedRecipientSchema = z.object({
+  formId: z.string().min(1),
+  name: z
+    .string()
+    .min(1, { message: msg`Name is required`.id })
+    .max(255),
+  email: z
+    .string()
+    .min(1, { message: msg`Email is required`.id })
+    .email({ message: msg`Invalid email`.id })
+    .max(254),
+  role: z.nativeEnum(RecipientRole),
+});
+
+const ZSuggestedRecipientsFormSchema = z.object({
+  recipients: z
+    .array(ZSuggestedRecipientSchema)
+    .min(1, { message: msg`Please add at least one recipient`.id }),
+});
+
+type TSuggestedRecipientsFormSchema = z.infer<typeof ZSuggestedRecipientsFormSchema>;
+
+export type SuggestedRecipientsFormProps = {
+  recipients: RecipientForCreation[] | null;
+  onCancel: () => void;
+  onSubmit: (recipients: RecipientForCreation[]) => Promise<void> | void;
+  onAutoAddFields?: (recipients: RecipientForCreation[]) => Promise<void> | void;
+  isProcessing?: boolean;
+};
+
+export const SuggestedRecipientsForm = ({
+  recipients,
+  onCancel,
+  onSubmit,
+  onAutoAddFields,
+  isProcessing = false,
+}: SuggestedRecipientsFormProps) => {
+  const { t } = useLingui();
+
+  const [recipientSearchQuery, setRecipientSearchQuery] = useState('');
+
+  const debouncedRecipientSearchQuery = useDebouncedValue(recipientSearchQuery, 500);
+
+  const { data: recipientSuggestionsData, isLoading } = trpc.recipient.suggestions.find.useQuery(
+    {
+      query: debouncedRecipientSearchQuery,
+    },
+    {
+      enabled: debouncedRecipientSearchQuery.length > 1,
+    },
+  );
+
+  const recipientSuggestions = recipientSuggestionsData?.results || [];
+
+  const defaultRecipients = useMemo(() => {
+    if (recipients && recipients.length > 0) {
+      const sorted = [...recipients].sort((a, b) => {
+        const orderA = a.signingOrder ?? 0;
+        const orderB = b.signingOrder ?? 0;
+
+        return orderA - orderB;
+      });
+
+      return sorted.map((recipient) => ({
+        formId: nanoid(),
+        name: recipient.name,
+        email: recipient.email,
+        role: recipient.role,
+      }));
+    }
+
+    return [
+      {
+        formId: nanoid(),
+        name: '',
+        email: '',
+        role: RecipientRole.SIGNER,
+      },
+    ];
+  }, [recipients]);
+
+  const form = useForm<TSuggestedRecipientsFormSchema>({
+    resolver: zodResolver(ZSuggestedRecipientsFormSchema),
+    defaultValues: {
+      recipients: defaultRecipients,
+    },
+  });
+  const {
+    formState: { isSubmitting },
+  } = form;
+
+  useEffect(() => {
+    form.reset({
+      recipients: defaultRecipients,
+    });
+  }, [defaultRecipients, form]);
+
+  const { fields, append, remove } = useFieldArray({
+    control: form.control,
+    name: 'recipients',
+  });
+
+  const handleRecipientAutoCompleteSelect = (
+    index: number,
+    suggestion: RecipientAutoCompleteOption,
+  ) => {
+    form.setValue(`recipients.${index}.email`, suggestion.email);
+    form.setValue(`recipients.${index}.name`, suggestion.name ?? suggestion.email);
+  };
+
+  const handleAddSigner = () => {
+    append({
+      formId: nanoid(),
+      name: '',
+      email: '',
+      role: RecipientRole.SIGNER,
+    });
+  };
+
+  const handleRemoveSigner = (index: number) => {
+    remove(index);
+  };
+
+  const handleSubmit = form.handleSubmit(async (values) => {
+    const normalizedRecipients: RecipientForCreation[] = values.recipients.map(
+      (recipient, index) => ({
+        name: recipient.name.trim(),
+        email: recipient.email.trim(),
+        role: recipient.role,
+        signingOrder: index + 1,
+      }),
+    );
+
+    try {
+      await onSubmit(normalizedRecipients);
+    } catch (error) {
+      console.error('Failed to submit recipients:', error);
+    }
+  });
+
+  const handleAutoAddFields = form.handleSubmit(async (values) => {
+    if (!onAutoAddFields) {
+      return;
+    }
+
+    const normalizedRecipients: RecipientForCreation[] = values.recipients.map(
+      (recipient, index) => ({
+        name: recipient.name.trim(),
+        email: recipient.email.trim(),
+        role: recipient.role,
+        signingOrder: index + 1,
+      }),
+    );
+
+    try {
+      await onAutoAddFields(normalizedRecipients);
+    } catch (error) {
+      console.error('Failed to auto-add fields:', error);
+    }
+  });
+
+  const getRecipientsRootError = (
+    error: typeof form.formState.errors.recipients,
+  ): FieldError | undefined => {
+    if (typeof error !== 'object' || !error || !('root' in error)) {
+      return undefined;
+    }
+
+    const candidate = (error as { root?: FieldError }).root;
+    return typeof candidate === 'object' ? candidate : undefined;
+  };
+
+  const recipientsRootError = getRecipientsRootError(form.formState.errors.recipients);
+
+  return (
+    <Form {...form}>
+      <form onSubmit={handleSubmit} className="space-y-6">
+        <div className="space-y-4">
+          {fields.map((field, index) => (
+            <div
+              key={field.id}
+              className="flex flex-col gap-4 md:flex-row md:items-center md:gap-x-2"
+            >
+              <FormField
+                control={form.control}
+                name={`recipients.${index}.email`}
+                render={({ field: emailField }) => (
+                  <FormItem
+                    className={cn('relative w-full', {
+                      'mb-6':
+                        form.formState.errors.recipients?.[index] &&
+                        !form.formState.errors.recipients[index]?.email,
+                    })}
+                  >
+                    {index === 0 && (
+                      <FormLabel required>
+                        <Trans>Email</Trans>
+                      </FormLabel>
+                    )}
+                    <FormControl>
+                      <RecipientAutoCompleteInput
+                        type="email"
+                        placeholder={t`Email`}
+                        value={emailField.value}
+                        options={recipientSuggestions}
+                        onSelect={(suggestion) =>
+                          handleRecipientAutoCompleteSelect(index, suggestion)
+                        }
+                        onSearchQueryChange={(query) => {
+                          emailField.onChange(query);
+                          setRecipientSearchQuery(query);
+                        }}
+                        loading={isLoading}
+                        disabled={isSubmitting}
+                        maxLength={254}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name={`recipients.${index}.name`}
+                render={({ field: nameField }) => (
+                  <FormItem
+                    className={cn('w-full', {
+                      'mb-6':
+                        form.formState.errors.recipients?.[index] &&
+                        !form.formState.errors.recipients[index]?.name,
+                    })}
+                  >
+                    {index === 0 && (
+                      <FormLabel>
+                        <Trans>Name</Trans>
+                      </FormLabel>
+                    )}
+                    <FormControl>
+                      <RecipientAutoCompleteInput
+                        type="text"
+                        placeholder={t`Name`}
+                        value={nameField.value}
+                        options={recipientSuggestions}
+                        onSelect={(suggestion) =>
+                          handleRecipientAutoCompleteSelect(index, suggestion)
+                        }
+                        onSearchQueryChange={(query) => {
+                          nameField.onChange(query);
+                          setRecipientSearchQuery(query);
+                        }}
+                        loading={isLoading}
+                        disabled={isSubmitting}
+                        maxLength={255}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <FormField
+                control={form.control}
+                name={`recipients.${index}.role`}
+                render={({ field: roleField }) => (
+                  <FormItem
+                    className={cn('mt-2 w-full md:mt-auto md:w-fit', {
+                      'mb-6':
+                        form.formState.errors.recipients?.[index] &&
+                        !form.formState.errors.recipients[index]?.role,
+                    })}
+                  >
+                    {index === 0 && (
+                      <FormLabel>
+                        <Trans>Role</Trans>
+                      </FormLabel>
+                    )}
+                    <FormControl>
+                      <RecipientRoleSelect
+                        value={roleField.value}
+                        onValueChange={roleField.onChange}
+                        disabled={isSubmitting}
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+
+              <Button
+                type="button"
+                variant="ghost"
+                className={cn('mt-2 w-full px-2 md:mt-auto md:w-auto', {
+                  'mb-6': form.formState.errors.recipients?.[index],
+                })}
+                onClick={() => handleRemoveSigner(index)}
+                disabled={isSubmitting || fields.length === 1}
+              >
+                <TrashIcon className="h-4 w-4" />
+              </Button>
+            </div>
+          ))}
+
+          <FormErrorMessage className="mt-2" error={recipientsRootError} />
+
+          <div className="flex">
+            <Button
+              type="button"
+              variant="outline"
+              onClick={handleAddSigner}
+              className="w-full md:w-auto"
+              disabled={isSubmitting}
+            >
+              <PlusIcon className="mr-2 h-4 w-4" />
+              <Trans>Add signer</Trans>
+            </Button>
+          </div>
+        </div>
+
+        <DialogFooter className="flex flex-col gap-2 sm:flex-row sm:justify-between sm:gap-3">
+          <Button
+            type="button"
+            variant="ghost"
+            onClick={onCancel}
+            disabled={isSubmitting || isProcessing}
+          >
+            <Trans>Cancel</Trans>
+          </Button>
+
+          <div className="flex flex-col gap-2 sm:flex-row sm:gap-3">
+            <Button type="submit" disabled={isSubmitting || isProcessing}>
+              <Trans>Use recipients</Trans>
+            </Button>
+
+            {onAutoAddFields && (
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <div>
+                      <Button
+                        type="button"
+                        onClick={handleAutoAddFields}
+                        disabled={
+                          isSubmitting ||
+                          isProcessing ||
+                          fields.length === 0 ||
+                          !form.formState.isValid
+                        }
+                      >
+                        {isProcessing ? (
+                          <Trans>Processing...</Trans>
+                        ) : (
+                          <Trans>Auto add fields</Trans>
+                        )}
+                      </Button>
+                    </div>
+                  </TooltipTrigger>
+                  {(fields.length === 0 || !form.formState.isValid) && (
+                    <TooltipContent>
+                      <Trans>Please add at least one valid recipient to auto-detect fields</Trans>
+                    </TooltipContent>
+                  )}
+                </Tooltip>
+              </TooltipProvider>
+            )}
+          </div>
+        </DialogFooter>
+      </form>
+    </Form>
+  );
+};

apps/remix/app/components/dialogs/template-use-dialog.tsx

@@ -21,7 +21,6 @@ import {
   SKIP_QUERY_BATCH_META,
 } from '@documenso/lib/constants/trpc';
 import { AppError } from '@documenso/lib/errors/app-error';
-import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
@@ -66,7 +65,7 @@ const ZAddRecipientsForNewDocumentSchema = z.object({
   recipients: z.array(
     z.object({
       id: z.number(),
-      email: ZRecipientEmailSchema,
+      email: z.string().email(),
       name: z.string(),
       signingOrder: z.number().optional(),
     }),
@@ -350,7 +349,7 @@ export function TemplateUseDialog({
 
                             {documentDistributionMethod === DocumentDistributionMethod.EMAIL && (
                               <label
-                                className="ml-2 flex items-center text-sm text-muted-foreground"
+                                className="text-muted-foreground ml-2 flex items-center text-sm"
                                 htmlFor="distributeDocument"
                               >
                                 <Trans>Send document</Trans>
@@ -359,7 +358,7 @@ export function TemplateUseDialog({
                                     <InfoIcon className="mx-1 h-4 w-4" />
                                   </TooltipTrigger>
 
-                                  <TooltipContent className="z-[99999] max-w-md space-y-2 p-4 text-muted-foreground">
+                                  <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
                                     <p>
                                       <Trans>
                                         The document will be immediately sent to recipients if this
@@ -379,7 +378,7 @@ export function TemplateUseDialog({
 
                             {documentDistributionMethod === DocumentDistributionMethod.NONE && (
                               <label
-                                className="ml-2 flex items-center text-sm text-muted-foreground"
+                                className="text-muted-foreground ml-2 flex items-center text-sm"
                                 htmlFor="distributeDocument"
                               >
                                 <Trans>Create as pending</Trans>
@@ -387,7 +386,7 @@ export function TemplateUseDialog({
                                   <TooltipTrigger type="button">
                                     <InfoIcon className="mx-1 h-4 w-4" />
                                   </TooltipTrigger>
-                                  <TooltipContent className="z-[99999] max-w-md space-y-2 p-4 text-muted-foreground">
+                                  <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
                                     <p>
                                       <Trans>
                                         Create the document as pending and ready to sign.
@@ -433,7 +432,7 @@ export function TemplateUseDialog({
                           }}
                         />
                         <label
-                          className="ml-2 flex items-center text-sm text-muted-foreground"
+                          className="text-muted-foreground ml-2 flex items-center text-sm"
                           htmlFor="useCustomDocument"
                         >
                           <Trans>Upload custom document</Trans>
@@ -441,7 +440,7 @@ export function TemplateUseDialog({
                             <TooltipTrigger type="button">
                               <InfoIcon className="mx-1 h-4 w-4" />
                             </TooltipTrigger>
-                            <TooltipContent className="z-[99999] max-w-md space-y-2 p-4 text-muted-foreground">
+                            <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
                               <p>
                                 <Trans>
                                   Upload a custom document to use instead of the template's default
@@ -471,19 +470,19 @@ export function TemplateUseDialog({
                               <FormControl>
                                 <div
                                   key={item.id}
-                                  className="flex items-center gap-4 rounded-lg border border-border bg-card p-4 transition-colors hover:bg-accent/10"
+                                  className="border-border bg-card hover:bg-accent/10 flex items-center gap-4 rounded-lg border p-4 transition-colors"
                                 >
                                   <div className="flex-shrink-0">
-                                    <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-primary/10">
-                                      <FileTextIcon className="h-5 w-5 text-primary" />
+                                    <div className="bg-primary/10 flex h-10 w-10 items-center justify-center rounded-lg">
+                                      <FileTextIcon className="text-primary h-5 w-5" />
                                     </div>
                                   </div>
 
                                   <div className="min-w-0 flex-1">
-                                    <h4 className="truncate text-sm font-medium text-foreground">
+                                    <h4 className="text-foreground truncate text-sm font-medium">
                                       {item.title}
                                     </h4>
-                                    <p className="mt-0.5 text-xs text-muted-foreground">
+                                    <p className="text-muted-foreground mt-0.5 text-xs">
                                       {field.value ? (
                                         <div>
                                           <Trans>

apps/remix/app/components/embed/authoring/configure-document-recipients.tsx

@@ -29,7 +29,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitive
 import { useConfigureDocument } from './configure-document-context';
 import type { TConfigureEmbedFormSchema } from './configure-document-view.types';
 
-// Define a type for signer items
 type SignerItem = TConfigureEmbedFormSchema['signers'][number];
 
 export interface ConfigureDocumentRecipientsProps {
@@ -97,18 +96,15 @@ export const ConfigureDocumentRecipients = ({
       const currentSigners = getValues('signers') || [...signers];
       const signer = currentSigners[index];
 
-      // Remove signer from current position and insert at new position
       const remainingSigners = currentSigners.filter((_: unknown, idx: number) => idx !== index);
       const newPosition = Math.min(Math.max(0, newOrder - 1), currentSigners.length - 1);
       remainingSigners.splice(newPosition, 0, signer);
 
-      // Update signing order for each item
       const updatedSigners = remainingSigners.map((s: SignerItem, idx: number) => ({
         ...s,
         signingOrder: signingOrder === DocumentSigningOrder.SEQUENTIAL ? idx + 1 : undefined,
       }));
 
-      // Update the form
       replace(updatedSigners);
     },
     [signers, replace, getValues],
@@ -118,17 +114,14 @@ export const ConfigureDocumentRecipients = ({
     (result: DropResult) => {
       if (!result.destination) return;
 
-      // Use the move function from useFieldArray which preserves input values
       move(result.source.index, result.destination.index);
 
-      // Update signing orders after move
       const currentSigners = getValues('signers');
       const updatedSigners = currentSigners.map((signer: SignerItem, index: number) => ({
         ...signer,
         signingOrder: signingOrder === DocumentSigningOrder.SEQUENTIAL ? index + 1 : undefined,
       }));
 
-      // Update the form with new ordering
       replace(updatedSigners);
     },
     [move, replace, getValues],

apps/remix/app/components/embed/authoring/configure-document-view.types.ts

@@ -5,7 +5,6 @@ import {
   ZDocumentMetaDateFormatSchema,
   ZDocumentMetaLanguageSchema,
 } from '@documenso/lib/types/document-meta';
-import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 import { DocumentDistributionMethod } from '@documenso/prisma/generated/types';
 
 // Define the schema for configuration
@@ -56,7 +55,7 @@ export const ZConfigureTemplateEmbedFormSchema = ZConfigureEmbedFormSchema.exten
       nativeId: z.number().optional(),
       formId: z.string(),
       name: z.string(),
-      email: ZRecipientEmailSchema,
+      email: z.union([z.string().length(0), z.string().email('Invalid email address')]),
       role: z.enum(['SIGNER', 'CC', 'APPROVER', 'VIEWER', 'ASSISTANT']),
       signingOrder: z.number().optional(),
       disabled: z.boolean().optional(),

apps/remix/app/components/general/document-signing/document-signing-complete-dialog.tsx

@@ -57,7 +57,7 @@ export type DocumentSigningCompleteDialogProps = {
     name: string;
     email: string;
   };
-  recipientPayload?: {
+  directTemplatePayload?: {
     name: string;
     email: string;
   };
@@ -89,7 +89,7 @@ export const DocumentSigningCompleteDialog = ({
   recipient,
   disabled = false,
   allowDictateNextSigner = false,
-  recipientPayload,
+  directTemplatePayload,
   defaultNextSigner,
   buttonSize = 'lg',
   position,
@@ -113,11 +113,11 @@ export const DocumentSigningCompleteDialog = ({
     },
   });
 
-  const recipientForm = useForm<TDirectRecipientFormSchema>({
+  const directRecipientForm = useForm<TDirectRecipientFormSchema>({
     resolver: zodResolver(ZDirectRecipientFormSchema),
     defaultValues: {
-      name: recipientPayload?.name ?? '',
-      email: recipientPayload?.email ?? '',
+      name: directTemplatePayload?.name ?? '',
+      email: directTemplatePayload?.email ?? '',
     },
   });
 
@@ -145,16 +145,16 @@ export const DocumentSigningCompleteDialog = ({
 
   const onFormSubmit = async (data: TNextSignerFormSchema) => {
     try {
-      let recipientOverridePayload: { name: string; email: string } | undefined;
+      let directRecipient: { name: string; email: string } | undefined;
 
-      if (recipientPayload && !recipientPayload.email) {
-        const isFormValid = await recipientForm.trigger();
+      if (directTemplatePayload && !directTemplatePayload.email) {
+        const isFormValid = await directRecipientForm.trigger();
 
         if (!isFormValid) {
           return;
         }
 
-        recipientOverridePayload = recipientForm.getValues();
+        directRecipient = directRecipientForm.getValues();
       }
 
       // Check if 2FA is required
@@ -168,7 +168,7 @@ export const DocumentSigningCompleteDialog = ({
           ? { name: data.name, email: data.email }
           : undefined;
 
-      await onSignatureComplete(nextSigner, data.accessAuthOptions, recipientOverridePayload);
+      await onSignatureComplete(nextSigner, data.accessAuthOptions, directRecipient);
     } catch (error) {
       const err = AppError.parseError(error);
 
@@ -222,7 +222,7 @@ export const DocumentSigningCompleteDialog = ({
             <Trans>Are you sure?</Trans>
           </DialogTitle>
           <DialogDescription>
-            <div className="max-w-[50ch] text-muted-foreground">
+            <div className="text-muted-foreground max-w-[50ch]">
               {match(recipient.role)
                 .with(RecipientRole.VIEWER, () => (
                   <span className="inline-flex flex-wrap">
@@ -250,19 +250,19 @@ export const DocumentSigningCompleteDialog = ({
           </DialogDescription>
         </DialogHeader>
 
-        <div className="rounded-lg border border-border bg-muted/50 p-4 text-center">
-          <p className="text-sm font-medium text-muted-foreground">{documentTitle}</p>
+        <div className="border-border bg-muted/50 rounded-lg border p-4 text-center">
+          <p className="text-muted-foreground text-sm font-medium">{documentTitle}</p>
         </div>
 
         {!showTwoFactorForm && (
           <>
             <fieldset disabled={form.formState.isSubmitting} className="border-none p-0">
-              {recipientPayload && !recipientPayload.email && (
-                <Form {...recipientForm}>
+              {directTemplatePayload && !directTemplatePayload.email && (
+                <Form {...directRecipientForm}>
                   <div className="mb-4 flex flex-col gap-4">
                     <div className="flex flex-col gap-4 md:flex-row">
                       <FormField
-                        control={recipientForm.control}
+                        control={directRecipientForm.control}
                         name="name"
                         render={({ field }) => (
                           <FormItem className="flex-1">
@@ -284,7 +284,7 @@ export const DocumentSigningCompleteDialog = ({
                       />
 
                       <FormField
-                        control={recipientForm.control}
+                        control={directRecipientForm.control}
                         name="email"
                         render={({ field }) => (
                           <FormItem className="flex-1">

apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx

@@ -174,18 +174,12 @@ export default function EnvelopeEditorFieldsPageRenderer() {
    * Initialize the Konva page canvas and all fields and interactions.
    */
   const createPageCanvas = (currentStage: Konva.Stage, currentPageLayer: Konva.Layer) => {
-    // Initialize snap guides layer
-    // snapGuideLayer.current = initializeSnapGuides(stage.current);
-
-    // Add transformer for resizing and rotating.
     interactiveTransformer.current = createInteractiveTransformer(currentStage, currentPageLayer);
 
-    // Render the fields.
     for (const field of localPageFields) {
       renderFieldOnLayer(field);
     }
 
-    // Handle stage click to deselect.
     currentStage.on('mousedown', (e) => {
       removePendingField();
 
@@ -270,7 +264,6 @@ export default function EnvelopeEditorFieldsPageRenderer() {
     let y2: number;
 
     currentStage.on('mousedown touchstart', (e) => {
-      // do nothing if we mousedown on any shape
       if (e.target !== currentStage) {
         return;
       }
@@ -296,7 +289,6 @@ export default function EnvelopeEditorFieldsPageRenderer() {
     });
 
     currentStage.on('mousemove touchmove', () => {
-      // do nothing if we didn't start selection
       if (!selectionRectangle.visible()) {
         return;
       }
@@ -321,7 +313,6 @@ export default function EnvelopeEditorFieldsPageRenderer() {
     });
 
     currentStage.on('mouseup touchend', () => {
-      // do nothing if we didn't start selection
       if (!selectionRectangle.visible()) {
         return;
       }
@@ -375,34 +366,25 @@ export default function EnvelopeEditorFieldsPageRenderer() {
         return;
       }
 
-      // If empty area clicked, remove all selections
       if (e.target === stage.current) {
         setSelectedFields([]);
         return;
       }
 
-      // Do nothing if field not clicked, or if field is not editable
       if (!e.target.hasName('field-group') || e.target.draggable() === false) {
         return;
       }
 
-      // do we pressed shift or ctrl?
       const metaPressed = e.evt.shiftKey || e.evt.ctrlKey || e.evt.metaKey;
       const isSelected = transformer.nodes().indexOf(e.target) >= 0;
 
       if (!metaPressed && !isSelected) {
-        // if no key pressed and the node is not selected
-        // select just one
         setSelectedFields([e.target]);
       } else if (metaPressed && isSelected) {
-        // if we pressed keys and node was selected
-        // we need to remove it from selection:
-        const nodes = transformer.nodes().slice(); // use slice to have new copy of array
-        // remove node from array
+        const nodes = transformer.nodes().slice();
         nodes.splice(nodes.indexOf(e.target), 1);
         setSelectedFields(nodes);
       } else if (metaPressed && !isSelected) {
-        // add the node into selection
         const nodes = transformer.nodes().concat([e.target]);
         setSelectedFields(nodes);
       }
@@ -429,12 +411,10 @@ export default function EnvelopeEditorFieldsPageRenderer() {
       }
     });
 
-    // If it exists, rerender.
     localPageFields.forEach((field) => {
       renderFieldOnLayer(field);
     });
 
-    // Rerender the transformer
     interactiveTransformer.current?.forceUpdate();
 
     pageLayer.current.batchDraw();

apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx

@@ -1,7 +1,7 @@
-import { lazy, useEffect, useMemo } from 'react';
+import { lazy, useEffect, useMemo, useState } from 'react';
 
 import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
+import { msg, plural } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { FieldType, RecipientRole } from '@prisma/client';
 import { FileTextIcon } from 'lucide-react';
@@ -11,6 +11,7 @@ import { match } from 'ts-pattern';
 
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentEnvelopeRender } from '@documenso/lib/client-only/providers/envelope-render-provider';
+import type { TDetectedFormField } from '@documenso/lib/types/document-analysis';
 import type {
   TCheckboxFieldMeta,
   TDateFieldMeta,
@@ -24,12 +25,14 @@ import type {
   TSignatureFieldMeta,
   TTextFieldMeta,
 } from '@documenso/lib/types/field-meta';
+import { FIELD_META_DEFAULT_VALUES } from '@documenso/lib/types/field-meta';
 import { canRecipientFieldsBeModified } from '@documenso/lib/utils/recipients';
 import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
 import PDFViewerKonvaLazy from '@documenso/ui/components/pdf-viewer/pdf-viewer-konva-lazy';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import { Separator } from '@documenso/ui/primitives/separator';
+import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { EditorFieldCheckboxForm } from '~/components/forms/editor/editor-field-checkbox-form';
 import { EditorFieldDateForm } from '~/components/forms/editor/editor-field-date-form';
@@ -50,6 +53,51 @@ const EnvelopeEditorFieldsPageRenderer = lazy(
   async () => import('~/components/general/envelope-editor/envelope-editor-fields-page-renderer'),
 );
 
+const detectFormFieldsInDocument = async (params: {
+  envelopeId: string;
+  onProgress: (current: number, total: number) => void;
+}): Promise<{
+  fieldsPerPage: Map<number, TDetectedFormField[]>;
+  errors: Map<number, Error>;
+}> => {
+  const { envelopeId, onProgress } = params;
+  const fieldsPerPage = new Map<number, TDetectedFormField[]>();
+  const errors = new Map<number, Error>();
+
+  try {
+    onProgress(0, 1);
+
+    const response = await fetch('/api/ai/detect-fields', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ envelopeId }),
+      credentials: 'include',
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Field detection failed: ${response.statusText} - ${errorText}`);
+    }
+
+    const detectedFields: TDetectedFormField[] = await response.json();
+
+    for (const field of detectedFields) {
+      if (!fieldsPerPage.has(field.pageNumber)) {
+        fieldsPerPage.set(field.pageNumber, []);
+      }
+      fieldsPerPage.get(field.pageNumber)!.push(field);
+    }
+
+    onProgress(1, 1);
+  } catch (error) {
+    errors.set(0, error instanceof Error ? error : new Error(String(error)));
+  }
+
+  return { fieldsPerPage, errors };
+};
+
 const FieldSettingsTypeTranslations: Record<FieldType, MessageDescriptor> = {
   [FieldType.SIGNATURE]: msg`Signature Settings`,
   [FieldType.FREE_SIGNATURE]: msg`Free Signature Settings`,
@@ -72,6 +120,14 @@ export const EnvelopeEditorFieldsPage = () => {
   const { currentEnvelopeItem } = useCurrentEnvelopeRender();
 
   const { t } = useLingui();
+  const { toast } = useToast();
+
+  const [isDetectingFields, setIsAutoAddingFields] = useState(false);
+  const [processingProgress, setProcessingProgress] = useState<{
+    current: number;
+    total: number;
+  } | null>(null);
+  const [hasAutoPlacedFields, setHasAutoPlacedFields] = useState(false);
 
   const selectedField = useMemo(
     () => structuredClone(editorFields.selectedField),
@@ -85,20 +141,13 @@ export const EnvelopeEditorFieldsPage = () => {
 
     const isMetaSame = isDeepEqual(selectedField.fieldMeta, fieldMeta);
 
-    // Todo: Envelopes - Clean up console logs.
     if (!isMetaSame) {
-      console.log('TRIGGER UPDATE');
       editorFields.updateFieldByFormId(selectedField.formId, {
         fieldMeta,
       });
-    } else {
-      console.log('DATA IS SAME, NO UPDATE');
     }
   };
 
-  /**
-   * Set the selected recipient to the first recipient in the envelope.
-   */
   useEffect(() => {
     const firstSelectableRecipient = envelope.recipients.find(
       (recipient) =>
@@ -108,10 +157,128 @@ export const EnvelopeEditorFieldsPage = () => {
     editorFields.setSelectedRecipient(firstSelectableRecipient?.id ?? null);
   }, []);
 
+  useEffect(() => {
+    if (hasAutoPlacedFields || !currentEnvelopeItem) {
+      return;
+    }
+
+    const storageKey = `autoPlaceFields_${envelope.id}`;
+    const storedData = sessionStorage.getItem(storageKey);
+
+    if (!storedData) {
+      return;
+    }
+
+    sessionStorage.removeItem(storageKey);
+    setHasAutoPlacedFields(true);
+
+    try {
+      const { fields: detectedFields, recipientCount } = JSON.parse(storedData) as {
+        fields: TDetectedFormField[];
+        recipientCount: number;
+      };
+
+      let totalAdded = 0;
+
+      const fieldsPerPage = new Map<number, TDetectedFormField[]>();
+      for (const field of detectedFields) {
+        if (!fieldsPerPage.has(field.pageNumber)) {
+          fieldsPerPage.set(field.pageNumber, []);
+        }
+        fieldsPerPage.get(field.pageNumber)!.push(field);
+      }
+
+      for (const [pageNumber, fields] of fieldsPerPage.entries()) {
+        for (const detected of fields) {
+          const { ymin, xmin, ymax, xmax } = detected.boundingBox;
+          const positionX = (xmin / 1000) * 100;
+          const positionY = (ymin / 1000) * 100;
+          const width = ((xmax - xmin) / 1000) * 100;
+          const height = ((ymax - ymin) / 1000) * 100;
+
+          const fieldType = detected.label as FieldType;
+          const resolvedRecipientId =
+            envelope.recipients.find((recipient) => recipient.id === detected.recipientId)?.id ??
+            editorFields.selectedRecipient?.id ??
+            envelope.recipients[0]?.id;
+
+          if (!resolvedRecipientId) {
+            console.warn('Skipping detected field because no recipient could be resolved', {
+              detectedRecipientId: detected.recipientId,
+            });
+            continue;
+          }
+
+          try {
+            editorFields.addField({
+              envelopeItemId: currentEnvelopeItem.id,
+              page: pageNumber,
+              type: fieldType,
+              positionX,
+              positionY,
+              width,
+              height,
+              recipientId: resolvedRecipientId,
+              fieldMeta: structuredClone(FIELD_META_DEFAULT_VALUES[fieldType]),
+            });
+            totalAdded++;
+          } catch (error) {
+            console.error(`Failed to add field on page ${pageNumber}:`, error);
+          }
+        }
+      }
+
+      if (totalAdded > 0) {
+        toast({
+          title: t`Recipients and fields added`,
+          description: t`Added ${recipientCount} ${plural(recipientCount, {
+            one: 'recipient',
+            other: 'recipients',
+          })} and ${totalAdded} ${plural(totalAdded, { one: 'field', other: 'fields' })}`,
+          duration: 5000,
+        });
+      } else {
+        toast({
+          title: t`Recipients added`,
+          description: t`Added ${recipientCount} ${plural(recipientCount, {
+            one: 'recipient',
+            other: 'recipients',
+          })}. No fields were detected in the document.`,
+          duration: 5000,
+        });
+      }
+    } catch (error) {
+      console.error('Failed to auto-place fields:', error);
+      toast({
+        title: t`Field placement failed`,
+        description: t`Failed to automatically place fields. You can add them manually.`,
+        variant: 'destructive',
+        duration: 5000,
+      });
+    }
+  }, [
+    currentEnvelopeItem,
+    envelope.id,
+    envelope.recipients,
+    editorFields,
+    hasAutoPlacedFields,
+    t,
+    toast,
+  ]);
+
   return (
     <div className="relative flex h-full">
-      <div className="flex w-full flex-col overflow-y-auto">
+      <div className="relative flex w-full flex-col overflow-y-auto">
         {/* Horizontal envelope item selector */}
+        {isDetectingFields && (
+          <>
+            <div className="edge-glow edge-glow-top pointer-events-none fixed left-0 right-0 top-0 z-20 h-32" />
+            <div className="edge-glow edge-glow-right pointer-events-none fixed bottom-0 right-0 top-0 z-20 w-32" />
+            <div className="edge-glow edge-glow-bottom pointer-events-none fixed bottom-0 left-0 right-0 z-20 h-32" />
+            <div className="edge-glow edge-glow-left pointer-events-none fixed bottom-0 left-0 top-0 z-20 w-32" />
+          </>
+        )}
+
         <EnvelopeRendererFileSelector fields={editorFields.localFields} />
 
         {/* Document View */}
@@ -202,6 +369,129 @@ export const EnvelopeEditorFieldsPage = () => {
               selectedRecipientId={editorFields.selectedRecipient?.id ?? null}
               selectedEnvelopeItemId={currentEnvelopeItem?.id ?? null}
             />
+
+            <Button
+              className="mt-4 w-full"
+              variant="outline"
+              disabled={isDetectingFields}
+              onClick={async () => {
+                setIsAutoAddingFields(true);
+                setProcessingProgress(null);
+
+                try {
+                  if (!currentEnvelopeItem) {
+                    toast({
+                      title: t`No document selected`,
+                      description: t`No document selected. Please reload the page and try again.`,
+                      variant: 'destructive',
+                    });
+                    return;
+                  }
+
+                  if (!currentEnvelopeItem.documentDataId) {
+                    toast({
+                      title: t`Document data missing`,
+                      description: t`Document data not found. Please try reloading the page.`,
+                      variant: 'destructive',
+                    });
+                    return;
+                  }
+
+                  const { fieldsPerPage, errors } = await detectFormFieldsInDocument({
+                    envelopeId: envelope.id,
+                    onProgress: (current, total) => {
+                      setProcessingProgress({ current, total });
+                    },
+                  });
+
+                  let totalAdded = 0;
+                  for (const [pageNumber, detectedFields] of fieldsPerPage.entries()) {
+                    for (const detected of detectedFields) {
+                      const { ymin, xmin, ymax, xmax } = detected.boundingBox;
+                      const positionX = (xmin / 1000) * 100;
+                      const positionY = (ymin / 1000) * 100;
+                      const width = ((xmax - xmin) / 1000) * 100;
+                      const height = ((ymax - ymin) / 1000) * 100;
+
+                      const fieldType = detected.label as FieldType;
+                      const resolvedRecipientId =
+                        envelope.recipients.find(
+                          (recipient) => recipient.id === detected.recipientId,
+                        )?.id ??
+                        editorFields.selectedRecipient?.id ??
+                        envelope.recipients[0]?.id;
+
+                      if (!resolvedRecipientId) {
+                        console.warn(
+                          'Skipping detected field because no recipient could be resolved',
+                          {
+                            detectedRecipientId: detected.recipientId,
+                          },
+                        );
+                        continue;
+                      }
+
+                      try {
+                        editorFields.addField({
+                          envelopeItemId: currentEnvelopeItem.id,
+                          page: pageNumber,
+                          type: fieldType,
+                          positionX,
+                          positionY,
+                          width,
+                          height,
+                          recipientId: resolvedRecipientId,
+                          fieldMeta: structuredClone(FIELD_META_DEFAULT_VALUES[fieldType]),
+                        });
+                        totalAdded++;
+                      } catch (error) {
+                        console.error(`Failed to add field on page ${pageNumber}:`, error);
+                      }
+                    }
+                  }
+
+                  const successfulPages = fieldsPerPage.size;
+                  const failedPages = errors.size;
+
+                  if (totalAdded > 0) {
+                    let description = t`Added ${totalAdded} fields`;
+                    if (fieldsPerPage.size > 1) {
+                      description = t`Added ${totalAdded} fields across ${successfulPages} pages`;
+                    }
+                    if (failedPages > 0) {
+                      description = t`Added ${totalAdded} fields across ${successfulPages} pages. ${failedPages} pages failed.`;
+                    }
+
+                    toast({
+                      title: t`Fields added`,
+                      description,
+                    });
+                  } else if (failedPages > 0) {
+                    toast({
+                      title: t`Field detection failed`,
+                      description: t`Failed to detect fields on ${failedPages} pages. Please try again.`,
+                      variant: 'destructive',
+                    });
+                  } else {
+                    toast({
+                      title: t`No fields detected`,
+                      description: t`No fields were detected in the document`,
+                    });
+                  }
+                } catch (error) {
+                  toast({
+                    title: t`Processing error`,
+                    description: t`An unexpected error occurred while processing pages.`,
+                    variant: 'destructive',
+                  });
+                } finally {
+                  setIsAutoAddingFields(false);
+                  setProcessingProgress(null);
+                }
+              }}
+            >
+              {isDetectingFields ? <Trans>Processing...</Trans> : <Trans>Auto add fields</Trans>}
+            </Button>
           </section>
 
           {/* Field details section. */}

apps/remix/app/components/general/envelope-editor/envelope-editor-header.tsx

@@ -30,11 +30,18 @@ import { EnvelopeItemTitleInput } from './envelope-editor-title-input';
 export default function EnvelopeEditorHeader() {
   const { t } = useLingui();
 
-  const { envelope, isDocument, isTemplate, updateEnvelope, autosaveError, relativePath } =
-    useCurrentEnvelopeEditor();
+  const {
+    envelope,
+    isDocument,
+    isTemplate,
+    updateEnvelope,
+    autosaveError,
+    relativePath,
+    editorFields,
+  } = useCurrentEnvelopeEditor();
 
   return (
-    <nav className="w-full border-b border-border bg-background px-4 py-3 md:px-6">
+    <nav className="bg-background border-border w-full border-b px-4 py-3 md:px-6">
       <div className="flex items-center justify-between">
         <div className="flex items-center space-x-4">
           <Link to="/">
@@ -140,6 +147,10 @@ export default function EnvelopeEditorHeader() {
           {isDocument && (
             <>
               <EnvelopeDistributeDialog
+                envelope={{
+                  ...envelope,
+                  fields: editorFields.localFields,
+                }}
                 documentRootPath={relativePath.documentRootPath}
                 trigger={
                   <Button size="sm">

apps/remix/app/components/general/envelope-editor/envelope-editor-recipient-form.tsx

@@ -8,6 +8,7 @@ import {
   type SensorAPI,
 } from '@hello-pangea/dnd';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { DocumentSigningOrder, EnvelopeType, RecipientRole, SendStatus } from '@prisma/client';
 import { motion } from 'framer-motion';
@@ -25,7 +26,6 @@ import {
   ZRecipientActionAuthTypesSchema,
   ZRecipientAuthOptionsSchema,
 } from '@documenso/lib/types/document-auth';
-import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 import { nanoid } from '@documenso/lib/universal/id';
 import { canRecipientBeModified as utilCanRecipientBeModified } from '@documenso/lib/utils/recipients';
 import { trpc } from '@documenso/trpc/react';
@@ -65,7 +65,10 @@ const ZEnvelopeRecipientsForm = z.object({
     z.object({
       formId: z.string().min(1),
       id: z.number().optional(),
-      email: ZRecipientEmailSchema,
+      email: z
+        .string()
+        .email({ message: msg`Invalid email`.id })
+        .min(1),
       name: z.string(),
       role: z.nativeEnum(RecipientRole),
       signingOrder: z.number().optional(),
@@ -198,13 +201,12 @@ export const EnvelopeEditorRecipientForm = () => {
     keyName: 'nativeId',
   });
 
-  const emptySignerIndex = watchedSigners.findIndex(
-    (signer) =>
-      !signer.name &&
-      !signer.email &&
-      envelope.fields.filter((field) => field.recipientId === signer.id).length === 0,
+  const emptySigners = useCallback(
+    () => form.getValues('signers').filter((signer) => signer.email === ''),
+    [form],
   );
 
+  const emptySignerIndex = watchedSigners.findIndex((signer) => !signer.name && !signer.email);
   const isUserAlreadyARecipient = watchedSigners.some(
     (signer) => signer.email.toLowerCase() === user?.email?.toLowerCase(),
   );
@@ -458,7 +460,21 @@ export const EnvelopeEditorRecipientForm = () => {
       return;
     }
 
-    const validatedFormValues = ZEnvelopeRecipientsForm.safeParse(formValues);
+    const formValueSigners = formValues.signers || [];
+
+    // Remove the last signer if it's empty.
+    const nonEmptyRecipients = formValueSigners.filter((signer, i) => {
+      if (i === formValueSigners.length - 1 && signer.email === '') {
+        return false;
+      }
+
+      return true;
+    });
+
+    const validatedFormValues = ZEnvelopeRecipientsForm.safeParse({
+      ...formValues,
+      signers: nonEmptyRecipients,
+    });
 
     if (!validatedFormValues.success) {
       return;
@@ -554,7 +570,7 @@ export const EnvelopeEditorRecipientForm = () => {
       <CardContent>
         <AnimateGenericFadeInOut motionKey={showAdvancedSettings ? 'Show' : 'Hide'}>
           <Form {...form}>
-            <div className="-mt-2 mb-2 space-y-4 rounded-md bg-accent/50 p-4">
+            <div className="bg-accent/50 -mt-2 mb-2 space-y-4 rounded-md p-4">
               {organisation.organisationClaim.flags.cfr21 && (
                 <div className="flex flex-row items-center">
                   <Checkbox
@@ -602,7 +618,9 @@ export const EnvelopeEditorRecipientForm = () => {
                             });
                           }
                         }}
-                        disabled={isSubmitting || hasDocumentBeenSent}
+                        disabled={
+                          isSubmitting || hasDocumentBeenSent || emptySigners().length !== 0
+                        }
                       />
                     </FormControl>
 
@@ -616,7 +634,7 @@ export const EnvelopeEditorRecipientForm = () => {
 
                       <Tooltip>
                         <TooltipTrigger asChild>
-                          <span className="ml-1 cursor-help text-muted-foreground">
+                          <span className="text-muted-foreground ml-1 cursor-help">
                             <HelpCircleIcon className="h-3.5 w-3.5" />
                           </span>
                         </TooltipTrigger>
@@ -661,7 +679,7 @@ export const EnvelopeEditorRecipientForm = () => {
 
                         <Tooltip>
                           <TooltipTrigger asChild>
-                            <span className="ml-1 cursor-help text-muted-foreground">
+                            <span className="text-muted-foreground ml-1 cursor-help">
                               <HelpCircleIcon className="h-3.5 w-3.5" />
                             </span>
                           </TooltipTrigger>
@@ -714,7 +732,7 @@ export const EnvelopeEditorRecipientForm = () => {
                             {...provided.draggableProps}
                             {...provided.dragHandleProps}
                             className={cn('py-1', {
-                              'pointer-events-none rounded-md bg-widget-foreground pt-2':
+                              'bg-widget-foreground pointer-events-none rounded-md pt-2':
                                 snapshot.isDragging,
                             })}
                           >
@@ -788,7 +806,7 @@ export const EnvelopeEditorRecipientForm = () => {
                                       })}
                                     >
                                       {!showAdvancedSettings && index === 0 && (
-                                        <FormLabel>
+                                        <FormLabel required>
                                           <Trans>Email</Trans>
                                         </FormLabel>
                                       )}

apps/remix/app/components/general/envelope-editor/envelope-editor-upload-page.tsx

@@ -1,12 +1,11 @@
 import { useMemo, useState } from 'react';
 
-import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd';
 import type { DropResult } from '@hello-pangea/dnd';
+import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd';
 import { msg } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { DocumentStatus } from '@prisma/client';
-import { FileWarningIcon, GripVerticalIcon, Loader2 } from 'lucide-react';
-import { X } from 'lucide-react';
+import { FileWarningIcon, GripVerticalIcon, Loader2, X } from 'lucide-react';
 import { ErrorCode as DropzoneErrorCode, type FileRejection } from 'react-dropzone';
 import { Link } from 'react-router';
 
@@ -174,7 +173,6 @@ export const EnvelopeEditorUploadPage = () => {
       fields: envelope.fields.filter((field) => field.envelopeItemId !== envelopeItemId),
     });
 
-    // Reset editor fields.
     editorFields.resetForm(fieldsWithoutDeletedItem);
   };
 

apps/remix/app/components/general/envelope-editor/envelope-editor.tsx

@@ -152,30 +152,30 @@ export default function EnvelopeEditor() {
     envelopeEditorSteps.find((step) => step.id === currentStep) || envelopeEditorSteps[0];
 
   return (
-    <div className="h-screen w-screen bg-gray-50 dark:bg-background">
+    <div className="dark:bg-background h-screen w-screen bg-gray-50">
       <EnvelopeEditorHeader />
 
       {/* Main Content Area */}
       <div className="flex h-[calc(100vh-4rem)] w-screen">
         {/* Left Section - Step Navigation */}
-        <div className="flex w-80 flex-shrink-0 flex-col overflow-y-auto border-r border-border bg-background py-4">
+        <div className="bg-background border-border flex w-80 flex-shrink-0 flex-col overflow-y-auto border-r py-4">
           {/* Left section step selector. */}
           <div className="px-4">
-            <h3 className="flex items-end justify-between text-sm font-semibold text-foreground">
+            <h3 className="text-foreground flex items-end justify-between text-sm font-semibold">
               {isDocument ? <Trans>Document Editor</Trans> : <Trans>Template Editor</Trans>}
 
-              <span className="ml-2 rounded border bg-muted/50 px-2 py-0.5 text-xs text-muted-foreground">
+              <span className="text-muted-foreground bg-muted/50 ml-2 rounded border px-2 py-0.5 text-xs">
                 <Trans context="The step counter">
                   Step {currentStepData.order}/{envelopeEditorSteps.length}
                 </Trans>
               </span>
             </h3>
 
-            <div className="relative my-4 h-[4px] rounded-md bg-muted">
+            <div className="bg-muted relative my-4 h-[4px] rounded-md">
               <motion.div
                 layout="size"
                 layoutId="document-flow-container-step"
-                className="absolute inset-y-0 left-0 bg-documenso"
+                className="bg-documenso absolute inset-y-0 left-0"
                 style={{
                   width: `${(100 / envelopeEditorSteps.length) * (currentStepData.order ?? 0)}%`,
                 }}
@@ -219,7 +219,7 @@ export default function EnvelopeEditor() {
                         >
                           {t(step.title)}
                         </div>
-                        <div className="text-xs text-muted-foreground">{t(step.description)}</div>
+                        <div className="text-muted-foreground text-xs">{t(step.description)}</div>
                       </div>
                     </div>
                   </div>
@@ -232,7 +232,7 @@ export default function EnvelopeEditor() {
 
           {/* Quick Actions. */}
           <div className="space-y-3 px-4">
-            <h4 className="text-sm font-semibold text-foreground">
+            <h4 className="text-foreground text-sm font-semibold">
               <Trans>Quick Actions</Trans>
             </h4>
             <EnvelopeEditorSettingsDialog
@@ -246,6 +246,10 @@ export default function EnvelopeEditor() {
 
             {isDocument && (
               <EnvelopeDistributeDialog
+                envelope={{
+                  ...envelope,
+                  fields: editorFields.localFields,
+                }}
                 documentRootPath={relativePath.documentRootPath}
                 trigger={
                   <Button variant="ghost" size="sm" className="w-full justify-start">

apps/remix/app/components/general/envelope-editor/envelope-recipient-selector.tsx

@@ -41,11 +41,6 @@ export const EnvelopeRecipientSelector = ({
 }: EnvelopeRecipientSelectorProps) => {
   const [showRecipientsSelector, setShowRecipientsSelector] = useState(false);
 
-  const getRecipientLabel = useCallback(
-    (recipient: Recipient) => extractRecipientLabel(recipient, recipients),
-    [recipients],
-  );
-
   return (
     <Popover open={showRecipientsSelector} onOpenChange={setShowRecipientsSelector}>
       <PopoverTrigger asChild>
@@ -54,7 +49,7 @@ export const EnvelopeRecipientSelector = ({
           variant="outline"
           role="combobox"
           className={cn(
-            'justify-between bg-background font-normal text-muted-foreground hover:text-foreground',
+            'bg-background text-muted-foreground hover:text-foreground justify-between font-normal',
             getRecipientColorStyles(
               Math.max(
                 recipients.findIndex((r) => r.id === selectedRecipient?.id),
@@ -64,12 +59,16 @@ export const EnvelopeRecipientSelector = ({
             className,
           )}
         >
-          {selectedRecipient && (
+          {selectedRecipient?.email && (
             <span className="flex-1 truncate text-left">
-              {getRecipientLabel(selectedRecipient)}
+              {selectedRecipient?.name} ({selectedRecipient?.email})
             </span>
           )}
 
+          {!selectedRecipient?.email && (
+            <span className="flex-1 truncate text-left">{selectedRecipient?.email}</span>
+          )}
+
           <ChevronsUpDown className="ml-2 h-4 w-4" />
         </Button>
       </PopoverTrigger>
@@ -155,11 +154,6 @@ export const EnvelopeRecipientSelectorCommand = ({
     [fields, recipients],
   );
 
-  const getRecipientLabel = useCallback(
-    (recipient: Recipient) => extractRecipientLabel(recipient, recipients),
-    [recipients],
-  );
-
   return (
     <Command
       value={selectedRecipient ? selectedRecipient.id.toString() : undefined}
@@ -168,21 +162,21 @@ export const EnvelopeRecipientSelectorCommand = ({
       <CommandInput placeholder={placeholder} />
 
       <CommandEmpty>
-        <span className="inline-block px-4 text-muted-foreground">
+        <span className="text-muted-foreground inline-block px-4">
           <Trans>No recipient matching this description was found.</Trans>
         </span>
       </CommandEmpty>
 
       {recipientsByRoleToDisplay().map(([role, roleRecipients], roleIndex) => (
         <CommandGroup key={roleIndex}>
-          <div className="mb-1 ml-2 mt-2 text-xs font-medium text-muted-foreground">
+          <div className="text-muted-foreground mb-1 ml-2 mt-2 text-xs font-medium">
             {t(RECIPIENT_ROLES_DESCRIPTION[role].roleNamePlural)}
           </div>
 
           {roleRecipients.length === 0 && (
             <div
               key={`${role}-empty`}
-              className="px-4 pb-4 pt-2.5 text-center text-xs text-muted-foreground/80"
+              className="text-muted-foreground/80 px-4 pb-4 pt-2.5 text-center text-xs"
             >
               <Trans>No recipients with this role</Trans>
             </div>
@@ -211,12 +205,18 @@ export const EnvelopeRecipientSelectorCommand = ({
               }}
             >
               <span
-                className={cn('truncate text-foreground/70', {
+                className={cn('text-foreground/70 truncate', {
                   'text-foreground/80': recipient.id === selectedRecipient?.id,
                   'opacity-50': isRecipientDisabled(recipient.id),
                 })}
               >
-                {getRecipientLabel(recipient)}
+                {recipient.name && (
+                  <span title={`${recipient.name} (${recipient.email})`}>
+                    {recipient.name} ({recipient.email})
+                  </span>
+                )}
+
+                {!recipient.name && <span title={recipient.email}>{recipient.email}</span>}
               </span>
 
               <div className="ml-auto flex items-center justify-center">
@@ -234,7 +234,7 @@ export const EnvelopeRecipientSelectorCommand = ({
                       <Info className="z-50 ml-2 h-4 w-4" />
                     </TooltipTrigger>
 
-                    <TooltipContent className="max-w-xs text-muted-foreground">
+                    <TooltipContent className="text-muted-foreground max-w-xs">
                       <Trans>
                         This document has already been sent to this recipient. You can no longer
                         edit this recipient.
@@ -250,22 +250,3 @@ export const EnvelopeRecipientSelectorCommand = ({
     </Command>
   );
 };
-
-const extractRecipientLabel = (recipient: Recipient, recipients: Recipient[]) => {
-  if (recipient.name && recipient.email) {
-    return `${recipient.name} (${recipient.email})`;
-  }
-
-  if (recipient.name) {
-    return recipient.name;
-  }
-
-  if (recipient.email) {
-    return recipient.email;
-  }
-
-  // Since objects are basically pointers we can use `indexOf` rather than `findIndex`
-  const index = recipients.indexOf(recipient);
-
-  return `Recipient ${index + 1}`;
-};

apps/remix/app/components/general/envelope-signing/envelope-signing-complete-dialog.tsx

@@ -80,14 +80,12 @@ export const EnvelopeSignerCompleteDialog = () => {
   const handleOnCompleteClick = async (
     nextSigner?: { name: string; email: string },
     accessAuthOptions?: TRecipientAccessAuth,
-    recipientDetails?: { name: string; email: string },
   ) => {
     try {
       await completeDocument({
         token: recipient.token,
         documentId: mapSecondaryIdToDocumentId(envelope.secondaryId),
         accessAuthOptions,
-        recipientOverride: recipientDetails,
         ...(nextSigner?.email && nextSigner?.name ? { nextSigner } : {}),
       });
 
@@ -207,18 +205,9 @@ export const EnvelopeSignerCompleteDialog = () => {
     }
   };
 
-  const recipientPayload = useMemo(() => {
+  const directTemplatePayload = useMemo(() => {
     if (!isDirectTemplate) {
-      return {
-        name:
-          recipient.name ||
-          recipient.fields.find((field) => field.type === FieldType.NAME)?.customText ||
-          '',
-        email:
-          recipient.email ||
-          recipient.fields.find((field) => field.type === FieldType.EMAIL)?.customText ||
-          '',
-      };
+      return;
     }
 
     return {
@@ -230,7 +219,7 @@ export const EnvelopeSignerCompleteDialog = () => {
   return (
     <DocumentSigningCompleteDialog
       isSubmitting={isPending}
-      recipientPayload={recipientPayload}
+      directTemplatePayload={directTemplatePayload}
       onSignatureComplete={
         isDirectTemplate ? handleDirectTemplateCompleteClick : handleOnCompleteClick
       }

apps/remix/app/components/general/envelope/envelope-drop-zone-wrapper.tsx

@@ -1,7 +1,7 @@
 import { type ReactNode, useState } from 'react';
 
-import { useLingui } from '@lingui/react/macro';
-import { Trans } from '@lingui/react/macro';
+import { plural } from '@lingui/core/macro';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { EnvelopeType } from '@prisma/client';
 import { Loader } from 'lucide-react';
 import {
@@ -27,7 +27,13 @@ import type { TCreateEnvelopePayload } from '@documenso/trpc/server/envelope-rou
 import { cn } from '@documenso/ui/lib/utils';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { RecipientDetectionPromptDialog } from '~/components/dialogs/recipient-detection-prompt-dialog';
 import { useCurrentTeam } from '~/providers/team';
+import {
+  type RecipientForCreation,
+  detectRecipientsInDocument,
+  ensureRecipientEmails,
+} from '~/utils/detect-document-recipients';
 
 export interface EnvelopeDropZoneWrapperProps {
   children: ReactNode;
@@ -52,6 +58,10 @@ export const EnvelopeDropZoneWrapper = ({
   const organisation = useCurrentOrganisation();
 
   const [isLoading, setIsLoading] = useState(false);
+  const [showExtractionPrompt, setShowExtractionPrompt] = useState(false);
+  const [uploadedDocumentId, setUploadedDocumentId] = useState<string | null>(null);
+  const [pendingRecipients, setPendingRecipients] = useState<RecipientForCreation[] | null>(null);
+  const [shouldNavigateAfterPromptClose, setShouldNavigateAfterPromptClose] = useState(true);
 
   const userTimezone =
     TIME_ZONES.find((timezone) => timezone === Intl.DateTimeFormat().resolvedOptions().timeZone) ??
@@ -60,6 +70,7 @@ export const EnvelopeDropZoneWrapper = ({
   const { quota, remaining, refreshLimits, maximumEnvelopeItemCount } = useLimits();
 
   const { mutateAsync: createEnvelope } = trpc.envelope.create.useMutation();
+  const { mutateAsync: createRecipients } = trpc.envelope.recipient.createMany.useMutation();
 
   const isUploadDisabled = remaining.documents === 0 || !user.emailVerified;
 
@@ -108,14 +119,15 @@ export const EnvelopeDropZoneWrapper = ({
           documentId: id,
           timestamp: new Date().toISOString(),
         });
+
+        setUploadedDocumentId(id);
+        setPendingRecipients(null);
+        setShouldNavigateAfterPromptClose(true);
+        setShowExtractionPrompt(true);
+      } else {
+        const pathPrefix = formatTemplatesPath(team.url);
+        await navigate(`${pathPrefix}/${id}/edit`);
       }
-
-      const pathPrefix =
-        type === EnvelopeType.DOCUMENT
-          ? formatDocumentsPath(team.url)
-          : formatTemplatesPath(team.url);
-
-      await navigate(`${pathPrefix}/${id}/edit`);
     } catch (err) {
       const error = AppError.parseError(err);
 
@@ -132,7 +144,7 @@ export const EnvelopeDropZoneWrapper = ({
         .otherwise(() => t`An error occurred during upload.`);
 
       toast({
-        title: t`Error`,
+        title: t`Upload failed`,
         description: errorMessage,
         variant: 'destructive',
         duration: 7500,
@@ -161,7 +173,6 @@ export const EnvelopeDropZoneWrapper = ({
       return;
     }
 
-    // Since users can only upload only one file (no multi-upload), we only handle the first file rejection
     const { file, errors } = fileRejections[0];
 
     if (!errors.length) {
@@ -201,6 +212,116 @@ export const EnvelopeDropZoneWrapper = ({
       variant: 'destructive',
     });
   };
+
+  const navigateToEnvelopeEditor = () => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    const pathPrefix = formatDocumentsPath(team.url);
+    void navigate(`${pathPrefix}/${uploadedDocumentId}/edit`);
+  };
+
+  const handleStartRecipientDetection = async () => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    try {
+      const recipients = await detectRecipientsInDocument(uploadedDocumentId);
+
+      if (recipients.length === 0) {
+        toast({
+          title: t`No recipients detected`,
+          description: t`You can add recipients manually in the editor`,
+          duration: 5000,
+        });
+
+        setShouldNavigateAfterPromptClose(true);
+        setShowExtractionPrompt(false);
+        navigateToEnvelopeEditor();
+        return;
+      }
+
+      const recipientsWithEmails = ensureRecipientEmails(recipients, uploadedDocumentId);
+
+      setPendingRecipients(recipientsWithEmails);
+      setShouldNavigateAfterPromptClose(false);
+    } catch (error) {
+      if (!(error instanceof Error && error.message === 'NO_RECIPIENTS_DETECTED')) {
+        const parsedError = AppError.parseError(error);
+
+        toast({
+          title: t`Failed to detect recipients`,
+          description: parsedError.userMessage || t`You can add recipients manually in the editor`,
+          variant: 'destructive',
+          duration: 7500,
+        });
+      }
+
+      throw error;
+    }
+  };
+
+  const handleSkipRecipientDetection = () => {
+    setShouldNavigateAfterPromptClose(true);
+    setShowExtractionPrompt(false);
+    navigateToEnvelopeEditor();
+  };
+
+  const handleRecipientsConfirm = async (recipientsToCreate: RecipientForCreation[]) => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    try {
+      await createRecipients({
+        envelopeId: uploadedDocumentId,
+        data: recipientsToCreate,
+      });
+
+      toast({
+        title: t`Recipients added`,
+        description: t`Successfully detected ${recipientsToCreate.length} ${plural(
+          recipientsToCreate.length,
+          {
+            one: 'recipient',
+            other: 'recipients',
+          },
+        )}`,
+        duration: 5000,
+      });
+
+      setShowExtractionPrompt(false);
+      setPendingRecipients(null);
+      navigateToEnvelopeEditor();
+    } catch (error) {
+      const parsedError = AppError.parseError(error);
+
+      toast({
+        title: t`Failed to add recipients`,
+        description: parsedError.userMessage || t`Please review the recipients and try again`,
+        variant: 'destructive',
+        duration: 7500,
+      });
+
+      throw error;
+    }
+  };
+
+  const handlePromptDialogOpenChange = (open: boolean) => {
+    setShowExtractionPrompt(open);
+
+    if (open) {
+      setShouldNavigateAfterPromptClose(true);
+      return;
+    }
+
+    if (!open && shouldNavigateAfterPromptClose) {
+      navigateToEnvelopeEditor();
+    }
+  };
+
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
     accept: {
       'application/pdf': ['.pdf'],
@@ -267,6 +388,15 @@ export const EnvelopeDropZoneWrapper = ({
           </div>
         </div>
       )}
+
+      <RecipientDetectionPromptDialog
+        open={showExtractionPrompt}
+        onOpenChange={handlePromptDialogOpenChange}
+        onAccept={handleStartRecipientDetection}
+        onSkip={handleSkipRecipientDetection}
+        recipients={pendingRecipients}
+        onRecipientsSubmit={handleRecipientsConfirm}
+      />
     </div>
   );
 };

apps/remix/app/components/general/envelope/envelope-upload-button.tsx

@@ -1,6 +1,6 @@
 import { useMemo, useState } from 'react';
 
-import { msg } from '@lingui/core/macro';
+import { msg, plural } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react/macro';
 import { Trans } from '@lingui/react/macro';
 import { EnvelopeType } from '@prisma/client';
@@ -27,7 +27,14 @@ import {
 } from '@documenso/ui/primitives/tooltip';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { RecipientDetectionPromptDialog } from '~/components/dialogs/recipient-detection-prompt-dialog';
 import { useCurrentTeam } from '~/providers/team';
+import { detectFieldsInDocument } from '~/utils/detect-document-fields';
+import {
+  type RecipientForCreation,
+  detectRecipientsInDocument,
+  ensureRecipientEmails,
+} from '~/utils/detect-document-recipients';
 
 export type EnvelopeUploadButtonProps = {
   className?: string;
@@ -35,9 +42,6 @@ export type EnvelopeUploadButtonProps = {
   folderId?: string;
 };
 
-/**
- * Upload an envelope
- */
 export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUploadButtonProps) => {
   const { t } = useLingui();
   const { toast } = useToast();
@@ -55,8 +59,14 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
   const { quota, remaining, refreshLimits, maximumEnvelopeItemCount } = useLimits();
 
   const [isLoading, setIsLoading] = useState(false);
+  const [showExtractionPrompt, setShowExtractionPrompt] = useState(false);
+  const [uploadedDocumentId, setUploadedDocumentId] = useState<string | null>(null);
+  const [pendingRecipients, setPendingRecipients] = useState<RecipientForCreation[] | null>(null);
+  const [shouldNavigateAfterPromptClose, setShouldNavigateAfterPromptClose] = useState(true);
+  const [isAutoAddingFields, setIsAutoAddingFields] = useState(false);
 
   const { mutateAsync: createEnvelope } = trpc.envelope.create.useMutation();
+  const { mutateAsync: createRecipients } = trpc.envelope.recipient.createMany.useMutation();
 
   const disabledMessage = useMemo(() => {
     if (organisation.subscription && remaining.documents === 0) {
@@ -108,16 +118,26 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
           ? formatDocumentsPath(team.url)
           : formatTemplatesPath(team.url);
 
-      await navigate(`${pathPrefix}/${id}/edit`);
+      if (type === EnvelopeType.DOCUMENT) {
+        setUploadedDocumentId(id);
+        setPendingRecipients(null);
+        setShouldNavigateAfterPromptClose(true);
+        setShowExtractionPrompt(true);
 
-      toast({
-        title: type === EnvelopeType.DOCUMENT ? t`Document uploaded` : t`Template uploaded`,
-        description:
-          type === EnvelopeType.DOCUMENT
-            ? t`Your document has been uploaded successfully.`
-            : t`Your template has been uploaded successfully.`,
-        duration: 5000,
-      });
+        toast({
+          title: t`Document uploaded`,
+          description: t`Your document has been uploaded successfully.`,
+          duration: 5000,
+        });
+      } else {
+        await navigate(`${pathPrefix}/${id}/edit`);
+
+        toast({
+          title: t`Template uploaded`,
+          description: t`Your template has been uploaded successfully.`,
+          duration: 5000,
+        });
+      }
     } catch (err) {
       const error = AppError.parseError(err);
 
@@ -136,7 +156,7 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
         .otherwise(() => t`An error occurred while uploading your document.`);
 
       toast({
-        title: t`Error`,
+        title: t`Upload failed`,
         description: errorMessage,
         variant: 'destructive',
         duration: 7500,
@@ -169,6 +189,181 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
     });
   };
 
+  const navigateToEnvelopeEditor = () => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    const pathPrefix = formatDocumentsPath(team.url);
+    void navigate(`${pathPrefix}/${uploadedDocumentId}/edit`);
+  };
+
+  const handleStartRecipientDetection = async () => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    try {
+      const recipients = await detectRecipientsInDocument(uploadedDocumentId);
+
+      if (recipients.length === 0) {
+        toast({
+          title: t`No recipients detected`,
+          description: t`You can add recipients manually in the editor`,
+          duration: 5000,
+        });
+
+        setShouldNavigateAfterPromptClose(true);
+        setShowExtractionPrompt(false);
+        navigateToEnvelopeEditor();
+        return;
+      }
+
+      const recipientsWithEmails = ensureRecipientEmails(recipients, uploadedDocumentId);
+
+      setPendingRecipients(recipientsWithEmails);
+      setShouldNavigateAfterPromptClose(false);
+    } catch (err) {
+      const error = AppError.parseError(err);
+
+      // Only show toast if this wasn't a "no recipients found" case
+      if (error.code !== 'NO_RECIPIENTS_DETECTED') {
+        toast({
+          title: t`Failed to analyze recipients`,
+          description: error.userMessage || t`You can add recipients manually in the editor`,
+          variant: 'destructive',
+          duration: 7500,
+        });
+      }
+
+      throw error;
+    }
+  };
+
+  const handleSkipRecipientDetection = () => {
+    setShouldNavigateAfterPromptClose(true);
+    setShowExtractionPrompt(false);
+    navigateToEnvelopeEditor();
+  };
+
+  const handleRecipientsConfirm = async (recipientsToCreate: RecipientForCreation[]) => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    try {
+      await createRecipients({
+        envelopeId: uploadedDocumentId,
+        data: recipientsToCreate,
+      });
+
+      toast({
+        title: t`Recipients added`,
+        description: t`Successfully detected ${recipientsToCreate.length} ${plural(
+          recipientsToCreate.length,
+          {
+            one: 'recipient',
+            other: 'recipients',
+          },
+        )}`,
+        duration: 5000,
+      });
+
+      setShowExtractionPrompt(false);
+      setPendingRecipients(null);
+      navigateToEnvelopeEditor();
+    } catch (err) {
+      const error = AppError.parseError(err);
+
+      toast({
+        title: t`Failed to add recipients`,
+        description: error.userMessage || t`Please review the recipients and try again`,
+        variant: 'destructive',
+        duration: 7500,
+      });
+
+      // Error is handled, dialog stays open for retry
+    }
+  };
+
+  const handleAutoAddFields = async (recipientsToCreate: RecipientForCreation[]) => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    setIsAutoAddingFields(true);
+
+    try {
+      await createRecipients({
+        envelopeId: uploadedDocumentId,
+        data: recipientsToCreate,
+      });
+
+      let detectedFields;
+      try {
+        detectedFields = await detectFieldsInDocument(uploadedDocumentId);
+      } catch (error) {
+        console.error('Field detection failed:', error);
+
+        toast({
+          title: t`Field detection failed`,
+          description: t`Recipients added successfully, but field detection encountered an error. You can add fields manually.`,
+          variant: 'destructive',
+          duration: 7500,
+        });
+
+        setShowExtractionPrompt(false);
+        setPendingRecipients(null);
+        setIsAutoAddingFields(false);
+
+        const pathPrefix = formatDocumentsPath(team.url);
+        void navigate(`${pathPrefix}/${uploadedDocumentId}/edit?step=addFields`);
+        return;
+      }
+
+      if (detectedFields.length > 0) {
+        sessionStorage.setItem(
+          `autoPlaceFields_${uploadedDocumentId}`,
+          JSON.stringify({
+            fields: detectedFields,
+            recipientCount: recipientsToCreate.length,
+          }),
+        );
+      }
+
+      setShowExtractionPrompt(false);
+      setPendingRecipients(null);
+      setIsAutoAddingFields(false);
+
+      const pathPrefix = formatDocumentsPath(team.url);
+      void navigate(`${pathPrefix}/${uploadedDocumentId}/edit?step=addFields`);
+    } catch (err) {
+      const error = AppError.parseError(err);
+
+      toast({
+        title: t`Failed to add recipients`,
+        description: error.userMessage || t`Please try again`,
+        variant: 'destructive',
+        duration: 7500,
+      });
+
+      setIsAutoAddingFields(false);
+    }
+  };
+
+  const handlePromptDialogOpenChange = (open: boolean) => {
+    setShowExtractionPrompt(open);
+
+    if (open) {
+      setShouldNavigateAfterPromptClose(true);
+      return;
+    }
+
+    if (!open && shouldNavigateAfterPromptClose) {
+      navigateToEnvelopeEditor();
+    }
+  };
+
   return (
     <div className={cn('relative', className)}>
       <TooltipProvider>
@@ -201,6 +396,17 @@ export const EnvelopeUploadButton = ({ className, type, folderId }: EnvelopeUplo
             )}
         </Tooltip>
       </TooltipProvider>
+
+      <RecipientDetectionPromptDialog
+        open={showExtractionPrompt}
+        onOpenChange={handlePromptDialogOpenChange}
+        onAccept={handleStartRecipientDetection}
+        onSkip={handleSkipRecipientDetection}
+        recipients={pendingRecipients}
+        onRecipientsSubmit={handleRecipientsConfirm}
+        onAutoAddFields={handleAutoAddFields}
+        isProcessingRecipients={isAutoAddingFields}
+      />
     </div>
   );
 };

apps/remix/app/components/tables/admin-dashboard-users-table.tsx

@@ -51,7 +51,7 @@ export const AdminDashboardUsersTable = ({
   const columns = useMemo(() => {
     return [
       {
-        header: _(msg`ID`),
+        header: 'ID',
         accessorKey: 'id',
         cell: ({ row }) => <div>{row.original.id}</div>,
       },

apps/remix/app/components/tables/admin-document-recipient-item-table.tsx

@@ -57,7 +57,7 @@ export const AdminDocumentRecipientItemTable = ({ recipient }: RecipientItemProp
   const columns = useMemo(() => {
     return [
       {
-        header: _(msg`ID`),
+        header: 'ID',
         accessorKey: 'id',
         cell: ({ row }) => <div>{row.original.id}</div>,
       },

apps/remix/app/components/tables/admin-organisations-table.tsx

@@ -113,11 +113,7 @@ export const AdminOrganisationsTable = ({
                 isPaid ? 'bg-green-100 text-green-800' : 'bg-gray-100 text-gray-800'
               }`}
             >
-              {isPaid ? (
-                <Trans context="Subscription status">Paid</Trans>
-              ) : (
-                <Trans context="Subscription status">Free</Trans>
-              )}
+              {isPaid ? t`Paid` : t`Free`}
             </div>
           );
         },
@@ -135,7 +131,7 @@ export const AdminOrganisationsTable = ({
               <ExternalLinkIcon className="h-4 w-4" />
             </Link>
           ) : (
-            <Trans>None</Trans>
+            'None'
           ),
       },
       {

apps/remix/app/components/tables/document-logs-table.tsx

@@ -96,11 +96,11 @@ export const DocumentLogsTable = ({ documentId }: DocumentLogsTableProps) => {
         cell: ({ row }) => <span>{formatDocumentAuditLogAction(_, row.original).description}</span>,
       },
       {
-        header: _(msg`IP Address`),
+        header: 'IP Address',
         accessorKey: 'ipAddress',
       },
       {
-        header: _(msg`Browser`),
+        header: 'Browser',
         cell: ({ row }) => {
           if (!row.original.userAgent) {
             return 'N/A';

apps/remix/app/components/tables/settings-security-activity-table.tsx

@@ -104,7 +104,7 @@ export const SettingsSecurityActivityTable = () => {
         },
       },
       {
-        header: _(msg`IP Address`),
+        header: 'IP Address',
         accessorKey: 'ipAddress',
         cell: ({ row }) => row.original.ipAddress ?? 'N/A',
       },

apps/remix/app/components/tables/user-billing-organisations-table.tsx

@@ -28,19 +28,19 @@ export const UserBillingOrganisationsTable = () => {
   const getSubscriptionStatusDisplay = (status: SubscriptionStatus | undefined) => {
     return match(status)
       .with(SubscriptionStatus.ACTIVE, () => ({
-        label: t({ message: `Active`, context: `Subscription status` }),
+        label: t`Active`,
         variant: 'default' as const,
       }))
       .with(SubscriptionStatus.PAST_DUE, () => ({
-        label: t({ message: `Past Due`, context: `Subscription status` }),
+        label: t`Past Due`,
         variant: 'warning' as const,
       }))
       .with(SubscriptionStatus.INACTIVE, () => ({
-        label: t({ message: `Inactive`, context: `Subscription status` }),
+        label: t`Inactive`,
         variant: 'neutral' as const,
       }))
       .otherwise(() => ({
-        label: t({ message: `Free`, context: `Subscription status` }),
+        label: t`Free`,
         variant: 'neutral' as const,
       }));
   };

apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx

@@ -114,7 +114,7 @@ export default function AdminDocumentsPage() {
         },
       },
       {
-        header: _(msg`Last updated`),
+        header: 'Last updated',
         accessorKey: 'updatedAt',
         cell: ({ row }) => i18n.date(row.original.updatedAt),
       },

apps/remix/app/routes/_authenticated+/admin+/stats.tsx

@@ -152,6 +152,12 @@ export default function AdminStatsPage({ loaderData }: Route.ComponentProps) {
         <div className="mt-5 grid grid-cols-2 gap-8">
           <MonthlyActiveUsersChart title={_(msg`MAU (signed in)`)} data={monthlyActiveUsers} />
 
+          <MonthlyActiveUsersChart
+            title={_(msg`Cumulative MAU (signed in)`)}
+            data={monthlyActiveUsers}
+            cummulative
+          />
+
           <AdminStatsUsersWithDocumentsChart
             data={monthlyUsersWithDocuments}
             title={_(msg`MAU (created document)`)}

apps/remix/app/utils/detect-document-fields.ts

@@ -0,0 +1,39 @@
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import type { TDetectedFormField } from '@documenso/lib/types/document-analysis';
+
+export const detectFieldsInDocument = async (envelopeId: string): Promise<TDetectedFormField[]> => {
+  const response = await fetch('/api/ai/detect-fields', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    body: JSON.stringify({ envelopeId }),
+    credentials: 'include',
+  });
+
+  if (!response.ok) {
+    const errorText = await response.text();
+
+    console.error('Field detection failed:', {
+      status: response.status,
+      statusText: response.statusText,
+      error: errorText,
+    });
+
+    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+      message: `Field detection failed: ${response.statusText}`,
+      userMessage: 'Failed to detect fields in the document. Please try adding fields manually.',
+    });
+  }
+
+  const data = await response.json();
+
+  if (!Array.isArray(data)) {
+    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+      message: 'Invalid response from field detection API - expected array',
+      userMessage: 'Failed to detect fields in the document. Please try again.',
+    });
+  }
+
+  return data;
+};

apps/remix/app/utils/detect-document-recipients.ts

@@ -0,0 +1,67 @@
+import { RecipientRole } from '@prisma/client';
+
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+
+export type SuggestedRecipient = {
+  name: string;
+  email?: string;
+  role: 'SIGNER' | 'APPROVER' | 'CC';
+  signingOrder?: number;
+};
+
+export const detectRecipientsInDocument = async (
+  envelopeId: string,
+): Promise<SuggestedRecipient[]> => {
+  try {
+    const response = await fetch('/api/ai/detect-recipients', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ envelopeId }),
+    });
+
+    if (!response.ok) {
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+        message: 'Failed to detect recipients',
+      });
+    }
+
+    return (await response.json()) as SuggestedRecipient[];
+  } catch (error) {
+    throw AppError.parseError(error);
+  }
+};
+
+export type RecipientForCreation = {
+  name: string;
+  email: string;
+  role: RecipientRole;
+  signingOrder?: number;
+};
+
+export const ensureRecipientEmails = (
+  recipients: SuggestedRecipient[],
+  envelopeId: string,
+): RecipientForCreation[] => {
+  const allowedRoles: RecipientRole[] = [
+    RecipientRole.SIGNER,
+    RecipientRole.APPROVER,
+    RecipientRole.CC,
+  ];
+
+  return recipients.map((recipient) => {
+    const email = recipient.email ?? '';
+
+    const candidateRole = recipient.role as RecipientRole;
+    const normalizedRole = allowedRoles.includes(candidateRole)
+      ? candidateRole
+      : RecipientRole.SIGNER;
+
+    return {
+      ...recipient,
+      email,
+      role: normalizedRole,
+    };
+  });
+};

apps/remix/package.json

@@ -14,6 +14,8 @@
     "with:env": "dotenv -e ../../.env -e ../../.env.local --"
   },
   "dependencies": {
+    "@ai-sdk/google": "^2.0.25",
+    "@ai-sdk/react": "^2.0.82",
     "@cantoo/pdf-lib": "^2.5.3",
     "@documenso/api": "*",
     "@documenso/assets": "*",
@@ -41,6 +43,7 @@
     "@simplewebauthn/browser": "^9.0.1",
     "@simplewebauthn/server": "^9.0.3",
     "@tanstack/react-query": "5.90.10",
+    "ai": "^5.0.82",
     "autoprefixer": "^10.4.22",
     "colord": "^2.9.3",
     "content-disposition": "^1.0.1",
@@ -71,6 +74,7 @@
     "remix-themes": "^2.0.4",
     "satori": "^0.18.3",
     "sharp": "0.34.5",
+    "skia-canvas": "^3.0.8",
     "tailwindcss": "^3.4.18",
     "ts-pattern": "^5.9.0",
     "ua-parser-js": "^1.0.41",

apps/remix/server/api/document-analysis/authorization.ts

@@ -0,0 +1,61 @@
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getTeamById } from '@documenso/lib/server-only/team/get-team';
+import { prisma } from '@documenso/prisma';
+import type { DocumentData } from '@documenso/prisma/client';
+
+/**
+ * Authorize a user's access to an envelope and return its document data.
+ * Checks both direct ownership and team membership.
+ */
+export async function authorizeDocumentAccess(
+  envelopeId: string,
+  userId: number,
+): Promise<DocumentData> {
+  const envelope = await prisma.envelope.findUnique({
+    where: { id: envelopeId },
+    include: {
+      envelopeItems: {
+        include: {
+          documentData: true,
+        },
+      },
+    },
+  });
+
+  if (!envelope || !envelope.envelopeItems || envelope.envelopeItems.length === 0) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: `Envelope not found: ${envelopeId}`,
+      userMessage: 'The requested document does not exist.',
+    });
+  }
+
+  const isDirectOwner = envelope.userId === userId;
+
+  let hasTeamAccess = false;
+  if (envelope.teamId) {
+    try {
+      await getTeamById({ teamId: envelope.teamId, userId });
+      hasTeamAccess = true;
+    } catch {
+      hasTeamAccess = false;
+    }
+  }
+
+  if (!isDirectOwner && !hasTeamAccess) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: `User ${userId} does not have access to envelope ${envelopeId}`,
+      userMessage: 'You do not have permission to access this document.',
+    });
+  }
+
+  const documentData = envelope.envelopeItems[0]?.documentData;
+
+  if (!documentData) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: `Document data not found in envelope: ${envelopeId}`,
+      userMessage: 'The requested document does not exist.',
+    });
+  }
+
+  return documentData;
+}

apps/remix/server/api/document-analysis/debug-visualizer.ts

@@ -0,0 +1,183 @@
+import { mkdir, writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { Canvas, Image } from 'skia-canvas';
+
+import type { TDetectFormFieldsResponse } from './types';
+
+export type RenderedPage = {
+  image: Buffer;
+  pageNumber: number;
+  width: number;
+  height: number;
+};
+
+const GRID_PADDING = { left: 80, top: 20, right: 20, bottom: 40 };
+const GRID_INTERVAL = 100;
+const FIELD_COLORS = ['#FF0000', '#00FF00', '#0000FF', '#FFFF00', '#FF00FF', '#00FFFF'];
+
+/**
+ * Saves debug visualizations of detected form fields for development purposes.
+ * Creates annotated images showing field bounding boxes and coordinate grids.
+ */
+export async function saveDebugVisualization(
+  renderedPages: RenderedPage[],
+  detectedFields: TDetectFormFieldsResponse,
+): Promise<void> {
+  const debugDir = join(process.cwd(), '..', '..', 'packages', 'assets', 'ai-previews');
+  await mkdir(debugDir, { recursive: true });
+
+  const timestamp = new Date()
+    .toISOString()
+    .replace(/[-:]/g, '')
+    .replace(/\..+/, '')
+    .replace('T', '_');
+
+  for (const page of renderedPages) {
+    const canvas = createAnnotatedCanvas(page, detectedFields);
+    await saveCanvasToFile(canvas, debugDir, timestamp, page.pageNumber);
+  }
+}
+
+function createAnnotatedCanvas(
+  page: RenderedPage,
+  detectedFields: TDetectFormFieldsResponse,
+): Canvas {
+  const canvas = new Canvas(
+    page.width + GRID_PADDING.left + GRID_PADDING.right,
+    page.height + GRID_PADDING.top + GRID_PADDING.bottom,
+  );
+  const ctx = canvas.getContext('2d');
+
+  // Draw the original page image
+  const img = new Image();
+  img.src = page.image;
+  ctx.drawImage(img, GRID_PADDING.left, GRID_PADDING.top);
+
+  // Draw coordinate grid
+  drawCoordinateGrid(ctx, page.width, page.height);
+
+  // Draw field bounding boxes
+  drawFieldBoundingBoxes(ctx, page, detectedFields);
+
+  // Draw axis labels
+  drawAxisLabels(ctx, page.width, page.height);
+
+  return canvas;
+}
+
+function drawCoordinateGrid(
+  ctx: ReturnType<Canvas['getContext']>,
+  pageWidth: number,
+  pageHeight: number,
+): void {
+  ctx.strokeStyle = 'rgba(255, 0, 0, 0.5)';
+  ctx.lineWidth = 1;
+
+  // Draw vertical grid lines
+  for (let i = 0; i <= 1000; i += GRID_INTERVAL) {
+    const x = GRID_PADDING.left + (i / 1000) * pageWidth;
+    ctx.beginPath();
+    ctx.moveTo(x, GRID_PADDING.top);
+    ctx.lineTo(x, pageHeight + GRID_PADDING.top);
+    ctx.stroke();
+  }
+
+  // Draw horizontal grid lines
+  for (let i = 0; i <= 1000; i += GRID_INTERVAL) {
+    const y = GRID_PADDING.top + (i / 1000) * pageHeight;
+    ctx.beginPath();
+    ctx.moveTo(GRID_PADDING.left, y);
+    ctx.lineTo(pageWidth + GRID_PADDING.left, y);
+    ctx.stroke();
+  }
+}
+
+function drawFieldBoundingBoxes(
+  ctx: ReturnType<Canvas['getContext']>,
+  page: RenderedPage,
+  detectedFields: TDetectFormFieldsResponse,
+): void {
+  const pageFields = detectedFields.filter((field) => field.pageNumber === page.pageNumber);
+
+  pageFields.forEach((field, index) => {
+    const { ymin, xmin, ymax, xmax } = field.boundingBox;
+
+    const x = (xmin / 1000) * page.width + GRID_PADDING.left;
+    const y = (ymin / 1000) * page.height + GRID_PADDING.top;
+    const width = ((xmax - xmin) / 1000) * page.width;
+    const height = ((ymax - ymin) / 1000) * page.height;
+
+    const color = FIELD_COLORS[index % FIELD_COLORS.length];
+    ctx.strokeStyle = color;
+    ctx.lineWidth = 5;
+    ctx.strokeRect(x, y, width, height);
+
+    // Draw field label
+    ctx.fillStyle = color;
+    ctx.font = '20px Arial';
+    ctx.fillText(field.label, x, y - 5);
+  });
+}
+
+function drawAxisLabels(
+  ctx: ReturnType<Canvas['getContext']>,
+  pageWidth: number,
+  pageHeight: number,
+): void {
+  ctx.strokeStyle = '#000000';
+  ctx.lineWidth = 1;
+  ctx.font = '26px Arial';
+
+  // Draw Y-axis
+  ctx.beginPath();
+  ctx.moveTo(GRID_PADDING.left, GRID_PADDING.top);
+  ctx.lineTo(GRID_PADDING.left, pageHeight + GRID_PADDING.top);
+  ctx.stroke();
+
+  // Y-axis labels
+  ctx.textAlign = 'right';
+  ctx.textBaseline = 'middle';
+  for (let i = 0; i <= 1000; i += GRID_INTERVAL) {
+    const y = GRID_PADDING.top + (i / 1000) * pageHeight;
+    ctx.fillStyle = '#000000';
+    ctx.fillText(i.toString(), GRID_PADDING.left - 5, y);
+
+    ctx.beginPath();
+    ctx.moveTo(GRID_PADDING.left - 5, y);
+    ctx.lineTo(GRID_PADDING.left, y);
+    ctx.stroke();
+  }
+
+  // Draw X-axis
+  ctx.beginPath();
+  ctx.moveTo(GRID_PADDING.left, pageHeight + GRID_PADDING.top);
+  ctx.lineTo(pageWidth + GRID_PADDING.left, pageHeight + GRID_PADDING.top);
+  ctx.stroke();
+
+  // X-axis labels
+  ctx.textAlign = 'center';
+  ctx.textBaseline = 'top';
+  for (let i = 0; i <= 1000; i += GRID_INTERVAL) {
+    const x = GRID_PADDING.left + (i / 1000) * pageWidth;
+    ctx.fillStyle = '#000000';
+    ctx.fillText(i.toString(), x, pageHeight + GRID_PADDING.top + 5);
+
+    ctx.beginPath();
+    ctx.moveTo(x, pageHeight + GRID_PADDING.top);
+    ctx.lineTo(x, pageHeight + GRID_PADDING.top + 5);
+    ctx.stroke();
+  }
+}
+
+async function saveCanvasToFile(
+  canvas: Canvas,
+  debugDir: string,
+  timestamp: string,
+  pageNumber: number,
+): Promise<void> {
+  const outputFilename = `detected_form_fields_${timestamp}_page_${pageNumber}.png`;
+  const outputPath = join(debugDir, outputFilename);
+
+  const pngBuffer = await canvas.toBuffer('png');
+  await writeFile(outputPath, new Uint8Array(pngBuffer));
+}

apps/remix/server/api/document-analysis/field-detection.ts

@@ -0,0 +1,118 @@
+import { generateObject } from 'ai';
+
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { resizeAndCompressImage } from '@documenso/lib/server-only/image/resize-and-compress-image';
+
+import { DETECT_OBJECTS_PROMPT } from './prompts';
+import type { TDetectFormFieldsResponse } from './types';
+import { ZDetectedFormFieldSchema } from './types';
+import { buildRecipientDirectory, safeGenerateObject, validateRecipientId } from './utils';
+
+export type FieldDetectionRecipient = {
+  id: number;
+  name: string | null;
+  email: string | null;
+  role: string;
+  signingOrder: number | null;
+};
+
+/**
+ * Build the field detection prompt with optional recipient context.
+ */
+function buildFieldDetectionPrompt(recipients: FieldDetectionRecipient[]): string {
+  if (recipients.length === 0) {
+    return DETECT_OBJECTS_PROMPT;
+  }
+
+  const directory = buildRecipientDirectory(recipients);
+
+  return `${DETECT_OBJECTS_PROMPT}
+
+RECIPIENT DIRECTORY:
+${directory}
+
+RECIPIENT ASSIGNMENT RULES:
+1. Every detected field MUST include a "recipientId" taken from the directory above.
+2. Match printed names, role labels ("Buyer", "Seller"), or instructions near the field to the closest recipient.
+3. When the document references numbered signers (Signer 1, Signer 2, etc.), align them with signingOrder when provided.
+4. If a name exactly matches a recipient, always use that recipient's ID.
+5. When context is ambiguous, distribute fields logically across recipients instead of assigning all fields to one person.
+6. Never invent new recipients or IDs—only use those in the directory.`;
+}
+
+/**
+ * Run form field detection on a single page image.
+ */
+export async function runFormFieldDetection(
+  imageBuffer: Buffer,
+  pageNumber: number,
+  recipients: FieldDetectionRecipient[],
+): Promise<TDetectFormFieldsResponse> {
+  const compressedImageBuffer = await resizeAndCompressImage(imageBuffer);
+  const base64Image = compressedImageBuffer.toString('base64');
+  const prompt = buildFieldDetectionPrompt(recipients);
+
+  const detectedFields = await safeGenerateObject(
+    async () =>
+      generateObject({
+        model: 'google/gemini-3-pro-preview',
+        output: 'array',
+        schema: ZDetectedFormFieldSchema,
+        messages: [
+          {
+            role: 'user',
+            content: [
+              {
+                type: 'image',
+                image: `data:image/jpeg;base64,${base64Image}`,
+              },
+              {
+                type: 'text',
+                text: prompt,
+              },
+            ],
+          },
+        ],
+      }),
+    {
+      operation: 'detect form fields',
+      pageNumber,
+    },
+  );
+
+  return validateAndEnrichFields(detectedFields, recipients, pageNumber);
+}
+
+/**
+ * Validate recipient IDs and add page numbers to detected fields.
+ */
+function validateAndEnrichFields(
+  detectedFields: Array<Omit<TDetectFormFieldsResponse[0], 'pageNumber'>>,
+  recipients: FieldDetectionRecipient[],
+  pageNumber: number,
+): TDetectFormFieldsResponse {
+  const recipientIds = new Set(recipients.map((r) => r.id));
+  const fallbackRecipientId = recipients[0]?.id;
+
+  if (fallbackRecipientId === undefined) {
+    throw new AppError(AppErrorCode.INVALID_REQUEST, {
+      message: 'Unable to assign recipients because no recipients were provided',
+      userMessage: 'Please add at least one recipient before detecting form fields.',
+    });
+  }
+
+  return detectedFields.map((field) => {
+    const validatedRecipientId = validateRecipientId(
+      field.recipientId,
+      recipientIds,
+      fallbackRecipientId,
+      { fieldLabel: field.label },
+    );
+
+    return {
+      ...field,
+      recipientId: validatedRecipientId,
+      pageNumber,
+    };
+  });
+}

apps/remix/server/api/document-analysis/index.ts

@@ -0,0 +1,180 @@
+import { Hono } from 'hono';
+
+import { getSession } from '@documenso/auth/server/lib/utils/get-session';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { renderPdfToImage } from '@documenso/lib/server-only/pdf/render-pdf-to-image';
+import { getFileServerSide } from '@documenso/lib/universal/upload/get-file.server';
+import { env } from '@documenso/lib/utils/env';
+import { logger } from '@documenso/lib/utils/logger';
+import { prisma } from '@documenso/prisma';
+
+import type { HonoEnv } from '../../router';
+import { authorizeDocumentAccess } from './authorization';
+import { saveDebugVisualization } from './debug-visualizer';
+import type { FieldDetectionRecipient } from './field-detection';
+import { runFormFieldDetection } from './field-detection';
+import { MAX_PAGES_FOR_RECIPIENT_ANALYSIS, analyzePageForRecipients } from './recipient-detection';
+import type { TAnalyzeRecipientsResponse, TDetectFormFieldsResponse } from './types';
+import {
+  ZAnalyzeRecipientsRequestSchema,
+  ZDetectFormFieldsRequestSchema,
+  ZDetectFormFieldsResponseSchema,
+} from './types';
+import { processPageBatch, sortRecipientsForDetection } from './utils';
+
+/**
+ * Validates the user has a verified email for AI features.
+ */
+async function validateUserForAI(request: Request): Promise<{ userId: number }> {
+  const { user } = await getSession(request);
+
+  if (!user.emailVerified) {
+    throw new AppError(AppErrorCode.UNAUTHORIZED, {
+      message: 'Email verification required',
+      userMessage: 'Please verify your email to use AI features',
+    });
+  }
+
+  return { userId: user.id };
+}
+
+/**
+ * Fetches recipients for an envelope and validates they exist.
+ */
+async function getEnvelopeRecipients(envelopeId: string): Promise<FieldDetectionRecipient[]> {
+  const recipients = await prisma.recipient.findMany({
+    where: { envelopeId },
+    select: {
+      id: true,
+      name: true,
+      email: true,
+      role: true,
+      signingOrder: true,
+    },
+  });
+
+  if (recipients.length === 0) {
+    throw new AppError(AppErrorCode.INVALID_REQUEST, {
+      message: `No recipients found for envelope ${envelopeId}`,
+      userMessage: 'Please add at least one recipient before detecting form fields.',
+    });
+  }
+
+  return sortRecipientsForDetection(recipients);
+}
+
+export const aiRoute = new Hono<HonoEnv>()
+  .post('/detect-fields', async (c) => {
+    try {
+      const { userId } = await validateUserForAI(c.req.raw);
+
+      const body = await c.req.json();
+      const parsed = ZDetectFormFieldsRequestSchema.safeParse(body);
+
+      if (!parsed.success) {
+        throw new AppError(AppErrorCode.INVALID_REQUEST, {
+          message: 'Envelope ID is required',
+          userMessage: 'Please provide a valid envelope ID.',
+        });
+      }
+
+      const { envelopeId } = parsed.data;
+
+      const documentData = await authorizeDocumentAccess(envelopeId, userId);
+      const detectionRecipients = await getEnvelopeRecipients(envelopeId);
+
+      const pdfBytes = await getFileServerSide({
+        type: documentData.type,
+        data: documentData.initialData || documentData.data,
+      });
+
+      const renderedPages = await renderPdfToImage(pdfBytes);
+
+      const { results: pageResults } = await processPageBatch(
+        renderedPages,
+        async (page) => runFormFieldDetection(page.image, page.pageNumber, detectionRecipients),
+        {
+          itemName: 'page',
+          getItemIdentifier: (_, index) => renderedPages[index]?.pageNumber ?? index + 1,
+          errorMessage: 'We could not detect fields on some pages. Please try again.',
+        },
+      );
+
+      const detectedFields = pageResults.flat();
+
+      if (env('NEXT_PUBLIC_AI_DEBUG_PREVIEW') === 'true') {
+        await saveDebugVisualization(renderedPages, detectedFields);
+      }
+
+      const validatedResponse = ZDetectFormFieldsResponseSchema.parse(detectedFields);
+
+      return c.json<TDetectFormFieldsResponse>(validatedResponse);
+    } catch (error) {
+      if (error instanceof AppError) {
+        throw error;
+      }
+
+      logger.error('Failed to detect form fields from PDF:', {
+        error: error instanceof Error ? error.message : String(error),
+      });
+
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+        message: `Failed to detect form fields from PDF: ${error instanceof Error ? error.message : String(error)}`,
+        userMessage: 'An error occurred while detecting form fields. Please try again.',
+      });
+    }
+  })
+  .post('/detect-recipients', async (c) => {
+    try {
+      const { userId } = await validateUserForAI(c.req.raw);
+
+      const body = await c.req.json();
+      const parsed = ZAnalyzeRecipientsRequestSchema.safeParse(body);
+
+      if (!parsed.success) {
+        throw new AppError(AppErrorCode.INVALID_REQUEST, {
+          message: 'Envelope ID is required',
+          userMessage: 'Please provide a valid envelope ID.',
+        });
+      }
+
+      const { envelopeId } = parsed.data;
+
+      const documentData = await authorizeDocumentAccess(envelopeId, userId);
+
+      const pdfBytes = await getFileServerSide({
+        type: documentData.type,
+        data: documentData.initialData || documentData.data,
+      });
+
+      const renderedPages = await renderPdfToImage(pdfBytes);
+      const pagesToAnalyze = renderedPages.slice(0, MAX_PAGES_FOR_RECIPIENT_ANALYSIS);
+
+      const { results: pageResults } = await processPageBatch(
+        pagesToAnalyze,
+        async (page) => analyzePageForRecipients(page),
+        {
+          itemName: 'page',
+          getItemIdentifier: (page) => page.pageNumber,
+          errorMessage: 'We could not analyze recipients on some pages. Please try again.',
+        },
+      );
+
+      const allRecipients = pageResults.flat();
+
+      return c.json<TAnalyzeRecipientsResponse>(allRecipients);
+    } catch (error) {
+      if (error instanceof AppError) {
+        throw error;
+      }
+
+      logger.error('Failed to analyze recipients from PDF:', {
+        error: error instanceof Error ? error.message : String(error),
+      });
+
+      throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+        message: `Failed to analyze recipients from PDF: ${error instanceof Error ? error.message : String(error)}`,
+        userMessage: 'An error occurred while analyzing recipients. Please try again.',
+      });
+    }
+  });

apps/remix/server/api/document-analysis/index.types.ts

@@ -0,0 +1,16 @@
+// Re-export all types from the module for convenient importing
+export type {
+  TAnalyzeRecipientsRequest,
+  TAnalyzeRecipientsResponse,
+  TDetectedFormField,
+  TDetectedRecipient,
+  TDetectFormFieldsRequest,
+  TDetectFormFieldsResponse,
+  TGenerateTextRequest,
+  TGenerateTextResponse,
+  TRecipientRole,
+} from './types';
+
+export type { FieldDetectionRecipient } from './field-detection';
+export type { PageWithImage } from './recipient-detection';
+export type { RenderedPage } from './debug-visualizer';

apps/remix/server/api/document-analysis/prompts.ts

@@ -0,0 +1,121 @@
+export const DETECT_OBJECTS_PROMPT = `You are analyzing a form document image to detect fillable fields for the Documenso document signing platform.
+
+IMPORTANT RULES:
+1. Only detect EMPTY/UNFILLED fields (ignore boxes that already contain text or data)
+2. Analyze nearby text labels to determine the field type
+3. Return bounding boxes for the fillable area only, NOT the label text
+4. Each boundingBox must be in the format {ymin, xmin, ymax, xmax} where all coordinates are NORMALIZED to a 0-1000 scale
+
+CRITICAL: UNDERSTANDING FILLABLE AREAS
+The "fillable area" is ONLY the empty space where a user will write, type, sign, or check.
+- ✓ CORRECT: The blank underscore where someone writes their name: "Name: _________" → box ONLY the underscores
+- ✓ CORRECT: The empty white rectangle inside a box outline → box ONLY the empty space, not any printed text
+- ✓ CORRECT: The blank space to the right of a label: "Email: [ empty box ]" → box ONLY the empty box, exclude "Email:"
+- ✗ INCORRECT: Including the word "Signature:" that appears to the left of a signature line
+- ✗ INCORRECT: Including printed labels, instructions, or descriptive text near the field
+- ✗ INCORRECT: Extending the box to include text just because it's close to the fillable area
+
+VISUALIZING THE DISTINCTION:
+- If there's text (printed words/labels) near an empty box or line, they are SEPARATE elements
+- The text is a LABEL telling the user what to fill
+- The empty space is the FILLABLE AREA where they actually write/sign
+- Your bounding box should capture ONLY the empty space, even if the label is immediately adjacent
+
+FIELD TYPES TO DETECT:
+• SIGNATURE - Signature lines, boxes labeled 'Signature', 'Sign here', 'Authorized signature', 'X____'
+• INITIALS - Small boxes labeled 'Initials', 'Initial here', typically smaller than signature fields
+• NAME - Boxes labeled 'Name', 'Full name', 'Your name', 'Print name', 'Printed name'
+• EMAIL - Boxes labeled 'Email', 'Email address', 'E-mail', 'Email:'
+• DATE - Boxes labeled 'Date', 'Date signed', "Today's date", or showing date format placeholders like 'MM/DD/YYYY', '__/__/____'
+• CHECKBOX - Empty checkbox squares (☐) with or without labels, typically small square boxes
+• RADIO - Empty radio button circles (○) in groups, typically circular selection options
+• NUMBER - Boxes labeled with numeric context: 'Amount', 'Quantity', 'Phone', 'Phone number', 'ZIP', 'ZIP code', 'Age', 'Price', '#'
+• DROPDOWN - Boxes with dropdown indicators (▼, ↓) or labeled 'Select', 'Choose', 'Please select'
+• TEXT - Any other empty text input boxes, general input fields, unlabeled boxes, or when field type is uncertain
+
+DETECTION GUIDELINES:
+- Read text located near the box (above, to the left, or inside the box boundary) to infer the field type
+- IMPORTANT: Use the nearby text to CLASSIFY the field type, but DO NOT include that text in the bounding box
+- If you're uncertain which type fits best, default to TEXT
+- For checkboxes and radio buttons: Detect each individual box/circle separately, not the label
+- Signature fields are often longer horizontal lines or larger boxes
+- Date fields often show format hints or date separators (slashes, dashes)
+- Look for visual patterns: underscores (____), horizontal lines, box outlines
+
+BOUNDING BOX PLACEMENT (CRITICAL):
+- Your coordinates must capture ONLY the empty fillable space (the blank area where input goes)
+- Once you find the fillable region, LOCK the box to the full boundary of that region (top, bottom, left, right). Do not leave the box floating over just the starting edge.
+- If the field is defined by a line or a rectangular border, extend xmin/xmax/ymin/ymax across the entire line/border so the box spans the whole writable area end-to-end.
+- EXCLUDE all printed text labels, even if they are:
+  · Directly to the left of the field (e.g., "Name: _____")
+  · Directly above the field (e.g., "Signature" printed above a line)
+  · Very close to the field with minimal spacing
+  · Inside the same outlined box as the fillable area
+- The label text helps you IDENTIFY the field type, but must be EXCLUDED from the bounding box
+- If you detect a label "Email:" followed by a blank box, draw the box around ONLY the blank box, not the word "Email:"
+- The box should never cover only the leftmost few characters of a long field. For "Signature: ____________", the box must stretch from the first underscore to the last.
+
+COORDINATE SYSTEM:
+- {ymin, xmin, ymax, xmax} normalized to 0-1000 scale
+- Top-left corner: ymin and xmin close to 0
+- Bottom-right corner: ymax and xmax close to 1000
+- Coordinates represent positions on a 1000x1000 grid overlaid on the image
+
+FIELD SIZING STRATEGY FOR LINE-BASED FIELDS:
+When detecting thin horizontal lines for SIGNATURE, INITIALS, NAME, EMAIL, DATE, TEXT, or NUMBER fields:
+1. Analyze the visual context around the detected line:
+   - Look at the empty space ABOVE the detected line
+   - Observe the spacing to any text labels, headers, or other form elements above
+   - Assess what would be a reasonable field height to make the field clearly visible when filled
+2. Expand UPWARD from the detected line to create a usable field:
+   - Keep ymax (bottom) at the detected line position (the line becomes the bottom edge)
+   - Extend ymin (top) upward into the available whitespace
+   - Aim to use 60-80% of the clear whitespace above the line, while being reasonable
+   - The expanded field should provide comfortable space for signing/writing (minimum 30 units tall)
+3. Apply minimum dimensions: height at least 30 units (3% of 1000-scale), width at least 36 units
+4. Ensure ymin >= 0 (do not go off-page). If ymin would be negative, clamp to 0
+5. Do NOT apply this expansion to CHECKBOX, RADIO, or DROPDOWN fields - use detected dimensions for those
+6. Example: If you detect a signature line at ymax=500 with clear whitespace extending up to y=400:
+   - Available whitespace: 100 units
+   - Use 60-80% of that: 60-80 units
+   - Expanded field: {ymin: 420, xmin: 200, ymax: 500, xmax: 600} (creates 80-unit tall field)
+   - This gives comfortable signing space while respecting the form layout`;
+
+export const ANALYZE_RECIPIENTS_PROMPT = `You are analyzing a document to identify recipients who need to sign, approve, or receive copies.
+
+TASK: Extract recipient information from this document.
+
+RECIPIENT TYPES:
+- SIGNER: People who must sign the document (look for signature lines, "Signed by:", "Signature:", "X____")
+- APPROVER: People who must review/approve before signing (look for "Approved by:", "Reviewed by:", "Approval:")
+- CC: People who receive a copy for information only (look for "CC:", "Copy to:", "For information:")
+
+EXTRACTION RULES:
+1. Look for signature lines with names printed above, below, or near them
+2. Check for explicit labels like "Name:", "Signer:", "Party:", "Recipient:"
+3. Look for "Approved by:", "Reviewed by:", "CC:" sections
+4. Extract FULL NAMES as they appear in the document
+5. If an email address is visible near a name, include it exactly in the "email" field
+6. If NO email is found, leave the email field empty.
+7. Assign signing order based on document flow (numbered items, "First signer:", "Second signer:", or top-to-bottom sequence)
+
+IMPORTANT:
+- Only extract recipients explicitly mentioned in the document
+- Default role is SIGNER if unclear (signature lines = SIGNER)
+- Signing order starts at 1 (first signer = 1, second = 2, etc.)
+- If no clear ordering, omit signingOrder
+- Return empty array if absolutely no recipients can be detected
+- Do NOT invent recipients - only extract what's clearly present
+- If a signature line exists but no name is associated with it, DO NOT return a recipient with name "<UNKNOWN>". Skip it.
+
+EXAMPLES:
+Good:
+  - "Signed: _________ John Doe" → { name: "John Doe", role: "SIGNER", signingOrder: 1 }
+  - "Approved by: Jane Smith (jane@example.com)" → { name: "Jane Smith", email: "jane@example.com", role: "APPROVER" }
+  - "CC: Legal Team" → { name: "Legal Team", role: "CC" }
+
+Bad:
+  - Extracting the document title as a recipient name
+  - Making up email addresses that aren't in the document
+  - Adding people not mentioned in the document
+  - Using placeholder names like "<UNKNOWN>", "Unknown", "Signer"`;

apps/remix/server/api/document-analysis/recipient-detection.ts

@@ -0,0 +1,72 @@
+import { generateObject } from 'ai';
+
+import { resizeAndCompressImage } from '@documenso/lib/server-only/image/resize-and-compress-image';
+import { resolveRecipientEmail } from '@documenso/lib/utils/recipients';
+
+import { ANALYZE_RECIPIENTS_PROMPT } from './prompts';
+import type { TDetectedRecipient } from './types';
+import { ZDetectedRecipientLLMSchema } from './types';
+import { safeGenerateObject } from './utils';
+
+// Limit recipient detection to first 3 pages for performance and cost efficiency
+export const MAX_PAGES_FOR_RECIPIENT_ANALYSIS = 3;
+
+export type PageWithImage = {
+  image: Buffer;
+  pageNumber: number;
+};
+
+/**
+ * Analyze a single page for recipient information.
+ */
+export async function analyzePageForRecipients(page: PageWithImage): Promise<TDetectedRecipient[]> {
+  const compressedImageBuffer = await resizeAndCompressImage(page.image);
+  const base64Image = compressedImageBuffer.toString('base64');
+
+  const recipients = await safeGenerateObject(
+    async () =>
+      generateObject({
+        model: 'anthropic/claude-haiku-4.5',
+        output: 'array',
+        schema: ZDetectedRecipientLLMSchema,
+        messages: [
+          {
+            role: 'user',
+            content: [
+              {
+                type: 'image',
+                image: `data:image/jpeg;base64,${base64Image}`,
+              },
+              {
+                type: 'text',
+                text: ANALYZE_RECIPIENTS_PROMPT,
+              },
+            ],
+          },
+        ],
+      }),
+    {
+      operation: 'analyze recipients',
+      pageNumber: page.pageNumber,
+    },
+  );
+
+  return normalizeRecipients(recipients);
+}
+
+/**
+ * Normalize recipient data by resolving emails and ensuring consistent format.
+ */
+function normalizeRecipients(
+  recipients: Array<{
+    name: string;
+    email?: string;
+    role: 'SIGNER' | 'APPROVER' | 'CC';
+    signingOrder?: number;
+  }>,
+): TDetectedRecipient[] {
+  return recipients.map((recipient) => ({
+    ...recipient,
+    email: resolveRecipientEmail(recipient.email),
+  }));
+}

apps/remix/server/api/document-analysis/types.ts

@@ -0,0 +1,75 @@
+import { z } from 'zod';
+
+import {
+  type TDetectedFormField,
+  ZDetectedFormFieldSchema,
+} from '@documenso/lib/types/document-analysis';
+
+export { ZDetectedFormFieldSchema };
+
+export const ZGenerateTextRequestSchema = z.object({
+  prompt: z.string().min(1, 'Prompt is required').max(5000, 'Prompt is too long'),
+});
+
+export const ZGenerateTextResponseSchema = z.object({
+  text: z.string(),
+});
+
+export type TGenerateTextRequest = z.infer<typeof ZGenerateTextRequestSchema>;
+export type TGenerateTextResponse = z.infer<typeof ZGenerateTextResponseSchema>;
+
+export const ZDetectFormFieldsRequestSchema = z.object({
+  envelopeId: z.string().min(1, { message: 'Envelope ID is required' }),
+});
+
+export const ZDetectFormFieldsResponseSchema = z.array(ZDetectedFormFieldSchema);
+
+export type TDetectFormFieldsRequest = z.infer<typeof ZDetectFormFieldsRequestSchema>;
+export type TDetectFormFieldsResponse = z.infer<typeof ZDetectFormFieldsResponseSchema>;
+export type { TDetectedFormField };
+
+const ZRecipientRoleEnum = z.enum(['SIGNER', 'APPROVER', 'CC']);
+
+const recipientFieldShape = {
+  name: z.string().describe('Full name of the recipient'),
+  role: ZRecipientRoleEnum.describe('Recipient role based on document context'),
+  signingOrder: z
+    .number()
+    .int()
+    .positive()
+    .optional()
+    .describe('Sequential signing order if document indicates ordering'),
+} as const;
+
+function createRecipientSchema<TSchema extends z.ZodTypeAny>(emailSchema: TSchema) {
+  return z.object({
+    ...recipientFieldShape,
+    email: emailSchema,
+  });
+}
+
+export const ZDetectedRecipientLLMSchema = createRecipientSchema(
+  z
+    .string()
+    .trim()
+    .max(320)
+    .optional()
+    .describe(
+      'Email address from the document. If missing or invalid, a placeholder will be generated.',
+    ),
+);
+
+export const ZDetectedRecipientSchema = createRecipientSchema(
+  z.string().email().optional().describe('Email address for the recipient (if found in document).'),
+);
+
+export const ZAnalyzeRecipientsRequestSchema = z.object({
+  envelopeId: z.string().min(1, { message: 'Envelope ID is required' }),
+});
+
+export const ZAnalyzeRecipientsResponseSchema = z.array(ZDetectedRecipientSchema);
+
+export type TDetectedRecipient = z.infer<typeof ZDetectedRecipientSchema>;
+export type TAnalyzeRecipientsRequest = z.infer<typeof ZAnalyzeRecipientsRequestSchema>;
+export type TAnalyzeRecipientsResponse = z.infer<typeof ZAnalyzeRecipientsResponseSchema>;
+export type TRecipientRole = z.infer<typeof ZRecipientRoleEnum>;

apps/remix/server/api/document-analysis/utils.ts

@@ -0,0 +1,164 @@
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { logger } from '@documenso/lib/utils/logger';
+
+/**
+ * Process an array of items in parallel and handle failures gracefully.
+ * Returns successful results and reports failed items.
+ */
+export async function processPageBatch<TInput, TOutput>(
+  items: TInput[],
+  processor: (item: TInput, index: number) => Promise<TOutput>,
+  context: {
+    itemName: string; // e.g., "page", "recipient"
+    getItemIdentifier: (item: TInput, index: number) => number | string; // e.g., pageNumber
+    errorMessage: string; // User-facing error message
+  },
+): Promise<{
+  results: TOutput[];
+  failedItems: Array<number | string>;
+}> {
+  const settledResults = await Promise.allSettled(
+    items.map(async (item, index) => processor(item, index)),
+  );
+
+  const results: TOutput[] = [];
+  const failedItems: Array<number | string> = [];
+
+  for (const [index, result] of settledResults.entries()) {
+    if (result.status === 'fulfilled') {
+      results.push(result.value);
+    } else {
+      const identifier = context.getItemIdentifier(items[index]!, index);
+      logger.error(`Failed to process ${context.itemName} ${identifier}:`, {
+        error: result.reason,
+        identifier,
+      });
+      failedItems.push(identifier);
+    }
+  }
+
+  if (failedItems.length > 0) {
+    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+      message: `Failed to process ${context.itemName}s: ${failedItems.join(', ')}`,
+      userMessage: context.errorMessage,
+    });
+  }
+
+  return { results, failedItems: [] };
+}
+
+/**
+ * Safely execute an LLM generation with proper error handling and logging.
+ */
+export async function safeGenerateObject<T>(
+  generatorFn: () => Promise<{ object: T }>,
+  context: {
+    operation: string; // e.g., "detect form fields", "analyze recipients"
+    pageNumber?: number;
+  },
+): Promise<T> {
+  try {
+    const result = await generatorFn();
+    return result.object;
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    const pageContext = context.pageNumber ? ` on page ${context.pageNumber}` : '';
+
+    logger.error(`Failed to ${context.operation}${pageContext}:`, {
+      error: errorMessage,
+      pageNumber: context.pageNumber,
+    });
+
+    throw new AppError(AppErrorCode.UNKNOWN_ERROR, {
+      message: `AI generation failed for ${context.operation}: ${errorMessage}`,
+      userMessage: `Unable to ${context.operation}. Please try again.`,
+    });
+  }
+}
+
+/**
+ * Sort recipients by role priority and signing order for consistent field assignment.
+ */
+export function sortRecipientsForDetection<
+  T extends { role: string; signingOrder: number | null; id: number },
+>(recipients: T[]): T[] {
+  const ROLE_PRIORITY: Record<string, number> = {
+    SIGNER: 0,
+    APPROVER: 1,
+    CC: 2,
+  };
+
+  return recipients.slice().sort((a, b) => {
+    // 1. Sort by role priority
+    const roleComparison = (ROLE_PRIORITY[a.role] ?? 3) - (ROLE_PRIORITY[b.role] ?? 3);
+    if (roleComparison !== 0) {
+      return roleComparison;
+    }
+
+    // 2. Sort by signing order (null values last)
+    const aOrder = a.signingOrder ?? Number.MAX_SAFE_INTEGER;
+    const bOrder = b.signingOrder ?? Number.MAX_SAFE_INTEGER;
+    if (aOrder !== bOrder) {
+      return aOrder - bOrder;
+    }
+
+    // 3. Sort by ID as final tiebreaker
+    return a.id - b.id;
+  });
+}
+
+/**
+ * Build a recipient directory string for LLM context.
+ */
+export function buildRecipientDirectory(
+  recipients: Array<{
+    id: number;
+    name: string | null;
+    email: string | null;
+    role: string;
+    signingOrder: number | null;
+  }>,
+): string {
+  return recipients
+    .map((recipient, index) => {
+      const name = recipient.name?.trim() || `Recipient ${index + 1}`;
+      const details = [`name: "${name}"`, `role: ${recipient.role}`];
+
+      if (recipient.email) {
+        details.push(`email: ${recipient.email}`);
+      }
+
+      if (typeof recipient.signingOrder === 'number') {
+        details.push(`signingOrder: ${recipient.signingOrder}`);
+      }
+
+      return `ID ${recipient.id} → ${details.join(', ')}`;
+    })
+    .join('\n');
+}
+
+/**
+ * Validate and correct recipient IDs to ensure they match available recipients.
+ */
+export function validateRecipientId(
+  fieldRecipientId: number,
+  availableRecipientIds: Set<number>,
+  fallbackRecipientId: number,
+  context?: { fieldLabel?: string },
+): number {
+  if (availableRecipientIds.has(fieldRecipientId)) {
+    return fieldRecipientId;
+  }
+
+  logger.error('AI returned invalid recipientId for detected field', {
+    invalidRecipientId: fieldRecipientId,
+    fieldLabel: context?.fieldLabel,
+    availableRecipientIds: Array.from(availableRecipientIds),
+  });
+
+  throw new AppError(AppErrorCode.INVALID_REQUEST, {
+    message: `AI assigned field "${context?.fieldLabel || 'Unknown'}" to invalid recipient ID ${fieldRecipientId}`,
+    userMessage:
+      'We detected fields assigned to a recipient that does not exist. Please try again.',
+  });
+}

apps/remix/server/router.ts

@@ -15,6 +15,7 @@ import { getIpAddress } from '@documenso/lib/universal/get-ip-address';
 import { logger } from '@documenso/lib/utils/logger';
 import { openApiDocument } from '@documenso/trpc/server/open-api';
 
+import { aiRoute } from './api/document-analysis/index';
 import { downloadRoute } from './api/download/download';
 import { filesRoute } from './api/files/files';
 import { type AppContext, appContext } from './context';
@@ -85,6 +86,9 @@ app.route('/api/auth', auth);
 // Files route.
 app.route('/api/files', filesRoute);
 
+// AI route.
+app.route('/api/ai', aiRoute);
+
 // API servers.
 app.use(`/api/v1/*`, cors());
 app.route('/api/v1', tsRestHonoApp);

package.json

@@ -7,6 +7,7 @@
   ],
   "version": "2.1.0",
   "scripts": {
+    "postinstall": "patch-package",
     "build": "turbo run build",
     "dev": "turbo run dev --filter=@documenso/remix",
     "dev:remix": "turbo run dev --filter=@documenso/remix",
@@ -60,9 +61,11 @@
     "dotenv-cli": "^11.0.0",
     "eslint": "^8.57.0",
     "husky": "^9.1.7",
+    "kysely": "0.28.8",
     "lint-staged": "^16.2.7",
     "nanoid": "^5.1.6",
     "nodemailer": "^7.0.10",
+    "patch-package": "^8.0.1",
     "pdfjs-dist": "5.4.296",
     "pino": "^9.14.0",
     "pino-pretty": "^13.1.2",
@@ -83,12 +86,15 @@
     "zod-prisma-types": "3.3.5"
   },
   "dependencies": {
+    "@ai-sdk/google-vertex": "3.0.81",
     "@documenso/pdf-sign": "^0.1.0",
     "@documenso/prisma": "*",
     "@lingui/conf": "^5.6.0",
     "@lingui/core": "^5.6.0",
+    "ai": "^5.0.82",
     "inngest-cli": "^1.13.7",
     "luxon": "^3.7.2",
+    "mupdf": "^1.0.0",
     "posthog-node": "4.18.0",
     "react": "^18",
     "typescript": "5.6.2",
@@ -99,4 +105,4 @@
     "typescript": "5.6.2",
     "zod": "^3.25.76"
   }
-}
+}

packages/app-tests/e2e/api/v2/envelopes-api.spec.ts

@@ -6,7 +6,6 @@ import { pick } from 'remeda';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
-import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
 import { prisma } from '@documenso/prisma';
 import {
   DocumentDistributionMethod,
@@ -24,9 +23,7 @@ import type {
   TCreateEnvelopePayload,
   TCreateEnvelopeResponse,
 } from '@documenso/trpc/server/envelope-router/create-envelope.types';
-import type { TDistributeEnvelopeRequest } from '@documenso/trpc/server/envelope-router/distribute-envelope.types';
 import type { TCreateEnvelopeRecipientsRequest } from '@documenso/trpc/server/envelope-router/envelope-recipients/create-envelope-recipients.types';
-import type { TUpdateEnvelopeRecipientsRequest } from '@documenso/trpc/server/envelope-router/envelope-recipients/update-envelope-recipients.types';
 import type { TGetEnvelopeResponse } from '@documenso/trpc/server/envelope-router/get-envelope.types';
 import type { TUpdateEnvelopeRequest } from '@documenso/trpc/server/envelope-router/update-envelope.types';
 
@@ -560,543 +557,4 @@ test.describe('API V2 Envelopes', () => {
       userEmail: userA.email,
     });
   });
-
-  test.describe('Empty recipient tests', () => {
-    test('Create template envelope with empty email recipient', async ({ request }) => {
-      const payload = {
-        type: EnvelopeType.TEMPLATE,
-        title: 'Template with Empty Email Recipient',
-      } satisfies TCreateEnvelopePayload;
-
-      const formData = new FormData();
-      formData.append('payload', JSON.stringify(payload));
-
-      const files = [
-        {
-          name: 'example.pdf',
-          data: fs.readFileSync(path.join(__dirname, '../../../../../assets/example.pdf')),
-        },
-      ];
-
-      for (const file of files) {
-        formData.append('files', new File([file.data], file.name, { type: 'application/pdf' }));
-      }
-
-      const res = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        multipart: formData,
-      });
-
-      expect(res.ok()).toBeTruthy();
-      expect(res.status()).toBe(200);
-
-      const response = (await res.json()) as TCreateEnvelopeResponse;
-
-      // Create recipient with empty email
-      const createRecipientsRequest: TCreateEnvelopeRecipientsRequest = {
-        envelopeId: response.id,
-        data: [
-          {
-            email: '',
-            name: 'Test Recipient',
-            role: RecipientRole.SIGNER,
-            accessAuth: [],
-            actionAuth: [],
-          },
-        ],
-      };
-
-      const createRecipientsRes = await request.post(`${baseUrl}/envelope/recipient/create-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: createRecipientsRequest,
-      });
-
-      expect(createRecipientsRes.ok()).toBeTruthy();
-      expect(createRecipientsRes.status()).toBe(200);
-
-      const recipientsResponse = await createRecipientsRes.json();
-      const recipient = recipientsResponse.data[0];
-
-      expect(recipient.email).toBe('');
-      expect(recipient.name).toBe('Test Recipient');
-
-      // Get envelope items to assign fields
-      const getEnvelopeRes = await request.get(`${baseUrl}/envelope/${response.id}`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-      });
-
-      const envelope: TGetEnvelopeResponse = await getEnvelopeRes.json();
-      const envelopeItem = envelope.envelopeItems[0];
-
-      // Create field for the recipient with empty email
-      const createFieldsRequest = {
-        envelopeId: response.id,
-        data: [
-          {
-            recipientId: recipient.id,
-            envelopeItemId: envelopeItem.id,
-            type: FieldType.SIGNATURE,
-            page: 1,
-            positionX: 100,
-            positionY: 100,
-            width: 50,
-            height: 50,
-          },
-        ],
-      };
-
-      const createFieldsRes = await request.post(`${baseUrl}/envelope/field/create-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: createFieldsRequest,
-      });
-
-      expect(createFieldsRes.ok()).toBeTruthy();
-      expect(createFieldsRes.status()).toBe(200);
-    });
-
-    test('Create document envelope with empty email recipient', async ({ request }) => {
-      const payload = {
-        type: EnvelopeType.DOCUMENT,
-        title: 'Document with Empty Email Recipient',
-      } satisfies TCreateEnvelopePayload;
-
-      const formData = new FormData();
-      formData.append('payload', JSON.stringify(payload));
-
-      const files = [
-        {
-          name: 'example.pdf',
-          data: fs.readFileSync(path.join(__dirname, '../../../../../assets/example.pdf')),
-        },
-      ];
-
-      for (const file of files) {
-        formData.append('files', new File([file.data], file.name, { type: 'application/pdf' }));
-      }
-
-      const res = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        multipart: formData,
-      });
-
-      expect(res.ok()).toBeTruthy();
-      expect(res.status()).toBe(200);
-
-      const response = (await res.json()) as TCreateEnvelopeResponse;
-
-      // Create recipient with empty email
-      const createRecipientsRequest: TCreateEnvelopeRecipientsRequest = {
-        envelopeId: response.id,
-        data: [
-          {
-            email: '',
-            name: 'Document Recipient No Email',
-            role: RecipientRole.SIGNER,
-            accessAuth: [],
-            actionAuth: [],
-          },
-        ],
-      };
-
-      const createRecipientsRes = await request.post(`${baseUrl}/envelope/recipient/create-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: createRecipientsRequest,
-      });
-
-      expect(createRecipientsRes.ok()).toBeTruthy();
-      const recipientsResponse = await createRecipientsRes.json();
-      const recipient = recipientsResponse.data[0];
-
-      expect(recipient.email).toBe('');
-      expect(recipient.name).toBe('Document Recipient No Email');
-    });
-
-    test('Update recipient to have empty email', async ({ request }) => {
-      const payload = {
-        type: EnvelopeType.TEMPLATE,
-        title: 'Update Recipient Email Test',
-        recipients: [
-          {
-            email: userA.email,
-            name: 'Test User',
-            role: RecipientRole.SIGNER,
-          },
-        ],
-      } satisfies TCreateEnvelopePayload;
-
-      const formData = new FormData();
-      formData.append('payload', JSON.stringify(payload));
-
-      const files = [
-        {
-          name: 'example.pdf',
-          data: fs.readFileSync(path.join(__dirname, '../../../../../assets/example.pdf')),
-        },
-      ];
-
-      for (const file of files) {
-        formData.append('files', new File([file.data], file.name, { type: 'application/pdf' }));
-      }
-
-      const createRes = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        multipart: formData,
-      });
-
-      expect(createRes.ok()).toBeTruthy();
-      const createResponse = (await createRes.json()) as TCreateEnvelopeResponse;
-
-      // Get the envelope to get recipient ID
-      const getRes = await request.get(`${baseUrl}/envelope/${createResponse.id}`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-      });
-
-      const envelope: TGetEnvelopeResponse = await getRes.json();
-      const recipientId = envelope.recipients[0].id;
-
-      // Update recipient to have empty email
-      const updateRequest: TUpdateEnvelopeRecipientsRequest = {
-        envelopeId: createResponse.id,
-        data: [
-          {
-            id: recipientId,
-            email: '',
-            name: 'Updated Name No Email',
-          },
-        ],
-      };
-
-      const updateRes = await request.post(`${baseUrl}/envelope/recipient/update-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: updateRequest,
-      });
-
-      expect(updateRes.ok()).toBeTruthy();
-      const updateResponse = await updateRes.json();
-      const updatedRecipient = updateResponse.data[0];
-
-      expect(updatedRecipient.email).toBe('');
-      expect(updatedRecipient.name).toBe('Updated Name No Email');
-    });
-
-    test('Mixed recipients with and without emails', async ({ request }) => {
-      const payload = {
-        type: EnvelopeType.TEMPLATE,
-        title: 'Mixed Recipients Test',
-      } satisfies TCreateEnvelopePayload;
-
-      const formData = new FormData();
-      formData.append('payload', JSON.stringify(payload));
-
-      const files = [
-        {
-          name: 'example.pdf',
-          data: fs.readFileSync(path.join(__dirname, '../../../../../assets/example.pdf')),
-        },
-      ];
-
-      for (const file of files) {
-        formData.append('files', new File([file.data], file.name, { type: 'application/pdf' }));
-      }
-
-      const res = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        multipart: formData,
-      });
-
-      expect(res.ok()).toBeTruthy();
-      const response = (await res.json()) as TCreateEnvelopeResponse;
-
-      // Create multiple recipients, some with email, some without
-      const createRecipientsRequest: TCreateEnvelopeRecipientsRequest = {
-        envelopeId: response.id,
-        data: [
-          {
-            email: userA.email,
-            name: 'Recipient With Email',
-            role: RecipientRole.SIGNER,
-            accessAuth: [],
-            actionAuth: [],
-          },
-          {
-            email: '',
-            name: 'Recipient Without Email 1',
-            role: RecipientRole.SIGNER,
-            accessAuth: [],
-            actionAuth: [],
-          },
-          {
-            email: userB.email,
-            name: 'Another With Email',
-            role: RecipientRole.APPROVER,
-            accessAuth: [],
-            actionAuth: [],
-          },
-          {
-            email: '',
-            name: 'Recipient Without Email 2',
-            role: RecipientRole.SIGNER,
-            accessAuth: [],
-            actionAuth: [],
-          },
-        ],
-      };
-
-      const createRecipientsRes = await request.post(`${baseUrl}/envelope/recipient/create-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: createRecipientsRequest,
-      });
-
-      expect(createRecipientsRes.ok()).toBeTruthy();
-      const recipientsResponse = await createRecipientsRes.json();
-      const recipients = recipientsResponse.data;
-
-      expect(recipients.length).toBe(4);
-      expect(recipients[0].email).toBe(userA.email.toLowerCase());
-      expect(recipients[1].email).toBe('');
-      expect(recipients[2].email).toBe(userB.email.toLowerCase());
-      expect(recipients[3].email).toBe('');
-
-      // Get envelope to assign fields
-      const getEnvelopeRes = await request.get(`${baseUrl}/envelope/${response.id}`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-      });
-
-      const envelope: TGetEnvelopeResponse = await getEnvelopeRes.json();
-      const envelopeItem = envelope.envelopeItems[0];
-
-      // Create fields for all recipients including those without emails
-      const createFieldsRequest = {
-        envelopeId: response.id,
-        data: recipients.map((recipient, index) => ({
-          recipientId: recipient.id,
-          envelopeItemId: envelopeItem.id,
-          type: FieldType.SIGNATURE,
-          page: 1,
-          positionX: 100,
-          positionY: 0 + index,
-          width: 50,
-          height: 50,
-        })),
-      };
-
-      const createFieldsRes = await request.post(`${baseUrl}/envelope/field/create-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: createFieldsRequest,
-      });
-
-      expect(createFieldsRes.ok()).toBeTruthy();
-    });
-
-    test('Distribute envelope with empty email recipients', async ({ request }) => {
-      const payload = {
-        type: EnvelopeType.DOCUMENT,
-        title: 'Document for Distribution with Empty Email',
-      } satisfies TCreateEnvelopePayload;
-
-      const formData = new FormData();
-      formData.append('payload', JSON.stringify(payload));
-
-      const files = [
-        {
-          name: 'example.pdf',
-          data: fs.readFileSync(path.join(__dirname, '../../../../../assets/example.pdf')),
-        },
-      ];
-
-      for (const file of files) {
-        formData.append('files', new File([file.data], file.name, { type: 'application/pdf' }));
-      }
-
-      const createRes = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        multipart: formData,
-      });
-
-      expect(createRes.ok()).toBeTruthy();
-      const createResponse = (await createRes.json()) as TCreateEnvelopeResponse;
-
-      // Create recipients with empty emails
-      const createRecipientsRequest: TCreateEnvelopeRecipientsRequest = {
-        envelopeId: createResponse.id,
-        data: [
-          {
-            email: '',
-            name: 'Recipient One',
-            role: RecipientRole.SIGNER,
-            accessAuth: [],
-            actionAuth: [],
-          },
-          {
-            email: '',
-            name: 'Recipient Two',
-            role: RecipientRole.APPROVER,
-            accessAuth: [],
-            actionAuth: [],
-          },
-        ],
-      };
-
-      const createRecipientsRes = await request.post(`${baseUrl}/envelope/recipient/create-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: createRecipientsRequest,
-      });
-
-      expect(createRecipientsRes.ok()).toBeTruthy();
-      const recipientsResponse = await createRecipientsRes.json();
-      const recipients = recipientsResponse.data;
-
-      // Get envelope to assign fields
-      const getEnvelopeRes = await request.get(`${baseUrl}/envelope/${createResponse.id}`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-      });
-
-      const envelope: TGetEnvelopeResponse = await getEnvelopeRes.json();
-      const envelopeItem = envelope.envelopeItems[0];
-
-      // Create fields for recipients
-      const createFieldsRequest = {
-        envelopeId: createResponse.id,
-        data: recipients.map((recipient, index) => ({
-          recipientId: recipient.id,
-          envelopeItemId: envelopeItem.id,
-          type: FieldType.SIGNATURE,
-          page: 1,
-          positionX: 100,
-          positionY: 0 + index,
-          width: 50,
-          height: 50,
-        })),
-      };
-
-      const createFieldsRes = await request.post(`${baseUrl}/envelope/field/create-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: createFieldsRequest,
-      });
-
-      expect(createFieldsRes.ok()).toBeTruthy();
-
-      // Distribute the envelope
-      const distributeRes = await request.post(`${baseUrl}/envelope/distribute`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: {
-          envelopeId: createResponse.id,
-        } satisfies TDistributeEnvelopeRequest,
-      });
-
-      expect(distributeRes.ok()).toBeTruthy();
-      expect(distributeRes.status()).toBe(200);
-
-      const distributeResponse = await distributeRes.json();
-      expect(distributeResponse.success).toBe(true);
-      expect(distributeResponse.id).toBe(createResponse.id);
-      expect(distributeResponse.recipients).toHaveLength(2);
-
-      // Verify recipients have empty emails and signing URLs
-      expect(distributeResponse.recipients[0].email).toBe('');
-      expect(distributeResponse.recipients[0].signingUrl).toBeTruthy();
-      expect(distributeResponse.recipients[1].email).toBe('');
-      expect(distributeResponse.recipients[1].signingUrl).toBeTruthy();
-    });
-
-    test('Distribute envelope with empty email recipient and auth requirements fails', async ({
-      request,
-    }) => {
-      const payload = {
-        type: EnvelopeType.DOCUMENT,
-        title: 'Document with Auth Requirements',
-      } satisfies TCreateEnvelopePayload;
-
-      const formData = new FormData();
-      formData.append('payload', JSON.stringify(payload));
-
-      const files = [
-        {
-          name: 'example.pdf',
-          data: fs.readFileSync(path.join(__dirname, '../../../../../assets/example.pdf')),
-        },
-      ];
-
-      for (const file of files) {
-        formData.append('files', new File([file.data], file.name, { type: 'application/pdf' }));
-      }
-
-      const createRes = await request.post(`${baseUrl}/envelope/create`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        multipart: formData,
-      });
-
-      expect(createRes.ok()).toBeTruthy();
-      const createResponse = (await createRes.json()) as TCreateEnvelopeResponse;
-
-      // Create recipient with empty email and TWO_FACTOR_AUTH action auth
-      const createRecipientsRequest: TCreateEnvelopeRecipientsRequest = {
-        envelopeId: createResponse.id,
-        data: [
-          {
-            email: '',
-            name: 'Recipient With Auth',
-            role: RecipientRole.SIGNER,
-            accessAuth: [DocumentAccessAuth.TWO_FACTOR_AUTH],
-          },
-        ],
-      };
-
-      const createRecipientsRes = await request.post(`${baseUrl}/envelope/recipient/create-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: createRecipientsRequest,
-      });
-
-      expect(createRecipientsRes.ok()).toBeTruthy();
-      const recipientsResponse = await createRecipientsRes.json();
-      const recipient = recipientsResponse.data[0];
-
-      // Get envelope to assign fields
-      const getEnvelopeRes = await request.get(`${baseUrl}/envelope/${createResponse.id}`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-      });
-
-      const envelope: TGetEnvelopeResponse = await getEnvelopeRes.json();
-      const envelopeItem = envelope.envelopeItems[0];
-
-      // Create field for the recipient
-      const createFieldsRequest = {
-        envelopeId: createResponse.id,
-        data: [
-          {
-            recipientId: recipient.id,
-            envelopeItemId: envelopeItem.id,
-            type: FieldType.SIGNATURE,
-            page: 1,
-            positionX: 100,
-            positionY: 100,
-            width: 50,
-            height: 50,
-          },
-        ],
-      };
-
-      const createFieldsRes = await request.post(`${baseUrl}/envelope/field/create-many`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: createFieldsRequest,
-      });
-
-      expect(createFieldsRes.ok()).toBeTruthy();
-
-      // Try to distribute the envelope - should fail
-      const distributeRes = await request.post(`${baseUrl}/envelope/distribute`, {
-        headers: { Authorization: `Bearer ${tokenA}` },
-        data: {
-          envelopeId: createResponse.id,
-        },
-      });
-
-      // Expect distribution to fail
-      expect(distributeRes.ok()).toBeFalsy();
-      expect(distributeRes.status()).toBe(400);
-
-      const errorResponse = await distributeRes.json();
-      expect(errorResponse.message).toContain('requires an email');
-    });
-  });
 });

packages/lib/client-only/providers/envelope-editor-provider.tsx

@@ -132,12 +132,7 @@ export const EnvelopeEditorProvider = ({
   });
 
   const envelopeFieldSetMutationQuery = trpc.envelope.field.set.useMutation({
-    onSuccess: ({ data: fields }) => {
-      setEnvelope((prev) => ({
-        ...prev,
-        fields,
-      }));
-
+    onSuccess: () => {
       setAutosaveError(false);
     },
     onError: (err) => {
@@ -159,18 +154,8 @@ export const EnvelopeEditorProvider = ({
       setEnvelope((prev) => ({
         ...prev,
         recipients,
-        fields: prev.fields.filter((field) =>
-          recipients.some((recipient) => recipient.id === field.recipientId),
-        ),
       }));
 
-      // Reset the local fields to ensure deleted recipient fields are removed.
-      editorFields.resetForm(
-        envelope.fields.filter((field) =>
-          recipients.some((recipient) => recipient.id === field.recipientId),
-        ),
-      );
-
       setAutosaveError(false);
     },
     onError: (err) => {
@@ -280,7 +265,7 @@ export const EnvelopeEditorProvider = ({
   );
 
   /**
-   * Fetch and sync the envelope back into the editor.
+   * Fetch and sycn the envelope back into the editor.
    *
    * Overrides everything.
    */

packages/lib/constants/i18n.ts

@@ -6,7 +6,6 @@ export const SUPPORTED_LANGUAGE_CODES = [
   'fr',
   'es',
   'it',
-  'nl',
   'pl',
   'pt-BR',
   'ja',
@@ -62,10 +61,6 @@ export const SUPPORTED_LANGUAGES: Record<string, SupportedLanguage> = {
     full: 'Italian',
     short: 'it',
   },
-  nl: {
-    short: 'nl',
-    full: 'Dutch',
-  },
   pl: {
     short: 'pl',
     full: 'Polish',

packages/lib/jobs/definitions/emails/send-document-cancelled-emails.handler.ts

@@ -5,7 +5,6 @@ import { EnvelopeType, ReadStatus, SendStatus, SigningStatus } from '@prisma/cli
 
 import { mailer } from '@documenso/email/mailer';
 import DocumentCancelTemplate from '@documenso/email/templates/document-cancel';
-import { isRecipientEmailValidForSending } from '@documenso/lib/utils/recipients';
 import { prisma } from '@documenso/prisma';
 
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
@@ -78,8 +77,7 @@ export const run = async ({
   const recipientsToNotify = envelope.recipients.filter(
     (recipient) =>
       (recipient.sendStatus === SendStatus.SENT || recipient.readStatus === ReadStatus.OPENED) &&
-      recipient.signingStatus !== SigningStatus.REJECTED &&
-      isRecipientEmailValidForSending(recipient),
+      recipient.signingStatus !== SigningStatus.REJECTED,
   );
 
   await io.runTask('send-cancellation-emails', async () => {

packages/lib/jobs/definitions/emails/send-recipient-signed-email.handler.ts

@@ -12,7 +12,6 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
 import { getEmailContext } from '../../../server-only/email/get-email-context';
 import { extractDerivedDocumentEmailSettings } from '../../../types/document-email';
 import { unsafeBuildEnvelopeIdQuery } from '../../../utils/envelope';
-import { isRecipientEmailValidForSending } from '../../../utils/recipients';
 import { renderEmailWithI18N } from '../../../utils/render-email-with-i18n';
 import type { JobRunIO } from '../../client/_internal/job';
 import type { TSendRecipientSignedEmailJobDefinition } from './send-recipient-signed-email';
@@ -80,8 +79,8 @@ export const run = async ({
 
   const recipientReference = recipientName || recipientEmail;
 
-  // Don't send notification if the owner is the one who signed.
-  if (owner.email === recipientEmail || !isRecipientEmailValidForSending(recipient)) {
+  // Don't send notification if the owner is the one who signed
+  if (owner.email === recipientEmail) {
     return;
   }
 

packages/lib/jobs/definitions/emails/send-rejection-emails.handler.ts

@@ -6,7 +6,6 @@ import { EnvelopeType, SendStatus, SigningStatus } from '@prisma/client';
 import { mailer } from '@documenso/email/mailer';
 import DocumentRejectedEmail from '@documenso/email/templates/document-rejected';
 import DocumentRejectionConfirmedEmail from '@documenso/email/templates/document-rejection-confirmed';
-import { isRecipientEmailValidForSending } from '@documenso/lib/utils/recipients';
 import { prisma } from '@documenso/prisma';
 
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
@@ -86,38 +85,36 @@ export const run = async ({
   const i18n = await getI18nInstance(emailLanguage);
 
   // Send confirmation email to the recipient who rejected
-  if (isRecipientEmailValidForSending(recipient)) {
-    await io.runTask('send-rejection-confirmation-email', async () => {
-      const recipientTemplate = createElement(DocumentRejectionConfirmedEmail, {
-        recipientName: recipient.name,
-        documentName: envelope.title,
-        documentOwnerName: envelope.user.name || envelope.user.email,
-        reason: recipient.rejectionReason || '',
-        assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
-      });
-
-      const [html, text] = await Promise.all([
-        renderEmailWithI18N(recipientTemplate, { lang: emailLanguage, branding }),
-        renderEmailWithI18N(recipientTemplate, {
-          lang: emailLanguage,
-          branding,
-          plainText: true,
-        }),
-      ]);
-
-      await mailer.sendMail({
-        to: {
-          name: recipient.name,
-          address: recipient.email,
-        },
-        from: senderEmail,
-        replyTo: replyToEmail,
-        subject: i18n._(msg`Document "${envelope.title}" - Rejection Confirmed`),
-        html,
-        text,
-      });
+  await io.runTask('send-rejection-confirmation-email', async () => {
+    const recipientTemplate = createElement(DocumentRejectionConfirmedEmail, {
+      recipientName: recipient.name,
+      documentName: envelope.title,
+      documentOwnerName: envelope.user.name || envelope.user.email,
+      reason: recipient.rejectionReason || '',
+      assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL(),
     });
-  }
+
+    const [html, text] = await Promise.all([
+      renderEmailWithI18N(recipientTemplate, { lang: emailLanguage, branding }),
+      renderEmailWithI18N(recipientTemplate, {
+        lang: emailLanguage,
+        branding,
+        plainText: true,
+      }),
+    ]);
+
+    await mailer.sendMail({
+      to: {
+        name: recipient.name,
+        address: recipient.email,
+      },
+      from: senderEmail,
+      replyTo: replyToEmail,
+      subject: i18n._(msg`Document "${envelope.title}" - Rejection Confirmed`),
+      html,
+      text,
+    });
+  });
 
   // Send notification email to document owner
   await io.runTask('send-owner-notification-email', async () => {

packages/lib/jobs/definitions/emails/send-signing-email.handler.ts

@@ -12,7 +12,6 @@ import {
 
 import { mailer } from '@documenso/email/mailer';
 import DocumentInviteEmailTemplate from '@documenso/email/templates/document-invite';
-import { isRecipientEmailValidForSending } from '@documenso/lib/utils/recipients';
 import { prisma } from '@documenso/prisma';
 
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
@@ -178,33 +177,31 @@ export const run = async ({
     includeSenderDetails: settings.includeSenderDetails,
   });
 
-  if (isRecipientEmailValidForSending(recipient)) {
-    await io.runTask('send-signing-email', async () => {
-      const [html, text] = await Promise.all([
-        renderEmailWithI18N(template, { lang: emailLanguage, branding }),
-        renderEmailWithI18N(template, {
-          lang: emailLanguage,
-          branding,
-          plainText: true,
-        }),
-      ]);
+  await io.runTask('send-signing-email', async () => {
+    const [html, text] = await Promise.all([
+      renderEmailWithI18N(template, { lang: emailLanguage, branding }),
+      renderEmailWithI18N(template, {
+        lang: emailLanguage,
+        branding,
+        plainText: true,
+      }),
+    ]);
 
-      await mailer.sendMail({
-        to: {
-          name: recipient.name,
-          address: recipient.email,
-        },
-        from: senderEmail,
-        replyTo: replyToEmail,
-        subject: renderCustomEmailTemplate(
-          documentMeta?.subject || emailSubject,
-          customEmailTemplate,
-        ),
-        html,
-        text,
-      });
+    await mailer.sendMail({
+      to: {
+        name: recipient.name,
+        address: recipient.email,
+      },
+      from: senderEmail,
+      replyTo: replyToEmail,
+      subject: renderCustomEmailTemplate(
+        documentMeta?.subject || emailSubject,
+        customEmailTemplate,
+      ),
+      html,
+      text,
     });
-  }
+  });
 
   await io.runTask('update-recipient', async () => {
     await prisma.recipient.update({

packages/lib/package.json

@@ -43,6 +43,7 @@
     "luxon": "^3.7.2",
     "nanoid": "^5.1.6",
     "oslo": "^0.17.0",
+    "pdfjs-dist": "3.11.174",
     "pg": "^8.16.3",
     "pino": "^9.14.0",
     "pino-pretty": "^13.1.2",

packages/lib/server-only/2fa/email/send-2fa-token-email.ts

@@ -5,7 +5,6 @@ import { EnvelopeType } from '@prisma/client';
 
 import { mailer } from '@documenso/email/mailer';
 import { AccessAuth2FAEmailTemplate } from '@documenso/email/templates/access-auth-2fa';
-import { isRecipientEmailValidForSending } from '@documenso/lib/utils/recipients';
 import { prisma } from '@documenso/prisma';
 
 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
@@ -70,12 +69,6 @@ export const send2FATokenEmail = async ({ token, envelopeId }: Send2FATokenEmail
     });
   }
 
-  if (!isRecipientEmailValidForSending(recipient)) {
-    throw new AppError(AppErrorCode.INVALID_REQUEST, {
-      message: 'Recipient is missing email address',
-    });
-  }
-
   const twoFactorTokenToken = await generateTwoFactorTokenFromEmail({
     envelopeId,
     email: recipient.email,

packages/lib/server-only/admin/admin-super-delete-document.ts

@@ -14,7 +14,6 @@ import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import type { RequestMetadata } from '../../universal/extract-request-metadata';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
-import { isRecipientEmailValidForSending } from '../../utils/recipients';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';
 
@@ -65,18 +64,14 @@ export const adminSuperDeleteDocument = async ({
     envelope.documentMeta,
   ).documentDeleted;
 
-  const recipientsToNotify = envelope.recipients.filter((recipient) =>
-    isRecipientEmailValidForSending(recipient),
-  );
-
   // if the document is pending, send cancellation emails to all recipients
   if (
     status === DocumentStatus.PENDING &&
-    recipientsToNotify.length > 0 &&
+    envelope.recipients.length > 0 &&
     isDocumentDeletedEmailEnabled
   ) {
     await Promise.all(
-      recipientsToNotify.map(async (recipient) => {
+      envelope.recipients.map(async (recipient) => {
         if (recipient.sendStatus !== SendStatus.SENT) {
           return;
         }

packages/lib/server-only/document/complete-document-with-token.ts

@@ -2,7 +2,6 @@ import {
   DocumentSigningOrder,
   DocumentStatus,
   EnvelopeType,
-  FieldType,
   RecipientRole,
   SendStatus,
   SigningStatus,
@@ -44,14 +43,6 @@ export type CompleteDocumentWithTokenOptions = {
     email: string;
     name: string;
   };
-  /**
-   * Override the recipient information. This will only work if the recipient
-   * does not have a name or email set.
-   */
-  recipientOverride?: {
-    email?: string;
-    name?: string;
-  };
 };
 
 export const completeDocumentWithToken = async ({
@@ -61,7 +52,6 @@ export const completeDocumentWithToken = async ({
   accessAuthOptions,
   requestMetadata,
   nextSigner,
-  recipientOverride,
 }: CompleteDocumentWithTokenOptions) => {
   const envelope = await prisma.envelope.findFirstOrThrow({
     where: {
@@ -126,35 +116,6 @@ export const completeDocumentWithToken = async ({
     throw new Error(`Recipient ${recipient.id} has unsigned fields`);
   }
 
-  let recipientName = recipient.name;
-  let recipientEmail = recipient.email;
-
-  // Only trim the name if it's been derived.
-  if (!recipientName) {
-    recipientName = (
-      recipientOverride?.name ||
-      fields.find((field) => field.type === FieldType.NAME)?.customText ||
-      ''
-    ).trim();
-  }
-
-  // Only trim the email if it's been derived.
-  if (!recipient.email) {
-    recipientEmail = (
-      recipientOverride?.email ||
-      fields.find((field) => field.type === FieldType.EMAIL)?.customText ||
-      ''
-    )
-      .trim()
-      .toLowerCase();
-  }
-
-  if (!recipientEmail) {
-    throw new AppError(AppErrorCode.INVALID_BODY, {
-      message: 'Recipient email is required',
-    });
-  }
-
   // Check ACCESS AUTH 2FA validation during document completion
   const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
     documentAuth: envelope.authOptions,
@@ -168,12 +129,6 @@ export const completeDocumentWithToken = async ({
       });
     }
 
-    if (!recipient.email.trim()) {
-      throw new AppError(AppErrorCode.INVALID_REQUEST, {
-        message: `Recipient ${recipient.id} requires an email because they have auth requirements.`,
-      });
-    }
-
     const isValid = await isRecipientAuthorized({
       type: 'ACCESS_2FA',
       documentAuthOptions: envelope.authOptions,
@@ -221,43 +176,9 @@ export const completeDocumentWithToken = async ({
       data: {
         signingStatus: SigningStatus.SIGNED,
         signedAt: new Date(),
-        name: recipientName,
-        email: recipientEmail,
       },
     });
 
-    if (recipientEmail !== recipient.email || recipientName !== recipient.name) {
-      await tx.documentAuditLog.create({
-        data: createDocumentAuditLogData({
-          type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED,
-          envelopeId: envelope.id,
-          user: {
-            name: recipientName,
-            email: recipientEmail,
-          },
-          requestMetadata,
-          data: {
-            recipientEmail: recipient.email,
-            recipientName: recipient.name,
-            recipientId: recipient.id,
-            recipientRole: recipient.role,
-            changes: [
-              {
-                type: RECIPIENT_DIFF_TYPE.NAME,
-                from: recipient.name,
-                to: recipientName,
-              },
-              {
-                type: RECIPIENT_DIFF_TYPE.EMAIL,
-                from: recipient.email,
-                to: recipientEmail,
-              },
-            ],
-          },
-        }),
-      });
-    }
-
     const authOptions = extractDocumentAuthMethods({
       documentAuth: envelope.authOptions,
       recipientAuth: recipient.authOptions,
@@ -268,13 +189,13 @@ export const completeDocumentWithToken = async ({
         type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_RECIPIENT_COMPLETED,
         envelopeId: envelope.id,
         user: {
-          name: recipientName,
-          email: recipientEmail,
+          name: recipient.name,
+          email: recipient.email,
         },
         requestMetadata,
         data: {
-          recipientEmail: recipientEmail,
-          recipientName: recipientName,
+          recipientEmail: recipient.email,
+          recipientName: recipient.name,
           recipientId: recipient.id,
           recipientRole: recipient.role,
           actionAuth: authOptions.derivedRecipientActionAuth,
@@ -283,15 +204,13 @@ export const completeDocumentWithToken = async ({
     });
   });
 
-  if (recipientEmail) {
-    await jobs.triggerJob({
-      name: 'send.recipient.signed.email',
-      payload: {
-        documentId: legacyDocumentId,
-        recipientId: recipient.id,
-      },
-    });
-  }
+  await jobs.triggerJob({
+    name: 'send.recipient.signed.email',
+    payload: {
+      documentId: legacyDocumentId,
+      recipientId: recipient.id,
+    },
+  });
 
   const pendingRecipients = await prisma.recipient.findMany({
     select: {
@@ -328,8 +247,8 @@ export const completeDocumentWithToken = async ({
               type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED,
               envelopeId: envelope.id,
               user: {
-                name: recipientName,
-                email: recipientEmail,
+                name: recipient.name,
+                email: recipient.email,
               },
               requestMetadata,
               data: {

packages/lib/server-only/document/delete-document.ts

@@ -21,7 +21,6 @@ import type { ApiRequestMetadata } from '../../universal/extract-request-metadat
 import { isDocumentCompleted } from '../../utils/document';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
 import { type EnvelopeIdOptions, unsafeBuildEnvelopeIdQuery } from '../../utils/envelope';
-import { isRecipientEmailValidForSending } from '../../utils/recipients';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';
 import { getMemberRoles } from '../team/get-member-roles';
@@ -210,7 +209,7 @@ const handleDocumentOwnerDelete = async ({
   // Send cancellation emails to recipients.
   await Promise.all(
     envelope.recipients.map(async (recipient) => {
-      if (recipient.sendStatus !== SendStatus.SENT || !isRecipientEmailValidForSending(recipient)) {
+      if (recipient.sendStatus !== SendStatus.SENT) {
         return;
       }
 

packages/lib/server-only/document/resend-document.ts

@@ -26,7 +26,6 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { isDocumentCompleted } from '../../utils/document';
 import type { EnvelopeIdOptions } from '../../utils/envelope';
-import { isRecipientEmailValidForSending } from '../../utils/recipients';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
@@ -119,7 +118,7 @@ export const resendDocument = async ({
 
   await Promise.all(
     recipientsToRemind.map(async (recipient) => {
-      if (recipient.role === RecipientRole.CC || !isRecipientEmailValidForSending(recipient)) {
+      if (recipient.role === RecipientRole.CC) {
         return;
       }
 

packages/lib/server-only/document/send-completed-email.ts

@@ -16,7 +16,6 @@ import { getFileServerSide } from '../../universal/upload/get-file.server';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
 import type { EnvelopeIdOptions } from '../../utils/envelope';
 import { unsafeBuildEnvelopeIdQuery } from '../../utils/envelope';
-import { isRecipientEmailValidForSending } from '../../utils/recipients';
 import { renderCustomEmailTemplate } from '../../utils/render-custom-email-template';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { formatDocumentsPath } from '../../utils/teams';
@@ -177,12 +176,8 @@ export const sendCompletedEmail = async ({ id, requestMetadata }: SendDocumentOp
     return;
   }
 
-  const recipientsToNotify = envelope.recipients.filter((recipient) =>
-    isRecipientEmailValidForSending(recipient),
-  );
-
   await Promise.all(
-    recipientsToNotify.map(async (recipient) => {
+    envelope.recipients.map(async (recipient) => {
       const customEmailTemplate = {
         'signer.name': recipient.name,
         'signer.email': recipient.email,

packages/lib/server-only/document/send-document.ts

@@ -35,10 +35,8 @@ import {
 import { getFileServerSide } from '../../universal/upload/get-file.server';
 import { putPdfFileServerSide } from '../../universal/upload/put-file.server';
 import { isDocumentCompleted } from '../../utils/document';
-import { extractDocumentAuthMethods } from '../../utils/document-auth';
 import { type EnvelopeIdOptions, mapSecondaryIdToDocumentId } from '../../utils/envelope';
 import { toCheckboxCustomText, toRadioCustomText } from '../../utils/fields';
-import { isRecipientEmailValidForSending } from '../../utils/recipients';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
 import { insertFormValuesInPdf } from '../pdf/insert-form-values-in-pdf';
 import { triggerWebhook } from '../webhooks/trigger/trigger-webhook';
@@ -130,24 +128,6 @@ export const sendDocument = async ({
     );
   }
 
-  // Validate that recipients with auth requirements have a valid email.
-  envelope.recipients.forEach((recipient) => {
-    const auth = extractDocumentAuthMethods({
-      documentAuth: envelope.authOptions,
-      recipientAuth: recipient.authOptions,
-    });
-
-    if (
-      recipient.role !== RecipientRole.CC &&
-      (auth.recipientAccessAuthRequired || auth.recipientActionAuthRequired) &&
-      !isRecipientEmailValidForSending(recipient)
-    ) {
-      throw new AppError(AppErrorCode.INVALID_REQUEST, {
-        message: `Recipient ${recipient.id} requires an email because they have auth requirements.`,
-      });
-    }
-  });
-
   // Commented out server side checks for minimum 1 signature per signer now since we need to
   // decide if we want to enforce this for API & templates.
   // const fields = await getFieldsForDocument({

packages/lib/server-only/document/send-pending-email.ts

@@ -12,7 +12,6 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import type { EnvelopeIdOptions } from '../../utils/envelope';
 import { unsafeBuildEnvelopeIdQuery } from '../../utils/envelope';
-import { isRecipientEmailValidForSending } from '../../utils/recipients';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';
 
@@ -70,11 +69,6 @@ export const sendPendingEmail = async ({ id, recipientId }: SendPendingEmailOpti
 
   const { email, name } = recipient;
 
-  // Skip sending email if recipient has no email address
-  if (!isRecipientEmailValidForSending(recipient)) {
-    return;
-  }
-
   const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
 
   const template = createElement(DocumentPendingEmailTemplate, {

packages/lib/server-only/image/resize-and-compress-image.ts

@@ -0,0 +1,15 @@
+import sharp from 'sharp';
+
+export const resizeAndCompressImage = async (imageBuffer: Buffer): Promise<Buffer> => {
+  const metadata = await sharp(imageBuffer).metadata();
+  const originalWidth = metadata.width || 0;
+
+  if (originalWidth > 1000) {
+    return await sharp(imageBuffer)
+      .resize({ width: 1000, withoutEnlargement: true })
+      .jpeg({ quality: 70 })
+      .toBuffer();
+  }
+
+  return await sharp(imageBuffer).jpeg({ quality: 70 }).toBuffer();
+};

packages/lib/server-only/pdf/render-pdf-to-image.ts

@@ -0,0 +1,84 @@
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import { Canvas, Image } from 'skia-canvas';
+
+const require = createRequire(import.meta.url || fileURLToPath(new URL('.', import.meta.url)));
+const Module = require('node:module');
+
+const originalRequire = Module.prototype.require;
+Module.prototype.require = function (path: string) {
+  if (path === 'canvas') {
+    return {
+      createCanvas: (width: number, height: number) => new Canvas(width, height),
+      Image, // needed by pdfjs-dist
+    };
+  }
+  // eslint-disable-next-line prefer-rest-params, @typescript-eslint/consistent-type-assertions
+  return originalRequire.apply(this, arguments as unknown as [string]);
+};
+
+// Use dynamic require to bypass Vite SSR transformation
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const pdfjsLib = require('pdfjs-dist/legacy/build/pdf.js');
+
+export const renderPdfToImage = async (pdfBytes: Uint8Array) => {
+  const loadingTask = pdfjsLib.getDocument({ data: pdfBytes });
+  const pdf = await loadingTask.promise;
+
+  try {
+    const scale = 2;
+
+    const results = await Promise.allSettled(
+      Array.from({ length: pdf.numPages }, async (_, index) => {
+        const pageNumber = index + 1;
+        const page = await pdf.getPage(pageNumber);
+
+        try {
+          const viewport = page.getViewport({ scale });
+
+          const virtualCanvas = new Canvas(viewport.width, viewport.height);
+          const context = virtualCanvas.getContext('2d');
+          context.imageSmoothingEnabled = false;
+
+          await page.render({ canvasContext: context, viewport }).promise;
+
+          return {
+            image: await virtualCanvas.toBuffer('png'),
+            pageNumber,
+            width: Math.floor(viewport.width),
+            height: Math.floor(viewport.height),
+          };
+        } finally {
+          page.cleanup();
+        }
+      }),
+    );
+
+    const pages = results
+      .filter(
+        (
+          result,
+        ): result is PromiseFulfilledResult<{
+          image: Buffer;
+          pageNumber: number;
+          width: number;
+          height: number;
+        }> => result.status === 'fulfilled',
+      )
+      .map((result) => result.value);
+
+    if (results.some((result) => result.status === 'rejected')) {
+      const failedReasons = results
+        .filter((result): result is PromiseRejectedResult => result.status === 'rejected')
+        .map((result) => result.reason);
+
+      // Note: We don't have logger available in this package
+      // Errors are handled by the caller in document-analysis/index.ts
+      // which will use the proper logger for reporting failures
+    }
+
+    return pages;
+  } finally {
+    await pdf.destroy();
+  }
+};

packages/lib/server-only/recipient/create-envelope-recipients.ts

@@ -12,10 +12,10 @@ import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import type { EnvelopeIdOptions } from '../../utils/envelope';
-import { mapRecipientToLegacyRecipient } from '../../utils/recipients';
+import { mapRecipientToLegacyRecipient, sanitizeRecipientName } from '../../utils/recipients';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
 
-export interface CreateEnvelopeRecipientsOptions {
+export type CreateEnvelopeRecipientsOptions = {
   userId: number;
   teamId: number;
   id: EnvelopeIdOptions;
@@ -28,7 +28,7 @@ export interface CreateEnvelopeRecipientsOptions {
     actionAuth?: TRecipientActionAuthTypes[];
   }[];
   requestMetadata: ApiRequestMetadata;
-}
+};
 
 export const createEnvelopeRecipients = async ({
   userId,
@@ -85,6 +85,7 @@ export const createEnvelopeRecipients = async ({
 
   const normalizedRecipients = recipientsToCreate.map((recipient) => ({
     ...recipient,
+    name: sanitizeRecipientName(recipient.name),
     email: recipient.email.toLowerCase(),
   }));
 

packages/lib/server-only/recipient/delete-envelope-recipient.ts

@@ -14,7 +14,7 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { createDocumentAuditLogData } from '../../utils/document-audit-logs';
-import { canRecipientBeModified, isRecipientEmailValidForSending } from '../../utils/recipients';
+import { canRecipientBeModified } from '../../utils/recipients';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { buildTeamWhereQuery } from '../../utils/teams';
 import { getEmailContext } from '../email/get-email-context';
@@ -142,8 +142,7 @@ export const deleteEnvelopeRecipient = async ({
   if (
     recipientToDelete.sendStatus === SendStatus.SENT &&
     isRecipientRemovedEmailEnabled &&
-    envelope.type === EnvelopeType.DOCUMENT &&
-    isRecipientEmailValidForSending(recipientToDelete)
+    envelope.type === EnvelopeType.DOCUMENT
   ) {
     const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';
 

packages/lib/server-only/recipient/set-document-recipients.ts

@@ -28,18 +28,18 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { extractDerivedDocumentEmailSettings } from '../../types/document-email';
 import { type EnvelopeIdOptions, mapSecondaryIdToDocumentId } from '../../utils/envelope';
-import { canRecipientBeModified, isRecipientEmailValidForSending } from '../../utils/recipients';
+import { canRecipientBeModified, sanitizeRecipientName } from '../../utils/recipients';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
 
-export interface SetDocumentRecipientsOptions {
+export type SetDocumentRecipientsOptions = {
   userId: number;
   teamId: number;
   id: EnvelopeIdOptions;
   recipients: RecipientData[];
   requestMetadata: ApiRequestMetadata;
-}
+};
 
 export const setDocumentRecipients = async ({
   userId,
@@ -114,6 +114,7 @@ export const setDocumentRecipients = async ({
 
   const normalizedRecipients = recipients.map((recipient) => ({
     ...recipient,
+    name: sanitizeRecipientName(recipient.name),
     email: recipient.email.toLowerCase(),
   }));
 
@@ -294,14 +295,10 @@ export const setDocumentRecipients = async ({
       envelope.documentMeta,
     ).recipientRemoved;
 
-    // Send emails to deleted recipients who have emails.
+    // Send emails to deleted recipients.
     await Promise.all(
       removedRecipients.map(async (recipient) => {
-        if (
-          recipient.sendStatus !== SendStatus.SENT ||
-          !isRecipientRemovedEmailEnabled ||
-          !isRecipientEmailValidForSending(recipient)
-        ) {
+        if (recipient.sendStatus !== SendStatus.SENT || !isRecipientRemovedEmailEnabled) {
           return;
         }
 

packages/lib/server-only/recipient/set-template-recipients.ts

@@ -15,6 +15,7 @@ import {
 import { nanoid } from '../../universal/id';
 import { createRecipientAuthOptions } from '../../utils/document-auth';
 import { type EnvelopeIdOptions, mapSecondaryIdToTemplateId } from '../../utils/envelope';
+import { sanitizeRecipientName } from '../../utils/recipients';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
 
 export type SetTemplateRecipientsOptions = {
@@ -88,6 +89,7 @@ export const setTemplateRecipients = async ({
 
     return {
       ...recipient,
+      name: sanitizeRecipientName(recipient.name),
       email: recipient.email.toLowerCase(),
     };
   });

packages/lib/server-only/recipient/update-envelope-recipients.ts

@@ -18,10 +18,10 @@ import { AppError, AppErrorCode } from '../../errors/app-error';
 import { extractLegacyIds } from '../../universal/id';
 import { type EnvelopeIdOptions } from '../../utils/envelope';
 import { mapFieldToLegacyField } from '../../utils/fields';
-import { canRecipientBeModified } from '../../utils/recipients';
+import { canRecipientBeModified, sanitizeRecipientName } from '../../utils/recipients';
 import { getEnvelopeWhereInput } from '../envelope/get-envelope-by-id';
 
-export interface UpdateEnvelopeRecipientsOptions {
+export type UpdateEnvelopeRecipientsOptions = {
   userId: number;
   teamId: number;
   id: EnvelopeIdOptions;
@@ -35,7 +35,7 @@ export interface UpdateEnvelopeRecipientsOptions {
     actionAuth?: TRecipientActionAuthTypes[];
   }[];
   requestMetadata: ApiRequestMetadata;
-}
+};
 
 export const updateEnvelopeRecipients = async ({
   userId,
@@ -108,9 +108,18 @@ export const updateEnvelopeRecipients = async ({
       });
     }
 
+    const sanitizedUpdateData = {
+      ...recipient,
+      ...(recipient.name !== undefined
+        ? {
+            name: sanitizeRecipientName(recipient.name),
+          }
+        : {}),
+    };
+
     return {
       originalRecipient,
-      updateData: recipient,
+      updateData: sanitizedUpdateData,
     };
   });
 

packages/lib/translations/de/web.po

@@ -2817,6 +2817,10 @@ msgstr "Erstellt am {0}"
 msgid "CSV Structure"
 msgstr "CSV-Struktur"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "Kumulative MAU (angemeldet)"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "Aktuell"

packages/lib/translations/en/web.po

@@ -2812,6 +2812,10 @@ msgstr "Created on {0}"
 msgid "CSV Structure"
 msgstr "CSV Structure"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "Cumulative MAU (signed in)"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "Current"

packages/lib/translations/es/web.po

@@ -2817,6 +2817,10 @@ msgstr "Creado el {0}"
 msgid "CSV Structure"
 msgstr "Estructura CSV"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "MAU acumulativo (con sesión iniciada)"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "Actual"

packages/lib/translations/fr/web.po

@@ -2817,6 +2817,10 @@ msgstr "Créé le {0}"
 msgid "CSV Structure"
 msgstr "Structure CSV"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "MAU cumulatif (connecté)"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "Actuel"

packages/lib/translations/it/web.po

@@ -2817,6 +2817,10 @@ msgstr "Creato il {0}"
 msgid "CSV Structure"
 msgstr "Struttura CSV"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "MAU cumulativi (autenticati)"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "Corrente"

packages/lib/translations/ja/web.po

@@ -2817,6 +2817,10 @@ msgstr "作成日 {0}"
 msgid "CSV Structure"
 msgstr "CSV 構造"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "累積 MAU（サインイン済み）"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "現在"

packages/lib/translations/ko/web.po

@@ -2817,6 +2817,10 @@ msgstr "{0}에 생성됨"
 msgid "CSV Structure"
 msgstr "CSV 구조"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "누적 MAU(로그인 기준)"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "현재"

packages/lib/translations/nl/web.po

@@ -2817,6 +2817,10 @@ msgstr "Aangemaakt op {0}"
 msgid "CSV Structure"
 msgstr "CSV-structuur"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "Cumulatieve MAU (ingelogd)"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "Huidig"

packages/lib/translations/pl/web.po

@@ -2817,6 +2817,10 @@ msgstr "Utworzono {0}"
 msgid "CSV Structure"
 msgstr "Struktura CSV"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "Łączna liczba MAU (zalogowani)"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "Obecna"

packages/lib/translations/pt-BR/web.po

@@ -2812,6 +2812,10 @@ msgstr "Criado em {0}"
 msgid "CSV Structure"
 msgstr "Estrutura do CSV"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "MAU acumulado (logados)"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "Atual"

packages/lib/translations/sq/web.po

@@ -2298,6 +2298,10 @@ msgstr "Krijuar më {0}"
 msgid "CSV Structure"
 msgstr "Struktura CSV"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr ""
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "Aktual"

packages/lib/translations/zh/web.po

@@ -2817,6 +2817,10 @@ msgstr "创建于 {0}"
 msgid "CSV Structure"
 msgstr "CSV 结构"
 
+#: apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+msgid "Cumulative MAU (signed in)"
+msgstr "累计月活跃用户（已登录）"
+
 #: apps/remix/app/routes/_authenticated+/settings+/security.sessions.tsx
 msgid "Current"
 msgstr "当前"

packages/lib/types/document-analysis.ts

@@ -0,0 +1,42 @@
+import { z } from 'zod';
+
+export const ZDetectedFormFieldSchema = z.object({
+  boundingBox: z
+    .object({
+      ymin: z.number().min(0).max(1000),
+      xmin: z.number().min(0).max(1000),
+      ymax: z.number().min(0).max(1000),
+      xmax: z.number().min(0).max(1000),
+    })
+    .refine((box) => box.xmin < box.xmax && box.ymin < box.ymax, {
+      message: 'Bounding box must have min < max for both axes',
+    })
+    .describe('Bounding box {ymin, xmin, ymax, xmax} in normalized 0-1000 range'),
+  label: z
+    .enum([
+      'SIGNATURE',
+      'INITIALS',
+      'NAME',
+      'EMAIL',
+      'DATE',
+      'TEXT',
+      'NUMBER',
+      'RADIO',
+      'CHECKBOX',
+      'DROPDOWN',
+    ])
+    .describe('Documenso field type inferred from nearby label text or visual characteristics'),
+  pageNumber: z
+    .number()
+    .int()
+    .positive()
+    .describe('1-indexed page number where field was detected'),
+  recipientId: z
+    .number()
+    .int()
+    .describe(
+      'ID of the recipient (from the provided envelope recipients) who should own the field',
+    ),
+});
+
+export type TDetectedFormField = z.infer<typeof ZDetectedFormFieldSchema>;

packages/lib/types/envelope.ts

@@ -63,7 +63,10 @@ export const ZEnvelopeSchema = EnvelopeSchema.pick({
     id: true,
     title: true,
     order: true,
-  }).array(),
+    documentDataId: true,
+  })
+    .partial({ documentDataId: true })
+    .array(),
   directLink: TemplateDirectLinkSchema.pick({
     directTemplateRecipientId: true,
     enabled: true,

packages/lib/types/field-meta.ts

@@ -303,6 +303,7 @@ export const FIELD_NUMBER_META_DEFAULT_VALUES: TNumberFieldMeta = {
   textAlign: 'left',
   label: '',
   placeholder: '',
+  value: '',
   required: false,
   readOnly: false,
 };

packages/lib/types/recipient.ts

@@ -1,4 +1,3 @@
-import { msg } from '@lingui/core/macro';
 import { z } from 'zod';
 
 import { RecipientSchema } from '@documenso/prisma/generated/zod/modelSchema/RecipientSchema';
@@ -111,13 +110,3 @@ export const ZEnvelopeRecipientManySchema = ZRecipientManySchema.omit({
   documentId: true,
   templateId: true,
 });
-
-export const ZRecipientEmailSchema = z.union([
-  z.literal(''),
-  z
-    .string()
-    .trim()
-    .toLowerCase()
-    .email({ message: msg`Invalid email`.id })
-    .max(254),
-]);

packages/lib/utils/logger.ts

@@ -27,7 +27,7 @@ if (loggingFilePath) {
 }
 
 export const logger = pino({
-  level: 'info',
+  level: env('LOG_LEVEL') || 'info',
   transport:
     transports.length > 0
       ? {

packages/lib/utils/recipients.ts

@@ -5,8 +5,22 @@ import { z } from 'zod';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../constants/app';
 import { extractLegacyIds } from '../universal/id';
 
+const UNKNOWN_RECIPIENT_NAME_PLACEHOLDER = '<UNKNOWN>';
+
 export const formatSigningLink = (token: string) => `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${token}`;
 
+export const resolveRecipientEmail = (candidateEmail: string | undefined | null) => {
+  if (candidateEmail) {
+    const trimmedEmail = candidateEmail.trim();
+
+    if (z.string().email().safeParse(trimmedEmail).success) {
+      return trimmedEmail;
+    }
+  }
+
+  return undefined;
+};
+
 /**
  * Whether a recipient can be modified by the document owner.
  */
@@ -60,6 +74,20 @@ export const mapRecipientToLegacyRecipient = (
   };
 };
 
-export const isRecipientEmailValidForSending = (recipient: Pick<Recipient, 'email'>) => {
-  return z.string().email().safeParse(recipient.email).success;
+export const sanitizeRecipientName = (name?: string | null) => {
+  if (!name) {
+    return '';
+  }
+
+  const trimmedName = name.trim();
+
+  if (!trimmedName) {
+    return '';
+  }
+
+  if (trimmedName.toUpperCase() === UNKNOWN_RECIPIENT_NAME_PLACEHOLDER) {
+    return '';
+  }
+
+  return trimmedName;
 };

packages/tailwind-config/index.cjs

@@ -142,11 +142,17 @@ module.exports = {
           '0%,70%,100%': { opacity: '1' },
           '20%,50%': { opacity: '0' },
         },
+        scan: {
+          '0%': { top: '0%' },
+          '50%': { top: '95%' },
+          '100%': { top: '0%' },
+        },
       },
       animation: {
         'accordion-down': 'accordion-down 0.2s ease-out',
         'accordion-up': 'accordion-up 0.2s ease-out',
         'caret-blink': 'caret-blink 1.25s ease-out infinite',
+        scan: 'scan 4s linear infinite',
       },
       screens: {
         '3xl': '1920px',

packages/trpc/server/embedding-router/create-embedding-template.types.ts

@@ -22,7 +22,6 @@ import {
   ZFieldWidthSchema,
 } from '@documenso/lib/types/field';
 import { ZFieldAndMetaSchema } from '@documenso/lib/types/field-meta';
-import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 
 import { ZDocumentTitleSchema } from '../document-router/schema';
 
@@ -31,7 +30,7 @@ export const ZCreateEmbeddingTemplateRequestSchema = z.object({
   documentDataId: z.string(),
   recipients: z.array(
     z.object({
-      email: ZRecipientEmailSchema,
+      email: z.union([z.string().length(0), z.string().email()]),
       name: z.string(),
       role: z.nativeEnum(RecipientRole),
       signingOrder: z.number().optional(),

packages/trpc/server/embedding-router/update-embedding-template.types.ts

@@ -1,4 +1,4 @@
-import { DocumentSigningOrder, RecipientRole } from '@prisma/client';
+import { DocumentSigningOrder, FieldType, RecipientRole } from '@prisma/client';
 import { z } from 'zod';
 
 import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
@@ -21,11 +21,22 @@ import {
   ZFieldPageYSchema,
   ZFieldWidthSchema,
 } from '@documenso/lib/types/field';
-import { ZFieldAndMetaSchema } from '@documenso/lib/types/field-meta';
-import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
+import { ZFieldAndMetaSchema, ZFieldMetaSchema } from '@documenso/lib/types/field-meta';
 
 import { ZDocumentTitleSchema } from '../document-router/schema';
 
+const ZFieldSchema = z.object({
+  id: z.number().optional(),
+  type: z.nativeEnum(FieldType),
+  pageNumber: ZFieldPageNumberSchema,
+  pageX: ZFieldPageXSchema,
+  pageY: ZFieldPageYSchema,
+  width: ZFieldWidthSchema,
+  height: ZFieldHeightSchema,
+  fieldMeta: ZFieldMetaSchema.optional(),
+  envelopeItemId: z.string(),
+});
+
 export const ZUpdateEmbeddingTemplateRequestSchema = z.object({
   templateId: z.number(),
   title: ZDocumentTitleSchema.optional(),
@@ -33,7 +44,7 @@ export const ZUpdateEmbeddingTemplateRequestSchema = z.object({
   recipients: z.array(
     z.object({
       id: z.number().optional(),
-      email: ZRecipientEmailSchema,
+      email: z.union([z.string().length(0), z.string().email()]),
       name: z.string(),
       role: z.nativeEnum(RecipientRole),
       signingOrder: z.number().optional(),

packages/trpc/server/envelope-router/create-envelope.types.ts

@@ -24,8 +24,8 @@ import {
   ZDocumentTitleSchema,
   ZDocumentVisibilitySchema,
 } from '../document-router/schema';
+import { ZCreateRecipientSchema } from '../recipient-router/schema';
 import type { TrpcRouteMeta } from '../trpc';
-import { ZCreateEnvelopeRecipientSchema } from './envelope-recipients/create-envelope-recipients.types';
 
 export const createEnvelopeMeta: TrpcRouteMeta = {
   openapi: {
@@ -54,7 +54,7 @@ export const ZCreateEnvelopePayloadSchema = z.object({
     .optional(),
   recipients: z
     .array(
-      ZCreateEnvelopeRecipientSchema.extend({
+      ZCreateRecipientSchema.extend({
         fields: ZEnvelopeFieldAndMetaSchema.and(
           z.object({
             identifier: z

packages/trpc/server/envelope-router/envelope-recipients/create-envelope-recipients.types.ts

@@ -1,15 +1,8 @@
-import { RecipientRole } from '@prisma/client';
 import { z } from 'zod';
 
-import {
-  ZRecipientAccessAuthTypesSchema,
-  ZRecipientActionAuthTypesSchema,
-} from '@documenso/lib/types/document-auth';
-import {
-  ZEnvelopeRecipientLiteSchema,
-  ZRecipientEmailSchema,
-} from '@documenso/lib/types/recipient';
+import { ZEnvelopeRecipientLiteSchema } from '@documenso/lib/types/recipient';
 
+import { ZCreateRecipientSchema } from '../../recipient-router/schema';
 import type { TrpcRouteMeta } from '../../trpc';
 
 export const createEnvelopeRecipientsMeta: TrpcRouteMeta = {
@@ -22,18 +15,9 @@ export const createEnvelopeRecipientsMeta: TrpcRouteMeta = {
   },
 };
 
-export const ZCreateEnvelopeRecipientSchema = z.object({
-  email: ZRecipientEmailSchema,
-  name: z.string().max(255),
-  role: z.nativeEnum(RecipientRole),
-  signingOrder: z.number().optional(),
-  accessAuth: z.array(ZRecipientAccessAuthTypesSchema).default([]).optional(),
-  actionAuth: z.array(ZRecipientActionAuthTypesSchema).default([]).optional(),
-});
-
 export const ZCreateEnvelopeRecipientsRequestSchema = z.object({
   envelopeId: z.string(),
-  data: ZCreateEnvelopeRecipientSchema.array(),
+  data: ZCreateRecipientSchema.array(),
 });
 
 export const ZCreateEnvelopeRecipientsResponseSchema = z.object({

packages/trpc/server/envelope-router/envelope-recipients/update-envelope-recipients.types.ts

@@ -1,12 +1,8 @@
-import { RecipientRole } from '@prisma/client';
 import { z } from 'zod';
 
-import {
-  ZRecipientAccessAuthTypesSchema,
-  ZRecipientActionAuthTypesSchema,
-} from '@documenso/lib/types/document-auth';
-import { ZRecipientEmailSchema, ZRecipientLiteSchema } from '@documenso/lib/types/recipient';
+import { ZRecipientLiteSchema } from '@documenso/lib/types/recipient';
 
+import { ZUpdateRecipientSchema } from '../../recipient-router/schema';
 import type { TrpcRouteMeta } from '../../trpc';
 
 export const updateEnvelopeRecipientsMeta: TrpcRouteMeta = {
@@ -19,19 +15,9 @@ export const updateEnvelopeRecipientsMeta: TrpcRouteMeta = {
   },
 };
 
-export const ZUpdateEnvelopeRecipientSchema = z.object({
-  id: z.number().describe('The ID of the recipient to update.'),
-  email: ZRecipientEmailSchema,
-  name: z.string().max(255).optional(),
-  role: z.nativeEnum(RecipientRole).optional(),
-  signingOrder: z.number().optional(),
-  accessAuth: z.array(ZRecipientAccessAuthTypesSchema).default([]).optional(),
-  actionAuth: z.array(ZRecipientActionAuthTypesSchema).default([]).optional(),
-});
-
 export const ZUpdateEnvelopeRecipientsRequestSchema = z.object({
   envelopeId: z.string(),
-  data: ZUpdateEnvelopeRecipientSchema.array(),
+  data: ZUpdateRecipientSchema.array(),
 });
 
 export const ZUpdateEnvelopeRecipientsResponseSchema = z.object({

packages/trpc/server/envelope-router/set-envelope-fields.ts

@@ -66,7 +66,7 @@ export const setEnvelopeFieldsRoute = authenticatedProcedure
 
     return {
       data: result.fields.map((field) => ({
-        ...field,
+        id: field.id,
         formId: field.formId,
       })),
     };

packages/trpc/server/envelope-router/set-envelope-fields.types.ts

@@ -6,7 +6,6 @@ import {
   ZClampedFieldPositionXSchema,
   ZClampedFieldPositionYSchema,
   ZClampedFieldWidthSchema,
-  ZEnvelopeFieldSchema,
 } from '@documenso/lib/types/field';
 import { ZFieldMetaSchema } from '@documenso/lib/types/field-meta';
 
@@ -38,9 +37,12 @@ export const ZSetEnvelopeFieldsRequestSchema = z.object({
 });
 
 export const ZSetEnvelopeFieldsResponseSchema = z.object({
-  data: ZEnvelopeFieldSchema.extend({
-    formId: z.string().optional(),
-  }).array(),
+  data: z
+    .object({
+      id: z.number(),
+      formId: z.string().optional(),
+    })
+    .array(),
 });
 
 export type TSetEnvelopeFieldsRequest = z.infer<typeof ZSetEnvelopeFieldsRequestSchema>;

packages/trpc/server/envelope-router/set-envelope-recipients.types.ts

@@ -2,7 +2,7 @@ import { EnvelopeType, RecipientRole } from '@prisma/client';
 import { z } from 'zod';
 
 import { ZRecipientActionAuthTypesSchema } from '@documenso/lib/types/document-auth';
-import { ZRecipientEmailSchema, ZRecipientLiteSchema } from '@documenso/lib/types/recipient';
+import { ZRecipientLiteSchema } from '@documenso/lib/types/recipient';
 
 export const ZSetEnvelopeRecipientsRequestSchema = z.object({
   envelopeId: z.string(),
@@ -10,7 +10,7 @@ export const ZSetEnvelopeRecipientsRequestSchema = z.object({
   recipients: z.array(
     z.object({
       id: z.number().optional(),
-      email: ZRecipientEmailSchema,
+      email: z.string().toLowerCase().email().min(1).max(254),
       name: z.string().max(255),
       role: z.nativeEnum(RecipientRole),
       signingOrder: z.number().optional(),

packages/trpc/server/envelope-router/use-envelope.types.ts

@@ -16,7 +16,6 @@ import {
 } from '@documenso/lib/types/document-meta';
 import { ZEnvelopeAttachmentTypeSchema } from '@documenso/lib/types/envelope-attachment';
 import { ZFieldMetaPrefillFieldsSchema } from '@documenso/lib/types/field-meta';
-import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 
 import { zodFormData } from '../../utils/zod-form-data';
 import type { TrpcRouteMeta } from '../trpc';
@@ -41,7 +40,7 @@ export const ZUseEnvelopePayloadSchema = z.object({
     .array(
       z.object({
         id: z.number().describe('The ID of the recipient in the template.'),
-        email: ZRecipientEmailSchema,
+        email: z.string().email().max(254),
         name: z.string().max(255).optional(),
         signingOrder: z.number().optional(),
       }),

packages/trpc/server/recipient-router/router.ts

@@ -561,7 +561,7 @@ export const recipientRouter = router({
   completeDocumentWithToken: procedure
     .input(ZCompleteDocumentWithTokenMutationSchema)
     .mutation(async ({ input, ctx }) => {
-      const { token, documentId, accessAuthOptions, nextSigner, recipientOverride } = input;
+      const { token, documentId, accessAuthOptions, nextSigner } = input;
 
       ctx.logger.info({
         input: {
@@ -577,7 +577,6 @@ export const recipientRouter = router({
         },
         accessAuthOptions,
         nextSigner,
-        recipientOverride,
         userId: ctx.user?.id,
         requestMetadata: ctx.metadata.requestMetadata,
       });

packages/trpc/server/recipient-router/schema.ts

@@ -171,12 +171,6 @@ export const ZCompleteDocumentWithTokenMutationSchema = z.object({
       name: z.string().min(1).max(255),
     })
     .optional(),
-  recipientOverride: z
-    .object({
-      email: z.string().trim().toLowerCase().email().max(254).optional(),
-      name: z.string().max(255).optional(),
-    })
-    .optional(),
 });
 
 export type TCompleteDocumentWithTokenMutationSchema = z.infer<

packages/trpc/server/template-router/schema.ts

@@ -22,7 +22,6 @@ import {
 } from '@documenso/lib/types/document-meta';
 import { ZEnvelopeAttachmentTypeSchema } from '@documenso/lib/types/envelope-attachment';
 import { ZFieldMetaPrefillFieldsSchema } from '@documenso/lib/types/field-meta';
-import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 import { ZFindResultResponse, ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
 import {
   ZTemplateLiteSchema,
@@ -101,7 +100,7 @@ export const ZCreateDocumentFromTemplateRequestSchema = z.object({
     .array(
       z.object({
         id: z.number().describe('The ID of the recipient in the template.'),
-        email: ZRecipientEmailSchema,
+        email: z.string().email().max(254),
         name: z.string().max(255).optional(),
       }),
     )