refactor: improve variable naming and streamline placeholder extraction logic in PDF processing

.env.example

@@ -135,14 +135,6 @@ NEXT_PUBLIC_FEATURE_BILLING_ENABLED=
 # OPTIONAL: Leave blank to allow users to signup through /signup page.
 NEXT_PUBLIC_DISABLE_SIGNUP=
 
-# [[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,6 +60,3 @@ CLAUDE.md
 
 # agents
 .specs
-
-# ai debug previews
-packages/assets/ai-previews/

apps/remix/app/components/general/direct-template/direct-template-page.tsx

@@ -89,7 +89,10 @@ export const DirectTemplatePageView = ({
     setStep('sign');
   };
 
-  const onSignDirectTemplateSubmit = async (fields: DirectTemplateLocalField[]) => {
+  const onSignDirectTemplateSubmit = async (
+    fields: DirectTemplateLocalField[],
+    nextSigner?: { name: string; email: string },
+  ) => {
     try {
       let directTemplateExternalId = searchParams?.get('externalId') || undefined;
 
@@ -98,6 +101,7 @@ export const DirectTemplatePageView = ({
       }
 
       const { token } = await createDocumentFromDirectTemplate({
+        nextSigner,
         directTemplateToken,
         directTemplateExternalId,
         directRecipientName: fullName,

apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx

@@ -55,10 +55,13 @@ import { DocumentSigningRecipientProvider } from '../document-signing/document-s
 
 export type DirectTemplateSigningFormProps = {
   flowStep: DocumentFlowStep;
-  directRecipient: Pick<Recipient, 'authOptions' | 'email' | 'role' | 'name' | 'token'>;
+  directRecipient: Pick<Recipient, 'authOptions' | 'email' | 'role' | 'name' | 'token' | 'id'>;
   directRecipientFields: Field[];
   template: Omit<TTemplate, 'user'>;
-  onSubmit: (_data: DirectTemplateLocalField[]) => Promise<void>;
+  onSubmit: (
+    _data: DirectTemplateLocalField[],
+    _nextSigner?: { name: string; email: string },
+  ) => Promise<void>;
 };
 
 export type DirectTemplateLocalField = Field & {
@@ -149,7 +152,7 @@ export const DirectTemplateSigningForm = ({
     validateFieldsInserted(fieldsRequiringValidation);
   };
 
-  const handleSubmit = async () => {
+  const handleSubmit = async (nextSigner?: { name: string; email: string }) => {
     setValidateUninsertedFields(true);
 
     const isFieldsValid = validateFieldsInserted(fieldsRequiringValidation);
@@ -161,7 +164,7 @@ export const DirectTemplateSigningForm = ({
     setIsSubmitting(true);
 
     try {
-      await onSubmit(localFields);
+      await onSubmit(localFields, nextSigner);
     } catch {
       setIsSubmitting(false);
     }
@@ -218,6 +221,30 @@ export const DirectTemplateSigningForm = ({
     setLocalFields(updatedFields);
   }, []);
 
+  const nextRecipient = useMemo(() => {
+    if (
+      !template.templateMeta?.signingOrder ||
+      template.templateMeta.signingOrder !== 'SEQUENTIAL' ||
+      !template.templateMeta.allowDictateNextSigner
+    ) {
+      return undefined;
+    }
+
+    const sortedRecipients = template.recipients.sort((a, b) => {
+      // Sort by signingOrder first (nulls last), then by id
+      if (a.signingOrder === null && b.signingOrder === null) return a.id - b.id;
+      if (a.signingOrder === null) return 1;
+      if (b.signingOrder === null) return -1;
+      if (a.signingOrder === b.signingOrder) return a.id - b.id;
+      return a.signingOrder - b.signingOrder;
+    });
+
+    const currentIndex = sortedRecipients.findIndex((r) => r.id === directRecipient.id);
+    return currentIndex !== -1 && currentIndex < sortedRecipients.length - 1
+      ? sortedRecipients[currentIndex + 1]
+      : undefined;
+  }, [template.templateMeta?.signingOrder, template.recipients, directRecipient.id]);
+
   return (
     <DocumentSigningRecipientProvider recipient={directRecipient}>
       <DocumentFlowFormContainerHeader title={flowStep.title} description={flowStep.description} />
@@ -417,11 +444,15 @@ export const DirectTemplateSigningForm = ({
 
           <DocumentSigningCompleteDialog
             isSubmitting={isSubmitting}
-            onSignatureComplete={async () => handleSubmit()}
+            onSignatureComplete={async (nextSigner) => handleSubmit(nextSigner)}
             documentTitle={template.title}
             fields={localFields}
             fieldsValidated={fieldsValidated}
             recipient={directRecipient}
+            allowDictateNextSigner={nextRecipient && template.templateMeta?.allowDictateNextSigner}
+            defaultNextSigner={
+              nextRecipient ? { name: nextRecipient.name, email: nextRecipient.email } : undefined
+            }
           />
         </div>
       </DocumentFlowFormContainerFooter>

apps/remix/app/components/general/document-signing/document-signing-auth-page.tsx

@@ -9,7 +9,7 @@ import { Button } from '@documenso/ui/primitives/button';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type DocumentSigningAuthPageViewProps = {
-  email: string;
+  email?: string;
   emailHasAccount?: boolean;
 };
 
@@ -22,12 +22,18 @@ export const DocumentSigningAuthPageView = ({
 
   const [isSigningOut, setIsSigningOut] = useState(false);
 
-  const handleChangeAccount = async (email: string) => {
+  const handleChangeAccount = async (email?: string) => {
     try {
       setIsSigningOut(true);
 
+      let redirectPath = '/signin';
+
+      if (email) {
+        redirectPath = emailHasAccount ? `/signin#email=${email}` : `/signup#email=${email}`;
+      }
+
       await authClient.signOut({
-        redirectPath: emailHasAccount ? `/signin#email=${email}` : `/signup#email=${email}`,
+        redirectPath,
       });
     } catch {
       toast({
@@ -49,9 +55,13 @@ export const DocumentSigningAuthPageView = ({
         </h1>
 
         <p className="text-muted-foreground mt-2 text-sm">
-          <Trans>
-            You need to be logged in as <strong>{email}</strong> to view this page.
-          </Trans>
+          {email ? (
+            <Trans>
+              You need to be logged in as <strong>{email}</strong> to view this page.
+            </Trans>
+          ) : (
+            <Trans>You need to be logged in to view this page.</Trans>
+          )}
         </p>
 
         <Button

apps/remix/app/components/general/document-signing/document-signing-auth-provider.tsx

@@ -24,7 +24,10 @@ type PasskeyData = {
   isError: boolean;
 };
 
-type SigningAuthRecipient = Pick<Recipient, 'authOptions' | 'email' | 'role' | 'name' | 'token'>;
+type SigningAuthRecipient = Pick<
+  Recipient,
+  'authOptions' | 'email' | 'role' | 'name' | 'token' | 'id'
+>;
 
 export type DocumentSigningAuthContextValue = {
   executeActionAuthProcedure: (_value: ExecuteActionAuthProcedureOptions) => Promise<void>;

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

@@ -304,7 +304,6 @@ export const DocumentSigningCompleteDialog = ({
                 <form onSubmit={form.handleSubmit(onFormSubmit)}>
                   {allowDictateNextSigner && defaultNextSigner && (
                     <div className="mb-4 flex flex-col gap-4">
-                      {/* Todo: Envelopes - Should we say "The next recipient to sign this document will be"? */}
                       <div className="flex flex-col gap-4 md:flex-row">
                         <FormField
                           control={form.control}

apps/remix/app/components/general/document-signing/envelope-signing-provider.tsx

@@ -285,8 +285,6 @@ export const EnvelopeSigningProvider = ({
   }, [envelope.documentMeta?.signingOrder, envelope.recipients, recipient.id]);
 
   const signField = async (fieldId: number, fieldValue: TSignEnvelopeFieldValue) => {
-    console.log('insertField', fieldId, fieldValue);
-
     // Set the field locally for direct templates.
     if (isDirectTemplate) {
       handleDirectTemplateFieldInsertion(fieldId, fieldValue);

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

@@ -11,10 +11,6 @@ import type { TLocalField } from '@documenso/lib/client-only/hooks/use-editor-fi
 import { usePageRenderer } from '@documenso/lib/client-only/hooks/use-page-renderer';
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentEnvelopeRender } from '@documenso/lib/client-only/providers/envelope-render-provider';
-import {
-  registerPageCanvas,
-  unregisterPageCanvas,
-} from '@documenso/lib/client-only/utils/page-canvas-registry';
 import { FIELD_META_DEFAULT_VALUES } from '@documenso/lib/types/field-meta';
 import {
   MIN_FIELD_HEIGHT_PX,
@@ -60,15 +56,6 @@ export default function EnvelopeEditorFieldsPageRenderer() {
     [editorFields.localFields, pageContext.pageNumber],
   );
 
-  /**
-   * Cleanup: Unregister canvas when component unmounts
-   */
-  useEffect(() => {
-    return () => {
-      unregisterPageCanvas(pageContext.pageNumber);
-    };
-  }, [pageContext.pageNumber]);
-
   const handleResizeOrMove = (event: KonvaEventObject<Event>) => {
     const { current: container } = canvasElement;
 
@@ -227,15 +214,6 @@ export default function EnvelopeEditorFieldsPageRenderer() {
     currentStage.on('transformend', () => setIsFieldChanging(false));
 
     currentPageLayer.batchDraw();
-
-    // Register this page's canvas references now that everything is initialized
-    if (canvasElement.current && currentStage) {
-      registerPageCanvas({
-        pageNumber: pageContext.pageNumber,
-        pdfCanvas: canvasElement.current,
-        konvaStage: currentStage,
-      });
-    }
   };
 
   /**

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

@@ -1,4 +1,4 @@
-import { lazy, useEffect, useMemo, useState } from 'react';
+import { lazy, useEffect, useMemo } from 'react';
 
 import type { MessageDescriptor } from '@lingui/core';
 import { msg } from '@lingui/core/macro';
@@ -11,8 +11,6 @@ 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 { getPageCanvasRefs } from '@documenso/lib/client-only/utils/page-canvas-registry';
-import type { TDetectedFormField } from '@documenso/lib/types/ai';
 import type {
   TCheckboxFieldMeta,
   TDateFieldMeta,
@@ -26,15 +24,12 @@ 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 } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
 import { RecipientSelector } from '@documenso/ui/primitives/recipient-selector';
 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';
@@ -54,136 +49,6 @@ const EnvelopeEditorFieldsPageRenderer = lazy(
   async () => import('./envelope-editor-fields-page-renderer'),
 );
 
-/**
- * Enforces minimum field dimensions and centers the field when expanding to meet minimums.
- *
- * AI often detects form lines as very thin fields (0.2-0.5% height). This function ensures
- * fields meet minimum usability requirements by expanding them to at least 30px height and
- * 36px width, while keeping them centered on their original position.
- *
- * @param params - Field dimensions and page size
- * @param params.positionX - Field X position as percentage (0-100)
- * @param params.positionY - Field Y position as percentage (0-100)
- * @param params.width - Field width as percentage (0-100)
- * @param params.height - Field height as percentage (0-100)
- * @param params.pageWidth - Page width in pixels
- * @param params.pageHeight - Page height in pixels
- * @returns Adjusted field dimensions with minimums enforced and centered
- *
- * @example
- * // AI detected a thin line: 0.3% height
- * const adjusted = enforceMinimumFieldDimensions({
- *   positionX: 20, positionY: 50, width: 30, height: 0.3,
- *   pageWidth: 800, pageHeight: 1100
- * });
- * // Result: height expanded to ~2.7% (30px), centered on original position
- */
-const enforceMinimumFieldDimensions = (params: {
-  positionX: number;
-  positionY: number;
-  width: number;
-  height: number;
-  pageWidth: number;
-  pageHeight: number;
-}): {
-  positionX: number;
-  positionY: number;
-  width: number;
-  height: number;
-} => {
-  const MIN_HEIGHT_PX = 30;
-  const MIN_WIDTH_PX = 36;
-
-  // Convert percentage to pixels to check against minimums
-  const widthPx = (params.width / 100) * params.pageWidth;
-  const heightPx = (params.height / 100) * params.pageHeight;
-
-  let adjustedWidth = params.width;
-  let adjustedHeight = params.height;
-  let adjustedPositionX = params.positionX;
-  let adjustedPositionY = params.positionY;
-
-  if (widthPx < MIN_WIDTH_PX) {
-    const centerXPx = (params.positionX / 100) * params.pageWidth + widthPx / 2;
-    adjustedWidth = (MIN_WIDTH_PX / params.pageWidth) * 100;
-    adjustedPositionX = ((centerXPx - MIN_WIDTH_PX / 2) / params.pageWidth) * 100;
-
-    if (adjustedPositionX < 0) {
-      adjustedPositionX = 0;
-    } else if (adjustedPositionX + adjustedWidth > 100) {
-      adjustedPositionX = 100 - adjustedWidth;
-    }
-  }
-
-  if (heightPx < MIN_HEIGHT_PX) {
-    const centerYPx = (params.positionY / 100) * params.pageHeight + heightPx / 2;
-    adjustedHeight = (MIN_HEIGHT_PX / params.pageHeight) * 100;
-
-    adjustedPositionY = ((centerYPx - MIN_HEIGHT_PX / 2) / params.pageHeight) * 100;
-
-    if (adjustedPositionY < 0) {
-      adjustedPositionY = 0;
-    } else if (adjustedPositionY + adjustedHeight > 100) {
-      adjustedPositionY = 100 - adjustedHeight;
-    }
-  }
-
-  return {
-    positionX: adjustedPositionX,
-    positionY: adjustedPositionY,
-    width: adjustedWidth,
-    height: adjustedHeight,
-  };
-};
-
-const processAllPagesWithAI = async (params: {
-  documentDataId: string;
-  onProgress: (current: number, total: number) => void;
-}): Promise<{
-  fieldsPerPage: Map<number, TDetectedFormField[]>;
-  errors: Map<number, Error>;
-}> => {
-  const { documentDataId, onProgress } = params;
-  const fieldsPerPage = new Map<number, TDetectedFormField[]>();
-  const errors = new Map<number, Error>();
-
-  try {
-    // Make single API call to process all pages server-side
-    onProgress(0, 1);
-
-    const response = await fetch('/api/ai/detect-form-fields', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ documentId: documentDataId }),
-      credentials: 'include',
-    });
-
-    if (!response.ok) {
-      const errorText = await response.text();
-      throw new Error(`AI detection failed: ${response.statusText} - ${errorText}`);
-    }
-
-    const detectedFields: TDetectedFormField[] = await response.json();
-
-    // Group fields by page number
-    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) {
-    // If request fails, treat it as error for all pages
-    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`,
@@ -204,13 +69,6 @@ export const EnvelopeEditorFieldsPage = () => {
   const { currentEnvelopeItem } = useCurrentEnvelopeRender();
 
   const { t } = useLingui();
-  const { toast } = useToast();
-
-  const [isAutoAddingFields, setIsAutoAddingFields] = useState(false);
-  const [processingProgress, setProcessingProgress] = useState<{
-    current: number;
-    total: number;
-  } | null>(null);
 
   const selectedField = useMemo(
     () => structuredClone(editorFields.selectedField),
@@ -249,17 +107,8 @@ export const EnvelopeEditorFieldsPage = () => {
 
   return (
     <div className="relative flex h-full">
-      <div className="relative flex w-full flex-col overflow-y-auto">
+      <div className="flex w-full flex-col overflow-y-auto">
         {/* Horizontal envelope item selector */}
-        {isAutoAddingFields && (
-          <>
-            <div className="edge-glow edge-glow-top pointer-events-none fixed left-0 right-0 top-0 z-20 h-16" />
-            <div className="edge-glow edge-glow-right pointer-events-none fixed bottom-0 right-0 top-0 z-20 w-16" />
-            <div className="edge-glow edge-glow-bottom pointer-events-none fixed bottom-0 left-0 right-0 z-20 h-16" />
-            <div className="edge-glow edge-glow-left pointer-events-none fixed bottom-0 left-0 top-0 z-20 w-16" />
-          </>
-        )}
-
         <EnvelopeRendererFileSelector fields={editorFields.localFields} />
 
         {/* Document View */}
@@ -338,141 +187,6 @@ export const EnvelopeEditorFieldsPage = () => {
               selectedRecipientId={editorFields.selectedRecipient?.id ?? null}
               selectedEnvelopeItemId={currentEnvelopeItem?.id ?? null}
             />
-
-            <Button
-              className="mt-4 w-full"
-              variant="outline"
-              disabled={isAutoAddingFields}
-              onClick={async () => {
-                setIsAutoAddingFields(true);
-                setProcessingProgress(null);
-
-                try {
-                  if (!editorFields.selectedRecipient || !currentEnvelopeItem) {
-                    toast({
-                      title: t`Warning`,
-                      description: t`Please select a recipient before adding fields.`,
-                      variant: 'destructive',
-                    });
-                    return;
-                  }
-
-                  if (!currentEnvelopeItem.documentDataId) {
-                    toast({
-                      title: t`Error`,
-                      description: t`Document data not found. Please try reloading the page.`,
-                      variant: 'destructive',
-                    });
-                    return;
-                  }
-
-                  const { fieldsPerPage, errors } = await processAllPagesWithAI({
-                    documentDataId: currentEnvelopeItem.documentDataId,
-                    onProgress: (current, total) => {
-                      setProcessingProgress({ current, total });
-                    },
-                  });
-
-                  let totalAdded = 0;
-                  for (const [pageNumber, detectedFields] of fieldsPerPage.entries()) {
-                    const pageCanvasRefs = getPageCanvasRefs(pageNumber);
-
-                    for (const detected of detectedFields) {
-                      const [ymin, xmin, ymax, xmax] = detected.boundingBox;
-                      let positionX = (xmin / 1000) * 100;
-                      let positionY = (ymin / 1000) * 100;
-                      let width = ((xmax - xmin) / 1000) * 100;
-                      let height = ((ymax - ymin) / 1000) * 100;
-
-                      if (pageCanvasRefs) {
-                        const adjusted = enforceMinimumFieldDimensions({
-                          positionX,
-                          positionY,
-                          width,
-                          height,
-                          pageWidth: pageCanvasRefs.pdfCanvas.width,
-                          pageHeight: pageCanvasRefs.pdfCanvas.height,
-                        });
-
-                        positionX = adjusted.positionX;
-                        positionY = adjusted.positionY;
-                        width = adjusted.width;
-                        height = adjusted.height;
-                      }
-
-                      const fieldType = detected.label as FieldType;
-
-                      try {
-                        editorFields.addField({
-                          envelopeItemId: currentEnvelopeItem.id,
-                          page: pageNumber,
-                          type: fieldType,
-                          positionX,
-                          positionY,
-                          width,
-                          height,
-                          recipientId: editorFields.selectedRecipient.id,
-                          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`Success`,
-                      description,
-                    });
-                  } else if (failedPages > 0) {
-                    toast({
-                      title: t`Error`,
-                      description: t`Failed to detect fields on ${failedPages} pages. Please try again.`,
-                      variant: 'destructive',
-                    });
-                  } else {
-                    toast({
-                      title: t`Info`,
-                      description: t`No fields were detected in the document`,
-                    });
-                  }
-                } catch (error) {
-                  toast({
-                    title: t`Error`,
-                    description: t`An unexpected error occurred while processing pages.`,
-                    variant: 'destructive',
-                  });
-                } finally {
-                  setIsAutoAddingFields(false);
-                  setProcessingProgress(null);
-                }
-              }}
-            >
-              {isAutoAddingFields ? (
-                processingProgress ? (
-                  <Trans>
-                    Processing page {processingProgress.current} of {processingProgress.total}...
-                  </Trans>
-                ) : (
-                  <Trans>Processing...</Trans>
-                )
-              ) : (
-                <Trans>Auto add fields</Trans>
-              )}
-            </Button>
           </section>
 
           {/* Field details section. */}

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

@@ -1,11 +1,12 @@
 import { useMemo, useState } from 'react';
 
-import type { DropResult } from '@hello-pangea/dnd';
 import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd';
+import type { DropResult } 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, X } from 'lucide-react';
+import { FileWarningIcon, GripVerticalIcon, Loader2 } from 'lucide-react';
+import { X } from 'lucide-react';
 import { ErrorCode as DropzoneErrorCode, type FileRejection } from 'react-dropzone';
 import { Link } from 'react-router';
 

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

@@ -127,6 +127,7 @@ export const EnvelopeSignerCompleteDialog = () => {
             isBase64,
           };
         }),
+        nextSigner,
       });
 
       const redirectUrl = envelope.documentMeta.redirectUrl;

apps/remix/app/routes/_recipient+/d.$token+/_index.tsx

@@ -8,7 +8,6 @@ import { EnvelopeRenderProvider } from '@documenso/lib/client-only/providers/env
 import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { getEnvelopeForDirectTemplateSigning } from '@documenso/lib/server-only/envelope/get-envelope-for-direct-template-signing';
-import { getEnvelopeRequiredAccessData } from '@documenso/lib/server-only/envelope/get-envelope-required-access-data';
 import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';
 import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
@@ -98,15 +97,12 @@ const handleV2Loader = async ({ params, request }: Route.LoaderArgs) => {
         envelopeForSigning,
       } as const;
     })
-    .catch(async (e) => {
+    .catch((e) => {
       const error = AppError.parseError(e);
 
       if (error.code === AppErrorCode.UNAUTHORIZED) {
-        const requiredAccessData = await getEnvelopeRequiredAccessData({ token });
-
         return {
           isDocumentAccessValid: false,
-          ...requiredAccessData,
         } as const;
       }
 
@@ -226,20 +222,21 @@ const DirectSigningPageV2 = ({ data }: { data: Awaited<ReturnType<typeof handleV
   const user = sessionData?.user;
 
   if (!data.isDocumentAccessValid) {
-    return (
-      <DocumentSigningAuthPageView
-        email={data.recipientEmail}
-        emailHasAccount={!!data.recipientHasAccount}
-      />
-    );
+    return <DocumentSigningAuthPageView email={''} emailHasAccount={true} />;
   }
 
   const { envelope, recipient } = data.envelopeForSigning;
 
+  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
+    documentAuth: envelope.authOptions,
+  });
+
+  const isEmailForced = derivedRecipientAccessAuth.includes(DocumentAccessAuth.ACCOUNT);
+
   return (
     <EnvelopeSigningProvider
       envelopeData={data.envelopeForSigning}
-      email={''} // Doing this allows us to let users change the email if they want to.
+      email={isEmailForced ? user?.email || '' : ''} // Doing this allows us to let users change the email if they want to for non-auth templates.
       fullName={user?.name}
       signature={user?.signature}
     >

apps/remix/package.json

@@ -14,8 +14,6 @@
     "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.2",
     "@documenso/api": "*",
     "@documenso/assets": "*",
@@ -40,7 +38,6 @@
     "@react-router/serve": "^7.6.0",
     "@simplewebauthn/browser": "^9.0.1",
     "@simplewebauthn/server": "^9.0.3",
-    "ai": "^5.0.82",
     "autoprefixer": "^10.4.13",
     "colord": "^2.9.3",
     "framer-motion": "^10.12.8",
@@ -71,7 +68,6 @@
     "remix-themes": "^2.0.4",
     "satori": "^0.12.1",
     "sharp": "0.32.6",
-    "skia-canvas": "^3.0.8",
     "tailwindcss": "^3.4.15",
     "ts-pattern": "^5.0.5",
     "ua-parser-js": "^1.0.37",
@@ -108,4 +104,4 @@
     "vite-tsconfig-paths": "^5.1.4"
   },
   "version": "1.13.1"
-}
+}

apps/remix/server/api/ai.ts

@@ -1,420 +0,0 @@
-// sort-imports-ignore
-
-// ---- PATCH pdfjs-dist's canvas require BEFORE importing it ----
-import { createRequire } from 'module';
-import { fileURLToPath } from 'url';
-import { Canvas, Image } from 'skia-canvas';
-
-const require = createRequire(import.meta.url || fileURLToPath(new URL('.', import.meta.url)));
-const Module = require('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');
-
-import { generateObject } from 'ai';
-import { mkdir, writeFile } from 'fs/promises';
-import { Hono } from 'hono';
-import { join } from 'path';
-import sharp from 'sharp';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
-import { getFileServerSide } from '@documenso/lib/universal/upload/get-file.server';
-import { env } from '@documenso/lib/utils/env';
-import { prisma } from '@documenso/prisma';
-
-import type { HonoEnv } from '../router';
-import {
-  type TDetectFormFieldsResponse,
-  ZDetectFormFieldsRequestSchema,
-  ZDetectedFormFieldSchema,
-} from './ai.types';
-
-const renderPdfToImage = async (pdfBytes: Uint8Array) => {
-  const loadingTask = pdfjsLib.getDocument({ data: pdfBytes });
-  const pdf = await loadingTask.promise;
-
-  try {
-    const scale = 4;
-
-    const pages = await Promise.all(
-      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();
-        }
-      }),
-    );
-
-    return pages;
-  } finally {
-    await pdf.destroy();
-  }
-};
-
-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();
-};
-
-const detectObjectsPrompt = `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)
-- 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:"
-
-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`;
-
-const runFormFieldDetection = async (
-  imageBuffer: Buffer,
-  pageNumber: number,
-): Promise<TDetectFormFieldsResponse> => {
-  const compressedImageBuffer = await resizeAndCompressImage(imageBuffer);
-  const base64Image = compressedImageBuffer.toString('base64');
-
-  const result = await generateObject({
-    model: 'google/gemini-2.5-pro',
-    output: 'array',
-    schema: ZDetectedFormFieldSchema,
-    messages: [
-      {
-        role: 'user',
-        content: [
-          {
-            type: 'image',
-            image: `data:image/jpeg;base64,${base64Image}`,
-          },
-          {
-            type: 'text',
-            text: detectObjectsPrompt,
-          },
-        ],
-      },
-    ],
-  });
-
-  return result.object.map((field) => ({
-    ...field,
-    pageNumber,
-  }));
-};
-
-export const aiRoute = new Hono<HonoEnv>().post('/detect-form-fields', async (c) => {
-  try {
-    const { user } = await getSession(c.req.raw);
-
-    const body = await c.req.json();
-    const parsed = ZDetectFormFieldsRequestSchema.safeParse(body);
-
-    if (!parsed.success) {
-      throw new AppError(AppErrorCode.INVALID_REQUEST, {
-        message: 'Document ID is required',
-        userMessage: 'Please provide a valid document ID.',
-      });
-    }
-
-    const { documentId } = parsed.data;
-
-    const documentData = await prisma.documentData.findUnique({
-      where: { id: documentId },
-      include: {
-        envelopeItem: {
-          include: {
-            envelope: {
-              select: {
-                userId: true,
-                teamId: true,
-              },
-            },
-          },
-        },
-      },
-    });
-
-    if (!documentData || !documentData.envelopeItem) {
-      throw new AppError(AppErrorCode.NOT_FOUND, {
-        message: `Document data not found: ${documentId}`,
-        userMessage: 'The requested document does not exist.',
-      });
-    }
-
-    const envelope = documentData.envelopeItem.envelope;
-
-    const isDirectOwner = envelope.userId === user.id;
-
-    let hasTeamAccess = false;
-    if (envelope.teamId) {
-      try {
-        await getTeamById({ teamId: envelope.teamId, userId: user.id });
-        hasTeamAccess = true;
-      } catch (error) {
-        hasTeamAccess = false;
-      }
-    }
-
-    if (!isDirectOwner && !hasTeamAccess) {
-      throw new AppError(AppErrorCode.UNAUTHORIZED, {
-        message: `User ${user.id} does not have access to document ${documentId}`,
-        userMessage: 'You do not have permission to access this document.',
-      });
-    }
-
-    const pdfBytes = await getFileServerSide({
-      type: documentData.type,
-      data: documentData.initialData || documentData.data,
-    });
-
-    const renderedPages = await renderPdfToImage(pdfBytes);
-
-    const results = await Promise.allSettled(
-      renderedPages.map(async (page) => {
-        return await runFormFieldDetection(page.image, page.pageNumber);
-      }),
-    );
-
-    const detectedFields: TDetectFormFieldsResponse = [];
-    for (const [index, result] of results.entries()) {
-      if (result.status === 'fulfilled') {
-        detectedFields.push(...result.value);
-      } else {
-        const pageNumber = renderedPages[index]?.pageNumber ?? index + 1;
-        console.error(`Failed to detect fields on page ${pageNumber}:`, result.reason);
-      }
-    }
-
-    if (env('NEXT_PUBLIC_AI_DEBUG_PREVIEW') === 'true') {
-      const debugDir = join(process.cwd(), '..', '..', 'packages', 'assets', 'ai-previews');
-      await mkdir(debugDir, { recursive: true });
-
-      const now = new Date();
-      const timestamp = now
-        .toISOString()
-        .replace(/[-:]/g, '')
-        .replace(/\..+/, '')
-        .replace('T', '_');
-
-      for (const page of renderedPages) {
-        const padding = { left: 80, top: 20, right: 20, bottom: 40 };
-        const canvas = new Canvas(
-          page.width + padding.left + padding.right,
-          page.height + padding.top + padding.bottom,
-        );
-        const ctx = canvas.getContext('2d');
-
-        const img = new Image();
-        img.src = page.image;
-        ctx.drawImage(img, padding.left, padding.top);
-
-        ctx.strokeStyle = 'rgba(255, 0, 0, 0.5)';
-        ctx.lineWidth = 1;
-
-        for (let i = 0; i <= 1000; i += 100) {
-          const x = padding.left + (i / 1000) * page.width;
-          ctx.beginPath();
-          ctx.moveTo(x, padding.top);
-          ctx.lineTo(x, page.height + padding.top);
-          ctx.stroke();
-        }
-
-        for (let i = 0; i <= 1000; i += 100) {
-          const y = padding.top + (i / 1000) * page.height;
-          ctx.beginPath();
-          ctx.moveTo(padding.left, y);
-          ctx.lineTo(page.width + padding.left, y);
-          ctx.stroke();
-        }
-
-        const colors = ['#FF0000', '#00FF00', '#0000FF', '#FFFF00', '#FF00FF', '#00FFFF'];
-
-        const pageFields = detectedFields.filter((f) => f.pageNumber === page.pageNumber);
-        pageFields.forEach((field, index) => {
-          const [ymin, xmin, ymax, xmax] = field.boundingBox.map((coord) => coord / 1000);
-
-          const x = xmin * page.width + padding.left;
-          const y = ymin * page.height + padding.top;
-          const width = (xmax - xmin) * page.width;
-          const height = (ymax - ymin) * page.height;
-
-          ctx.strokeStyle = colors[index % colors.length];
-          ctx.lineWidth = 5;
-          ctx.strokeRect(x, y, width, height);
-
-          ctx.fillStyle = colors[index % colors.length];
-          ctx.font = '20px Arial';
-          ctx.fillText(field.label, x, y - 5);
-        });
-
-        ctx.strokeStyle = '#000000';
-        ctx.lineWidth = 1;
-        ctx.font = '26px Arial';
-
-        ctx.beginPath();
-        ctx.moveTo(padding.left, padding.top);
-        ctx.lineTo(padding.left, page.height + padding.top);
-        ctx.stroke();
-
-        ctx.textAlign = 'right';
-        ctx.textBaseline = 'middle';
-        for (let i = 0; i <= 1000; i += 100) {
-          const y = padding.top + (i / 1000) * page.height;
-          ctx.fillStyle = '#000000';
-          ctx.fillText(i.toString(), padding.left - 5, y);
-
-          ctx.beginPath();
-          ctx.moveTo(padding.left - 5, y);
-          ctx.lineTo(padding.left, y);
-          ctx.stroke();
-        }
-
-        ctx.beginPath();
-        ctx.moveTo(padding.left, page.height + padding.top);
-        ctx.lineTo(page.width + padding.left, page.height + padding.top);
-        ctx.stroke();
-
-        ctx.textAlign = 'center';
-        ctx.textBaseline = 'top';
-        for (let i = 0; i <= 1000; i += 100) {
-          const x = padding.left + (i / 1000) * page.width;
-          ctx.fillStyle = '#000000';
-          ctx.fillText(i.toString(), x, page.height + padding.top + 5);
-
-          ctx.beginPath();
-          ctx.moveTo(x, page.height + padding.top);
-          ctx.lineTo(x, page.height + padding.top + 5);
-          ctx.stroke();
-        }
-
-        const outputFilename = `detected_form_fields_${timestamp}_page_${page.pageNumber}.png`;
-        const outputPath = join(debugDir, outputFilename);
-
-        const pngBuffer = await canvas.toBuffer('png');
-        await writeFile(outputPath, new Uint8Array(pngBuffer));
-      }
-    }
-
-    return c.json<TDetectFormFieldsResponse>(detectedFields);
-  } catch (error) {
-    if (error instanceof AppError) {
-      throw error;
-    }
-
-    console.error('Failed to detect form fields from PDF:', 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.',
-    });
-  }
-});

apps/remix/server/api/ai.types.ts

@@ -1,50 +0,0 @@
-import { z } from 'zod';
-
-import type { TDetectedFormField } from '@documenso/lib/types/ai';
-
-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 ZDetectedFormFieldSchema = z.object({
-  boundingBox: z
-    .array(z.number())
-    .length(4)
-    .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'),
-});
-
-export const ZDetectFormFieldsRequestSchema = z.object({
-  documentId: z.string().min(1, { message: 'Document 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 };

apps/remix/server/router.ts

@@ -14,7 +14,6 @@ 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/ai';
 import { filesRoute } from './api/files';
 import { type AppContext, appContext } from './context';
 import { appMiddleware } from './middleware';
@@ -84,9 +83,6 @@ 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-lock.json

@@ -16,13 +16,13 @@
         "@documenso/prisma": "^0.0.0",
         "@lingui/conf": "^5.2.0",
         "@lingui/core": "^5.2.0",
-        "ai": "^5.0.82",
         "inngest-cli": "^0.29.1",
         "luxon": "^3.5.0",
         "mupdf": "^1.0.0",
+        "pdf2json": "^4.0.0",
         "react": "^18",
         "typescript": "5.6.2",
-        "zod": "3.25.76"
+        "zod": "3.24.1"
       },
       "devDependencies": {
         "@commitlint/cli": "^17.7.1",
@@ -92,8 +92,6 @@
       "name": "@documenso/remix",
       "version": "1.13.1",
       "dependencies": {
-        "@ai-sdk/google": "^2.0.25",
-        "@ai-sdk/react": "^2.0.82",
         "@cantoo/pdf-lib": "^2.5.2",
         "@documenso/api": "*",
         "@documenso/assets": "*",
@@ -118,7 +116,6 @@
         "@react-router/serve": "^7.6.0",
         "@simplewebauthn/browser": "^9.0.1",
         "@simplewebauthn/server": "^9.0.3",
-        "ai": "^5.0.82",
         "autoprefixer": "^10.4.13",
         "colord": "^2.9.3",
         "framer-motion": "^10.12.8",
@@ -149,7 +146,6 @@
         "remix-themes": "^2.0.4",
         "satori": "^0.12.1",
         "sharp": "0.32.6",
-        "skia-canvas": "^3.0.8",
         "tailwindcss": "^3.4.15",
         "ts-pattern": "^5.0.5",
         "ua-parser-js": "^1.0.37",
@@ -192,92 +188,6 @@
       "integrity": "sha512-EGs8PguQqAAUIcQfK4E9xdXxB6s2GK4sJfT/vcc9V1ELIvC4LH/zXu2t/5fajtv6oiRCxdv7BgtVK3vWgROxag==",
       "license": "MIT"
     },
-    "node_modules/@ai-sdk/gateway": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@ai-sdk/gateway/-/gateway-2.0.3.tgz",
-      "integrity": "sha512-/vCoMKtod+A74/BbkWsaAflWKz1ovhX5lmJpIaXQXtd6gyexZncjotBTbFM8rVJT9LKJ/Kx7iVVo3vh+KT+IJg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ai-sdk/provider": "2.0.0",
-        "@ai-sdk/provider-utils": "3.0.14",
-        "@vercel/oidc": "3.0.3"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "zod": "^3.25.76 || ^4.1.8"
-      }
-    },
-    "node_modules/@ai-sdk/google": {
-      "version": "2.0.25",
-      "resolved": "https://registry.npmjs.org/@ai-sdk/google/-/google-2.0.25.tgz",
-      "integrity": "sha512-tH2rA3428jnY6COoPfKB/BoQMs57sv9t+PEdyIB9ePtlV9dnVUbfKcdKoEcAaVffNZ6pzk8otrQYnu67pyn8TQ==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ai-sdk/provider": "2.0.0",
-        "@ai-sdk/provider-utils": "3.0.14"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "zod": "^3.25.76 || ^4.1.8"
-      }
-    },
-    "node_modules/@ai-sdk/provider": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@ai-sdk/provider/-/provider-2.0.0.tgz",
-      "integrity": "sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "json-schema": "^0.4.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@ai-sdk/provider-utils": {
-      "version": "3.0.14",
-      "resolved": "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-3.0.14.tgz",
-      "integrity": "sha512-CYRU6L7IlR7KslSBVxvlqlybQvXJln/PI57O8swhOaDIURZbjRP2AY3igKgUsrmWqqnFFUHP+AwTN8xqJAknnA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ai-sdk/provider": "2.0.0",
-        "@standard-schema/spec": "^1.0.0",
-        "eventsource-parser": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "zod": "^3.25.76 || ^4.1.8"
-      }
-    },
-    "node_modules/@ai-sdk/react": {
-      "version": "2.0.82",
-      "resolved": "https://registry.npmjs.org/@ai-sdk/react/-/react-2.0.82.tgz",
-      "integrity": "sha512-InaGqykKGFq/XA6Vhh2Hyy38nzeMpqp8eWxjTNEQA5Gwcal0BVNuZyTbTIL5t5VNXV+pQPDhe9ak1+mc9qxjog==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ai-sdk/provider-utils": "3.0.14",
-        "ai": "5.0.82",
-        "swr": "^2.2.5",
-        "throttleit": "2.1.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "react": "^18 || ^19 || ^19.0.0-rc",
-        "zod": "^3.25.76 || ^4.1.8"
-      },
-      "peerDependenciesMeta": {
-        "zod": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@alloc/quick-lru": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
@@ -11269,12 +11179,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@standard-schema/spec": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
-      "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
-      "license": "MIT"
-    },
     "node_modules/@swagger-api/apidom-ast": {
       "version": "1.0.0-beta.39",
       "resolved": "https://registry.npmjs.org/@swagger-api/apidom-ast/-/apidom-ast-1.0.0-beta.39.tgz",
@@ -11963,15 +11867,6 @@
         "zod": "3.22.4"
       }
     },
-    "node_modules/@team-plain/typescript-sdk/node_modules/zod": {
-      "version": "3.22.4",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.4.tgz",
-      "integrity": "sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    },
     "node_modules/@theguild/remark-mermaid": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/@theguild/remark-mermaid/-/remark-mermaid-0.0.5.tgz",
@@ -13236,15 +13131,6 @@
         "win32"
       ]
     },
-    "node_modules/@vercel/oidc": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@vercel/oidc/-/oidc-3.0.3.tgz",
-      "integrity": "sha512-yNEQvPcVrK9sIe637+I0jD6leluPxzwJKx/Haw6F4H77CdDsszUn5V3o96LPziXkSNE2B83+Z3mjqGKBK/R6Gg==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">= 20"
-      }
-    },
     "node_modules/@vvo/tzdb": {
       "version": "6.161.0",
       "resolved": "https://registry.npmjs.org/@vvo/tzdb/-/tzdb-6.161.0.tgz",
@@ -13386,33 +13272,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/ai": {
-      "version": "5.0.82",
-      "resolved": "https://registry.npmjs.org/ai/-/ai-5.0.82.tgz",
-      "integrity": "sha512-wmZZfsU40qB77umrcj3YzMSk6cUP5gxLXZDPfiSQLBLegTVXPUdSJC603tR7JB5JkhBDzN5VLaliuRKQGKpUXg==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@ai-sdk/gateway": "2.0.3",
-        "@ai-sdk/provider": "2.0.0",
-        "@ai-sdk/provider-utils": "3.0.14",
-        "@opentelemetry/api": "1.9.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "zod": "^3.25.76 || ^4.1.8"
-      }
-    },
-    "node_modules/ai/node_modules/@opentelemetry/api": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
-      "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/ajv": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
@@ -18737,15 +18596,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/eventsource-parser": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-3.0.6.tgz",
-      "integrity": "sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
     "node_modules/execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -21458,15 +21308,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/inngest/node_modules/zod": {
-      "version": "3.22.5",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.5.tgz",
-      "integrity": "sha512-HqnGsCdVZ2xc0qWPLdO25WnseXThh0kEYKIdV5F/hTHO75hNZFp8thxSeHhiPrHZKrFTo1SOgkAj9po5bexZlw==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    },
     "node_modules/input-otp": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/input-otp/-/input-otp-1.4.2.tgz",
@@ -22565,12 +22406,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "license": "MIT"
     },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "license": "(AFL-2.1 OR BSD-3-Clause)"
-    },
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
@@ -27364,6 +27199,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/pdf2json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pdf2json/-/pdf2json-4.0.0.tgz",
+      "integrity": "sha512-WkezNsLK8sGpuFC7+PPP0DsXROwdoOxmXPBTtUWWkCwCi/Vi97MRC52Ly6FWIJjOKIywpm/L2oaUgSrmtU+7ZQ==",
+      "license": "Apache-2.0",
+      "bin": {
+        "pdf2json": "bin/pdf2json.js"
+      },
+      "engines": {
+        "node": ">=20.18.0"
+      }
+    },
     "node_modules/pdfjs-dist": {
       "version": "3.11.174",
       "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.11.174.tgz",
@@ -32888,19 +32735,6 @@
       "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
       "license": "MIT"
     },
-    "node_modules/swr": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.6.tgz",
-      "integrity": "sha512-wfHRmHWk/isGNMwlLGlZX5Gzz/uTgo0o2IRuTMcf4CPuPFJZlq0rDaKUx+ozB5nBOReNV1kiOyzMfj+MBMikLw==",
-      "license": "MIT",
-      "dependencies": {
-        "dequal": "^2.0.3",
-        "use-sync-external-store": "^1.4.0"
-      },
-      "peerDependencies": {
-        "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
     "node_modules/tailwind-merge": {
       "version": "1.14.0",
       "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.14.0.tgz",
@@ -33238,18 +33072,6 @@
         "real-require": "^0.2.0"
       }
     },
-    "node_modules/throttleit": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-2.1.0.tgz",
-      "integrity": "sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -36279,9 +36101,9 @@
       }
     },
     "node_modules/zod": {
-      "version": "3.25.76",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "version": "3.24.1",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.1.tgz",
+      "integrity": "sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
@@ -36354,7 +36176,7 @@
         "superjson": "^1.13.1",
         "swagger-ui-react": "^5.21.0",
         "ts-pattern": "^5.0.5",
-        "zod": "3.25.76"
+        "zod": "3.24.1"
       }
     },
     "packages/api/node_modules/ts-pattern": {
@@ -36575,7 +36397,7 @@
         "luxon": "^3.5.0",
         "nanoid": "^5.1.5",
         "ts-pattern": "^5.0.5",
-        "zod": "3.25.76"
+        "zod": "3.24.1"
       }
     },
     "packages/auth/node_modules/ts-pattern": {
@@ -36595,7 +36417,7 @@
         "micro": "^10.0.1",
         "react": "^18",
         "ts-pattern": "^5.0.5",
-        "zod": "3.25.76"
+        "zod": "3.24.1"
       }
     },
     "packages/ee/node_modules/ts-pattern": {
@@ -36913,7 +36735,6 @@
         "micro": "^10.0.1",
         "nanoid": "^5.1.5",
         "oslo": "^0.17.0",
-        "pdfjs-dist": "3.11.174",
         "pg": "^8.11.3",
         "pino": "^9.7.0",
         "pino-pretty": "^13.0.0",
@@ -36926,7 +36747,7 @@
         "skia-canvas": "^3.0.8",
         "stripe": "^12.7.0",
         "ts-pattern": "^5.0.5",
-        "zod": "3.25.76"
+        "zod": "3.24.1"
       },
       "devDependencies": {
         "@playwright/browser-chromium": "1.52.0",
@@ -37356,7 +37177,7 @@
         "superjson": "^1.13.1",
         "trpc-to-openapi": "2.0.4",
         "ts-pattern": "^5.0.5",
-        "zod": "3.25.76"
+        "zod": "3.24.1"
       }
     },
     "packages/trpc/node_modules/ts-pattern": {
@@ -37427,7 +37248,7 @@
         "tailwind-merge": "^1.12.0",
         "tailwindcss-animate": "^1.0.5",
         "ts-pattern": "^5.0.5",
-        "zod": "3.25.76"
+        "zod": "3.24.1"
       },
       "devDependencies": {
         "@documenso/tailwind-config": "*",

package.json

@@ -71,13 +71,16 @@
     "@documenso/prisma": "^0.0.0",
     "@lingui/conf": "^5.2.0",
     "@lingui/core": "^5.2.0",
-    "ai": "^5.0.82",
     "inngest-cli": "^0.29.1",
     "luxon": "^3.5.0",
     "mupdf": "^1.0.0",
+    "pdf2json": "^4.0.0",
     "react": "^18",
     "typescript": "5.6.2",
-    "zod": "3.25.76"
+    "zod": "3.24.1"
+  },
+  "overrides": {
+    "zod": "3.24.1"
   },
   "trigger.dev": {
     "endpointId": "documenso-app"

packages/api/package.json

@@ -25,6 +25,6 @@
     "superjson": "^1.13.1",
     "swagger-ui-react": "^5.21.0",
     "ts-pattern": "^5.0.5",
-    "zod": "3.25.76"
+    "zod": "3.24.1"
   }
 }

packages/app-tests/e2e/auto-placing-fields/auto-place-fields-document.spec.ts

@@ -0,0 +1,98 @@
+import { expect, test } from '@playwright/test';
+import path from 'path';
+
+import { seedUser } from '@documenso/prisma/seed/users';
+
+import { apiSignin } from '../fixtures/authentication';
+
+const PLACEHOLDER_PDF_PATH = path.join(
+  __dirname,
+  '../../../assets/project-proposal-single-recipient.pdf',
+);
+test.describe('PDF Placeholders with single recipient', () => {
+  test('[AUTO_PLACING_FIELDS]: should automatically create recipients from PDF placeholders', async ({
+    page,
+  }) => {
+    const { user, team } = await seedUser();
+
+    await apiSignin({
+      page,
+      email: user.email,
+      redirectPath: `/t/${team.url}/documents`,
+    });
+
+    const fileInput = page.locator('input[type="file"]').nth(1);
+    await fileInput.waitFor({ state: 'attached' });
+    await fileInput.setInputFiles(PLACEHOLDER_PDF_PATH);
+
+    await page.waitForTimeout(3000);
+
+    await page.getByRole('button', { name: 'Continue' }).click();
+
+    await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+    await expect(page.getByPlaceholder('Email')).toHaveValue('recipient.1@documenso.com');
+    await expect(page.getByPlaceholder('Name')).toHaveValue('Recipient 1');
+  });
+
+  test('[AUTO_PLACING_FIELDS]: should automatically place fields from PDF placeholders', async ({
+    page,
+  }) => {
+    const { user, team } = await seedUser();
+
+    await apiSignin({
+      page,
+      email: user.email,
+      redirectPath: `/t/${team.url}/documents`,
+    });
+
+    const fileInput = page.locator('input[type="file"]').nth(1);
+    await fileInput.waitFor({ state: 'attached' });
+    await fileInput.setInputFiles(PLACEHOLDER_PDF_PATH);
+
+    await page.waitForTimeout(3000);
+
+    await page.getByRole('button', { name: 'Continue' }).click();
+    await page.getByRole('button', { name: 'Continue' }).click();
+
+    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
+
+    await expect(page.locator('[data-field-type="SIGNATURE"]')).toBeVisible();
+    await expect(page.locator('[data-field-type="EMAIL"]')).toBeVisible();
+    await expect(page.locator('[data-field-type="NAME"]')).toBeVisible();
+    await expect(page.locator('[data-field-type="TEXT"]')).toBeVisible();
+  });
+
+  test('[AUTO_PLACING_FIELDS]: should automatically configure fields from PDF placeholders', async ({
+    page,
+  }) => {
+    const { user, team } = await seedUser();
+
+    await apiSignin({
+      page,
+      email: user.email,
+      redirectPath: `/t/${team.url}/documents`,
+    });
+
+    const fileInput = page.locator('input[type="file"]').nth(1);
+    await fileInput.waitFor({ state: 'attached' });
+    await fileInput.setInputFiles(PLACEHOLDER_PDF_PATH);
+
+    await page.waitForTimeout(3000);
+
+    await page.getByRole('button', { name: 'Continue' }).click();
+    await page.getByRole('button', { name: 'Continue' }).click();
+
+    await page.getByText('Text').nth(1).click();
+    await page.getByRole('button', { name: 'Advanced settings' }).click();
+
+    await expect(page.getByRole('heading', { name: 'Advanced settings' })).toBeVisible();
+    await expect(
+      page
+        .locator('div')
+        .filter({ hasText: /^Required field$/ })
+        .getByRole('switch'),
+    ).toBeChecked();
+
+    await expect(page.getByRole('combobox')).toHaveText('Right');
+  });
+});

packages/app-tests/e2e/templates/direct-templates.spec.ts

@@ -1,9 +1,12 @@
 import { expect, test } from '@playwright/test';
+import { DocumentSigningOrder, RecipientRole } from '@prisma/client';
 import { customAlphabet } from 'nanoid';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { createDocumentAuthOptions } from '@documenso/lib/utils/document-auth';
+import { mapSecondaryIdToTemplateId } from '@documenso/lib/utils/envelope';
 import { formatDirectTemplatePath } from '@documenso/lib/utils/templates';
+import { prisma } from '@documenso/prisma';
 import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedDirectTemplate, seedTemplate } from '@documenso/prisma/seed/templates';
 import { seedTestEmail, seedUser } from '@documenso/prisma/seed/users';
@@ -121,7 +124,7 @@ test('[DIRECT_TEMPLATES]: delete direct template link', async ({ page }) => {
   await expect(page.getByText('404 not found')).toBeVisible();
 });
 
-test('[DIRECT_TEMPLATES]: direct template link auth access', async ({ page }) => {
+test('[DIRECT_TEMPLATES]: V1 direct template link auth access', async ({ page }) => {
   const { user, team } = await seedUser();
 
   const directTemplateWithAuth = await seedDirectTemplate({
@@ -153,6 +156,53 @@ test('[DIRECT_TEMPLATES]: direct template link auth access', async ({ page }) =>
 
   await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
   await expect(page.getByLabel('Email')).toBeDisabled();
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await page.getByRole('button', { name: 'Complete' }).click();
+
+  await page.getByRole('button', { name: 'Sign' }).click();
+  await page.waitForURL(/\/sign/);
+  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
+});
+
+test('[DIRECT_TEMPLATES]: V2 direct template link auth access', async ({ page }) => {
+  const { user, team } = await seedUser();
+
+  const directTemplateWithAuth = await seedDirectTemplate({
+    title: 'Personal direct template link',
+    userId: user.id,
+    teamId: team.id,
+    internalVersion: 2,
+    createTemplateOptions: {
+      authOptions: createDocumentAuthOptions({
+        globalAccessAuth: ['ACCOUNT'],
+        globalActionAuth: [],
+      }),
+    },
+  });
+
+  const directTemplatePath = formatDirectTemplatePath(
+    directTemplateWithAuth.directLink?.token || '',
+  );
+
+  await page.goto(directTemplatePath);
+
+  await expect(page.getByText('Authentication required')).toBeVisible();
+
+  await apiSignin({
+    page,
+    email: user.email,
+  });
+
+  await page.goto(directTemplatePath);
+
+  await expect(page.getByRole('heading', { name: 'Personal direct template link' })).toBeVisible();
+  await page.getByRole('button', { name: 'Complete' }).click();
+  await expect(page.getByLabel('Your Email')).not.toBeVisible();
+
+  await page.getByRole('button', { name: 'Sign' }).click();
+  await page.waitForURL(/\/sign/);
+  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
 });
 
 test('[DIRECT_TEMPLATES]: use direct template link with 1 recipient', async ({ page }) => {
@@ -175,6 +225,9 @@ test('[DIRECT_TEMPLATES]: use direct template link with 1 recipient', async ({ p
   await page.getByPlaceholder('recipient@documenso.com').fill(seedTestEmail());
 
   await page.getByRole('button', { name: 'Continue' }).click();
+
+  await expect(page.getByText('Next Recipient Name')).not.toBeVisible();
+
   await page.getByRole('button', { name: 'Complete' }).click();
   await page.getByRole('button', { name: 'Sign' }).click();
   await page.waitForURL(/\/sign/);
@@ -183,3 +236,173 @@ test('[DIRECT_TEMPLATES]: use direct template link with 1 recipient', async ({ p
   // Add a longer waiting period to ensure document status is updated
   await page.waitForTimeout(3000);
 });
+
+test('[DIRECT_TEMPLATES]: V1 use direct template link with 2 recipients with next signer dictation', async ({
+  page,
+}) => {
+  const { team, owner, organisation } = await seedTeam({
+    createTeamMembers: 1,
+  });
+
+  // Should be visible to team members.
+  const template = await seedDirectTemplate({
+    title: 'Team direct template link 1',
+    userId: owner.id,
+    teamId: team.id,
+  });
+
+  await prisma.documentMeta.update({
+    where: {
+      id: template.documentMetaId,
+    },
+    data: {
+      allowDictateNextSigner: true,
+      signingOrder: DocumentSigningOrder.SEQUENTIAL,
+    },
+  });
+
+  const originalName = 'Signer 2';
+  const originalSecondSignerEmail = seedTestEmail();
+
+  // Add another signer
+  await prisma.recipient.create({
+    data: {
+      signingOrder: 2,
+      envelopeId: template.id,
+      email: originalSecondSignerEmail,
+      name: originalName,
+      token: Math.random().toString().slice(2, 7),
+      role: RecipientRole.SIGNER,
+    },
+  });
+
+  // Check that the direct template link is accessible.
+  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
+  await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
+
+  await page.waitForTimeout(100);
+  await page.getByPlaceholder('recipient@documenso.com').fill(seedTestEmail());
+
+  await page.getByRole('button', { name: 'Continue' }).click();
+  await page.getByRole('button', { name: 'Complete' }).click();
+
+  await expect(page.getByText('Next Recipient Name')).toBeVisible();
+
+  const nextRecipientNameInputValue = await page.getByLabel('Next Recipient Name').inputValue();
+  expect(nextRecipientNameInputValue).toBe(originalName);
+
+  const nextRecipientEmailInputValue = await page.getByLabel('Next Recipient Email').inputValue();
+  expect(nextRecipientEmailInputValue).toBe(originalSecondSignerEmail);
+
+  const newName = 'Hello';
+  const newSecondSignerEmail = seedTestEmail();
+
+  await page.getByLabel('Next Recipient Email').fill(newSecondSignerEmail);
+  await page.getByLabel('Next Recipient Name').fill(newName);
+
+  await page.getByRole('button', { name: 'Sign' }).click();
+  await page.waitForURL(/\/sign/);
+  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
+
+  const createdEnvelopeRecipients = await prisma.recipient.findMany({
+    where: {
+      envelope: {
+        templateId: mapSecondaryIdToTemplateId(template.secondaryId),
+      },
+    },
+  });
+
+  const updatedSecondRecipient = createdEnvelopeRecipients.find(
+    (recipient) => recipient.signingOrder === 2,
+  );
+
+  expect(updatedSecondRecipient?.name).toBe(newName);
+  expect(updatedSecondRecipient?.email).toBe(newSecondSignerEmail);
+});
+
+test('[DIRECT_TEMPLATES]: V2 use direct template link with 2 recipients with next signer dictation', async ({
+  page,
+}) => {
+  const { team, owner, organisation } = await seedTeam({
+    createTeamMembers: 1,
+  });
+
+  // Should be visible to team members.
+  const template = await seedDirectTemplate({
+    title: 'Team direct template link 1',
+    userId: owner.id,
+    teamId: team.id,
+    internalVersion: 2,
+  });
+
+  await prisma.documentMeta.update({
+    where: {
+      id: template.documentMetaId,
+    },
+    data: {
+      allowDictateNextSigner: true,
+      signingOrder: DocumentSigningOrder.SEQUENTIAL,
+    },
+  });
+
+  const originalName = 'Signer 2';
+  const originalSecondSignerEmail = seedTestEmail();
+
+  // Add another signer
+  await prisma.recipient.create({
+    data: {
+      signingOrder: 2,
+      envelopeId: template.id,
+      email: originalSecondSignerEmail,
+      name: originalName,
+      token: Math.random().toString().slice(2, 7),
+      role: RecipientRole.SIGNER,
+    },
+  });
+
+  // Check that the direct template link is accessible.
+  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
+  await expect(page.getByRole('heading', { name: 'Team direct template link 1' })).toBeVisible();
+  await page.waitForTimeout(100);
+
+  await page.getByRole('button', { name: 'Complete' }).click();
+
+  const currentName = 'John Doe';
+  const currentEmail = seedTestEmail();
+
+  await page.getByPlaceholder('Enter Your Name').fill(currentName);
+  await page.getByPlaceholder('Enter Your Email').fill(currentEmail);
+
+  await expect(page.getByText('Next Recipient Name')).toBeVisible();
+
+  const nextRecipientNameInputValue = await page.getByLabel('Next Recipient Name').inputValue();
+  expect(nextRecipientNameInputValue).toBe(originalName);
+
+  const nextRecipientEmailInputValue = await page.getByLabel('Next Recipient Email').inputValue();
+  expect(nextRecipientEmailInputValue).toBe(originalSecondSignerEmail);
+
+  const newName = 'Hello';
+  const newSecondSignerEmail = seedTestEmail();
+
+  await page.getByLabel('Next Recipient Email').fill(newSecondSignerEmail);
+  await page.getByLabel('Next Recipient Name').fill(newName);
+
+  await page.getByRole('button', { name: 'Sign' }).click();
+  await page.waitForURL(/\/sign/);
+  await expect(page.getByRole('heading', { name: 'Document Signed' })).toBeVisible();
+
+  const createdEnvelopeRecipients = await prisma.recipient.findMany({
+    where: {
+      envelope: {
+        templateId: mapSecondaryIdToTemplateId(template.secondaryId),
+      },
+    },
+  });
+
+  const updatedSecondRecipient = createdEnvelopeRecipients.find(
+    (recipient) => recipient.signingOrder === 2,
+  );
+
+  expect(updatedSecondRecipient?.name).toBe(newName);
+  expect(updatedSecondRecipient?.email).toBe(newSecondSignerEmail);
+});

packages/auth/package.json

@@ -20,6 +20,6 @@
     "luxon": "^3.5.0",
     "nanoid": "^5.1.5",
     "ts-pattern": "^5.0.5",
-    "zod": "3.25.76"
+    "zod": "3.24.1"
   }
 }

packages/ee/package.json

@@ -19,6 +19,6 @@
     "micro": "^10.0.1",
     "react": "^18",
     "ts-pattern": "^5.0.5",
-    "zod": "3.25.76"
+    "zod": "3.24.1"
   }
 }

packages/lib/client-only/utils/page-canvas-registry.ts

@@ -1,110 +0,0 @@
-import type Konva from 'konva';
-
-/**
- * Represents canvas references for a specific PDF page.
- */
-export interface PageCanvasRefs {
-  /** The page number (1-indexed) */
-  pageNumber: number;
-  /** The canvas element containing the rendered PDF */
-  pdfCanvas: HTMLCanvasElement;
-  /** The Konva stage containing field overlays */
-  konvaStage: Konva.Stage;
-}
-
-/**
- * Module-level registry to store canvas references by page number.
- * This allows any component to access page canvases without prop drilling.
- */
-const pageCanvasRegistry = new Map<number, PageCanvasRefs>();
-
-/**
- * Register a page's canvas references.
- * Call this when a page renderer mounts and has valid canvas refs.
- *
- * @param refs - The canvas references to register
- */
-export const registerPageCanvas = (refs: PageCanvasRefs): void => {
-  pageCanvasRegistry.set(refs.pageNumber, refs);
-};
-
-/**
- * Unregister a page's canvas references.
- * Call this when a page renderer unmounts to prevent memory leaks.
- *
- * @param pageNumber - The page number to unregister
- */
-export const unregisterPageCanvas = (pageNumber: number): void => {
-  pageCanvasRegistry.delete(pageNumber);
-};
-
-/**
- * Get canvas references for a specific page.
- *
- * @param pageNumber - The page number to retrieve
- * @returns The canvas references, or undefined if not registered
- */
-export const getPageCanvasRefs = (pageNumber: number): PageCanvasRefs | undefined => {
-  return pageCanvasRegistry.get(pageNumber);
-};
-
-/**
- * Get all registered page numbers.
- *
- * @returns Array of page numbers currently registered
- */
-export const getRegisteredPageNumbers = (): number[] => {
-  return Array.from(pageCanvasRegistry.keys()).sort((a, b) => a - b);
-};
-
-/**
- * Composite a PDF page with its field overlays into a single PNG Blob.
- * This creates a temporary canvas, draws the PDF canvas first (background),
- * then draws the Konva canvas on top (field overlays).
- *
- * @param pageNumber - The page number to composite (1-indexed)
- * @returns Promise that resolves to a PNG Blob, or null if page not found or compositing fails
- */
-export const compositePageToBlob = async (pageNumber: number): Promise<Blob | null> => {
-  const refs = getPageCanvasRefs(pageNumber);
-
-  if (!refs) {
-    console.warn(`Page ${pageNumber} is not registered for canvas capture`);
-    return null;
-  }
-
-  try {
-    // Create temporary canvas with same dimensions as PDF canvas
-    const tempCanvas = document.createElement('canvas');
-    tempCanvas.width = refs.pdfCanvas.width;
-    tempCanvas.height = refs.pdfCanvas.height;
-
-    const ctx = tempCanvas.getContext('2d');
-    if (!ctx) {
-      console.error('Failed to get 2D context for temporary canvas');
-      return null;
-    }
-
-    // Draw PDF canvas first (background layer)
-    ctx.drawImage(refs.pdfCanvas, 0, 0);
-
-    // Get Konva canvas and draw on top (field overlays)
-    // Note: Konva's toCanvas() returns a new canvas with all layers rendered
-    const konvaCanvas = refs.konvaStage.toCanvas();
-    ctx.drawImage(konvaCanvas, 0, 0);
-
-    // Convert to PNG Blob
-    return new Promise((resolve, reject) => {
-      tempCanvas.toBlob((blob) => {
-        if (blob) {
-          resolve(blob);
-        } else {
-          reject(new Error('Failed to convert canvas to blob'));
-        }
-      }, 'image/png');
-    });
-  } catch (error) {
-    console.error(`Error compositing page ${pageNumber}:`, error);
-    return null;
-  }
-};

packages/lib/package.json

@@ -43,7 +43,6 @@
     "micro": "^10.0.1",
     "nanoid": "^5.1.5",
     "oslo": "^0.17.0",
-    "pdfjs-dist": "3.11.174",
     "pg": "^8.11.3",
     "pino": "^9.7.0",
     "pino-pretty": "^13.0.0",
@@ -56,7 +55,7 @@
     "skia-canvas": "^3.0.8",
     "stripe": "^12.7.0",
     "ts-pattern": "^5.0.5",
-    "zod": "3.25.76"
+    "zod": "3.24.1"
   },
   "devDependencies": {
     "@playwright/browser-chromium": "1.52.0",

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

@@ -10,6 +10,7 @@ import {
 } from '@prisma/client';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { insertFieldsFromPlaceholdersInPDF } from '@documenso/lib/server-only/pdf/auto-place-fields';
 import { normalizePdf as makeNormalizedPdf } from '@documenso/lib/server-only/pdf/normalize-pdf';
 import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
@@ -233,7 +234,7 @@ export const createEnvelope = async ({
       ? await incrementDocumentId().then((v) => v.formattedDocumentId)
       : await incrementTemplateId().then((v) => v.formattedTemplateId);
 
-  return await prisma.$transaction(async (tx) => {
+  const createdEnvelope = await prisma.$transaction(async (tx) => {
     const envelope = await tx.envelope.create({
       data: {
         id: prefixedId('envelope'),
@@ -353,8 +354,12 @@ export const createEnvelope = async ({
         recipients: true,
         fields: true,
         folder: true,
-        envelopeItems: true,
         envelopeAttachments: true,
+        envelopeItems: {
+          include: {
+            documentData: true,
+          },
+        },
       },
     });
 
@@ -390,4 +395,51 @@ export const createEnvelope = async ({
 
     return createdEnvelope;
   });
+
+  for (const envelopeItem of createdEnvelope.envelopeItems) {
+    const buffer = await getFileServerSide(envelopeItem.documentData);
+
+    // Use normalized PDF if normalizePdf was true, otherwise use original
+    const pdfToProcess = normalizePdf
+      ? await makeNormalizedPdf(Buffer.from(buffer))
+      : Buffer.from(buffer);
+
+    await insertFieldsFromPlaceholdersInPDF(
+      pdfToProcess,
+      userId,
+      teamId,
+      {
+        type: 'envelopeId',
+        id: createdEnvelope.id,
+      },
+      requestMetadata,
+      envelopeItem.id,
+    );
+  }
+
+  const finalEnvelope = await prisma.envelope.findFirst({
+    where: {
+      id: createdEnvelope.id,
+    },
+    include: {
+      documentMeta: true,
+      recipients: true,
+      fields: true,
+      folder: true,
+      envelopeAttachments: true,
+      envelopeItems: {
+        include: {
+          documentData: true,
+        },
+      },
+    },
+  });
+
+  if (!finalEnvelope) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Envelope not found',
+    });
+  }
+
+  return finalEnvelope;
 };

packages/lib/server-only/envelope/get-envelope-for-direct-template-signing.ts

@@ -1,10 +1,11 @@
 import { DocumentStatus, EnvelopeType } from '@prisma/client';
+import { match } from 'ts-pattern';
 
 import { prisma } from '@documenso/prisma';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
-import type { TDocumentAuthMethods } from '../../types/document-auth';
-import { isRecipientAuthorized } from '../document/is-recipient-authorized';
+import { DocumentAccessAuth, type TDocumentAuthMethods } from '../../types/document-auth';
+import { extractDocumentAuthMethods } from '../../utils/document-auth';
 import { getTeamSettings } from '../team/get-team-settings';
 import type { EnvelopeForSigningResponse } from './get-envelope-for-recipient-signing';
 import { ZEnvelopeForSigningResponse } from './get-envelope-for-recipient-signing';
@@ -98,14 +99,28 @@ export const getEnvelopeForDirectTemplateSigning = async ({
     });
   }
 
-  const documentAccessValid = await isRecipientAuthorized({
-    type: 'ACCESS',
-    documentAuthOptions: envelope.authOptions,
-    recipient,
-    userId,
-    authOptions: accessAuth,
+  // Currently not using this since for direct templates "User" access means they just need to be
+  // logged in.
+  // const documentAccessValid = await isRecipientAuthorized({
+  //   type: 'ACCESS',
+  //   documentAuthOptions: envelope.authOptions,
+  //   recipient,
+  //   userId,
+  //   authOptions: accessAuth,
+  // });
+
+  const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({
+    documentAuth: envelope.authOptions,
   });
 
+  // Ensure typesafety when we add more options.
+  const documentAccessValid = derivedRecipientAccessAuth.every((auth) =>
+    match(auth)
+      .with(DocumentAccessAuth.ACCOUNT, () => Boolean(userId))
+      .with(DocumentAccessAuth.TWO_FACTOR_AUTH, () => true)
+      .exhaustive(),
+  );
+
   if (!documentAccessValid) {
     throw new AppError(AppErrorCode.UNAUTHORIZED, {
       message: 'Invalid access values',

packages/lib/server-only/envelope/get-envelope-required-access-data.ts

@@ -54,54 +54,3 @@ export const getEnvelopeRequiredAccessData = async ({ token }: { token: string }
     recipientHasAccount: Boolean(recipientUserAccount),
   } as const;
 };
-
-export const getEnvelopeDirectTemplateRequiredAccessData = async ({ token }: { token: string }) => {
-  const envelope = await prisma.envelope.findFirst({
-    where: {
-      type: EnvelopeType.TEMPLATE,
-      directLink: {
-        enabled: true,
-        token,
-      },
-      status: DocumentStatus.DRAFT,
-    },
-    include: {
-      recipients: {
-        where: {
-          token,
-        },
-      },
-      directLink: true,
-    },
-  });
-
-  if (!envelope) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Envelope not found',
-    });
-  }
-
-  const recipient = envelope.recipients.find(
-    (r) => r.id === envelope.directLink?.directTemplateRecipientId,
-  );
-
-  if (!recipient) {
-    throw new AppError(AppErrorCode.NOT_FOUND, {
-      message: 'Recipient not found',
-    });
-  }
-
-  const recipientUserAccount = await prisma.user.findFirst({
-    where: {
-      email: recipient.email.toLowerCase(),
-    },
-    select: {
-      id: true,
-    },
-  });
-
-  return {
-    recipientEmail: recipient.email,
-    recipientHasAccount: Boolean(recipientUserAccount),
-  } as const;
-};

packages/lib/server-only/pdf/auto-place-fields.ts

@@ -0,0 +1,517 @@
+import { PDFDocument, rgb } from '@cantoo/pdf-lib';
+import type { Recipient } from '@prisma/client';
+import { EnvelopeType, FieldType, RecipientRole } from '@prisma/client';
+import PDFParser from 'pdf2json';
+import { match } from 'ts-pattern';
+
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getEnvelopeWhereInput } from '@documenso/lib/server-only/envelope/get-envelope-by-id';
+import { createEnvelopeFields } from '@documenso/lib/server-only/field/create-envelope-fields';
+import { createDocumentRecipients } from '@documenso/lib/server-only/recipient/create-document-recipients';
+import { createTemplateRecipients } from '@documenso/lib/server-only/recipient/create-template-recipients';
+import { type TFieldAndMeta, ZFieldAndMetaSchema } from '@documenso/lib/types/field-meta';
+import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
+import type { EnvelopeIdOptions } from '@documenso/lib/utils/envelope';
+import { mapSecondaryIdToTemplateId } from '@documenso/lib/utils/envelope';
+import { prisma } from '@documenso/prisma';
+
+import { getPageSize } from './get-page-size';
+
+type TextPosition = {
+  text: string;
+  x: number;
+  y: number;
+  w: number;
+};
+
+type CharIndexMapping = {
+  textPositionIndex: number;
+};
+
+type PlaceholderInfo = {
+  placeholder: string;
+  recipient: string;
+  fieldAndMeta: TFieldAndMeta;
+  page: number;
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+  pageWidth: number;
+  pageHeight: number;
+};
+
+type FieldToCreate = TFieldAndMeta & {
+  envelopeItemId?: string;
+  recipientId: number;
+  pageNumber: number;
+  pageX: number;
+  pageY: number;
+  width: number;
+  height: number;
+};
+
+type RecipientPlaceholderInfo = {
+  email: string;
+  name: string;
+  recipientIndex: number;
+};
+
+/*
+  Questions for later:
+    - Does it handle multi-page PDFs? ✅ YES! ✅
+    - Does it handle multiple recipients on the same page? ✅ YES! ✅
+    - Does it handle multiple recipients on multiple pages? ✅ YES! ✅
+    - What happens with incorrect placeholders? E.g. those containing non-accepted properties.
+    - The placeholder data is dynamic. How to handle this parsing? Perhaps we need to do it similar to the fieldMeta parsing. ✅
+    - Need to handle envelopes with multiple items. ✅
+*/
+
+/*
+  Parse field type string to FieldType enum.
+  Normalizes the input (uppercase, trim) and validates it's a valid field type.
+  This ensures we handle case variations and whitespace, and provides clear error messages.
+*/
+const parseFieldType = (fieldTypeString: string): FieldType => {
+  const normalizedType = fieldTypeString.toUpperCase().trim();
+
+  return match(normalizedType)
+    .with('SIGNATURE', () => FieldType.SIGNATURE)
+    .with('FREE_SIGNATURE', () => FieldType.FREE_SIGNATURE)
+    .with('INITIALS', () => FieldType.INITIALS)
+    .with('NAME', () => FieldType.NAME)
+    .with('EMAIL', () => FieldType.EMAIL)
+    .with('DATE', () => FieldType.DATE)
+    .with('TEXT', () => FieldType.TEXT)
+    .with('NUMBER', () => FieldType.NUMBER)
+    .with('RADIO', () => FieldType.RADIO)
+    .with('CHECKBOX', () => FieldType.CHECKBOX)
+    .with('DROPDOWN', () => FieldType.DROPDOWN)
+    .otherwise(() => {
+      throw new AppError(AppErrorCode.INVALID_BODY, {
+        message: `Invalid field type: ${fieldTypeString}`,
+      });
+    });
+};
+
+/*
+  Transform raw field metadata from placeholder format to schema format.
+  Users should provide properly capitalized property names (e.g., readOnly, fontSize, textAlign).
+  Converts string values to proper types (booleans, numbers).
+*/
+const parseFieldMeta = (
+  rawFieldMeta: Record<string, string>,
+  fieldType: FieldType,
+): Record<string, unknown> | undefined => {
+  if (fieldType === FieldType.SIGNATURE || fieldType === FieldType.FREE_SIGNATURE) {
+    return;
+  }
+
+  if (Object.keys(rawFieldMeta).length === 0) {
+    return;
+  }
+
+  const fieldTypeString = String(fieldType).toLowerCase();
+
+  const parsedFieldMeta: Record<string, boolean | number | string> = {
+    type: fieldTypeString,
+  };
+
+  /*
+    rawFieldMeta is an object with string keys and string values.
+    It contains string values because the PDF parser returns the values as strings.
+
+    E.g. { 'required': 'true', 'fontSize': '12', 'maxValue': '100', 'minValue': '0', 'characterLimit': '100' }
+  */
+  const rawFieldMetaEntries = Object.entries(rawFieldMeta);
+
+  for (const [property, value] of rawFieldMetaEntries) {
+    if (property === 'readOnly' || property === 'required') {
+      parsedFieldMeta[property] = value === 'true';
+    } else if (
+      property === 'fontSize' ||
+      property === 'maxValue' ||
+      property === 'minValue' ||
+      property === 'characterLimit'
+    ) {
+      const numValue = Number(value);
+
+      if (!Number.isNaN(numValue)) {
+        parsedFieldMeta[property] = numValue;
+      }
+    } else {
+      parsedFieldMeta[property] = value;
+    }
+  }
+
+  return parsedFieldMeta;
+};
+
+export const extractPlaceholdersFromPDF = async (pdf: Buffer): Promise<PlaceholderInfo[]> => {
+  return new Promise((resolve, reject) => {
+    const parser = new PDFParser(null, true);
+
+    parser.on('pdfParser_dataError', (errData) => {
+      reject(errData);
+    });
+
+    parser.on('pdfParser_dataReady', (pdfData) => {
+      const placeholders: PlaceholderInfo[] = [];
+
+      pdfData.Pages.forEach((page, pageIndex) => {
+        /*
+          pdf2json returns the PDF page content as an array of characters.
+          We need to concatenate the characters to get the full text.
+          We also need to get the position of the text so we can place the placeholders in the correct position.
+          
+          Page dimensions from PDF2JSON are in "page units" (relative coordinates)
+        */
+        let pageText = '';
+        const textPositions: TextPosition[] = [];
+        const charIndexMappings: CharIndexMapping[] = [];
+
+        page.Texts.forEach((text) => {
+          /*
+            R is an array of objects containing each character, its position and styling information.
+            The decodedText stores the characters, without any other information.
+
+            textPositions stores each character and its position on the page.
+          */
+          const decodedText = text.R.map((run) => decodeURIComponent(run.T)).join('');
+
+          /*
+            For each character in the decodedText, we store its position in the textPositions array.
+            This allows us to quickly find the position of a character in the textPositions array by its index.
+          */
+          for (let i = 0; i < decodedText.length; i++) {
+            charIndexMappings.push({
+              textPositionIndex: textPositions.length,
+            });
+          }
+
+          pageText += decodedText;
+
+          textPositions.push({
+            text: decodedText,
+            x: text.x,
+            y: text.y,
+            w: text.w || 0,
+          });
+        });
+
+        const placeholderMatches = pageText.matchAll(/{{([^}]+)}}/g);
+
+        /*
+          A placeholder match has the following format:
+
+          [
+            '{{fieldType,recipient,fieldMeta}}',
+            'fieldType,recipient,fieldMeta',
+            'index: <number>',
+            'input: <pdf-text>'
+          ]
+        */
+        for (const placeholderMatch of placeholderMatches) {
+          const placeholder = placeholderMatch[0];
+          const placeholderData = placeholderMatch[1].split(',').map((property) => property.trim());
+
+          const [fieldTypeString, recipient, ...fieldMetaData] = placeholderData;
+
+          const rawFieldMeta = Object.fromEntries(
+            fieldMetaData.map((property) => property.split('=')),
+          );
+
+          const fieldType = parseFieldType(fieldTypeString);
+          const parsedFieldMeta = parseFieldMeta(rawFieldMeta, fieldType);
+
+          const fieldAndMeta: TFieldAndMeta = ZFieldAndMetaSchema.parse({
+            type: fieldType,
+            fieldMeta: parsedFieldMeta,
+          });
+
+          /*
+            Find the position of where the placeholder starts and ends in the text.
+
+            Then find the position of the characters in the textPositions array.
+            This allows us to quickly find the position of a character in the textPositions array by its index.
+          */
+          if (placeholderMatch.index === undefined) {
+            console.error('Placeholder match index is undefined for placeholder', placeholder);
+
+            continue;
+          }
+
+          const placeholderEndCharIndex = placeholderMatch.index + placeholder.length;
+
+          /*
+            Get the index of the placeholder's first and last character in the textPositions array.
+            Used to retrieve the character information from the textPositions array.
+
+            Example:
+              startTextPosIndex - 1
+              endTextPosIndex - 40
+          */
+          const startTextPosIndex = charIndexMappings[placeholderMatch.index].textPositionIndex;
+          const endTextPosIndex = charIndexMappings[placeholderEndCharIndex - 1].textPositionIndex;
+
+          /*
+            Get the placeholder's first and last character information from the textPositions array.
+
+            Example:
+              placeholderStart = { text: '{', x: 100, y: 100, w: 100 }
+              placeholderEnd = { text: '}', x: 200, y: 100, w: 100 }
+          */
+          const placeholderStart = textPositions[startTextPosIndex];
+          const placeholderEnd = textPositions[endTextPosIndex];
+
+          const width = placeholderEnd.x + placeholderEnd.w * 0.1 - placeholderStart.x;
+
+          placeholders.push({
+            placeholder,
+            recipient,
+            fieldAndMeta,
+            page: pageIndex + 1,
+            x: placeholderStart.x,
+            y: placeholderStart.y,
+            width,
+            height: 1,
+            pageWidth: page.Width,
+            pageHeight: page.Height,
+          });
+        }
+      });
+
+      resolve(placeholders);
+    });
+
+    parser.parseBuffer(pdf);
+  });
+};
+
+export const replacePlaceholdersInPDF = async (pdf: Buffer): Promise<Buffer> => {
+  const placeholders = await extractPlaceholdersFromPDF(pdf);
+
+  const pdfDoc = await PDFDocument.load(new Uint8Array(pdf));
+  const pages = pdfDoc.getPages();
+
+  for (const placeholder of placeholders) {
+    const pageIndex = placeholder.page - 1;
+    const page = pages[pageIndex];
+
+    const { width: pdfLibPageWidth, height: pdfLibPageHeight } = getPageSize(page);
+
+    /*
+      Convert PDF2JSON coordinates to pdf-lib coordinates:
+      
+      PDF2JSON uses relative "page units":
+      - x, y, width, height are in page units
+      - Page dimensions (Width, Height) are also in page units
+      
+      pdf-lib uses absolute points (1 point = 1/72 inch):
+      - Need to convert from page units to points
+      - Y-axis in pdf-lib is bottom-up (origin at bottom-left)
+      - Y-axis in PDF2JSON is top-down (origin at top-left)
+    */
+
+    const xPoints = (placeholder.x / placeholder.pageWidth) * pdfLibPageWidth;
+    const yPoints = pdfLibPageHeight - (placeholder.y / placeholder.pageHeight) * pdfLibPageHeight;
+    const widthPoints = (placeholder.width / placeholder.pageWidth) * pdfLibPageWidth;
+    const heightPoints = (placeholder.height / placeholder.pageHeight) * pdfLibPageHeight;
+
+    page.drawRectangle({
+      x: xPoints,
+      y: yPoints - heightPoints, // Adjust for height since y is at baseline
+      width: widthPoints,
+      height: heightPoints,
+      color: rgb(1, 1, 1),
+      borderColor: rgb(1, 1, 1),
+      borderWidth: 2,
+    });
+  }
+
+  const modifiedPdfBytes = await pdfDoc.save();
+
+  return Buffer.from(modifiedPdfBytes);
+};
+
+const extractRecipientPlaceholder = (placeholder: string): RecipientPlaceholderInfo => {
+  const indexMatch = placeholder.match(/^r(\d+)$/i);
+
+  if (!indexMatch) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: `Invalid recipient placeholder format: ${placeholder}. Expected format: r1, r2, r3, etc.`,
+    });
+  }
+
+  const recipientIndex = Number(indexMatch[1]);
+
+  return {
+    email: `recipient.${recipientIndex}@documenso.com`,
+    name: `Recipient ${recipientIndex}`,
+    recipientIndex,
+  };
+};
+
+export const insertFieldsFromPlaceholdersInPDF = async (
+  pdf: Buffer,
+  userId: number,
+  teamId: number,
+  envelopeId: EnvelopeIdOptions,
+  requestMetadata: ApiRequestMetadata,
+  envelopeItemId?: string,
+): Promise<Buffer> => {
+  const placeholders = await extractPlaceholdersFromPDF(pdf);
+
+  if (placeholders.length === 0) {
+    return pdf;
+  }
+
+  /*
+    A structure that maps the recipient index to the recipient name.
+    Example: 1 => 'Recipient 1'
+  */
+  const recipientPlaceholders = new Map<number, string>();
+
+  for (const placeholder of placeholders) {
+    const { name, recipientIndex } = extractRecipientPlaceholder(placeholder.recipient);
+
+    recipientPlaceholders.set(recipientIndex, name);
+  }
+
+  /*
+    Create a list of recipients to create.
+    Example: [{ email: 'recipient.1@documenso.com', name: 'Recipient 1', role: 'SIGNER', signingOrder: 1 }]
+  */
+  const recipientsToCreate = Array.from(
+    recipientPlaceholders.entries(),
+    ([recipientIndex, name]) => {
+      return {
+        email: `recipient.${recipientIndex}@documenso.com`,
+        name,
+        role: RecipientRole.SIGNER,
+        signingOrder: recipientIndex,
+      };
+    },
+  );
+
+  const { envelopeWhereInput } = await getEnvelopeWhereInput({
+    id: envelopeId,
+    userId,
+    teamId,
+    type: null,
+  });
+
+  const envelope = await prisma.envelope.findFirst({
+    where: envelopeWhereInput,
+    select: {
+      id: true,
+      type: true,
+      secondaryId: true,
+    },
+  });
+
+  if (!envelope) {
+    throw new AppError(AppErrorCode.NOT_FOUND, {
+      message: 'Envelope not found',
+    });
+  }
+
+  const existingRecipients = await prisma.recipient.findMany({
+    where: {
+      envelopeId: envelope.id,
+    },
+    select: {
+      id: true,
+      email: true,
+    },
+  });
+
+  const existingEmails = new Set(existingRecipients.map((r) => r.email));
+  const recipientsToCreateFiltered = recipientsToCreate.filter(
+    (recipient) => !existingEmails.has(recipient.email),
+  );
+
+  let createdRecipients: Pick<Recipient, 'id' | 'email'>[] = existingRecipients;
+
+  if (recipientsToCreateFiltered.length > 0) {
+    if (envelope.type === EnvelopeType.DOCUMENT) {
+      const { recipients } = await createDocumentRecipients({
+        userId,
+        teamId,
+        id: envelopeId,
+        recipients: recipientsToCreateFiltered,
+        requestMetadata,
+      });
+
+      createdRecipients = [...existingRecipients, ...recipients];
+    } else if (envelope.type === EnvelopeType.TEMPLATE) {
+      const templateId =
+        envelopeId.type === 'templateId'
+          ? envelopeId.id
+          : mapSecondaryIdToTemplateId(envelope.secondaryId);
+
+      const { recipients } = await createTemplateRecipients({
+        userId,
+        teamId,
+        templateId,
+        recipients: recipientsToCreateFiltered,
+      });
+
+      createdRecipients = [...existingRecipients, ...recipients];
+    } else {
+      throw new AppError(AppErrorCode.INVALID_BODY, {
+        message: `Invalid envelope type: ${envelope.type}`,
+      });
+    }
+  }
+
+  const fieldsToCreate: FieldToCreate[] = [];
+
+  for (const placeholder of placeholders) {
+    /*
+      Convert PDF2JSON coordinates to percentage-based coordinates (0-100)
+      The UI expects positionX and positionY as percentages, not absolute points
+      PDF2JSON uses relative coordinates: x/pageWidth and y/pageHeight give us the percentage
+    */
+    const xPercent = (placeholder.x / placeholder.pageWidth) * 100;
+    const yPercent = (placeholder.y / placeholder.pageHeight) * 100;
+
+    const widthPercent = (placeholder.width / placeholder.pageWidth) * 100;
+    const heightPercent = (placeholder.height / placeholder.pageHeight) * 100;
+
+    const { email } = extractRecipientPlaceholder(placeholder.recipient);
+    const recipient = createdRecipients.find((r) => r.email === email);
+
+    if (!recipient) {
+      throw new AppError(AppErrorCode.INVALID_BODY, {
+        message: `Could not find recipient ID for placeholder: ${placeholder.placeholder}`,
+      });
+    }
+
+    const recipientId = recipient.id;
+
+    // Default height percentage if too small (use 2% as a reasonable default)
+    const finalHeightPercent = heightPercent > 0.01 ? heightPercent : 2;
+
+    fieldsToCreate.push({
+      ...placeholder.fieldAndMeta,
+      envelopeItemId,
+      recipientId,
+      pageNumber: placeholder.page,
+      pageX: xPercent,
+      pageY: yPercent,
+      width: widthPercent,
+      height: finalHeightPercent,
+    });
+  }
+
+  await createEnvelopeFields({
+    userId,
+    teamId,
+    id: envelopeId,
+    fields: fieldsToCreate,
+    requestMetadata,
+  });
+
+  return pdf;
+};

packages/lib/server-only/pdf/normalize-pdf.ts

@@ -1,5 +1,6 @@
 import { PDFDocument } from '@cantoo/pdf-lib';
 
+import { replacePlaceholdersInPDF } from './auto-place-fields';
 import { flattenAnnotations } from './flatten-annotations';
 import { flattenForm, removeOptionalContentGroups } from './flatten-form';
 
@@ -13,6 +14,7 @@ export const normalizePdf = async (pdf: Buffer) => {
   removeOptionalContentGroups(pdfDoc);
   await flattenForm(pdfDoc);
   flattenAnnotations(pdfDoc);
+  const pdfWithoutPlaceholders = await replacePlaceholdersInPDF(pdf);
 
-  return Buffer.from(await pdfDoc.save());
+  return pdfWithoutPlaceholders;
 };

packages/lib/server-only/template/create-document-from-direct-template.ts

@@ -3,6 +3,7 @@ import { createElement } from 'react';
 import { msg } from '@lingui/core/macro';
 import type { Field, Signature } from '@prisma/client';
 import {
+  DocumentSigningOrder,
   DocumentSource,
   DocumentStatus,
   EnvelopeType,
@@ -26,7 +27,7 @@ import type { TSignFieldWithTokenMutationSchema } from '@documenso/trpc/server/f
 import { getI18nInstance } from '../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
 import { AppError, AppErrorCode } from '../../errors/app-error';
-import { DOCUMENT_AUDIT_LOG_TYPE } from '../../types/document-audit-logs';
+import { DOCUMENT_AUDIT_LOG_TYPE, RECIPIENT_DIFF_TYPE } from '../../types/document-audit-logs';
 import type { TRecipientActionAuthTypes } from '../../types/document-auth';
 import { DocumentAccessAuth, ZRecipientAuthOptionsSchema } from '../../types/document-auth';
 import { ZFieldMetaSchema } from '../../types/field-meta';
@@ -68,6 +69,10 @@ export type CreateDocumentFromDirectTemplateOptions = {
     name?: string;
     email: string;
   };
+  nextSigner?: {
+    email: string;
+    name: string;
+  };
 };
 
 type CreatedDirectRecipientField = {
@@ -92,6 +97,7 @@ export const createDocumentFromDirectTemplate = async ({
   directTemplateExternalId,
   signedFieldValues,
   templateUpdatedAt,
+  nextSigner,
   requestMetadata,
   user,
 }: CreateDocumentFromDirectTemplateOptions): Promise<TCreateDocumentFromDirectTemplateResponse> => {
@@ -128,6 +134,17 @@ export const createDocumentFromDirectTemplate = async ({
     throw new AppError(AppErrorCode.INVALID_REQUEST, { message: 'Invalid or missing template' });
   }
 
+  if (
+    nextSigner &&
+    (!directTemplateEnvelope.documentMeta?.allowDictateNextSigner ||
+      directTemplateEnvelope.documentMeta?.signingOrder !== DocumentSigningOrder.SEQUENTIAL)
+  ) {
+    throw new AppError(AppErrorCode.INVALID_REQUEST, {
+      message:
+        'You need to enable allowDictateNextSigner and sequential signing to dictate the next signer',
+    });
+  }
+
   const directTemplateEnvelopeLegacyId = mapSecondaryIdToTemplateId(
     directTemplateEnvelope.secondaryId,
   );
@@ -630,6 +647,77 @@ export const createDocumentFromDirectTemplate = async ({
       }),
     ];
 
+    if (nextSigner) {
+      const pendingRecipients = await tx.recipient.findMany({
+        select: {
+          id: true,
+          signingOrder: true,
+          name: true,
+          email: true,
+          role: true,
+        },
+        where: {
+          envelopeId: createdEnvelope.id,
+          signingStatus: {
+            not: SigningStatus.SIGNED,
+          },
+          role: {
+            not: RecipientRole.CC,
+          },
+        },
+        // Composite sort so our next recipient is always the one with the lowest signing order or id
+        // if there is a tie.
+        orderBy: [{ signingOrder: { sort: 'asc', nulls: 'last' } }, { id: 'asc' }],
+      });
+
+      const nextRecipient = pendingRecipients[0];
+
+      if (nextRecipient) {
+        auditLogsToCreate.push(
+          createDocumentAuditLogData({
+            type: DOCUMENT_AUDIT_LOG_TYPE.RECIPIENT_UPDATED,
+            envelopeId: createdEnvelope.id,
+            user: {
+              name: user?.name || directRecipientName || '',
+              email: user?.email || directRecipientEmail,
+            },
+            metadata: requestMetadata,
+            data: {
+              recipientEmail: nextRecipient.email,
+              recipientName: nextRecipient.name,
+              recipientId: nextRecipient.id,
+              recipientRole: nextRecipient.role,
+              changes: [
+                {
+                  type: RECIPIENT_DIFF_TYPE.NAME,
+                  from: nextRecipient.name,
+                  to: nextSigner.name,
+                },
+                {
+                  type: RECIPIENT_DIFF_TYPE.EMAIL,
+                  from: nextRecipient.email,
+                  to: nextSigner.email,
+                },
+              ],
+            },
+          }),
+        );
+
+        await tx.recipient.update({
+          where: { id: nextRecipient.id },
+          data: {
+            sendStatus: SendStatus.SENT,
+            ...(nextSigner && documentMeta?.allowDictateNextSigner
+              ? {
+                  name: nextSigner.name,
+                  email: nextSigner.email,
+                }
+              : {}),
+          },
+        });
+      }
+    }
+
     await tx.documentAuditLog.createMany({
       data: auditLogsToCreate,
     });

packages/lib/types/ai.ts

@@ -1,15 +0,0 @@
-export type TDetectedFormField = {
-  boundingBox: number[];
-  label:
-    | 'SIGNATURE'
-    | 'INITIALS'
-    | 'NAME'
-    | 'EMAIL'
-    | 'DATE'
-    | 'TEXT'
-    | 'NUMBER'
-    | 'RADIO'
-    | 'CHECKBOX'
-    | 'DROPDOWN';
-  pageNumber: number;
-};

packages/lib/types/field-meta.ts

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

packages/lib/universal/field-renderer/field-constants.ts

@@ -1,19 +0,0 @@
-/**
- * Shared constants for field dimension enforcement.
- *
- * These constants ensure consistency between:
- * 1. AI prompt (server/api/ai.ts) - instructs Gemini on minimum field dimensions
- * 2. Client enforcement (envelope-editor-fields-page.tsx) - fallback validation
- */
-
-/**
- * Minimum field height in pixels.
- * Fields smaller than this will be expanded to meet minimum usability requirements.
- */
-export const MIN_FIELD_HEIGHT_PX = 30;
-
-/**
- * Minimum field width in pixels.
- * Fields smaller than this will be expanded to meet minimum usability requirements.
- */
-export const MIN_FIELD_WIDTH_PX = 36;

packages/prisma/seed/templates.ts

@@ -28,6 +28,7 @@ type SeedTemplateOptions = {
   title?: string;
   userId: number;
   teamId: number;
+  internalVersion?: 1 | 2;
   createTemplateOptions?: Partial<Prisma.EnvelopeUncheckedCreateInput>;
 };
 
@@ -167,7 +168,7 @@ export const seedDirectTemplate = async (options: SeedTemplateOptions) => {
     data: {
       id: prefixedId('envelope'),
       secondaryId: templateId.formattedTemplateId,
-      internalVersion: 1,
+      internalVersion: options.internalVersion ?? 1,
       type: EnvelopeType.TEMPLATE,
       title,
       envelopeItems: {
@@ -184,6 +185,7 @@ export const seedDirectTemplate = async (options: SeedTemplateOptions) => {
       teamId,
       recipients: {
         create: {
+          signingOrder: 1,
           email: DIRECT_TEMPLATE_RECIPIENT_EMAIL,
           name: DIRECT_TEMPLATE_RECIPIENT_NAME,
           token: Math.random().toString().slice(2, 7),

packages/trpc/package.json

@@ -21,6 +21,6 @@
     "superjson": "^1.13.1",
     "trpc-to-openapi": "2.0.4",
     "ts-pattern": "^5.0.5",
-    "zod": "3.25.76"
+    "zod": "3.24.1"
   }
 }

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

@@ -519,6 +519,7 @@ export const templateRouter = router({
         directTemplateExternalId,
         signedFieldValues,
         templateUpdatedAt,
+        nextSigner,
       } = input;
 
       ctx.logger.info({
@@ -541,6 +542,7 @@ export const templateRouter = router({
               email: ctx.user.email,
             }
           : undefined,
+        nextSigner,
         requestMetadata: ctx.metadata,
       });
     }),

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

@@ -90,6 +90,12 @@ export const ZCreateDocumentFromDirectTemplateRequestSchema = z.object({
   directTemplateExternalId: z.string().optional(),
   signedFieldValues: z.array(ZSignFieldWithTokenMutationSchema),
   templateUpdatedAt: z.date(),
+  nextSigner: z
+    .object({
+      email: z.string().email().max(254),
+      name: z.string().min(1).max(255),
+    })
+    .optional(),
 });
 
 export const ZCreateDocumentFromTemplateRequestSchema = z.object({

packages/tsconfig/process-env.d.ts

@@ -80,11 +80,6 @@ declare namespace NodeJS {
     NEXT_PRIVATE_INNGEST_APP_ID?: string;
     NEXT_PRIVATE_INNGEST_EVENT_KEY?: string;
 
-    /**
-     * Google Generative AI (Gemini)
-     */
-    GOOGLE_GENERATIVE_AI_API_KEY?: string;
-
     POSTGRES_URL?: string;
     DATABASE_URL?: string;
     POSTGRES_PRISMA_URL?: string;

packages/ui/package.json

@@ -78,6 +78,6 @@
     "tailwind-merge": "^1.12.0",
     "tailwindcss-animate": "^1.0.5",
     "ts-pattern": "^5.0.5",
-    "zod": "3.25.76"
+    "zod": "3.24.1"
   }
 }

packages/ui/styles/theme.css

@@ -197,56 +197,6 @@
   }
 }
 
-@keyframes edgeGlow {
-  0%,
-  100% {
-    opacity: 0.3;
-  }
-  50% {
-    opacity: 0.6;
-  }
-}
-
-.edge-glow {
-  animation: edgeGlow 2s ease-in-out infinite;
-}
-
-.edge-glow-top {
-  background: linear-gradient(
-    to bottom,
-    rgba(162, 231, 113, 0.4) 0%,
-    rgba(162, 231, 113, 0.2) 20%,
-    transparent 100%
-  );
-}
-
-.edge-glow-right {
-  background: linear-gradient(
-    to left,
-    rgba(162, 231, 113, 0.4) 0%,
-    rgba(162, 231, 113, 0.2) 20%,
-    transparent 100%
-  );
-}
-
-.edge-glow-bottom {
-  background: linear-gradient(
-    to top,
-    rgba(162, 231, 113, 0.4) 0%,
-    rgba(162, 231, 113, 0.2) 20%,
-    transparent 100%
-  );
-}
-
-.edge-glow-left {
-  background: linear-gradient(
-    to right,
-    rgba(162, 231, 113, 0.4) 0%,
-    rgba(162, 231, 113, 0.2) 20%,
-    transparent 100%
-  );
-}
-
 /*
  * Custom CSS for printing reports
  * - Sets page margins to 0.5 inches

turbo.json

@@ -46,7 +46,6 @@
     "NEXT_PUBLIC_WEBAPP_URL",
     "NEXT_PRIVATE_INTERNAL_WEBAPP_URL",
     "NEXT_PUBLIC_POSTHOG_KEY",
-    "NEXT_PUBLIC_AI_DEBUG_PREVIEW",
     "NEXT_PUBLIC_FEATURE_BILLING_ENABLED",
     "NEXT_PUBLIC_DISABLE_SIGNUP",
     "NEXT_PRIVATE_PLAIN_API_KEY",