fix: uncook the lock file

.env.example

@@ -148,13 +148,12 @@ NEXT_PUBLIC_USE_INTERNAL_URL_BROWSERLESS=false
 DOCUMENSO_DISABLE_TELEMETRY=
 
 # [[AI]]
-# OPTIONAL: Google Cloud Project ID for Vertex AI.
-GOOGLE_VERTEX_PROJECT_ID=""
-# OPTIONAL: Google Cloud region for Vertex AI. Defaults to "global".
-GOOGLE_VERTEX_LOCATION="global"
-# OPTIONAL: API key for Google Vertex AI (Gemini). Get your key from:
-# https://console.cloud.google.com/vertex-ai/studio/settings/api-keys
-GOOGLE_VERTEX_API_KEY=""
+# 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"
@@ -166,4 +165,4 @@ E2E_TEST_AUTHENTICATE_USER_PASSWORD="test_Password123"
 NEXT_PRIVATE_LOGGER_FILE_PATH=
 
 # [[PLAIN SUPPORT]]
-NEXT_PRIVATE_PLAIN_API_KEY=
+NEXT_PRIVATE_PLAIN_API_KEY=

.github/workflows/e2e-tests.yml

@@ -1,19 +1,14 @@
 name: Playwright Tests
 on:
   push:
-    branches: ['main']
+    branches: ['main', 'feat/rr7']
   pull_request:
     branches: ['main']
-
-concurrency:
-  group: ci-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   e2e_tests:
     name: 'E2E Tests'
     timeout-minutes: 60
-    runs-on: warp-ubuntu-2204-x64-8x
+    runs-on: warp-ubuntu-2204-x64-16x
     steps:
       - uses: actions/checkout@v4
 
@@ -33,6 +28,9 @@ jobs:
       - name: Seed the database
         run: npm run prisma:seed
 
+      - name: Build app
+        run: npm run build
+
       - name: Install playwright browsers
         run: npx playwright install --with-deps
 
@@ -47,7 +45,7 @@ jobs:
         with:
           name: test-results
           path: 'packages/app-tests/**/test-results/*'
-          retention-days: 7
+          retention-days: 30
     env:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
       TURBO_TEAM: ${{ vars.TURBO_TEAM }}

.github/workflows/translations-upload.yml

@@ -17,7 +17,6 @@ jobs:
     environment: Translations
     permissions:
       contents: write
-      pull-requests: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -27,54 +26,12 @@ jobs:
       - name: Extract translations
         run: npm run translate:extract
 
-      - name: Commit changes and push to reserved branch
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Check and commit any files created
         run: |
-          set -euo pipefail
-
-          BRANCH="chore/extract-translations"
-
           git config --global user.name 'github-actions'
           git config --global user.email 'github-actions@documenso.com'
-
-          git fetch origin
-
-          # Create branch locally (always reset to main)
-          git checkout -B "$BRANCH" origin/main
-
-          # Stage translation output
           git add packages/lib/translations
-
-          # If no changes, exit early
-          if git diff --staged --quiet; then
-            echo "No translation changes found."
-            exit 0
-          fi
-
-          # Commit fresh snapshot
-          git commit -m "chore: extract translations"
-
-          # Force push reserved branch
-          git push origin "$BRANCH" --force
-
-          # Does a PR already exist?
-          EXISTING_PR=$(gh pr list \
-            --state open \
-            --head "$BRANCH" \
-            --json number \
-            --jq '.[0].number // empty')
-
-          if [ -z "$EXISTING_PR" ]; then
-            echo "No existing PR — creating new one."
-            gh pr create \
-              --title "chore: extract translations" \
-              --body "Automated translation extraction" \
-              --base main \
-              --head "$BRANCH"
-          else
-            echo "PR #$EXISTING_PR already exists — not creating a new one."
-          fi
+          git diff --staged --quiet --exit-code || (git commit -m "chore: extract translations" && git push)
 
       - name: Compile translations
         id: compile_translations

.gitignore

@@ -61,5 +61,5 @@ CLAUDE.md
 # agents
 .specs
 
-# scripts
-scripts/output*
+# ai debug previews
+packages/assets/ai-previews/

README.md

@@ -1,3 +1,6 @@
+> 🚨 🚨 🚨
+> Documenso 2.0.0 is live on Product Hunt 🎉 <a href="https://documen.so/launch" target="_blank" rel="noopener noreferrer" style="text-decoration: underline;">Join us to celebrate the best Documenso yet 🪩</a>
+
 <img src="https://github.com/documenso/documenso/assets/13398220/a643571f-0239-46a6-a73e-6bef38d1228b" alt="Documenso Logo">
 
 <p align="center" style="margin-top: 20px">
@@ -171,11 +174,9 @@ git clone https://github.com/<your-username>/documenso
 
 5. Create the database schema by running `npm run prisma:migrate-dev`
 
-6. Run `npm run translate:compile` in the root directory to compile lingui
+6. Run `npm run dev` in the root directory to start
 
-7. Run `npm run dev` in the root directory to start
-
-8. Register a new user at http://localhost:3000/signup
+7. Register a new user at http://localhost:3000/signup
 
 ---
 

apps/documentation/package.json

@@ -15,7 +15,7 @@
     "@documenso/tailwind-config": "*",
     "@documenso/trpc": "*",
     "@documenso/ui": "*",
-    "next": "^15.5.7",
+    "next": "^15",
     "next-plausible": "^3.12.5",
     "nextra": "^3",
     "nextra-theme-docs": "^3",

apps/documentation/pages/developers/self-hosting/_meta.js

@@ -4,5 +4,4 @@ export default {
   'how-to': 'How To',
   'setting-up-oauth-providers': 'Setting up OAuth Providers',
   telemetry: 'Telemetry',
-  'ai-features': 'AI Recipient & Field Detection',
 };

apps/documentation/pages/developers/self-hosting/ai-features.mdx

@@ -1,72 +0,0 @@
----
-title: AI Recipient & Field Detection (Self-hosting)
-description: Configure Google Vertex AI so Documenso can detect recipients and fields automatically.
----
-
-import { Callout, Steps } from 'nextra/components';
-
-# AI Recipient & Field Detection (Self-hosting)
-
-This guide covers how to enable the AI recipient and field detection features when you self-host Documenso.
-
-## What this enables
-
-- Detect recipients from uploaded PDFs (roles, names, emails when present).
-- Detect and place fields (signature, initials, name, email, date, text, number, radio, checkbox) onto draft envelopes.
-- Built-in rate limits (3 requests per minute per IP) to prevent abuse.
-
-## Prerequisites
-
-- A Google Cloud project with the **Vertex AI API** enabled and billing active.
-- A **Vertex AI Express API key** with access to Gemini models (create via the [Vertex AI Express flow](https://cloud.google.com/vertex-ai/generative-ai/docs/start/express-mode/overview) and manage keys in [API keys](https://cloud.google.com/vertex-ai/generative-ai/docs/start/api-keys)).
-- Documenso version that includes the AI detection feature and the corresponding database migration.
-
-## Configure environment variables
-
-Add these variables to your deployment `.env` (or secret manager):
-
-```
-GOOGLE_VERTEX_PROJECT_ID="<your-gcp-project-id>"
-GOOGLE_VERTEX_API_KEY="<your-vertex-api-key>"
-# Optional, defaults to "global"
-GOOGLE_VERTEX_LOCATION="global"
-```
-
-<Callout type="info">
-  Use a region close to your users if you need data residency considerations (e.g. `europe-west1`).
-  If you omit the location, Documenso uses `global`. Not all models are available in every region;
-  if a model is unavailable, switch to a supported region.
-</Callout>
-
-## Deploy with the published container
-
-- Use the official Documenso image (DockerHub or GHCR) and supply the Vertex env vars above.
-- Ensure migrations run on startup (the container runs `prisma migrate deploy` in production mode).
-- Restart the container after adding or changing Vertex env vars.
-
-## Enable the feature in Documenso
-
-Once the service is running with the Vertex env vars:
-
-<Steps>
-### Organisation settings
-
-Go to **Settings → Document Preferences → AI Features** and set to **Enabled**. Teams that inherit organisation defaults will pick this up.
-
-### Team settings
-
-If a team overrides organisation defaults, go to **Team Settings → Document Preferences → AI Features** and choose **Enabled** (or **Inherit** to follow the organisation).
-
-### Verify in the editor
-
-Open a draft envelope. In **Recipients**, you should see the sparkle button for AI detection. In **Fields**, you should see **Detect with AI** available.
-
-</Steps>
-
-## Troubleshooting
-
-- **Too many requests**: Wait a minute or two and retry (rate limit is 3/min per IP).
-- **AI options hidden**: Ensure the env vars are set, the server was restarted after setting them, and `aiFeaturesEnabled` is enabled at organisation/team level.
-- **Detection fails immediately**: Confirm the Vertex API key is valid and the project has Vertex AI enabled. Check server logs for status codes from Vertex.
-
-If issues persist, recheck env vars, restart the service, and confirm the Prisma migration was applied.

apps/documentation/pages/developers/self-hosting/how-to.mdx

@@ -119,8 +119,6 @@ NEXT_PRIVATE_SMTP_USERNAME="<your-username>"
 NEXT_PRIVATE_SMTP_PASSWORD="<your-password>"
 ```
 
-For full AI setup details (including model availability notes), see the [AI Recipient & Field Detection (Self-hosting)](./ai-features) page.
-
 ### Set Up Your Signing Certificate
 
 <Callout type="warning">
@@ -269,63 +267,58 @@ You can access the Documenso application by visiting the URL you provided for th
 
 The environment variables listed above are a subset of those available for configuring Documenso. The table below provides a complete list of environment variables and their descriptions.
 
-For AI setup specifics, see the [AI Recipient & Field Detection (Self-hosting)](./ai-features) page.
-
-| Variable                                     | Description                                                                                                                                             |
-| -------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `PORT`                                       | The port on which the Documenso application runs. It defaults to `3000`.                                                                                |
-| `NEXTAUTH_SECRET`                            | The secret key used by NextAuth.js for encryption and signing.                                                                                          |
-| `NEXT_PRIVATE_ENCRYPTION_KEY`                | The primary encryption key for symmetric encryption and decryption (at least 32 characters).                                                            |
-| `NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY`      | The secondary encryption key for symmetric encryption and decryption (at least 32 characters).                                                          |
-| `NEXT_PRIVATE_GOOGLE_CLIENT_ID`              | The Google client ID for Google authentication (optional).                                                                                              |
-| `NEXT_PRIVATE_GOOGLE_CLIENT_SECRET`          | The Google client secret for Google authentication (optional).                                                                                          |
-| `NEXT_PRIVATE_MICROSOFT_CLIENT_ID`           | The Microsoft client ID for Microsoft authentication (optional).                                                                                        |
-| `NEXT_PRIVATE_MICROSOFT_CLIENT_SECRET`       | The Microsoft client secret for Microsoft authentication (optional).                                                                                    |
-| `NEXT_PRIVATE_OIDC_CLIENT_ID`                | The OIDC client ID for OIDC authentication (optional).                                                                                                  |
-| `NEXT_PRIVATE_OIDC_CLIENT_SECRET`            | The OIDC client secret for OIDC authentication (optional).                                                                                              |
-| `NEXT_PRIVATE_OIDC_WELL_KNOWN`               | The well-known URL for the OIDC provider (optional).                                                                                                    |
-| `NEXT_PRIVATE_OIDC_PROVIDER_LABEL`           | The label to display for the OIDC provider button (optional).                                                                                           |
-| `NEXT_PRIVATE_OIDC_SKIP_VERIFY`              | Whether to skip email verification for OIDC accounts (optional, default `false`).                                                                       |
-| `NEXT_PUBLIC_WEBAPP_URL`                     | The URL for the web application.                                                                                                                        |
-| `NEXT_PUBLIC_SUPPORT_EMAIL`                  | The support email address displayed to users (default `support@documenso.com`).                                                                         |
-| `NEXT_PRIVATE_DATABASE_URL`                  | The URL for the primary database connection (with connection pooling).                                                                                  |
-| `NEXT_PRIVATE_DIRECT_DATABASE_URL`           | The URL for the direct database connection (without connection pooling).                                                                                |
-| `NEXT_PRIVATE_SIGNING_TRANSPORT`             | The signing transport to use. Available options: local (default)                                                                                        |
-| `NEXT_PRIVATE_SIGNING_PASSPHRASE`            | The passphrase for the key file.                                                                                                                        |
-| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`   | The base64-encoded contents of the key file will be used instead of the file path.                                                                      |
-| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`       | The path to the key file, default `/opt/documenso/cert.p12`.                                                                                            |
-| `NEXT_PUBLIC_UPLOAD_TRANSPORT`               | The transport for file uploads (database or s3).                                                                                                        |
-| `NEXT_PRIVATE_UPLOAD_ENDPOINT`               | The endpoint for the S3 storage transport (for third-party S3-compatible providers).                                                                    |
-| `NEXT_PRIVATE_UPLOAD_FORCE_PATH_STYLE`       | Whether to force path-style URLs for the S3 storage transport.                                                                                          |
-| `NEXT_PRIVATE_UPLOAD_REGION`                 | The region for the S3 storage transport (defaults to us-east-1).                                                                                        |
-| `NEXT_PRIVATE_UPLOAD_BUCKET`                 | The bucket to use for the S3 storage transport.                                                                                                         |
-| `NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID`          | The access key ID for the S3 storage transport.                                                                                                         |
-| `NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY`      | The secret access key for the S3 storage transport.                                                                                                     |
-| `NEXT_PRIVATE_SMTP_TRANSPORT`                | The transport to send emails (smtp-auth, smtp-api, resend, or mailchannels).                                                                            |
-| `NEXT_PRIVATE_SMTP_HOST`                     | The host for the SMTP server for SMTP transports.                                                                                                       |
-| `NEXT_PRIVATE_SMTP_PORT`                     | The port for the SMTP server for SMTP transports.                                                                                                       |
-| `NEXT_PRIVATE_SMTP_USERNAME`                 | The username for the SMTP server for the `smtp-auth` transport.                                                                                         |
-| `NEXT_PRIVATE_SMTP_PASSWORD`                 | The password for the SMTP server for the `smtp-auth` transport.                                                                                         |
-| `NEXT_PRIVATE_SMTP_APIKEY_USER`              | The API key user for the SMTP server for the `smtp-api` transport.                                                                                      |
-| `NEXT_PRIVATE_SMTP_APIKEY`                   | The API key for the SMTP server for the `smtp-api` transport.                                                                                           |
-| `NEXT_PRIVATE_SMTP_SECURE`                   | Whether to force the use of TLS for the SMTP server for SMTP transports.                                                                                |
-| `NEXT_PRIVATE_SMTP_UNSAFE_IGNORE_TLS`        | Whether to ignore TLS errors for the SMTP server (useful for self-signed certificates).                                                                 |
-| `NEXT_PRIVATE_SMTP_FROM_ADDRESS`             | The email address for the "from" address.                                                                                                               |
-| `NEXT_PRIVATE_SMTP_FROM_NAME`                | The sender name for the "from" address.                                                                                                                 |
-| `NEXT_PRIVATE_RESEND_API_KEY`                | The API key for Resend.com for the `resend` transport.                                                                                                  |
-| `NEXT_PRIVATE_MAILCHANNELS_API_KEY`          | The optional API key for MailChannels (if using a proxy) for the `mailchannels` transport.                                                              |
-| `NEXT_PRIVATE_MAILCHANNELS_ENDPOINT`         | The optional endpoint for the MailChannels API (if using a proxy) for the `mailchannels` transport.                                                     |
-| `NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN`      | The domain for DKIM signing with MailChannels for the `mailchannels` transport.                                                                         |
-| `NEXT_PRIVATE_MAILCHANNELS_DKIM_SELECTOR`    | The selector for DKIM signing with MailChannels for the `mailchannels` transport.                                                                       |
-| `NEXT_PRIVATE_MAILCHANNELS_DKIM_PRIVATE_KEY` | The private key for DKIM signing with MailChannels for the `mailchannels` transport.                                                                    |
-| `NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT`     | The maximum document upload limit displayed to the user (in MB).                                                                                        |
-| `NEXT_PUBLIC_POSTHOG_KEY`                    | The optional PostHog key for analytics and feature flags.                                                                                               |
-| `NEXT_PUBLIC_DISABLE_SIGNUP`                 | Whether to disable user signups through the /signup page.                                                                                               |
-| `NEXT_PRIVATE_BROWSERLESS_URL`               | The URL for a Browserless.io instance to generate PDFs (optional).                                                                                      |
-| `DOCUMENSO_DISABLE_TELEMETRY`                | Set to `true` to disable anonymous telemetry (see [Telemetry](#telemetry) section below).                                                               |
-| `GOOGLE_VERTEX_PROJECT_ID`                   | Google Cloud project ID used for Vertex AI (required for AI detection).                                                                                 |
-| `GOOGLE_VERTEX_API_KEY`                      | Vertex AI Express API key with access to Gemini models (required for AI detection). See [AI Recipient & Field Detectionfor](./ai-features) for details. |
-| `GOOGLE_VERTEX_LOCATION`                     | Optional Vertex region, defaults to `global`. Not all models are available in every region.                                                             |
+| Variable                                     | Description                                                                                         |
+| -------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| `PORT`                                       | The port on which the Documenso application runs. It defaults to `3000`.                            |
+| `NEXTAUTH_SECRET`                            | The secret key used by NextAuth.js for encryption and signing.                                      |
+| `NEXT_PRIVATE_ENCRYPTION_KEY`                | The primary encryption key for symmetric encryption and decryption (at least 32 characters).        |
+| `NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY`      | The secondary encryption key for symmetric encryption and decryption (at least 32 characters).      |
+| `NEXT_PRIVATE_GOOGLE_CLIENT_ID`              | The Google client ID for Google authentication (optional).                                          |
+| `NEXT_PRIVATE_GOOGLE_CLIENT_SECRET`          | The Google client secret for Google authentication (optional).                                      |
+| `NEXT_PRIVATE_MICROSOFT_CLIENT_ID`           | The Microsoft client ID for Microsoft authentication (optional).                                    |
+| `NEXT_PRIVATE_MICROSOFT_CLIENT_SECRET`       | The Microsoft client secret for Microsoft authentication (optional).                                |
+| `NEXT_PRIVATE_OIDC_CLIENT_ID`                | The OIDC client ID for OIDC authentication (optional).                                              |
+| `NEXT_PRIVATE_OIDC_CLIENT_SECRET`            | The OIDC client secret for OIDC authentication (optional).                                          |
+| `NEXT_PRIVATE_OIDC_WELL_KNOWN`               | The well-known URL for the OIDC provider (optional).                                                |
+| `NEXT_PRIVATE_OIDC_PROVIDER_LABEL`           | The label to display for the OIDC provider button (optional).                                       |
+| `NEXT_PRIVATE_OIDC_SKIP_VERIFY`              | Whether to skip email verification for OIDC accounts (optional, default `false`).                   |
+| `NEXT_PUBLIC_WEBAPP_URL`                     | The URL for the web application.                                                                    |
+| `NEXT_PUBLIC_SUPPORT_EMAIL`                  | The support email address displayed to users (default `support@documenso.com`).                     |
+| `NEXT_PRIVATE_DATABASE_URL`                  | The URL for the primary database connection (with connection pooling).                              |
+| `NEXT_PRIVATE_DIRECT_DATABASE_URL`           | The URL for the direct database connection (without connection pooling).                            |
+| `NEXT_PRIVATE_SIGNING_TRANSPORT`             | The signing transport to use. Available options: local (default)                                    |
+| `NEXT_PRIVATE_SIGNING_PASSPHRASE`            | The passphrase for the key file.                                                                    |
+| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_CONTENTS`   | The base64-encoded contents of the key file will be used instead of the file path.                  |
+| `NEXT_PRIVATE_SIGNING_LOCAL_FILE_PATH`       | The path to the key file, default `/opt/documenso/cert.p12`.                                        |
+| `NEXT_PUBLIC_UPLOAD_TRANSPORT`               | The transport for file uploads (database or s3).                                                    |
+| `NEXT_PRIVATE_UPLOAD_ENDPOINT`               | The endpoint for the S3 storage transport (for third-party S3-compatible providers).                |
+| `NEXT_PRIVATE_UPLOAD_FORCE_PATH_STYLE`       | Whether to force path-style URLs for the S3 storage transport.                                      |
+| `NEXT_PRIVATE_UPLOAD_REGION`                 | The region for the S3 storage transport (defaults to us-east-1).                                    |
+| `NEXT_PRIVATE_UPLOAD_BUCKET`                 | The bucket to use for the S3 storage transport.                                                     |
+| `NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID`          | The access key ID for the S3 storage transport.                                                     |
+| `NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY`      | The secret access key for the S3 storage transport.                                                 |
+| `NEXT_PRIVATE_SMTP_TRANSPORT`                | The transport to send emails (smtp-auth, smtp-api, resend, or mailchannels).                        |
+| `NEXT_PRIVATE_SMTP_HOST`                     | The host for the SMTP server for SMTP transports.                                                   |
+| `NEXT_PRIVATE_SMTP_PORT`                     | The port for the SMTP server for SMTP transports.                                                   |
+| `NEXT_PRIVATE_SMTP_USERNAME`                 | The username for the SMTP server for the `smtp-auth` transport.                                     |
+| `NEXT_PRIVATE_SMTP_PASSWORD`                 | The password for the SMTP server for the `smtp-auth` transport.                                     |
+| `NEXT_PRIVATE_SMTP_APIKEY_USER`              | The API key user for the SMTP server for the `smtp-api` transport.                                  |
+| `NEXT_PRIVATE_SMTP_APIKEY`                   | The API key for the SMTP server for the `smtp-api` transport.                                       |
+| `NEXT_PRIVATE_SMTP_SECURE`                   | Whether to force the use of TLS for the SMTP server for SMTP transports.                            |
+| `NEXT_PRIVATE_SMTP_UNSAFE_IGNORE_TLS`        | Whether to ignore TLS errors for the SMTP server (useful for self-signed certificates).             |
+| `NEXT_PRIVATE_SMTP_FROM_ADDRESS`             | The email address for the "from" address.                                                           |
+| `NEXT_PRIVATE_SMTP_FROM_NAME`                | The sender name for the "from" address.                                                             |
+| `NEXT_PRIVATE_RESEND_API_KEY`                | The API key for Resend.com for the `resend` transport.                                              |
+| `NEXT_PRIVATE_MAILCHANNELS_API_KEY`          | The optional API key for MailChannels (if using a proxy) for the `mailchannels` transport.          |
+| `NEXT_PRIVATE_MAILCHANNELS_ENDPOINT`         | The optional endpoint for the MailChannels API (if using a proxy) for the `mailchannels` transport. |
+| `NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN`      | The domain for DKIM signing with MailChannels for the `mailchannels` transport.                     |
+| `NEXT_PRIVATE_MAILCHANNELS_DKIM_SELECTOR`    | The selector for DKIM signing with MailChannels for the `mailchannels` transport.                   |
+| `NEXT_PRIVATE_MAILCHANNELS_DKIM_PRIVATE_KEY` | The private key for DKIM signing with MailChannels for the `mailchannels` transport.                |
+| `NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT`     | The maximum document upload limit displayed to the user (in MB).                                    |
+| `NEXT_PUBLIC_POSTHOG_KEY`                    | The optional PostHog key for analytics and feature flags.                                           |
+| `NEXT_PUBLIC_DISABLE_SIGNUP`                 | Whether to disable user signups through the /signup page.                                           |
+| `NEXT_PRIVATE_BROWSERLESS_URL`               | The URL for a Browserless.io instance to generate PDFs (optional).                                  |
+| `DOCUMENSO_DISABLE_TELEMETRY`                | Set to `true` to disable anonymous telemetry (see [Telemetry](#telemetry) section below).           |
 
 ## Telemetry
 

apps/documentation/pages/users/documents/_meta.js

@@ -4,5 +4,4 @@ export default {
   'document-visibility': 'Document Visibility',
   fields: 'Document Fields',
   'email-preferences': 'Email Preferences',
-  'ai-detection': 'AI Recipient & Field Detection',
 };

apps/documentation/pages/users/documents/ai-detection.mdx

@@ -1,68 +0,0 @@
----
-title: AI Recipient & Field Detection
-description: Use Documenso’s AI helpers to detect recipients and fields in draft documents.
----
-
-# AI Recipient & Field Detection
-
-Documenso can suggest recipients and place fields automatically using Google Vertex AI (Gemini). The feature is optional and only available when your organisation or team has **AI Features** enabled. Documents are processed securely and providers do not retain your data for training.
-
-## Requirements
-
-- AI Features must be enabled in **Document Preferences** for your organisation or team.
-- The envelope must be in **Draft** status.
-- Helpful rate limits are in place (up to 3 detection requests per minute per IP) to prevent abuse. If you see a “too many requests” message, wait a minute or two and try again.
-
-### Enable AI features
-
-1. **Organisation settings**:
-
-Settings → Document Preferences → **AI Features** → Enabled.
-
-_This applies to teams that inherit organisation defaults._
-
-2. **Team settings**:
-
-Team Settings → Document Preferences → **AI Features** → choose Enabled, Disabled, or Inherit.
-
-## Detect recipients
-
-Use this to identify who needs to sign or approve.
-
-1. Open a draft document/template and go to the **Recipients** panel.
-2. Select the **sparkle** button to start detection. If AI is enabled, uploads launched from the dashboard will open the detector automatically.
-
-![Detect recipients with AI button in the Recipients panel](/document-signing/ai-recipient-detect-button.webp)
-
-3. Wait for progress to finish, then review the suggested recipients.
-4. Remove any incorrect entries, then **Add recipients** to apply them. Existing recipients and duplicates are preserved.
-
-Notes:
-
-- Detection is unavailable once an envelope is completed.
-- You can re-run detection if you update the document; each run counts toward the rate limit.
-
-## Detect fields
-
-Use this to auto-place fields on the pages of a draft.
-
-1. Open the envelope editor and switch to the **Fields** tab.
-2. Select **Detect with AI**. Provide optional context (e.g., “Alice is the tenant, Bob is the landlord”) to improve recipient assignment.
-
-![AI field detection dialog with context input](/document-signing/ai-field-detection-button.webp)
-![AI field detection dialog with context input](/document-signing/ai-field-detection-dialog.webp)
-
-3. Watch the progress indicators; they update per page and total fields found.
-4. Review the summary and choose **Add fields** to place them in the editor.
-
-Notes:
-
-- Works only for draft envelopes and teams with AI features enabled.
-- Existing fields are masked during detection to avoid duplicates.
-- Fields are assigned to recipients based on nearby labels and your context message; you can edit them after adding.
-
-## Best practices
-
-- Keep labels near the intended fields (e.g., “Tenant signature”, “Buyer email”).
-- Provide short context when roles are ambiguous.
-- Always review suggestions before sending; AI assists but does not replace final checks.

apps/openpage-api/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@documenso/prisma": "*",
     "luxon": "^3.7.2",
-    "next": "^15.5.7"
+    "next": "^15"
   },
   "devDependencies": {
     "@types/node": "^20",

apps/remix/app/app.css

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

apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx

@@ -45,7 +45,7 @@ export const AdminDocumentDeleteDialog = ({ envelopeId }: AdminDocumentDeleteDia
 
       toast({
         title: _(msg`Document deleted`),
-        description: _(msg`The Document has been deleted successfully.`),
+        description: 'The Document has been deleted successfully.',
         duration: 5000,
       });
 
@@ -54,9 +54,8 @@ export const AdminDocumentDeleteDialog = ({ envelopeId }: AdminDocumentDeleteDia
       toast({
         title: _(msg`An unknown error occurred`),
         variant: 'destructive',
-        description: _(
-          msg`We encountered an unknown error while attempting to delete your document. Please try again later.`,
-        ),
+        description:
+          'We encountered an unknown error while attempting to delete your document. Please try again later.',
       });
     }
   };

apps/remix/app/components/dialogs/ai-field-detection-dialog.tsx

@@ -1,368 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-
-import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { CheckIcon, FormInputIcon, ShieldCheckIcon } from 'lucide-react';
-
-import type { NormalizedFieldWithContext } from '@documenso/lib/server-only/ai/envelope/detect-fields/types';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { Label } from '@documenso/ui/primitives/label';
-import { Textarea } from '@documenso/ui/primitives/textarea';
-
-import {
-  AiApiError,
-  type DetectFieldsProgressEvent,
-  detectFields,
-} from '../../../server/api/ai/detect-fields.client';
-import { AnimatedDocumentScanner } from '../general/animated-document-scanner';
-
-type DialogState = 'PROMPT' | 'PROCESSING' | 'REVIEW' | 'ERROR' | 'RATE_LIMITED';
-
-type AiFieldDetectionDialogProps = {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  onComplete: (fields: NormalizedFieldWithContext[]) => void;
-  envelopeId: string;
-  teamId: number;
-};
-
-const PROCESSING_MESSAGES = [
-  msg`Reading your document`,
-  msg`Analyzing page layout`,
-  msg`Looking for form fields`,
-  msg`Detecting signature areas`,
-  msg`Identifying input fields`,
-  msg`Mapping fields to recipients`,
-  msg`Almost done`,
-] as const;
-
-const FIELD_TYPE_LABELS: Record<string, MessageDescriptor> = {
-  SIGNATURE: msg`Signature`,
-  INITIALS: msg`Initials`,
-  NAME: msg`Name`,
-  EMAIL: msg`Email`,
-  DATE: msg`Date`,
-  TEXT: msg`Text`,
-  NUMBER: msg`Number`,
-  CHECKBOX: msg`Checkbox`,
-  RADIO: msg`Radio`,
-};
-
-export const AiFieldDetectionDialog = ({
-  open,
-  onOpenChange,
-  onComplete,
-  envelopeId,
-  teamId,
-}: AiFieldDetectionDialogProps) => {
-  const { _ } = useLingui();
-
-  const [state, setState] = useState<DialogState>('PROMPT');
-  const [messageIndex, setMessageIndex] = useState(0);
-  const [detectedFields, setDetectedFields] = useState<NormalizedFieldWithContext[]>([]);
-  const [error, setError] = useState<string | null>(null);
-  const [context, setContext] = useState('');
-  const [progress, setProgress] = useState<DetectFieldsProgressEvent | null>(null);
-
-  const onDetectClick = useCallback(async () => {
-    setState('PROCESSING');
-    setMessageIndex(0);
-    setError(null);
-    setProgress(null);
-
-    try {
-      await detectFields({
-        request: {
-          envelopeId,
-          teamId,
-          context: context || undefined,
-        },
-        onProgress: (progressEvent) => {
-          setProgress(progressEvent);
-        },
-        onComplete: (event) => {
-          setDetectedFields(event.fields);
-          setState('REVIEW');
-        },
-        onError: (err) => {
-          console.error('Detection failed:', err);
-
-          if (err.status === 429) {
-            setState('RATE_LIMITED');
-            return;
-          }
-
-          setError(err.message);
-          setState('ERROR');
-        },
-      });
-    } catch (err) {
-      console.error('Detection failed:', err);
-
-      if (err instanceof AiApiError && err.status === 429) {
-        setState('RATE_LIMITED');
-        return;
-      }
-
-      setError(err instanceof Error ? err.message : 'Failed to detect fields');
-      setState('ERROR');
-    }
-  }, [envelopeId, teamId, context]);
-
-  const onAddFields = () => {
-    onComplete(detectedFields);
-    onOpenChange(false);
-    setState('PROMPT');
-    setDetectedFields([]);
-    setContext('');
-  };
-
-  const onClose = () => {
-    onOpenChange(false);
-    setState('PROMPT');
-    setDetectedFields([]);
-    setError(null);
-    setContext('');
-    setProgress(null);
-  };
-
-  // Group fields by type for summary display
-  const fieldCountsByType = useMemo(() => {
-    const counts: Record<string, number> = {};
-
-    for (const field of detectedFields) {
-      counts[field.type] = (counts[field.type] || 0) + 1;
-    }
-
-    return Object.entries(counts).sort(([, a], [, b]) => b - a);
-  }, [detectedFields]);
-
-  useEffect(() => {
-    if (state !== 'PROCESSING') {
-      return;
-    }
-
-    const interval = setInterval(() => {
-      setMessageIndex((prev) => (prev + 1) % PROCESSING_MESSAGES.length);
-    }, 4000);
-
-    return () => clearInterval(interval);
-  }, [state]);
-
-  return (
-    <Dialog open={open}>
-      <DialogContent className="sm:max-w-lg" hideClose={true}>
-        {state === 'PROMPT' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Detect fields</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div className="space-y-4">
-              <p className="text-sm text-muted-foreground">
-                <Trans>
-                  We'll scan your document to find form fields like signature lines, text inputs,
-                  checkboxes, and more. Detected fields will be suggested for you to review.
-                </Trans>
-              </p>
-
-              <Alert className="flex items-center gap-2 space-y-0" variant="neutral">
-                <ShieldCheckIcon className="h-5 w-5 stroke-green-600" />
-                <AlertDescription className="mt-0">
-                  <Trans>
-                    Your document is processed securely using AI services that don't retain your
-                    data.
-                  </Trans>
-                </AlertDescription>
-              </Alert>
-
-              <div className="space-y-1.5">
-                <Label htmlFor="context">
-                  <Trans>Context</Trans>
-                </Label>
-                <Textarea
-                  id="context"
-                  placeholder={_(msg`David is the Employee, Lucas is the Manager`)}
-                  value={context}
-                  onChange={(e) => setContext(e.target.value)}
-                  rows={2}
-                  className="resize-none"
-                />
-                <p className="text-xs text-muted-foreground">
-                  <Trans>Help the AI assign fields to the right recipients.</Trans>
-                </p>
-              </div>
-            </div>
-
-            <DialogFooter>
-              <Button type="button" variant="ghost" onClick={onClose}>
-                <Trans>Skip</Trans>
-              </Button>
-              <Button type="button" onClick={onDetectClick}>
-                <Trans>Detect</Trans>
-              </Button>
-            </DialogFooter>
-          </>
-        )}
-
-        {state === 'PROCESSING' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Detecting fields</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div className="flex flex-col items-center py-8">
-              <AnimatedDocumentScanner />
-
-              <p className="mt-8 text-muted-foreground">{_(PROCESSING_MESSAGES[messageIndex])}</p>
-
-              {progress && (
-                <p className="mt-2 text-xs text-muted-foreground/60">
-                  <Trans>
-                    Page {progress.pagesProcessed} of {progress.totalPages} -{' '}
-                    {progress.fieldsDetected} field(s) found
-                  </Trans>
-                </p>
-              )}
-
-              <p className="mt-2 max-w-[40ch] text-center text-xs text-muted-foreground/60">
-                <Trans>This can take a minute or two depending on the size of your document.</Trans>
-              </p>
-
-              <div className="mt-4 flex gap-1">
-                {PROCESSING_MESSAGES.map((_, index) => (
-                  <div
-                    key={index}
-                    className={`h-1.5 w-1.5 rounded-full transition-all duration-300 ${
-                      index === messageIndex ? 'w-4 bg-primary' : 'bg-muted-foreground/30'
-                    }`}
-                  />
-                ))}
-              </div>
-            </div>
-          </>
-        )}
-
-        {state === 'REVIEW' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Detected fields</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div className="max-h-[400px] overflow-y-auto">
-              {detectedFields.length === 0 ? (
-                <div className="flex flex-col items-center py-8">
-                  <FormInputIcon className="h-12 w-12 text-muted-foreground/50" />
-                  <p className="mt-4 text-center text-sm text-muted-foreground">
-                    <Trans>No fields were detected in your document.</Trans>
-                  </p>
-                  <p className="mt-1 text-center text-xs text-muted-foreground/70">
-                    <Trans>You can add fields manually in the editor.</Trans>
-                  </p>
-                </div>
-              ) : (
-                <>
-                  <p className="text-sm text-muted-foreground">
-                    <Trans>We found {detectedFields.length} field(s) in your document.</Trans>
-                  </p>
-
-                  <ul className="mt-4 divide-y rounded-lg border">
-                    {fieldCountsByType.map(([type, count]) => (
-                      <li key={type} className="flex items-center justify-between px-4 py-3">
-                        <span className="text-sm">{_(FIELD_TYPE_LABELS[type]) || type}</span>
-                        <span className="text-sm font-medium text-muted-foreground">{count}</span>
-                      </li>
-                    ))}
-                  </ul>
-                </>
-              )}
-            </div>
-
-            <DialogFooter>
-              <Button type="button" variant="ghost" onClick={onClose}>
-                <Trans>Cancel</Trans>
-              </Button>
-
-              {detectedFields.length > 0 && (
-                <Button type="button" onClick={onAddFields}>
-                  <CheckIcon className="-ml-1 mr-2 h-4 w-4" />
-                  <Trans>Add fields</Trans>
-                </Button>
-              )}
-            </DialogFooter>
-          </>
-        )}
-
-        {state === 'ERROR' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Detection failed</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div className="py-4">
-              <p className="text-sm text-muted-foreground">
-                <Trans>Something went wrong while detecting fields.</Trans>
-              </p>
-
-              {error && <p className="mt-2 text-sm text-destructive">{error}</p>}
-            </div>
-
-            <DialogFooter>
-              <Button type="button" variant="ghost" onClick={onClose}>
-                <Trans>Close</Trans>
-              </Button>
-              <Button type="button" onClick={onDetectClick}>
-                <Trans>Try again</Trans>
-              </Button>
-            </DialogFooter>
-          </>
-        )}
-
-        {state === 'RATE_LIMITED' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Too many requests</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div className="py-4">
-              <p className="text-sm text-muted-foreground">
-                <Trans>
-                  You've made too many detection requests. Please wait a minute before trying again.
-                </Trans>
-              </p>
-            </div>
-
-            <DialogFooter>
-              <Button type="button" variant="ghost" onClick={onClose}>
-                <Trans>Close</Trans>
-              </Button>
-              <Button type="button" onClick={onDetectClick}>
-                <Trans>Try again</Trans>
-              </Button>
-            </DialogFooter>
-          </>
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-};

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

@@ -1,361 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { CheckIcon, ShieldCheckIcon, UserIcon, XIcon } from 'lucide-react';
-
-import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import type { TDetectedRecipientSchema } from '@documenso/lib/server-only/ai/envelope/detect-recipients/schema';
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { AvatarWithText } from '@documenso/ui/primitives/avatar';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-
-import {
-  AiApiError,
-  type DetectRecipientsProgressEvent,
-  detectRecipients,
-} from '../../../server/api/ai/detect-recipients.client';
-import { AnimatedDocumentScanner } from '../general/animated-document-scanner';
-
-type DialogState = 'PROMPT' | 'PROCESSING' | 'REVIEW' | 'ERROR' | 'RATE_LIMITED';
-
-type AiRecipientDetectionDialogProps = {
-  open: boolean;
-  onOpenChange: (open: boolean) => void;
-  onComplete: (recipients: TDetectedRecipientSchema[]) => void;
-  envelopeId: string;
-  teamId: number;
-};
-
-const PROCESSING_MESSAGES = [
-  msg`Reading your document`,
-  msg`Analyzing pages`,
-  msg`Looking for signature fields`,
-  msg`Identifying recipients`,
-  msg`Extracting contact details`,
-  msg`Almost done`,
-] as const;
-
-export const AiRecipientDetectionDialog = ({
-  open,
-  onOpenChange,
-  onComplete,
-  envelopeId,
-  teamId,
-}: AiRecipientDetectionDialogProps) => {
-  const { _ } = useLingui();
-
-  const [state, setState] = useState<DialogState>('PROMPT');
-  const [messageIndex, setMessageIndex] = useState(0);
-  const [detectedRecipients, setDetectedRecipients] = useState<TDetectedRecipientSchema[]>([]);
-  const [error, setError] = useState<string | null>(null);
-  const [progress, setProgress] = useState<DetectRecipientsProgressEvent | null>(null);
-
-  const onDetectClick = useCallback(async () => {
-    setState('PROCESSING');
-    setMessageIndex(0);
-    setError(null);
-    setProgress(null);
-
-    try {
-      await detectRecipients({
-        request: {
-          envelopeId,
-          teamId,
-        },
-        onProgress: (progressEvent) => {
-          setProgress(progressEvent);
-        },
-        onComplete: (event) => {
-          setDetectedRecipients(event.recipients);
-          setState('REVIEW');
-        },
-        onError: (err) => {
-          console.error('Detection failed:', err);
-
-          if (err.status === 429) {
-            setState('RATE_LIMITED');
-            return;
-          }
-
-          setError(err.message);
-          setState('ERROR');
-        },
-      });
-    } catch (err) {
-      console.error('Detection failed:', err);
-
-      if (err instanceof AiApiError && err.status === 429) {
-        setState('RATE_LIMITED');
-        return;
-      }
-
-      setError(err instanceof Error ? err.message : 'Failed to detect recipients');
-      setState('ERROR');
-    }
-  }, [envelopeId, teamId]);
-
-  const handleRemoveRecipient = (index: number) => {
-    setDetectedRecipients((prev) => prev.filter((_, i) => i !== index));
-  };
-
-  const onAddRecipients = () => {
-    onComplete(detectedRecipients);
-    onOpenChange(false);
-    setState('PROMPT');
-    setDetectedRecipients([]);
-  };
-
-  const onClose = () => {
-    onOpenChange(false);
-    setState('PROMPT');
-    setDetectedRecipients([]);
-    setError(null);
-    setProgress(null);
-  };
-
-  useEffect(() => {
-    if (state !== 'PROCESSING') {
-      return;
-    }
-
-    const interval = setInterval(() => {
-      setMessageIndex((prev) => (prev + 1) % PROCESSING_MESSAGES.length);
-    }, 4000);
-
-    return () => clearInterval(interval);
-  }, [state]);
-
-  return (
-    <Dialog open={open}>
-      <DialogContent className="sm:max-w-lg" hideClose={true}>
-        {state === 'PROMPT' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Detect recipients</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div>
-              <p className="text-sm text-muted-foreground">
-                <Trans>
-                  We'll scan your document to find signature fields and identify who needs to sign.
-                  Detected recipients will be suggested for you to review.
-                </Trans>
-              </p>
-
-              <Alert className="mt-4 flex items-center gap-2 space-y-0" variant="neutral">
-                <ShieldCheckIcon className="h-5 w-5 stroke-green-600" />
-                <AlertDescription className="mt-0">
-                  <Trans>
-                    Your document is processed securely using AI services that don't retain your
-                    data.
-                  </Trans>
-                </AlertDescription>
-              </Alert>
-            </div>
-
-            <DialogFooter>
-              <Button type="button" variant="ghost" onClick={onClose}>
-                <Trans>Skip</Trans>
-              </Button>
-              <Button type="button" onClick={onDetectClick}>
-                <Trans>Detect</Trans>
-              </Button>
-            </DialogFooter>
-          </>
-        )}
-
-        {state === 'PROCESSING' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Detecting recipients</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div className="flex flex-col items-center py-8">
-              <AnimatedDocumentScanner />
-
-              <p className="mt-8 text-muted-foreground">{_(PROCESSING_MESSAGES[messageIndex])}</p>
-
-              {progress && (
-                <p className="mt-2 text-xs text-muted-foreground/60">
-                  <Trans>
-                    Page {progress.pagesProcessed} of {progress.totalPages} -{' '}
-                    {progress.recipientsDetected} recipient(s) found
-                  </Trans>
-                </p>
-              )}
-
-              <p className="mt-2 max-w-[40ch] text-center text-xs text-muted-foreground/60">
-                <Trans>This can take a minute or two depending on the size of your document.</Trans>
-              </p>
-
-              <div className="mt-4 flex gap-1">
-                {PROCESSING_MESSAGES.map((_, index) => (
-                  <div
-                    key={index}
-                    className={`h-1.5 w-1.5 rounded-full transition-all duration-300 ${
-                      index === messageIndex ? 'w-4 bg-primary' : 'bg-muted-foreground/30'
-                    }`}
-                  />
-                ))}
-              </div>
-            </div>
-          </>
-        )}
-
-        {state === 'REVIEW' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Detected recipients</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div className="max-h-[400px] overflow-y-auto">
-              {detectedRecipients.length === 0 ? (
-                <div className="flex flex-col items-center py-8">
-                  <UserIcon className="h-12 w-12 text-muted-foreground/50" />
-                  <p className="mt-4 text-center text-sm text-muted-foreground">
-                    <Trans>No recipients were detected in your document.</Trans>
-                  </p>
-                  <p className="mt-1 text-center text-xs text-muted-foreground/70">
-                    <Trans>You can add recipients manually in the editor.</Trans>
-                  </p>
-                </div>
-              ) : (
-                <>
-                  <p className="text-sm text-muted-foreground">
-                    <Trans>
-                      We found {detectedRecipients.length} recipient(s) in your document.
-                    </Trans>
-                  </p>
-
-                  <ul className="mt-4 divide-y rounded-lg border">
-                    {detectedRecipients.map((recipient, index) => (
-                      <li key={index} className="flex items-center justify-between px-4 py-3">
-                        <AvatarWithText
-                          avatarFallback={
-                            recipient.name
-                              ? recipient.name.slice(0, 1).toUpperCase()
-                              : recipient.email
-                                ? recipient.email.slice(0, 1).toUpperCase()
-                                : '?'
-                          }
-                          primaryText={
-                            <p className="text-sm font-medium text-foreground">
-                              {recipient.name || _(msg`Unknown name`)}
-                            </p>
-                          }
-                          secondaryText={
-                            <div className="text-xs text-muted-foreground">
-                              <p className="italic text-muted-foreground/70">
-                                {recipient.email || _(msg`No email detected`)}
-                              </p>
-                              <p>{_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}</p>
-                            </div>
-                          }
-                        />
-
-                        <button
-                          type="button"
-                          className="h-8 w-8 p-0 text-muted-foreground/80 hover:text-destructive focus-visible:border-destructive focus-visible:ring-destructive"
-                          onClick={() => handleRemoveRecipient(index)}
-                        >
-                          <span className="sr-only">
-                            <Trans>Remove recipient</Trans>
-                          </span>
-
-                          <XIcon className="h-4 w-4" aria-hidden="true" />
-                        </button>
-                      </li>
-                    ))}
-                  </ul>
-                </>
-              )}
-            </div>
-
-            <DialogFooter>
-              <Button type="button" variant="ghost" onClick={onClose}>
-                <Trans>Cancel</Trans>
-              </Button>
-
-              {detectedRecipients.length > 0 && (
-                <Button type="button" onClick={onAddRecipients}>
-                  <CheckIcon className="-ml-1 mr-2 h-4 w-4" />
-                  <Trans>Add recipients</Trans>
-                </Button>
-              )}
-            </DialogFooter>
-          </>
-        )}
-
-        {state === 'ERROR' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Detection failed</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div className="py-4">
-              <p className="text-sm text-muted-foreground">
-                <Trans>Something went wrong while detecting recipients.</Trans>
-              </p>
-
-              {error && <p className="mt-2 text-sm text-destructive">{error}</p>}
-            </div>
-
-            <DialogFooter>
-              <Button type="button" variant="ghost" onClick={onClose}>
-                <Trans>Close</Trans>
-              </Button>
-
-              <Button type="button" onClick={onDetectClick}>
-                <Trans>Try again</Trans>
-              </Button>
-            </DialogFooter>
-          </>
-        )}
-
-        {state === 'RATE_LIMITED' && (
-          <>
-            <DialogHeader>
-              <DialogTitle>
-                <Trans>Too many requests</Trans>
-              </DialogTitle>
-            </DialogHeader>
-
-            <div className="py-4">
-              <p className="text-sm text-muted-foreground">
-                <Trans>
-                  You've made too many detection requests. Please wait a minute before trying again.
-                </Trans>
-              </p>
-            </div>
-
-            <DialogFooter>
-              <Button type="button" variant="ghost" onClick={onClose}>
-                <Trans>Close</Trans>
-              </Button>
-              <Button type="button" onClick={onDetectClick}>
-                <Trans>Try again</Trans>
-              </Button>
-            </DialogFooter>
-          </>
-        )}
-      </DialogContent>
-    </Dialog>
-  );
-};

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

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

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

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

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

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

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

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

apps/remix/app/components/dialogs/sign-field-email-dialog.tsx

@@ -24,10 +24,7 @@ import {
 import { Input } from '@documenso/ui/primitives/input';
 
 const ZSignFieldEmailFormSchema = z.object({
-  email: z
-    .string()
-    .email()
-    .min(1, { message: msg`Email is required`.id }),
+  email: z.string().min(1, { message: msg`Email is required`.id }),
 });
 
 type TSignFieldEmailFormSchema = z.infer<typeof ZSignFieldEmailFormSchema>;

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

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

apps/remix/app/components/dialogs/template-bulk-send-dialog.tsx

@@ -103,8 +103,8 @@ export const TemplateBulkSendDialog = ({
       console.error(err);
 
       toast({
-        title: _(msg`Error`),
-        description: _(msg`Failed to upload CSV. Please check the file format and try again.`),
+        title: 'Error',
+        description: 'Failed to upload CSV. Please check the file format and try again.',
         variant: 'destructive',
       });
     }

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

@@ -21,7 +21,6 @@ import {
   SKIP_QUERY_BATCH_META,
 } from '@documenso/lib/constants/trpc';
 import { AppError } from '@documenso/lib/errors/app-error';
-import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
@@ -66,7 +65,7 @@ const ZAddRecipientsForNewDocumentSchema = z.object({
   recipients: z.array(
     z.object({
       id: z.number(),
-      email: ZRecipientEmailSchema,
+      email: z.string().email(),
       name: z.string(),
       signingOrder: z.number().optional(),
     }),
@@ -101,29 +100,12 @@ export function TemplateUseDialog({
 
   const [open, setOpen] = useState(false);
 
-  const { data: response, isLoading: isLoadingEnvelopeItems } = trpc.envelope.item.getMany.useQuery(
-    {
-      envelopeId,
-    },
-    {
-      placeholderData: (previousData) => previousData,
-      ...SKIP_QUERY_BATCH_META,
-      ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-      enabled: open,
-    },
-  );
-
-  const envelopeItems = response?.data ?? [];
-
-  const generateDefaultFormValues = () => {
-    return {
+  const form = useForm<TAddRecipientsForNewDocumentSchema>({
+    resolver: zodResolver(ZAddRecipientsForNewDocumentSchema),
+    defaultValues: {
       distributeDocument: false,
       useCustomDocument: false,
-      customDocumentData: envelopeItems.map((item) => ({
-        title: item.title,
-        data: undefined,
-        envelopeItemId: item.id,
-      })),
+      customDocumentData: [],
       recipients: recipients
         .sort((a, b) => (a.signingOrder || 0) - (b.signingOrder || 0))
         .map((recipient) => {
@@ -142,12 +124,7 @@ export function TemplateUseDialog({
             signingOrder: recipient.signingOrder ?? undefined,
           };
         }),
-    };
-  };
-
-  const form = useForm<TAddRecipientsForNewDocumentSchema>({
-    resolver: zodResolver(ZAddRecipientsForNewDocumentSchema),
-    defaultValues: generateDefaultFormValues(),
+    },
   });
 
   const { replace, fields: localCustomDocumentData } = useFieldArray({
@@ -155,6 +132,19 @@ export function TemplateUseDialog({
     name: 'customDocumentData',
   });
 
+  const { data: response, isLoading: isLoadingEnvelopeItems } = trpc.envelope.item.getMany.useQuery(
+    {
+      envelopeId,
+    },
+    {
+      placeholderData: (previousData) => previousData,
+      ...SKIP_QUERY_BATCH_META,
+      ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
+    },
+  );
+
+  const envelopeItems = response?.data ?? [];
+
   const { mutateAsync: createDocumentFromTemplate } =
     trpc.template.createDocumentFromTemplate.useMutation();
 
@@ -224,8 +214,8 @@ export function TemplateUseDialog({
   });
 
   useEffect(() => {
-    if (open) {
-      form.reset(generateDefaultFormValues());
+    if (!open) {
+      form.reset();
     }
   }, [open, form]);
 
@@ -332,7 +322,7 @@ export function TemplateUseDialog({
                             <Input
                               {...field}
                               aria-label="Name"
-                              placeholder={recipients[index].name || _(msg`Recipient ${index + 1}`)}
+                              placeholder={recipients[index].name || _(msg`Name`)}
                             />
                           </FormControl>
                           <FormMessage />
@@ -359,7 +349,7 @@ export function TemplateUseDialog({
 
                             {documentDistributionMethod === DocumentDistributionMethod.EMAIL && (
                               <label
-                                className="ml-2 flex items-center text-sm text-muted-foreground"
+                                className="text-muted-foreground ml-2 flex items-center text-sm"
                                 htmlFor="distributeDocument"
                               >
                                 <Trans>Send document</Trans>
@@ -368,7 +358,7 @@ export function TemplateUseDialog({
                                     <InfoIcon className="mx-1 h-4 w-4" />
                                   </TooltipTrigger>
 
-                                  <TooltipContent className="z-[99999] max-w-md space-y-2 p-4 text-muted-foreground">
+                                  <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
                                     <p>
                                       <Trans>
                                         The document will be immediately sent to recipients if this
@@ -388,7 +378,7 @@ export function TemplateUseDialog({
 
                             {documentDistributionMethod === DocumentDistributionMethod.NONE && (
                               <label
-                                className="ml-2 flex items-center text-sm text-muted-foreground"
+                                className="text-muted-foreground ml-2 flex items-center text-sm"
                                 htmlFor="distributeDocument"
                               >
                                 <Trans>Create as pending</Trans>
@@ -396,7 +386,7 @@ export function TemplateUseDialog({
                                   <TooltipTrigger type="button">
                                     <InfoIcon className="mx-1 h-4 w-4" />
                                   </TooltipTrigger>
-                                  <TooltipContent className="z-[99999] max-w-md space-y-2 p-4 text-muted-foreground">
+                                  <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
                                     <p>
                                       <Trans>
                                         Create the document as pending and ready to sign.
@@ -442,7 +432,7 @@ export function TemplateUseDialog({
                           }}
                         />
                         <label
-                          className="ml-2 flex items-center text-sm text-muted-foreground"
+                          className="text-muted-foreground ml-2 flex items-center text-sm"
                           htmlFor="useCustomDocument"
                         >
                           <Trans>Upload custom document</Trans>
@@ -450,7 +440,7 @@ export function TemplateUseDialog({
                             <TooltipTrigger type="button">
                               <InfoIcon className="mx-1 h-4 w-4" />
                             </TooltipTrigger>
-                            <TooltipContent className="z-[99999] max-w-md space-y-2 p-4 text-muted-foreground">
+                            <TooltipContent className="text-muted-foreground z-[99999] max-w-md space-y-2 p-4">
                               <p>
                                 <Trans>
                                   Upload a custom document to use instead of the template's default
@@ -480,19 +470,19 @@ export function TemplateUseDialog({
                               <FormControl>
                                 <div
                                   key={item.id}
-                                  className="flex items-center gap-4 rounded-lg border border-border bg-card p-4 transition-colors hover:bg-accent/10"
+                                  className="border-border bg-card hover:bg-accent/10 flex items-center gap-4 rounded-lg border p-4 transition-colors"
                                 >
                                   <div className="flex-shrink-0">
-                                    <div className="flex h-10 w-10 items-center justify-center rounded-lg bg-primary/10">
-                                      <FileTextIcon className="h-5 w-5 text-primary" />
+                                    <div className="bg-primary/10 flex h-10 w-10 items-center justify-center rounded-lg">
+                                      <FileTextIcon className="text-primary h-5 w-5" />
                                     </div>
                                   </div>
 
                                   <div className="min-w-0 flex-1">
-                                    <h4 className="truncate text-sm font-medium text-foreground">
+                                    <h4 className="text-foreground truncate text-sm font-medium">
                                       {item.title}
                                     </h4>
-                                    <p className="mt-0.5 text-xs text-muted-foreground">
+                                    <p className="text-muted-foreground mt-0.5 text-xs">
                                       {field.value ? (
                                         <div>
                                           <Trans>

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

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

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

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

apps/remix/app/components/embed/authoring/configure-fields-view.tsx

@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
-import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import type { EnvelopeItem, FieldType } from '@prisma/client';
@@ -230,8 +229,8 @@ export const ConfigureFieldsView = ({
         setFieldClipboard(lastActiveField);
 
         toast({
-          title: _(msg`Copied field`),
-          description: _(msg`Copied field to clipboard`),
+          title: 'Copied field',
+          description: 'Copied field to clipboard',
         });
       }
     },

apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx

@@ -150,8 +150,8 @@ export const MultiSignDocumentSigningView = ({
       onDocumentError?.();
 
       toast({
-        title: _(msg`Error`),
-        description: _(msg`Failed to complete the document. Please try again.`),
+        title: 'Error',
+        description: 'Failed to complete the document. Please try again.',
         variant: 'destructive',
       });
     } finally {

apps/remix/app/components/forms/document-preferences-form.tsx

@@ -58,7 +58,6 @@ export type TDocumentPreferencesFormSchema = {
   includeSigningCertificate: boolean | null;
   includeAuditLog: boolean | null;
   signatureTypes: DocumentSignatureType[];
-  aiFeaturesEnabled: boolean | null;
 };
 
 type SettingsSubset = Pick<
@@ -73,13 +72,11 @@ type SettingsSubset = Pick<
   | 'typedSignatureEnabled'
   | 'uploadSignatureEnabled'
   | 'drawSignatureEnabled'
-  | 'aiFeaturesEnabled'
 >;
 
 export type DocumentPreferencesFormProps = {
   settings: SettingsSubset;
   canInherit: boolean;
-  isAiFeaturesConfigured?: boolean;
   onFormSubmit: (data: TDocumentPreferencesFormSchema) => Promise<void>;
 };
 
@@ -87,7 +84,6 @@ export const DocumentPreferencesForm = ({
   settings,
   onFormSubmit,
   canInherit,
-  isAiFeaturesConfigured = false,
 }: DocumentPreferencesFormProps) => {
   const { t } = useLingui();
   const { user, organisations } = useSession();
@@ -109,7 +105,6 @@ export const DocumentPreferencesForm = ({
     signatureTypes: z.array(z.nativeEnum(DocumentSignatureType)).min(canInherit ? 0 : 1, {
       message: msg`At least one signature type must be enabled`.id,
     }),
-    aiFeaturesEnabled: z.boolean().nullable(),
   });
 
   const form = useForm<TDocumentPreferencesFormSchema>({
@@ -125,7 +120,6 @@ export const DocumentPreferencesForm = ({
       includeSigningCertificate: settings.includeSigningCertificate,
       includeAuditLog: settings.includeAuditLog,
       signatureTypes: extractTeamSignatureSettings({ ...settings }),
-      aiFeaturesEnabled: settings.aiFeaturesEnabled,
     },
     resolver: zodResolver(ZDocumentPreferencesFormSchema),
   });
@@ -318,7 +312,7 @@ export const DocumentPreferencesForm = ({
                     }))}
                     selectedValues={field.value}
                     onChange={field.onChange}
-                    className="w-full bg-background"
+                    className="bg-background w-full"
                     enableSearch={false}
                     emptySelectionPlaceholder={
                       canInherit ? t`Inherit from organisation` : t`Select signature types`
@@ -384,7 +378,7 @@ export const DocumentPreferencesForm = ({
                   </FormControl>
 
                   <div className="pt-2">
-                    <div className="text-xs font-medium text-muted-foreground">
+                    <div className="text-muted-foreground text-xs font-medium">
                       <Trans>Preview</Trans>
                     </div>
 
@@ -515,59 +509,6 @@ export const DocumentPreferencesForm = ({
             )}
           />
 
-          {isAiFeaturesConfigured && (
-            <FormField
-              control={form.control}
-              name="aiFeaturesEnabled"
-              render={({ field }) => (
-                <FormItem className="flex-1">
-                  <FormLabel>
-                    <Trans>AI Features</Trans>
-                  </FormLabel>
-
-                  <FormControl>
-                    <Select
-                      {...field}
-                      value={field.value === null ? '-1' : field.value.toString()}
-                      onValueChange={(value) =>
-                        field.onChange(value === 'true' ? true : value === 'false' ? false : null)
-                      }
-                    >
-                      <SelectTrigger className="bg-background text-muted-foreground">
-                        <SelectValue />
-                      </SelectTrigger>
-
-                      <SelectContent>
-                        <SelectItem value="true">
-                          <Trans>Enabled</Trans>
-                        </SelectItem>
-
-                        <SelectItem value="false">
-                          <Trans>Disabled</Trans>
-                        </SelectItem>
-
-                        {canInherit && (
-                          <SelectItem value={'-1'}>
-                            <Trans>Inherit from organisation</Trans>
-                          </SelectItem>
-                        )}
-                      </SelectContent>
-                    </Select>
-                  </FormControl>
-
-                  <FormDescription>
-                    <Trans>
-                      Enable AI-powered features such as automatic recipient detection. When
-                      enabled, document content will be sent to AI providers. We only use providers
-                      that do not retain data for training and prefer European regions where
-                      available.
-                    </Trans>
-                  </FormDescription>
-                </FormItem>
-              )}
-            />
-          )}
-
           <div className="flex flex-row justify-end space-x-4">
             <Button type="submit" loading={form.formState.isSubmitting}>
               <Trans>Update</Trans>

apps/remix/app/components/forms/signin.tsx

@@ -201,7 +201,7 @@ export const SignInForm = ({
         .otherwise(() => handleFallbackErrorMessages(error.code));
 
       toast({
-        title: _(msg`Something went wrong`),
+        title: 'Something went wrong',
         description: _(errorMessage),
         duration: 10000,
         variant: 'destructive',

apps/remix/app/components/general/animated-document-scanner.tsx

@@ -1,78 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { SearchIcon } from 'lucide-react';
-
-import { cn } from '@documenso/ui/lib/utils';
-
-export type AnimatedDocumentScannerProps = {
-  className?: string;
-  interval?: number;
-};
-
-export const AnimatedDocumentScanner = ({
-  className,
-  interval = 2500,
-}: AnimatedDocumentScannerProps) => {
-  const [magPosition, setMagPosition] = useState({ x: 0, y: 0, page: 0 });
-
-  useEffect(() => {
-    const moveInterval = setInterval(() => {
-      setMagPosition({
-        x: Math.random() * 60 - 30,
-        y: Math.random() * 50 - 25,
-        page: Math.random() > 0.5 ? 1 : 0,
-      });
-    }, interval);
-
-    return () => clearInterval(moveInterval);
-  }, [interval]);
-
-  return (
-    <div className={cn('relative mx-auto h-36 w-56', className)}>
-      {/* Magnifying glass */}
-      <div
-        className="pointer-events-none absolute z-50 transition-all duration-1000 ease-in-out"
-        style={{
-          left: magPosition.page === 0 ? '25%' : '75%',
-          top: '50%',
-          transform: `translate(calc(-50% + ${magPosition.x}px), calc(-50% + ${magPosition.y}px))`,
-        }}
-      >
-        <SearchIcon className="h-8 w-8 text-foreground" />
-      </div>
-
-      {/* Book container */}
-      <div className="relative h-full w-full animate-pulse" style={{ perspective: '800px' }}>
-        <div className="relative h-full w-full" style={{ transformStyle: 'preserve-3d' }}>
-          {/* Left page */}
-          <div
-            className="absolute left-0 top-0 h-full w-[calc(50%)] origin-right overflow-hidden rounded-l-md border border-border bg-card shadow-md"
-            style={{ transform: 'rotateY(15deg) skewY(-1deg)' }}
-          >
-            <div className="absolute inset-3 space-y-2">
-              <div className="h-1.5 w-3/4 rounded-sm bg-muted" />
-              <div className="h-1.5 w-full rounded-sm bg-muted" />
-              <div className="h-1.5 w-5/6 rounded-sm bg-muted" />
-              <div className="h-1.5 w-2/3 rounded-sm bg-muted" />
-              <div className="mt-3 h-6 w-3/4 rounded border border-dashed border-primary" />
-            </div>
-          </div>
-
-          {/* Right page */}
-          <div
-            className="absolute right-0 top-0 h-full w-[calc(50%)] origin-left overflow-hidden rounded-r-md border border-border bg-card shadow-md"
-            style={{ transform: 'rotateY(-15deg) skewY(1deg)' }}
-          >
-            <div className="absolute inset-3 space-y-2">
-              <div className="h-1.5 w-full rounded-sm bg-muted" />
-              <div className="h-1.5 w-4/5 rounded-sm bg-muted" />
-              <div className="h-1.5 w-full rounded-sm bg-muted" />
-              <div className="h-1.5 w-3/5 rounded-sm bg-muted" />
-              <div className="mt-3 h-6 w-2/3 rounded border border-dashed border-primary" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};

apps/remix/app/components/general/avatar-with-recipient.tsx

@@ -56,13 +56,13 @@ export function AvatarWithRecipient({ recipient, documentStatus }: AvatarWithRec
       />
 
       <div
-        className="text-sm text-muted-foreground"
+        className="text-muted-foreground text-sm"
         title={
           signingToken ? _(msg`Click to copy signing link for sending to recipient`) : undefined
         }
       >
-        <p>{recipient.email || recipient.name}</p>
-        <p className="text-xs text-muted-foreground/70">
+        <p>{recipient.email}</p>
+        <p className="text-muted-foreground/70 text-xs">
           {_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}
         </p>
       </div>

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

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

apps/remix/app/components/general/document-signing/document-signing-form.tsx

@@ -108,8 +108,8 @@ export const DocumentSigningForm = ({
       await completeDocument({ nextSigner });
     } catch (err) {
       toast({
-        title: _(msg`Error`),
-        description: _(msg`An error occurred while completing the document. Please try again.`),
+        title: 'Error',
+        description: 'An error occurred while completing the document. Please try again.',
         variant: 'destructive',
       });
 

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

@@ -187,74 +187,45 @@ export const DocumentSigningPageViewV1 = ({
 
         <div className="mt-1.5 flex flex-wrap items-center justify-between gap-y-2 sm:mt-2.5 sm:gap-y-0">
           <div className="max-w-[50ch]">
+            <span className="truncate text-muted-foreground" title={senderName}>
+              {senderName} {senderEmail}
+            </span>{' '}
             <span className="text-muted-foreground">
               {match(recipient.role)
                 .with(RecipientRole.VIEWER, () =>
                   includeSenderDetails ? (
                     <Trans>
-                      <span className="truncate" title={senderName}>
-                        {senderName} {senderEmail}
-                      </span>{' '}
                       on behalf of "{document.team?.name}" has invited you to view this document
                     </Trans>
                   ) : (
-                    <Trans>
-                      <span className="truncate" title={senderName}>
-                        {senderName} {senderEmail}
-                      </span>{' '}
-                      has invited you to view this document
-                    </Trans>
+                    <Trans>has invited you to view this document</Trans>
                   ),
                 )
                 .with(RecipientRole.SIGNER, () =>
                   includeSenderDetails ? (
                     <Trans>
-                      <span className="truncate" title={senderName}>
-                        {senderName} {senderEmail}
-                      </span>{' '}
                       on behalf of "{document.team?.name}" has invited you to sign this document
                     </Trans>
                   ) : (
-                    <Trans>
-                      <span className="truncate" title={senderName}>
-                        {senderName} {senderEmail}
-                      </span>{' '}
-                      has invited you to sign this document
-                    </Trans>
+                    <Trans>has invited you to sign this document</Trans>
                   ),
                 )
                 .with(RecipientRole.APPROVER, () =>
                   includeSenderDetails ? (
                     <Trans>
-                      <span className="truncate" title={senderName}>
-                        {senderName} {senderEmail}
-                      </span>{' '}
                       on behalf of "{document.team?.name}" has invited you to approve this document
                     </Trans>
                   ) : (
-                    <Trans>
-                      <span className="truncate" title={senderName}>
-                        {senderName} {senderEmail}
-                      </span>{' '}
-                      has invited you to approve this document
-                    </Trans>
+                    <Trans>has invited you to approve this document</Trans>
                   ),
                 )
                 .with(RecipientRole.ASSISTANT, () =>
                   includeSenderDetails ? (
                     <Trans>
-                      <span className="truncate" title={senderName}>
-                        {senderName} {senderEmail}
-                      </span>{' '}
                       on behalf of "{document.team?.name}" has invited you to assist this document
                     </Trans>
                   ) : (
-                    <Trans>
-                      <span className="truncate" title={senderName}>
-                        {senderName} {senderEmail}
-                      </span>{' '}
-                      has invited you to assist this document
-                    </Trans>
+                    <Trans>has invited you to assist this document</Trans>
                   ),
                 )
                 .otherwise(() => null)}

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

@@ -74,8 +74,8 @@ export function DocumentSigningRejectDialog({
       });
 
       toast({
-        title: t`Document rejected`,
-        description: t`The document has been successfully rejected.`,
+        title: 'Document rejected',
+        description: 'The document has been successfully rejected.',
         duration: 5000,
       });
 
@@ -88,8 +88,8 @@ export function DocumentSigningRejectDialog({
       }
     } catch (err) {
       toast({
-        title: t`Error`,
-        description: t`An error occurred while rejecting the document. Please try again.`,
+        title: 'Error',
+        description: 'An error occurred while rejecting the document. Please try again.',
         variant: 'destructive',
         duration: 5000,
       });

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

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

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

@@ -1,40 +1,39 @@
 import { lazy, useEffect, useMemo, useState } from 'react';
 
 import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { DocumentStatus, FieldType, RecipientRole } from '@prisma/client';
-import { FileTextIcon, SparklesIcon } from 'lucide-react';
+import { msg, plural } from '@lingui/core/macro';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { FieldType, RecipientRole } from '@prisma/client';
+import { FileTextIcon } from 'lucide-react';
 import { Link, useSearchParams } from 'react-router';
 import { isDeepEqual } from 'remeda';
 import { match } from 'ts-pattern';
 
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentEnvelopeRender } from '@documenso/lib/client-only/providers/envelope-render-provider';
-import type { NormalizedFieldWithContext } from '@documenso/lib/server-only/ai/envelope/detect-fields/types';
-import {
-  FIELD_META_DEFAULT_VALUES,
-  type TCheckboxFieldMeta,
-  type TDateFieldMeta,
-  type TDropdownFieldMeta,
-  type TEmailFieldMeta,
-  type TFieldMetaSchema,
-  type TInitialsFieldMeta,
-  type TNameFieldMeta,
-  type TNumberFieldMeta,
-  type TRadioFieldMeta,
-  type TSignatureFieldMeta,
-  type TTextFieldMeta,
+import type { TDetectedFormField } from '@documenso/lib/types/document-analysis';
+import type {
+  TCheckboxFieldMeta,
+  TDateFieldMeta,
+  TDropdownFieldMeta,
+  TEmailFieldMeta,
+  TFieldMetaSchema,
+  TInitialsFieldMeta,
+  TNameFieldMeta,
+  TNumberFieldMeta,
+  TRadioFieldMeta,
+  TSignatureFieldMeta,
+  TTextFieldMeta,
 } from '@documenso/lib/types/field-meta';
+import { FIELD_META_DEFAULT_VALUES } from '@documenso/lib/types/field-meta';
 import { canRecipientFieldsBeModified } from '@documenso/lib/utils/recipients';
 import { AnimateGenericFadeInOut } from '@documenso/ui/components/animate/animate-generic-fade-in-out';
 import PDFViewerKonvaLazy from '@documenso/ui/components/pdf-viewer/pdf-viewer-konva-lazy';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import { Separator } from '@documenso/ui/primitives/separator';
+import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { AiFieldDetectionDialog } from '~/components/dialogs/ai-field-detection-dialog';
 import { EditorFieldCheckboxForm } from '~/components/forms/editor/editor-field-checkbox-form';
 import { EditorFieldDateForm } from '~/components/forms/editor/editor-field-date-form';
 import { EditorFieldDropdownForm } from '~/components/forms/editor/editor-field-dropdown-form';
@@ -45,7 +44,6 @@ import { EditorFieldNumberForm } from '~/components/forms/editor/editor-field-nu
 import { EditorFieldRadioForm } from '~/components/forms/editor/editor-field-radio-form';
 import { EditorFieldSignatureForm } from '~/components/forms/editor/editor-field-signature-form';
 import { EditorFieldTextForm } from '~/components/forms/editor/editor-field-text-form';
-import { useCurrentTeam } from '~/providers/team';
 
 import { EnvelopeEditorFieldDragDrop } from './envelope-editor-fields-drag-drop';
 import { EnvelopeRendererFileSelector } from './envelope-file-selector';
@@ -55,6 +53,51 @@ const EnvelopeEditorFieldsPageRenderer = lazy(
   async () => import('~/components/general/envelope-editor/envelope-editor-fields-page-renderer'),
 );
 
+const detectFormFieldsInDocument = async (params: {
+  envelopeId: string;
+  onProgress: (current: number, total: number) => void;
+}): Promise<{
+  fieldsPerPage: Map<number, TDetectedFormField[]>;
+  errors: Map<number, Error>;
+}> => {
+  const { envelopeId, onProgress } = params;
+  const fieldsPerPage = new Map<number, TDetectedFormField[]>();
+  const errors = new Map<number, Error>();
+
+  try {
+    onProgress(0, 1);
+
+    const response = await fetch('/api/ai/detect-fields', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ envelopeId }),
+      credentials: 'include',
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Field detection failed: ${response.statusText} - ${errorText}`);
+    }
+
+    const detectedFields: TDetectedFormField[] = await response.json();
+
+    for (const field of detectedFields) {
+      if (!fieldsPerPage.has(field.pageNumber)) {
+        fieldsPerPage.set(field.pageNumber, []);
+      }
+      fieldsPerPage.get(field.pageNumber)!.push(field);
+    }
+
+    onProgress(1, 1);
+  } catch (error) {
+    errors.set(0, error instanceof Error ? error : new Error(String(error)));
+  }
+
+  return { fieldsPerPage, errors };
+};
+
 const FieldSettingsTypeTranslations: Record<FieldType, MessageDescriptor> = {
   [FieldType.SIGNATURE]: msg`Signature Settings`,
   [FieldType.FREE_SIGNATURE]: msg`Free Signature Settings`,
@@ -72,15 +115,19 @@ const FieldSettingsTypeTranslations: Record<FieldType, MessageDescriptor> = {
 export const EnvelopeEditorFieldsPage = () => {
   const [searchParams] = useSearchParams();
 
-  const team = useCurrentTeam();
-
   const { envelope, editorFields, relativePath } = useCurrentEnvelopeEditor();
 
   const { currentEnvelopeItem } = useCurrentEnvelopeRender();
 
-  const { _ } = useLingui();
+  const { t } = useLingui();
+  const { toast } = useToast();
 
-  const [isAiFieldDialogOpen, setIsAiFieldDialogOpen] = useState(false);
+  const [isDetectingFields, setIsAutoAddingFields] = useState(false);
+  const [processingProgress, setProcessingProgress] = useState<{
+    current: number;
+    total: number;
+  } | null>(null);
+  const [hasAutoPlacedFields, setHasAutoPlacedFields] = useState(false);
 
   const selectedField = useMemo(
     () => structuredClone(editorFields.selectedField),
@@ -94,38 +141,13 @@ export const EnvelopeEditorFieldsPage = () => {
 
     const isMetaSame = isDeepEqual(selectedField.fieldMeta, fieldMeta);
 
-    // Todo: Envelopes - Clean up console logs.
     if (!isMetaSame) {
-      console.log('TRIGGER UPDATE');
       editorFields.updateFieldByFormId(selectedField.formId, {
         fieldMeta,
       });
-    } else {
-      console.log('DATA IS SAME, NO UPDATE');
     }
   };
 
-  const onFieldDetectionComplete = (fields: NormalizedFieldWithContext[]) => {
-    for (const field of fields) {
-      editorFields.addField({
-        height: field.height,
-        width: field.width,
-        positionX: field.positionX,
-        positionY: field.positionY,
-        type: field.type,
-        envelopeItemId: field.envelopeItemId,
-        recipientId: field.recipientId,
-        page: field.pageNumber,
-        fieldMeta: structuredClone(FIELD_META_DEFAULT_VALUES[field.type]),
-      });
-    }
-
-    setIsAiFieldDialogOpen(false);
-  };
-
-  /**
-   * Set the selected recipient to the first recipient in the envelope.
-   */
   useEffect(() => {
     const firstSelectableRecipient = envelope.recipients.find(
       (recipient) =>
@@ -135,10 +157,128 @@ export const EnvelopeEditorFieldsPage = () => {
     editorFields.setSelectedRecipient(firstSelectableRecipient?.id ?? null);
   }, []);
 
+  useEffect(() => {
+    if (hasAutoPlacedFields || !currentEnvelopeItem) {
+      return;
+    }
+
+    const storageKey = `autoPlaceFields_${envelope.id}`;
+    const storedData = sessionStorage.getItem(storageKey);
+
+    if (!storedData) {
+      return;
+    }
+
+    sessionStorage.removeItem(storageKey);
+    setHasAutoPlacedFields(true);
+
+    try {
+      const { fields: detectedFields, recipientCount } = JSON.parse(storedData) as {
+        fields: TDetectedFormField[];
+        recipientCount: number;
+      };
+
+      let totalAdded = 0;
+
+      const fieldsPerPage = new Map<number, TDetectedFormField[]>();
+      for (const field of detectedFields) {
+        if (!fieldsPerPage.has(field.pageNumber)) {
+          fieldsPerPage.set(field.pageNumber, []);
+        }
+        fieldsPerPage.get(field.pageNumber)!.push(field);
+      }
+
+      for (const [pageNumber, fields] of fieldsPerPage.entries()) {
+        for (const detected of fields) {
+          const { ymin, xmin, ymax, xmax } = detected.boundingBox;
+          const positionX = (xmin / 1000) * 100;
+          const positionY = (ymin / 1000) * 100;
+          const width = ((xmax - xmin) / 1000) * 100;
+          const height = ((ymax - ymin) / 1000) * 100;
+
+          const fieldType = detected.label as FieldType;
+          const resolvedRecipientId =
+            envelope.recipients.find((recipient) => recipient.id === detected.recipientId)?.id ??
+            editorFields.selectedRecipient?.id ??
+            envelope.recipients[0]?.id;
+
+          if (!resolvedRecipientId) {
+            console.warn('Skipping detected field because no recipient could be resolved', {
+              detectedRecipientId: detected.recipientId,
+            });
+            continue;
+          }
+
+          try {
+            editorFields.addField({
+              envelopeItemId: currentEnvelopeItem.id,
+              page: pageNumber,
+              type: fieldType,
+              positionX,
+              positionY,
+              width,
+              height,
+              recipientId: resolvedRecipientId,
+              fieldMeta: structuredClone(FIELD_META_DEFAULT_VALUES[fieldType]),
+            });
+            totalAdded++;
+          } catch (error) {
+            console.error(`Failed to add field on page ${pageNumber}:`, error);
+          }
+        }
+      }
+
+      if (totalAdded > 0) {
+        toast({
+          title: t`Recipients and fields added`,
+          description: t`Added ${recipientCount} ${plural(recipientCount, {
+            one: 'recipient',
+            other: 'recipients',
+          })} and ${totalAdded} ${plural(totalAdded, { one: 'field', other: 'fields' })}`,
+          duration: 5000,
+        });
+      } else {
+        toast({
+          title: t`Recipients added`,
+          description: t`Added ${recipientCount} ${plural(recipientCount, {
+            one: 'recipient',
+            other: 'recipients',
+          })}. No fields were detected in the document.`,
+          duration: 5000,
+        });
+      }
+    } catch (error) {
+      console.error('Failed to auto-place fields:', error);
+      toast({
+        title: t`Field placement failed`,
+        description: t`Failed to automatically place fields. You can add them manually.`,
+        variant: 'destructive',
+        duration: 5000,
+      });
+    }
+  }, [
+    currentEnvelopeItem,
+    envelope.id,
+    envelope.recipients,
+    editorFields,
+    hasAutoPlacedFields,
+    t,
+    toast,
+  ]);
+
   return (
     <div className="relative flex h-full">
-      <div className="flex w-full flex-col overflow-y-auto">
+      <div className="relative flex w-full flex-col overflow-y-auto">
         {/* Horizontal envelope item selector */}
+        {isDetectingFields && (
+          <>
+            <div className="edge-glow edge-glow-top pointer-events-none fixed left-0 right-0 top-0 z-20 h-32" />
+            <div className="edge-glow edge-glow-right pointer-events-none fixed bottom-0 right-0 top-0 z-20 w-32" />
+            <div className="edge-glow edge-glow-bottom pointer-events-none fixed bottom-0 left-0 right-0 z-20 h-32" />
+            <div className="edge-glow edge-glow-left pointer-events-none fixed bottom-0 left-0 top-0 z-20 w-32" />
+          </>
+        )}
+
         <EnvelopeRendererFileSelector fields={editorFields.localFields} />
 
         {/* Document View */}
@@ -230,34 +370,128 @@ export const EnvelopeEditorFieldsPage = () => {
               selectedEnvelopeItemId={currentEnvelopeItem?.id ?? null}
             />
 
-            {team.preferences.aiFeaturesEnabled && (
-              <>
-                <Button
-                  type="button"
-                  variant="outline"
-                  size="sm"
-                  className="mt-4 w-full"
-                  onClick={() => setIsAiFieldDialogOpen(true)}
-                  disabled={envelope.status !== DocumentStatus.DRAFT}
-                  title={
-                    envelope.status !== DocumentStatus.DRAFT
-                      ? _(msg`You can only detect fields in draft envelopes`)
-                      : undefined
-                  }
-                >
-                  <SparklesIcon className="-ml-1 mr-2 h-4 w-4" />
-                  <Trans>Detect with AI</Trans>
-                </Button>
+            <Button
+              className="mt-4 w-full"
+              variant="outline"
+              disabled={isDetectingFields}
+              onClick={async () => {
+                setIsAutoAddingFields(true);
+                setProcessingProgress(null);
 
-                <AiFieldDetectionDialog
-                  open={isAiFieldDialogOpen}
-                  onOpenChange={setIsAiFieldDialogOpen}
-                  onComplete={onFieldDetectionComplete}
-                  envelopeId={envelope.id}
-                  teamId={envelope.teamId}
-                />
-              </>
-            )}
+                try {
+                  if (!currentEnvelopeItem) {
+                    toast({
+                      title: t`No document selected`,
+                      description: t`No document selected. Please reload the page and try again.`,
+                      variant: 'destructive',
+                    });
+                    return;
+                  }
+
+                  if (!currentEnvelopeItem.documentDataId) {
+                    toast({
+                      title: t`Document data missing`,
+                      description: t`Document data not found. Please try reloading the page.`,
+                      variant: 'destructive',
+                    });
+                    return;
+                  }
+
+                  const { fieldsPerPage, errors } = await detectFormFieldsInDocument({
+                    envelopeId: envelope.id,
+                    onProgress: (current, total) => {
+                      setProcessingProgress({ current, total });
+                    },
+                  });
+
+                  let totalAdded = 0;
+                  for (const [pageNumber, detectedFields] of fieldsPerPage.entries()) {
+                    for (const detected of detectedFields) {
+                      const { ymin, xmin, ymax, xmax } = detected.boundingBox;
+                      const positionX = (xmin / 1000) * 100;
+                      const positionY = (ymin / 1000) * 100;
+                      const width = ((xmax - xmin) / 1000) * 100;
+                      const height = ((ymax - ymin) / 1000) * 100;
+
+                      const fieldType = detected.label as FieldType;
+                      const resolvedRecipientId =
+                        envelope.recipients.find(
+                          (recipient) => recipient.id === detected.recipientId,
+                        )?.id ??
+                        editorFields.selectedRecipient?.id ??
+                        envelope.recipients[0]?.id;
+
+                      if (!resolvedRecipientId) {
+                        console.warn(
+                          'Skipping detected field because no recipient could be resolved',
+                          {
+                            detectedRecipientId: detected.recipientId,
+                          },
+                        );
+                        continue;
+                      }
+
+                      try {
+                        editorFields.addField({
+                          envelopeItemId: currentEnvelopeItem.id,
+                          page: pageNumber,
+                          type: fieldType,
+                          positionX,
+                          positionY,
+                          width,
+                          height,
+                          recipientId: resolvedRecipientId,
+                          fieldMeta: structuredClone(FIELD_META_DEFAULT_VALUES[fieldType]),
+                        });
+                        totalAdded++;
+                      } catch (error) {
+                        console.error(`Failed to add field on page ${pageNumber}:`, error);
+                      }
+                    }
+                  }
+
+                  const successfulPages = fieldsPerPage.size;
+                  const failedPages = errors.size;
+
+                  if (totalAdded > 0) {
+                    let description = t`Added ${totalAdded} fields`;
+                    if (fieldsPerPage.size > 1) {
+                      description = t`Added ${totalAdded} fields across ${successfulPages} pages`;
+                    }
+                    if (failedPages > 0) {
+                      description = t`Added ${totalAdded} fields across ${successfulPages} pages. ${failedPages} pages failed.`;
+                    }
+
+                    toast({
+                      title: t`Fields added`,
+                      description,
+                    });
+                  } else if (failedPages > 0) {
+                    toast({
+                      title: t`Field detection failed`,
+                      description: t`Failed to detect fields on ${failedPages} pages. Please try again.`,
+                      variant: 'destructive',
+                    });
+                  } else {
+                    toast({
+                      title: t`No fields detected`,
+                      description: t`No fields were detected in the document`,
+                    });
+                  }
+                } catch (error) {
+                  toast({
+                    title: t`Processing error`,
+                    description: t`An unexpected error occurred while processing pages.`,
+                    variant: 'destructive',
+                  });
+                } finally {
+                  setIsAutoAddingFields(false);
+                  setProcessingProgress(null);
+                }
+              }}
+            >
+              {isDetectingFields ? <Trans>Processing...</Trans> : <Trans>Auto add fields</Trans>}
+            </Button>
           </section>
 
           {/* Field details section. */}
@@ -299,7 +533,7 @@ export const EnvelopeEditorFieldsPage = () => {
 
                 <div className="px-4 [&_label]:text-xs [&_label]:text-foreground/70">
                   <h3 className="text-sm font-semibold">
-                    {_(FieldSettingsTypeTranslations[selectedField.type])}
+                    {t(FieldSettingsTypeTranslations[selectedField.type])}
                   </h3>
 
                   {match(selectedField.type)

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

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

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

@@ -8,12 +8,12 @@ import {
   type SensorAPI,
 } from '@hello-pangea/dnd';
 import { zodResolver } from '@hookform/resolvers/zod';
+import { msg } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { DocumentSigningOrder, EnvelopeType, RecipientRole, SendStatus } from '@prisma/client';
 import { motion } from 'framer-motion';
-import { GripVerticalIcon, HelpCircleIcon, PlusIcon, SparklesIcon, TrashIcon } from 'lucide-react';
+import { GripVerticalIcon, HelpCircleIcon, PlusIcon, TrashIcon } from 'lucide-react';
 import { useFieldArray, useForm, useWatch } from 'react-hook-form';
-import { useSearchParams } from 'react-router';
 import { isDeepEqual, prop, sortBy } from 'remeda';
 import { z } from 'zod';
 
@@ -22,12 +22,10 @@ import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounce
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
-import type { TDetectedRecipientSchema } from '@documenso/lib/server-only/ai/envelope/detect-recipients/schema';
 import {
   ZRecipientActionAuthTypesSchema,
   ZRecipientAuthOptionsSchema,
 } from '@documenso/lib/types/document-auth';
-import { ZRecipientEmailSchema } from '@documenso/lib/types/recipient';
 import { nanoid } from '@documenso/lib/universal/id';
 import { canRecipientBeModified as utilCanRecipientBeModified } from '@documenso/lib/utils/recipients';
 import { trpc } from '@documenso/trpc/react';
@@ -62,15 +60,15 @@ import { Input } from '@documenso/ui/primitives/input';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { AiRecipientDetectionDialog } from '~/components/dialogs/ai-recipient-detection-dialog';
-import { useCurrentTeam } from '~/providers/team';
-
 const ZEnvelopeRecipientsForm = z.object({
   signers: z.array(
     z.object({
       formId: z.string().min(1),
       id: z.number().optional(),
-      email: ZRecipientEmailSchema,
+      email: z
+        .string()
+        .email({ message: msg`Invalid email`.id })
+        .min(1),
       name: z.string(),
       role: z.nativeEnum(RecipientRole),
       signingOrder: z.number().optional(),
@@ -87,36 +85,14 @@ export const EnvelopeEditorRecipientForm = () => {
   const { envelope, setRecipientsDebounced, updateEnvelope } = useCurrentEnvelopeEditor();
 
   const organisation = useCurrentOrganisation();
-  const team = useCurrentTeam();
 
   const { t } = useLingui();
   const { toast } = useToast();
   const { remaining } = useLimits();
   const { user } = useSession();
 
-  const [searchParams, setSearchParams] = useSearchParams();
   const [recipientSearchQuery, setRecipientSearchQuery] = useState('');
 
-  // AI recipient detection dialog state
-  const [isAiDialogOpen, setIsAiDialogOpen] = useState(() => searchParams.get('ai') === 'true');
-
-  const onAiDialogOpenChange = (open: boolean) => {
-    setIsAiDialogOpen(open);
-
-    if (!open && searchParams.get('ai') === 'true') {
-      setSearchParams(
-        (prev) => {
-          const newParams = new URLSearchParams(prev);
-
-          newParams.delete('ai');
-
-          return newParams;
-        },
-        { replace: true },
-      );
-    }
-  };
-
   const debouncedRecipientSearchQuery = useDebouncedValue(recipientSearchQuery, 500);
 
   const initialId = useId();
@@ -225,13 +201,12 @@ export const EnvelopeEditorRecipientForm = () => {
     keyName: 'nativeId',
   });
 
-  const emptySignerIndex = watchedSigners.findIndex(
-    (signer) =>
-      !signer.name &&
-      !signer.email &&
-      envelope.fields.filter((field) => field.recipientId === signer.id).length === 0,
+  const emptySigners = useCallback(
+    () => form.getValues('signers').filter((signer) => signer.email === ''),
+    [form],
   );
 
+  const emptySignerIndex = watchedSigners.findIndex((signer) => !signer.name && !signer.email);
   const isUserAlreadyARecipient = watchedSigners.some(
     (signer) => signer.email.toLowerCase() === user?.email?.toLowerCase(),
   );
@@ -269,71 +244,6 @@ export const EnvelopeEditorRecipientForm = () => {
     });
   };
 
-  const onAiDetectionComplete = (detectedRecipients: TDetectedRecipientSchema[]) => {
-    const currentSigners = form.getValues('signers');
-
-    let nextSigningOrder =
-      currentSigners.length > 0
-        ? Math.max(...currentSigners.map((s) => s.signingOrder ?? 0)) + 1
-        : 1;
-
-    // If the only signer is the default empty signer lets just replace it with the detected recipients
-    if (currentSigners.length === 1 && !currentSigners[0].name && !currentSigners[0].email) {
-      form.setValue(
-        'signers',
-        detectedRecipients.map((recipient, index) => ({
-          formId: nanoid(12),
-          name: recipient.name,
-          email: recipient.email,
-          role: recipient.role,
-          actionAuth: [],
-          signingOrder: index + 1,
-        })),
-        {
-          shouldValidate: true,
-          shouldDirty: true,
-        },
-      );
-
-      return;
-    }
-
-    for (const recipient of detectedRecipients) {
-      const emailExists = currentSigners.some(
-        (s) => s.email.toLowerCase() === recipient.email.toLowerCase(),
-      );
-
-      const nameExists = currentSigners.some(
-        (s) => s.name.toLowerCase() === recipient.name.toLowerCase(),
-      );
-
-      if ((emailExists && recipient.email) || (nameExists && recipient.name)) {
-        continue;
-      }
-
-      currentSigners.push({
-        formId: nanoid(12),
-        name: recipient.name,
-        email: recipient.email,
-        role: recipient.role,
-        actionAuth: [],
-        signingOrder: nextSigningOrder,
-      });
-
-      nextSigningOrder += 1;
-    }
-
-    form.setValue('signers', normalizeSigningOrders(currentSigners), {
-      shouldValidate: true,
-      shouldDirty: true,
-    });
-
-    toast({
-      title: t`Recipients added`,
-      description: t`${detectedRecipients.length} recipient(s) have been added from AI detection.`,
-    });
-  };
-
   const onRemoveSigner = (index: number) => {
     const signer = signers[index];
 
@@ -396,14 +306,8 @@ export const EnvelopeEditorRecipientForm = () => {
     index: number,
     suggestion: RecipientAutoCompleteOption,
   ) => {
-    setValue(`signers.${index}.email`, suggestion.email, {
-      shouldValidate: true,
-      shouldDirty: true,
-    });
-    setValue(`signers.${index}.name`, suggestion.name || '', {
-      shouldValidate: true,
-      shouldDirty: true,
-    });
+    setValue(`signers.${index}.email`, suggestion.email);
+    setValue(`signers.${index}.name`, suggestion.name || '');
   };
 
   const onDragEnd = useCallback(
@@ -556,7 +460,21 @@ export const EnvelopeEditorRecipientForm = () => {
       return;
     }
 
-    const validatedFormValues = ZEnvelopeRecipientsForm.safeParse(formValues);
+    const formValueSigners = formValues.signers || [];
+
+    // Remove the last signer if it's empty.
+    const nonEmptyRecipients = formValueSigners.filter((signer, i) => {
+      if (i === formValueSigners.length - 1 && signer.email === '') {
+        return false;
+      }
+
+      return true;
+    });
+
+    const validatedFormValues = ZEnvelopeRecipientsForm.safeParse({
+      ...formValues,
+      signers: nonEmptyRecipients,
+    });
 
     if (!validatedFormValues.success) {
       return;
@@ -625,26 +543,6 @@ export const EnvelopeEditorRecipientForm = () => {
         </div>
 
         <div className="flex flex-row items-center space-x-2">
-          {team.preferences.aiFeaturesEnabled && (
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  variant="outline"
-                  type="button"
-                  size="sm"
-                  disabled={isSubmitting}
-                  onClick={() => setIsAiDialogOpen(true)}
-                >
-                  <SparklesIcon className="h-4 w-4" />
-                </Button>
-              </TooltipTrigger>
-
-              <TooltipContent>
-                <Trans>Detect recipients with AI</Trans>
-              </TooltipContent>
-            </Tooltip>
-          )}
-
           <Button
             variant="outline"
             className="flex flex-row items-center"
@@ -672,7 +570,7 @@ export const EnvelopeEditorRecipientForm = () => {
       <CardContent>
         <AnimateGenericFadeInOut motionKey={showAdvancedSettings ? 'Show' : 'Hide'}>
           <Form {...form}>
-            <div className="-mt-2 mb-2 space-y-4 rounded-md bg-accent/50 p-4">
+            <div className="bg-accent/50 -mt-2 mb-2 space-y-4 rounded-md p-4">
               {organisation.organisationClaim.flags.cfr21 && (
                 <div className="flex flex-row items-center">
                   <Checkbox
@@ -720,7 +618,9 @@ export const EnvelopeEditorRecipientForm = () => {
                             });
                           }
                         }}
-                        disabled={isSubmitting || hasDocumentBeenSent}
+                        disabled={
+                          isSubmitting || hasDocumentBeenSent || emptySigners().length !== 0
+                        }
                       />
                     </FormControl>
 
@@ -734,7 +634,7 @@ export const EnvelopeEditorRecipientForm = () => {
 
                       <Tooltip>
                         <TooltipTrigger asChild>
-                          <span className="ml-1 cursor-help text-muted-foreground">
+                          <span className="text-muted-foreground ml-1 cursor-help">
                             <HelpCircleIcon className="h-3.5 w-3.5" />
                           </span>
                         </TooltipTrigger>
@@ -779,7 +679,7 @@ export const EnvelopeEditorRecipientForm = () => {
 
                         <Tooltip>
                           <TooltipTrigger asChild>
-                            <span className="ml-1 cursor-help text-muted-foreground">
+                            <span className="text-muted-foreground ml-1 cursor-help">
                               <HelpCircleIcon className="h-3.5 w-3.5" />
                             </span>
                           </TooltipTrigger>
@@ -816,7 +716,7 @@ export const EnvelopeEditorRecipientForm = () => {
                   >
                     {signers.map((signer, index) => (
                       <Draggable
-                        key={`${signer.nativeId}-${signer.signingOrder}`}
+                        key={`${signer.id}-${signer.signingOrder}`}
                         draggableId={signer['nativeId']}
                         index={index}
                         isDragDisabled={
@@ -832,7 +732,7 @@ export const EnvelopeEditorRecipientForm = () => {
                             {...provided.draggableProps}
                             {...provided.dragHandleProps}
                             className={cn('py-1', {
-                              'pointer-events-none rounded-md bg-widget-foreground pt-2':
+                              'bg-widget-foreground pointer-events-none rounded-md pt-2':
                                 snapshot.isDragging,
                             })}
                           >
@@ -906,7 +806,7 @@ export const EnvelopeEditorRecipientForm = () => {
                                       })}
                                     >
                                       {!showAdvancedSettings && index === 0 && (
-                                        <FormLabel>
+                                        <FormLabel required>
                                           <Trans>Email</Trans>
                                         </FormLabel>
                                       )}
@@ -960,7 +860,7 @@ export const EnvelopeEditorRecipientForm = () => {
                                       <FormControl>
                                         <RecipientAutoCompleteInput
                                           type="text"
-                                          placeholder={t`Recipient ${index + 1}`}
+                                          placeholder={t`Name`}
                                           {...field}
                                           disabled={
                                             snapshot.isDragging ||
@@ -1092,14 +992,6 @@ export const EnvelopeEditorRecipientForm = () => {
           onOpenChange={setShowSigningOrderConfirmation}
           onConfirm={handleSigningOrderDisable}
         />
-
-        <AiRecipientDetectionDialog
-          open={isAiDialogOpen}
-          onOpenChange={onAiDialogOpenChange}
-          onComplete={onAiDetectionComplete}
-          envelopeId={envelope.id}
-          teamId={envelope.teamId}
-        />
       </CardContent>
     </Card>
   );

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

@@ -1,12 +1,11 @@
 import { useMemo, useState } from 'react';
 
-import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd';
 import type { DropResult } from '@hello-pangea/dnd';
-import { msg, plural } from '@lingui/core/macro';
+import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd';
+import { msg } from '@lingui/core/macro';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { DocumentStatus } from '@prisma/client';
-import { FileWarningIcon, GripVerticalIcon, Loader2 } from 'lucide-react';
-import { X } from 'lucide-react';
+import { FileWarningIcon, GripVerticalIcon, Loader2, X } from 'lucide-react';
 import { ErrorCode as DropzoneErrorCode, type FileRejection } from 'react-dropzone';
 import { Link } from 'react-router';
 
@@ -174,7 +173,6 @@ export const EnvelopeEditorUploadPage = () => {
       fields: envelope.fields.filter((field) => field.envelopeItemId !== envelopeItemId),
     });
 
-    // Reset editor fields.
     editorFields.resetForm(fieldsWithoutDeletedItem);
   };
 
@@ -226,12 +224,7 @@ export const EnvelopeEditorUploadPage = () => {
     }
 
     if (maximumEnvelopeItemCount <= localFiles.length) {
-      return msg({
-        message: plural(maximumEnvelopeItemCount, {
-          one: `You cannot upload more than # item per envelope.`,
-          other: `You cannot upload more than # items per envelope.`,
-        }),
-      });
+      return msg`You cannot upload more than ${maximumEnvelopeItemCount} items per envelope.`;
     }
 
     return null;
@@ -245,10 +238,7 @@ export const EnvelopeEditorUploadPage = () => {
 
     if (maxItemsReached) {
       toast({
-        title: plural(maximumEnvelopeItemCount, {
-          one: `You cannot upload more than # item per envelope.`,
-          other: `You cannot upload more than # items per envelope.`,
-        }),
+        title: t`You cannot upload more than ${maximumEnvelopeItemCount} items per envelope.`,
         duration: 5000,
         variant: 'destructive',
       });

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

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

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

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

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

@@ -80,14 +80,12 @@ export const EnvelopeSignerCompleteDialog = () => {
   const handleOnCompleteClick = async (
     nextSigner?: { name: string; email: string },
     accessAuthOptions?: TRecipientAccessAuth,
-    recipientDetails?: { name: string; email: string },
   ) => {
     try {
       await completeDocument({
         token: recipient.token,
         documentId: mapSecondaryIdToDocumentId(envelope.secondaryId),
         accessAuthOptions,
-        recipientOverride: recipientDetails,
         ...(nextSigner?.email && nextSigner?.name ? { nextSigner } : {}),
       });
 
@@ -207,30 +205,21 @@ export const EnvelopeSignerCompleteDialog = () => {
     }
   };
 
-  const recipientPayload = useMemo(() => {
+  const directTemplatePayload = useMemo(() => {
     if (!isDirectTemplate) {
-      return {
-        name:
-          recipient.name ||
-          recipient.fields.find((field) => field.type === FieldType.NAME)?.customText ||
-          '',
-        email:
-          recipient.email ||
-          recipient.fields.find((field) => field.type === FieldType.EMAIL)?.customText ||
-          '',
-      };
+      return;
     }
 
     return {
       name: fullName,
       email: email,
     };
-  }, [email, fullName, isDirectTemplate, recipient.email, recipient.name, recipient.fields]);
+  }, [email, fullName, isDirectTemplate]);
 
   return (
     <DocumentSigningCompleteDialog
       isSubmitting={isPending}
-      recipientPayload={recipientPayload}
+      directTemplatePayload={directTemplatePayload}
       onSignatureComplete={
         isDirectTemplate ? handleDirectTemplateCompleteClick : handleOnCompleteClick
       }
@@ -241,7 +230,6 @@ export const EnvelopeSignerCompleteDialog = () => {
       allowDictateNextSigner={Boolean(
         nextRecipient && envelope.documentMeta.allowDictateNextSigner,
       )}
-      disableNameInput={!isDirectTemplate && recipient.name !== ''}
       defaultNextSigner={
         nextRecipient ? { name: nextRecipient.name, email: nextRecipient.email } : undefined
       }

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

@@ -1,8 +1,7 @@
 import { type ReactNode, useState } from 'react';
 
 import { plural } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react/macro';
-import { Trans } from '@lingui/react/macro';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { EnvelopeType } from '@prisma/client';
 import { Loader } from 'lucide-react';
 import {
@@ -28,7 +27,13 @@ import type { TCreateEnvelopePayload } from '@documenso/trpc/server/envelope-rou
 import { cn } from '@documenso/ui/lib/utils';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { RecipientDetectionPromptDialog } from '~/components/dialogs/recipient-detection-prompt-dialog';
 import { useCurrentTeam } from '~/providers/team';
+import {
+  type RecipientForCreation,
+  detectRecipientsInDocument,
+  ensureRecipientEmails,
+} from '~/utils/detect-document-recipients';
 
 export interface EnvelopeDropZoneWrapperProps {
   children: ReactNode;
@@ -53,6 +58,10 @@ export const EnvelopeDropZoneWrapper = ({
   const organisation = useCurrentOrganisation();
 
   const [isLoading, setIsLoading] = useState(false);
+  const [showExtractionPrompt, setShowExtractionPrompt] = useState(false);
+  const [uploadedDocumentId, setUploadedDocumentId] = useState<string | null>(null);
+  const [pendingRecipients, setPendingRecipients] = useState<RecipientForCreation[] | null>(null);
+  const [shouldNavigateAfterPromptClose, setShouldNavigateAfterPromptClose] = useState(true);
 
   const userTimezone =
     TIME_ZONES.find((timezone) => timezone === Intl.DateTimeFormat().resolvedOptions().timeZone) ??
@@ -61,6 +70,7 @@ export const EnvelopeDropZoneWrapper = ({
   const { quota, remaining, refreshLimits, maximumEnvelopeItemCount } = useLimits();
 
   const { mutateAsync: createEnvelope } = trpc.envelope.create.useMutation();
+  const { mutateAsync: createRecipients } = trpc.envelope.recipient.createMany.useMutation();
 
   const isUploadDisabled = remaining.documents === 0 || !user.emailVerified;
 
@@ -109,16 +119,15 @@ export const EnvelopeDropZoneWrapper = ({
           documentId: id,
           timestamp: new Date().toISOString(),
         });
+
+        setUploadedDocumentId(id);
+        setPendingRecipients(null);
+        setShouldNavigateAfterPromptClose(true);
+        setShowExtractionPrompt(true);
+      } else {
+        const pathPrefix = formatTemplatesPath(team.url);
+        await navigate(`${pathPrefix}/${id}/edit`);
       }
-
-      const pathPrefix =
-        type === EnvelopeType.DOCUMENT
-          ? formatDocumentsPath(team.url)
-          : formatTemplatesPath(team.url);
-
-      const aiQueryParam = team.preferences.aiFeaturesEnabled ? '?ai=true' : '';
-
-      await navigate(`${pathPrefix}/${id}/edit${aiQueryParam}`);
     } catch (err) {
       const error = AppError.parseError(err);
 
@@ -135,7 +144,7 @@ export const EnvelopeDropZoneWrapper = ({
         .otherwise(() => t`An error occurred during upload.`);
 
       toast({
-        title: t`Error`,
+        title: t`Upload failed`,
         description: errorMessage,
         variant: 'destructive',
         duration: 7500,
@@ -156,10 +165,7 @@ export const EnvelopeDropZoneWrapper = ({
 
     if (maxItemsReached) {
       toast({
-        title: plural(maximumEnvelopeItemCount, {
-          one: `You cannot upload more than # item per envelope.`,
-          other: `You cannot upload more than # items per envelope.`,
-        }),
+        title: t`You cannot upload more than ${maximumEnvelopeItemCount} items per envelope.`,
         duration: 5000,
         variant: 'destructive',
       });
@@ -167,7 +173,6 @@ export const EnvelopeDropZoneWrapper = ({
       return;
     }
 
-    // Since users can only upload only one file (no multi-upload), we only handle the first file rejection
     const { file, errors } = fileRejections[0];
 
     if (!errors.length) {
@@ -207,6 +212,116 @@ export const EnvelopeDropZoneWrapper = ({
       variant: 'destructive',
     });
   };
+
+  const navigateToEnvelopeEditor = () => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    const pathPrefix = formatDocumentsPath(team.url);
+    void navigate(`${pathPrefix}/${uploadedDocumentId}/edit`);
+  };
+
+  const handleStartRecipientDetection = async () => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    try {
+      const recipients = await detectRecipientsInDocument(uploadedDocumentId);
+
+      if (recipients.length === 0) {
+        toast({
+          title: t`No recipients detected`,
+          description: t`You can add recipients manually in the editor`,
+          duration: 5000,
+        });
+
+        setShouldNavigateAfterPromptClose(true);
+        setShowExtractionPrompt(false);
+        navigateToEnvelopeEditor();
+        return;
+      }
+
+      const recipientsWithEmails = ensureRecipientEmails(recipients, uploadedDocumentId);
+
+      setPendingRecipients(recipientsWithEmails);
+      setShouldNavigateAfterPromptClose(false);
+    } catch (error) {
+      if (!(error instanceof Error && error.message === 'NO_RECIPIENTS_DETECTED')) {
+        const parsedError = AppError.parseError(error);
+
+        toast({
+          title: t`Failed to detect recipients`,
+          description: parsedError.userMessage || t`You can add recipients manually in the editor`,
+          variant: 'destructive',
+          duration: 7500,
+        });
+      }
+
+      throw error;
+    }
+  };
+
+  const handleSkipRecipientDetection = () => {
+    setShouldNavigateAfterPromptClose(true);
+    setShowExtractionPrompt(false);
+    navigateToEnvelopeEditor();
+  };
+
+  const handleRecipientsConfirm = async (recipientsToCreate: RecipientForCreation[]) => {
+    if (!uploadedDocumentId) {
+      return;
+    }
+
+    try {
+      await createRecipients({
+        envelopeId: uploadedDocumentId,
+        data: recipientsToCreate,
+      });
+
+      toast({
+        title: t`Recipients added`,
+        description: t`Successfully detected ${recipientsToCreate.length} ${plural(
+          recipientsToCreate.length,
+          {
+            one: 'recipient',
+            other: 'recipients',
+          },
+        )}`,
+        duration: 5000,
+      });
+
+      setShowExtractionPrompt(false);
+      setPendingRecipients(null);
+      navigateToEnvelopeEditor();
+    } catch (error) {
+      const parsedError = AppError.parseError(error);
+
+      toast({
+        title: t`Failed to add recipients`,
+        description: parsedError.userMessage || t`Please review the recipients and try again`,
+        variant: 'destructive',
+        duration: 7500,
+      });
+
+      throw error;
+    }
+  };
+
+  const handlePromptDialogOpenChange = (open: boolean) => {
+    setShowExtractionPrompt(open);
+
+    if (open) {
+      setShouldNavigateAfterPromptClose(true);
+      return;
+    }
+
+    if (!open && shouldNavigateAfterPromptClose) {
+      navigateToEnvelopeEditor();
+    }
+  };
+
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
     accept: {
       'application/pdf': ['.pdf'],
@@ -226,9 +341,9 @@ export const EnvelopeDropZoneWrapper = ({
       {children}
 
       {isDragActive && (
-        <div className="fixed left-0 top-0 z-[9999] h-full w-full bg-muted/60 backdrop-blur-[4px]">
+        <div className="bg-muted/60 fixed left-0 top-0 z-[9999] h-full w-full backdrop-blur-[4px]">
           <div className="pointer-events-none flex h-full w-full flex-col items-center justify-center">
-            <h2 className="text-2xl font-semibold text-foreground">
+            <h2 className="text-foreground text-2xl font-semibold">
               {type === EnvelopeType.DOCUMENT ? (
                 <Trans>Upload Document</Trans>
               ) : (
@@ -236,7 +351,7 @@ export const EnvelopeDropZoneWrapper = ({
               )}
             </h2>
 
-            <p className="text-md mt-4 text-muted-foreground">
+            <p className="text-muted-foreground text-md mt-4">
               <Trans>Drag and drop your PDF file here</Trans>
             </p>
 
@@ -253,7 +368,7 @@ export const EnvelopeDropZoneWrapper = ({
               team?.id === undefined &&
               remaining.documents > 0 &&
               Number.isFinite(remaining.documents) && (
-                <p className="mt-4 text-sm text-muted-foreground/80">
+                <p className="text-muted-foreground/80 mt-4 text-sm">
                   <Trans>
                     {remaining.documents} of {quota.documents} documents remaining this month.
                   </Trans>
@@ -264,15 +379,24 @@ export const EnvelopeDropZoneWrapper = ({
       )}
 
       {isLoading && (
-        <div className="absolute inset-0 z-50 bg-muted/30 backdrop-blur-[2px]">
+        <div className="bg-muted/30 absolute inset-0 z-50 backdrop-blur-[2px]">
           <div className="pointer-events-none flex h-1/2 w-full flex-col items-center justify-center">
-            <Loader className="h-12 w-12 animate-spin text-primary" />
-            <p className="mt-8 font-medium text-foreground">
+            <Loader className="text-primary h-12 w-12 animate-spin" />
+            <p className="text-foreground mt-8 font-medium">
               <Trans>Uploading</Trans>
             </p>
           </div>
         </div>
       )}
+
+      <RecipientDetectionPromptDialog
+        open={showExtractionPrompt}
+        onOpenChange={handlePromptDialogOpenChange}
+        onAccept={handleStartRecipientDetection}
+        onSkip={handleSkipRecipientDetection}
+        recipients={pendingRecipients}
+        onRecipientsSubmit={handleRecipientsConfirm}
+      />
     </div>
   );
 };

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

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

apps/remix/app/components/general/stack-avatars-with-tooltip.tsx

@@ -83,8 +83,8 @@ export const StackAvatarsWithTooltip = ({
                 fallbackText={recipientAbbreviation(recipient)}
               />
               <div>
-                <p className="text-sm text-muted-foreground">{recipient.email || recipient.name}</p>
-                <p className="text-xs text-muted-foreground/70">
+                <p className="text-muted-foreground text-sm">{recipient.email}</p>
+                <p className="text-muted-foreground/70 text-xs">
                   {_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}
                 </p>
               </div>
@@ -107,8 +107,8 @@ export const StackAvatarsWithTooltip = ({
                 fallbackText={recipientAbbreviation(recipient)}
               />
               <div>
-                <p className="text-sm text-muted-foreground">{recipient.email || recipient.name}</p>
-                <p className="text-xs text-muted-foreground/70">
+                <p className="text-muted-foreground text-sm">{recipient.email}</p>
+                <p className="text-muted-foreground/70 text-xs">
                   {_(RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName)}
                 </p>
               </div>

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

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

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

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

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

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

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

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

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

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

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

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

apps/remix/app/entry.client.tsx

@@ -10,8 +10,6 @@ import { HydratedRouter } from 'react-router/dom';
 import { extractPostHogConfig } from '@documenso/lib/constants/feature-flags';
 import { dynamicActivate } from '@documenso/lib/utils/i18n';
 
-import './utils/polyfills/promise-with-resolvers';
-
 function PosthogInit() {
   const postHogConfig = extractPostHogConfig();
 

apps/remix/app/root.tsx

@@ -46,16 +46,12 @@ export async function loader({ request }: Route.LoaderArgs) {
 
   const { getTheme } = await themeSessionResolver(request);
 
-  const cookieHeader = request.headers.get('cookie') ?? '';
-
-  let lang: SupportedLanguageCodes = await langCookie.parse(cookieHeader);
+  let lang: SupportedLanguageCodes = await langCookie.parse(request.headers.get('cookie') ?? '');
 
   if (!APP_I18N_OPTIONS.supportedLangs.includes(lang)) {
     lang = extractLocaleData({ headers: request.headers }).lang;
   }
 
-  const disableAnimations = cookieHeader.includes('__disable_animations=true');
-
   let organisations = null;
 
   if (session.isAuthenticated) {
@@ -66,7 +62,6 @@ export async function loader({ request }: Route.LoaderArgs) {
     {
       lang,
       theme: getTheme(),
-      disableAnimations,
       session: session.isAuthenticated
         ? {
             user: session.user,
@@ -97,8 +92,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
 }
 
 export function LayoutContent({ children }: { children: React.ReactNode }) {
-  const { publicEnv, session, lang, disableAnimations, ...data } =
-    useLoaderData<typeof loader>() || {};
+  const { publicEnv, session, lang, ...data } = useLoaderData<typeof loader>() || {};
 
   const [theme] = useTheme();
 
@@ -117,14 +111,6 @@ export function LayoutContent({ children }: { children: React.ReactNode }) {
         <meta name="google" content="notranslate" />
         <PreventFlashOnWrongTheme ssrTheme={Boolean(data.theme)} />
 
-        {disableAnimations && (
-          <style
-            dangerouslySetInnerHTML={{
-              __html: `*, *::before, *::after { animation: none !important; transition: none !important; }`,
-            }}
-          />
-        )}
-
         {/* Fix: https://stackoverflow.com/questions/21147149/flash-of-unstyled-content-fouc-in-firefox-only-is-ff-slow-renderer */}
         <script>0</script>
       </head>

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

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

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

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

apps/remix/app/routes/_authenticated+/o.$orgUrl.settings.document.tsx

@@ -1,10 +1,8 @@
 import { useLingui } from '@lingui/react/macro';
 import { Loader } from 'lucide-react';
-import { useLoaderData } from 'react-router';
 
 import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { useSession } from '@documenso/lib/client-only/providers/session';
-import { IS_AI_FEATURES_CONFIGURED } from '@documenso/lib/constants/app';
 import { DocumentSignatureType } from '@documenso/lib/constants/document';
 import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { trpc } from '@documenso/trpc/react';
@@ -21,16 +19,9 @@ export function meta() {
   return appMetaTags('Document Preferences');
 }
 
-export const loader = () => {
-  return {
-    isAiFeaturesConfigured: IS_AI_FEATURES_CONFIGURED(),
-  };
-};
-
 export default function OrganisationSettingsDocumentPage() {
-  const { isAiFeaturesConfigured } = useLoaderData<typeof loader>();
-
   const { organisations } = useSession();
+
   const organisation = useCurrentOrganisation();
 
   const { t } = useLingui();
@@ -57,7 +48,6 @@ export default function OrganisationSettingsDocumentPage() {
         includeSigningCertificate,
         includeAuditLog,
         signatureTypes,
-        aiFeaturesEnabled,
       } = data;
 
       if (
@@ -66,8 +56,7 @@ export default function OrganisationSettingsDocumentPage() {
         documentDateFormat === null ||
         includeSenderDetails === null ||
         includeSigningCertificate === null ||
-        includeAuditLog === null ||
-        aiFeaturesEnabled === null
+        includeAuditLog === null
       ) {
         throw new Error('Should not be possible.');
       }
@@ -85,7 +74,6 @@ export default function OrganisationSettingsDocumentPage() {
           typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
           uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
           drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
-          aiFeaturesEnabled,
         },
       });
 
@@ -105,7 +93,7 @@ export default function OrganisationSettingsDocumentPage() {
   if (isLoadingOrganisation || !organisationWithSettings) {
     return (
       <div className="flex items-center justify-center rounded-lg py-32">
-        <Loader className="h-6 w-6 animate-spin text-muted-foreground" />
+        <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
       </div>
     );
   }
@@ -122,7 +110,6 @@ export default function OrganisationSettingsDocumentPage() {
       <section>
         <DocumentPreferencesForm
           canInherit={false}
-          isAiFeaturesConfigured={isAiFeaturesConfigured}
           settings={organisationWithSettings.organisationGlobalSettings}
           onFormSubmit={onDocumentPreferencesFormSubmit}
         />

apps/remix/app/routes/_authenticated+/settings+/_dynamic_personal_routes+/document.tsx

@@ -1,5 +1,5 @@
-import DocumentPage, { loader, meta } from '../../o.$orgUrl.settings.document';
+import DocumentPage, { meta } from '../../o.$orgUrl.settings.document';
 
-export { meta, loader };
+export { meta };
 
 export default DocumentPage;

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.document.tsx

@@ -1,8 +1,6 @@
 import { useLingui } from '@lingui/react/macro';
 import { Loader } from 'lucide-react';
-import { useLoaderData } from 'react-router';
 
-import { IS_AI_FEATURES_CONFIGURED } from '@documenso/lib/constants/app';
 import { DocumentSignatureType } from '@documenso/lib/constants/document';
 import { trpc } from '@documenso/trpc/react';
 import { useToast } from '@documenso/ui/primitives/use-toast';
@@ -19,15 +17,7 @@ export function meta() {
   return appMetaTags('Document Preferences');
 }
 
-export const loader = () => {
-  return {
-    isAiFeaturesConfigured: IS_AI_FEATURES_CONFIGURED(),
-  };
-};
-
 export default function TeamsSettingsPage() {
-  const { isAiFeaturesConfigured } = useLoaderData<typeof loader>();
-
   const team = useCurrentTeam();
 
   const { t } = useLingui();
@@ -50,7 +40,6 @@ export default function TeamsSettingsPage() {
         includeSigningCertificate,
         includeAuditLog,
         signatureTypes,
-        aiFeaturesEnabled,
       } = data;
 
       await updateTeamSettings({
@@ -63,7 +52,6 @@ export default function TeamsSettingsPage() {
           includeSenderDetails,
           includeSigningCertificate,
           includeAuditLog,
-          aiFeaturesEnabled,
           ...(signatureTypes.length === 0
             ? {
                 typedSignatureEnabled: null,
@@ -94,7 +82,7 @@ export default function TeamsSettingsPage() {
   if (isLoadingTeam || !teamWithSettings) {
     return (
       <div className="flex items-center justify-center rounded-lg py-32">
-        <Loader className="h-6 w-6 animate-spin text-muted-foreground" />
+        <Loader className="text-muted-foreground h-6 w-6 animate-spin" />
       </div>
     );
   }
@@ -109,7 +97,6 @@ export default function TeamsSettingsPage() {
       <section>
         <DocumentPreferencesForm
           canInherit={true}
-          isAiFeaturesConfigured={isAiFeaturesConfigured}
           settings={teamWithSettings.teamSettings}
           onFormSubmit={onDocumentPreferencesSubmit}
         />

apps/remix/app/routes/_unauthenticated+/organisation.sso.confirmation.$token.tsx

@@ -1,7 +1,6 @@
 import { useState } from 'react';
 
 import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { AlertTriangle, Building2, Database, Eye, Settings, UserCircle2 } from 'lucide-react';
 import { data, isRouteErrorResponse } from 'react-router';
@@ -126,7 +125,6 @@ export async function loader({ params }: Route.LoaderArgs) {
 export default function OrganisationSsoConfirmationTokenPage({ loaderData }: Route.ComponentProps) {
   const { token, type, user, organisation } = loaderData;
 
-  const { _ } = useLingui();
   const { toast } = useToast();
   const navigate = useNavigate();
 
@@ -138,12 +136,12 @@ export default function OrganisationSsoConfirmationTokenPage({ loaderData }: Rou
         await navigate('/');
 
         toast({
-          title: _(msg`Account link declined`),
+          title: 'Account link declined',
         });
       },
       onError: (error) => {
         toast({
-          title: _(msg`Error declining account link`),
+          title: 'Error declining account link',
           description: error.message,
         });
       },
@@ -155,12 +153,12 @@ export default function OrganisationSsoConfirmationTokenPage({ loaderData }: Rou
         await navigate(formatOrganisationLoginPath(organisation.url));
 
         toast({
-          title: _(msg`Account linked successfully`),
+          title: 'Account linked successfully',
         });
       },
       onError: (error) => {
         toast({
-          title: _(msg`Error linking account`),
+          title: 'Error linking account',
           description: error.message,
         });
       },

apps/remix/app/routes/embed+/v1+/authoring+/document.edit.$id.tsx

@@ -41,9 +41,7 @@ export const loader = async ({ request, params }: Route.LoaderArgs) => {
   const token = url.searchParams.get('token') || '';
 
   // We also know that the token is valid, but we need the userId + teamId
-  const result = await verifyEmbeddingPresignToken({ token, scope: `documentId:${id}` }).catch(
-    () => null,
-  );
+  const result = await verifyEmbeddingPresignToken({ token }).catch(() => null);
 
   if (!result) {
     throw new Error('Invalid token');

apps/remix/app/routes/embed+/v1+/authoring+/template.edit.$id.tsx

@@ -41,9 +41,7 @@ export const loader = async ({ request, params }: Route.LoaderArgs) => {
   const token = url.searchParams.get('token') || '';
 
   // We also know that the token is valid, but we need the userId + teamId
-  const result = await verifyEmbeddingPresignToken({ token, scope: `templateId:${id}` }).catch(
-    () => null,
-  );
+  const result = await verifyEmbeddingPresignToken({ token }).catch(() => null);
 
   if (!result) {
     throw new Error('Invalid token');

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

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

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

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

apps/remix/app/utils/polyfills/promise-with-resolvers.ts

@@ -1,30 +0,0 @@
-/**
- * Polyfill for Promise.withResolvers (ES2024)
- * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/withResolvers
- */
-
-type PromiseWithResolvers<T> = {
-  promise: Promise<T>;
-  resolve: (value: T | PromiseLike<T>) => void;
-  reject: (reason?: unknown) => void;
-};
-
-// We're patching here
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const GlobalPromise = globalThis.Promise as any;
-
-if (typeof GlobalPromise.withResolvers !== 'function') {
-  GlobalPromise.withResolvers = function <T>(): PromiseWithResolvers<T> {
-    let resolve!: (value: T | PromiseLike<T>) => void;
-    let reject!: (reason?: unknown) => void;
-
-    const promise = new Promise<T>((res, rej) => {
-      resolve = res;
-      reject = rej;
-    });
-
-    return { promise, resolve, reject };
-  };
-}
-
-export {};

apps/remix/package.json

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

apps/remix/server/api/ai/detect-fields.client.ts

@@ -1,161 +0,0 @@
-import { z } from 'zod';
-
-import {
-  type TDetectFieldsRequest,
-  ZNormalizedFieldWithContextSchema,
-} from './detect-fields.types';
-
-export type { TDetectFieldsRequest };
-
-// Stream event schemas
-const ZProgressEventSchema = z.object({
-  type: z.literal('progress'),
-  pagesProcessed: z.number(),
-  totalPages: z.number(),
-  fieldsDetected: z.number(),
-});
-
-const ZKeepaliveEventSchema = z.object({
-  type: z.literal('keepalive'),
-});
-
-const ZErrorEventSchema = z.object({
-  type: z.literal('error'),
-  message: z.string(),
-});
-
-const ZCompleteEventSchema = z.object({
-  type: z.literal('complete'),
-  fields: z.array(ZNormalizedFieldWithContextSchema),
-});
-
-const ZStreamEventSchema = z.discriminatedUnion('type', [
-  ZProgressEventSchema,
-  ZKeepaliveEventSchema,
-  ZErrorEventSchema,
-  ZCompleteEventSchema,
-]);
-
-export type DetectFieldsProgressEvent = z.infer<typeof ZProgressEventSchema>;
-export type DetectFieldsCompleteEvent = z.infer<typeof ZCompleteEventSchema>;
-export type DetectFieldsStreamEvent = z.infer<typeof ZStreamEventSchema>;
-
-const ZApiErrorResponseSchema = z.object({
-  error: z.string(),
-});
-
-export class AiApiError extends Error {
-  constructor(
-    message: string,
-    public status: number,
-  ) {
-    super(message);
-    this.name = 'AiApiError';
-  }
-}
-
-export type DetectFieldsOptions = {
-  request: TDetectFieldsRequest;
-  onProgress?: (event: DetectFieldsProgressEvent) => void;
-  onComplete: (event: DetectFieldsCompleteEvent) => void;
-  onError: (error: AiApiError) => void;
-  signal?: AbortSignal;
-};
-
-/**
- * Detect fields from an envelope using AI with streaming support.
- */
-export const detectFields = async ({
-  request,
-  onProgress,
-  onComplete,
-  onError,
-  signal,
-}: DetectFieldsOptions): Promise<void> => {
-  const response = await fetch('/api/ai/detect-fields', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(request),
-    signal,
-  });
-
-  // Handle non-streaming error responses (auth failures, etc.)
-  if (!response.ok) {
-    const text = await response.text();
-
-    try {
-      const parsed = ZApiErrorResponseSchema.parse(JSON.parse(text));
-
-      throw new AiApiError(parsed.error, response.status);
-    } catch (e) {
-      if (e instanceof AiApiError) {
-        throw e;
-      }
-
-      throw new AiApiError('Failed to detect fields', response.status);
-    }
-  }
-
-  // Handle streaming response
-  const reader = response.body?.getReader();
-
-  if (!reader) {
-    throw new AiApiError('No response body', 500);
-  }
-
-  const decoder = new TextDecoder();
-  let buffer = '';
-
-  try {
-    let done = false;
-
-    while (!done) {
-      const result = await reader.read();
-      done = result.done;
-
-      if (done) {
-        break;
-      }
-
-      const value = result.value;
-
-      buffer += decoder.decode(value, { stream: true });
-
-      // Process complete lines
-      const lines = buffer.split('\n');
-      buffer = lines.pop() || ''; // Keep incomplete line in buffer
-
-      for (const line of lines) {
-        if (!line.trim()) {
-          continue;
-        }
-
-        try {
-          const event = ZStreamEventSchema.parse(JSON.parse(line));
-
-          switch (event.type) {
-            case 'progress':
-              onProgress?.(event);
-              break;
-            case 'keepalive':
-              // Ignore keepalive, it's just to prevent timeout
-              break;
-            case 'error':
-              onError(new AiApiError(event.message, 500));
-              return;
-            case 'complete':
-              onComplete(event);
-              return;
-          }
-        } catch {
-          // Ignore malformed lines
-          console.warn('Failed to parse stream event:', line);
-        }
-      }
-    }
-  } finally {
-    reader.releaseLock();
-  }
-};

apps/remix/server/api/ai/detect-fields.ts

@@ -1,154 +0,0 @@
-import { sValidator } from '@hono/standard-validator';
-import { Hono } from 'hono';
-import { streamText } from 'hono/streaming';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { IS_AI_FEATURES_CONFIGURED } from '@documenso/lib/constants/app';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { detectFieldsFromEnvelope } from '@documenso/lib/server-only/ai/envelope/detect-fields';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
-
-import type { HonoEnv } from '../../router';
-import { ZDetectFieldsRequestSchema } from './detect-fields.types';
-
-const KEEPALIVE_INTERVAL_MS = 5000;
-
-export const detectFieldsRoute = new Hono<HonoEnv>().post(
-  '/',
-  sValidator('json', ZDetectFieldsRequestSchema),
-  async (c) => {
-    const logger = c.get('logger');
-
-    try {
-      const { envelopeId, teamId, context } = c.req.valid('json');
-
-      const session = await getSession(c);
-
-      if (!session.user) {
-        throw new AppError(AppErrorCode.UNAUTHORIZED, {
-          message: 'You must be logged in to detect fields',
-        });
-      }
-
-      // Verify user has access to the team (abort early)
-      const team = await getTeamById({
-        userId: session.user.id,
-        teamId,
-      }).catch(() => null);
-
-      if (!team) {
-        throw new AppError(AppErrorCode.UNAUTHORIZED, {
-          message: 'You do not have access to this team',
-        });
-      }
-
-      // Check if AI features are enabled for the team
-      const { aiFeaturesEnabled } = team.derivedSettings;
-
-      if (!aiFeaturesEnabled) {
-        throw new AppError(AppErrorCode.UNAUTHORIZED, {
-          message: 'AI features are not enabled for this team',
-        });
-      }
-
-      if (!IS_AI_FEATURES_CONFIGURED()) {
-        throw new AppError(AppErrorCode.INVALID_REQUEST, {
-          message: 'AI features are not configured. Please contact support to enable AI features.',
-        });
-      }
-
-      logger.info({
-        event: 'ai.detect-fields.start',
-        envelopeId,
-        userId: session.user.id,
-        teamId: team.id,
-        hasContext: !!context,
-      });
-
-      // Return streaming response with NDJSON
-      return streamText(c, async (stream) => {
-        // Start keepalive to prevent connection timeout
-        let interval: NodeJS.Timeout | null = setInterval(() => {
-          void stream.writeln(JSON.stringify({ type: 'keepalive' }));
-        }, KEEPALIVE_INTERVAL_MS);
-
-        try {
-          const allFields = await detectFieldsFromEnvelope({
-            context,
-            envelopeId,
-            userId: session.user.id,
-            teamId: team.id,
-            onProgress: (progress) => {
-              void stream.writeln(
-                JSON.stringify({
-                  type: 'progress',
-                  pagesProcessed: progress.pagesProcessed,
-                  totalPages: progress.totalPages,
-                  fieldsDetected: progress.fieldsDetected,
-                }),
-              );
-            },
-          });
-
-          // Clear keepalive before sending final response
-          if (interval) {
-            clearInterval(interval);
-            interval = null;
-          }
-
-          logger.info({
-            event: 'ai.detect-fields.complete',
-            envelopeId,
-            userId: session.user.id,
-            teamId: team.id,
-            fieldCount: allFields.length,
-          });
-
-          await stream.writeln(
-            JSON.stringify({
-              type: 'complete',
-              fields: allFields,
-            }),
-          );
-        } catch (error) {
-          // Clear keepalive on error
-          if (interval) {
-            clearInterval(interval);
-          }
-
-          // The logger below it stringifies the error, using `console.error`
-          // to attempt to get a stack trace
-          console.error(error);
-
-          logger.error({
-            event: 'ai.detect-fields.error',
-            error,
-          });
-
-          const message = error instanceof AppError ? error.message : 'Failed to detect fields';
-
-          await stream.writeln(
-            JSON.stringify({
-              type: 'error',
-              message,
-            }),
-          );
-        }
-      });
-    } catch (error) {
-      // Handle errors that occur before streaming starts
-      logger.error({
-        event: 'ai.detect-fields.error',
-        error,
-      });
-
-      if (error instanceof AppError) {
-        const { status, body } = AppError.toRestAPIError(error);
-
-        return c.json(body, status);
-      }
-
-      return c.json({ error: 'Failed to detect fields' }, 500);
-    }
-  },
-);

apps/remix/server/api/ai/detect-fields.types.ts

@@ -1,54 +0,0 @@
-import { z } from 'zod';
-
-import {
-  ZConfidenceLevel,
-  ZDetectableFieldType,
-} from '@documenso/lib/server-only/ai/envelope/detect-fields/schema';
-
-export const ZDetectFieldsRequestSchema = z.object({
-  envelopeId: z.string().min(1).describe('The ID of the envelope to detect fields from.'),
-  teamId: z.number().describe('The ID of the team the envelope belongs to.'),
-  context: z
-    .string()
-    .optional()
-    .describe(
-      'Optional context about recipients to help map fields (e.g., "David is the Employee, Lucas is the Manager").',
-    ),
-});
-
-export type TDetectFieldsRequest = z.infer<typeof ZDetectFieldsRequestSchema>;
-
-// Schema for fields returned from streaming API (before recipient resolution)
-export const ZNormalizedFieldWithPageSchema = z.object({
-  type: ZDetectableFieldType,
-  recipientKey: z.string(),
-  positionX: z.number(),
-  positionY: z.number(),
-  width: z.number(),
-  height: z.number(),
-  confidence: ZConfidenceLevel,
-  pageNumber: z.number(),
-});
-
-export type TNormalizedFieldWithPage = z.infer<typeof ZNormalizedFieldWithPageSchema>;
-
-// Schema for fields after recipient resolution
-export const ZNormalizedFieldWithContextSchema = z.object({
-  type: ZDetectableFieldType,
-  positionX: z.number(),
-  positionY: z.number(),
-  width: z.number(),
-  height: z.number(),
-  confidence: ZConfidenceLevel,
-  pageNumber: z.number(),
-  recipientId: z.number(),
-  envelopeItemId: z.string(),
-});
-
-export type TNormalizedFieldWithContext = z.infer<typeof ZNormalizedFieldWithContextSchema>;
-
-export const ZDetectFieldsResponseSchema = z.object({
-  fields: z.array(ZNormalizedFieldWithContextSchema),
-});
-
-export type TDetectFieldsResponse = z.infer<typeof ZDetectFieldsResponseSchema>;

apps/remix/server/api/ai/detect-recipients.client.ts

@@ -1,160 +0,0 @@
-import { z } from 'zod';
-
-import { ZDetectedRecipientSchema } from '@documenso/lib/server-only/ai/envelope/detect-recipients/schema';
-
-import { type TDetectRecipientsRequest } from './detect-recipients.types';
-
-export type { TDetectRecipientsRequest };
-
-// Stream event schemas
-const ZProgressEventSchema = z.object({
-  type: z.literal('progress'),
-  pagesProcessed: z.number(),
-  totalPages: z.number(),
-  recipientsDetected: z.number(),
-});
-
-const ZKeepaliveEventSchema = z.object({
-  type: z.literal('keepalive'),
-});
-
-const ZErrorEventSchema = z.object({
-  type: z.literal('error'),
-  message: z.string(),
-});
-
-const ZCompleteEventSchema = z.object({
-  type: z.literal('complete'),
-  recipients: z.array(ZDetectedRecipientSchema),
-});
-
-const ZStreamEventSchema = z.discriminatedUnion('type', [
-  ZProgressEventSchema,
-  ZKeepaliveEventSchema,
-  ZErrorEventSchema,
-  ZCompleteEventSchema,
-]);
-
-export type DetectRecipientsProgressEvent = z.infer<typeof ZProgressEventSchema>;
-export type DetectRecipientsCompleteEvent = z.infer<typeof ZCompleteEventSchema>;
-export type DetectRecipientsStreamEvent = z.infer<typeof ZStreamEventSchema>;
-
-const ZApiErrorResponseSchema = z.object({
-  error: z.string(),
-});
-
-export class AiApiError extends Error {
-  constructor(
-    message: string,
-    public status: number,
-  ) {
-    super(message);
-    this.name = 'AiApiError';
-  }
-}
-
-export type DetectRecipientsOptions = {
-  request: TDetectRecipientsRequest;
-  onProgress?: (event: DetectRecipientsProgressEvent) => void;
-  onComplete: (event: DetectRecipientsCompleteEvent) => void;
-  onError: (error: AiApiError) => void;
-  signal?: AbortSignal;
-};
-
-/**
- * Detect recipients from an envelope using AI with streaming support.
- */
-export const detectRecipients = async ({
-  request,
-  onProgress,
-  onComplete,
-  onError,
-  signal,
-}: DetectRecipientsOptions): Promise<void> => {
-  const response = await fetch('/api/ai/detect-recipients', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(request),
-    signal,
-  });
-
-  // Handle non-streaming error responses (auth failures, etc.)
-  if (!response.ok) {
-    const text = await response.text();
-
-    try {
-      const parsed = ZApiErrorResponseSchema.parse(JSON.parse(text));
-
-      throw new AiApiError(parsed.error, response.status);
-    } catch (e) {
-      if (e instanceof AiApiError) {
-        throw e;
-      }
-
-      throw new AiApiError('Failed to detect recipients', response.status);
-    }
-  }
-
-  // Handle streaming response
-  const reader = response.body?.getReader();
-
-  if (!reader) {
-    throw new AiApiError('No response body', 500);
-  }
-
-  const decoder = new TextDecoder();
-  let buffer = '';
-
-  try {
-    let done = false;
-
-    while (!done) {
-      const result = await reader.read();
-      done = result.done;
-
-      if (done) {
-        break;
-      }
-
-      const value = result.value;
-
-      buffer += decoder.decode(value, { stream: true });
-
-      // Process complete lines
-      const lines = buffer.split('\n');
-      buffer = lines.pop() || ''; // Keep incomplete line in buffer
-
-      for (const line of lines) {
-        if (!line.trim()) {
-          continue;
-        }
-
-        try {
-          const event = ZStreamEventSchema.parse(JSON.parse(line));
-
-          switch (event.type) {
-            case 'progress':
-              onProgress?.(event);
-              break;
-            case 'keepalive':
-              // Ignore keepalive, it's just to prevent timeout
-              break;
-            case 'error':
-              onError(new AiApiError(event.message, 500));
-              return;
-            case 'complete':
-              onComplete(event);
-              return;
-          }
-        } catch {
-          // Ignore malformed lines
-          console.warn('Failed to parse stream event:', line);
-        }
-      }
-    }
-  } finally {
-    reader.releaseLock();
-  }
-};

apps/remix/server/api/ai/detect-recipients.ts

@@ -1,152 +0,0 @@
-import { sValidator } from '@hono/standard-validator';
-import { Hono } from 'hono';
-import { streamText } from 'hono/streaming';
-
-import { getSession } from '@documenso/auth/server/lib/utils/get-session';
-import { IS_AI_FEATURES_CONFIGURED } from '@documenso/lib/constants/app';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { detectRecipientsFromEnvelope } from '@documenso/lib/server-only/ai/envelope/detect-recipients';
-import { getTeamById } from '@documenso/lib/server-only/team/get-team';
-
-import type { HonoEnv } from '../../router';
-import { ZDetectRecipientsRequestSchema } from './detect-recipients.types';
-
-const KEEPALIVE_INTERVAL_MS = 5000;
-
-export const detectRecipientsRoute = new Hono<HonoEnv>().post(
-  '/',
-  sValidator('json', ZDetectRecipientsRequestSchema),
-  async (c) => {
-    const logger = c.get('logger');
-
-    try {
-      const { envelopeId, teamId } = c.req.valid('json');
-
-      const session = await getSession(c);
-
-      if (!session.user) {
-        throw new AppError(AppErrorCode.UNAUTHORIZED, {
-          message: 'You must be logged in to detect recipients',
-        });
-      }
-
-      // Verify user has access to the team (abort early)
-      const team = await getTeamById({
-        userId: session.user.id,
-        teamId,
-      }).catch(() => null);
-
-      if (!team) {
-        throw new AppError(AppErrorCode.UNAUTHORIZED, {
-          message: 'You do not have access to this team',
-        });
-      }
-
-      // Check if AI features are enabled for the team
-      const { aiFeaturesEnabled } = team.derivedSettings;
-
-      if (!aiFeaturesEnabled) {
-        throw new AppError(AppErrorCode.UNAUTHORIZED, {
-          message: 'AI features are not enabled for this team',
-        });
-      }
-
-      if (!IS_AI_FEATURES_CONFIGURED()) {
-        throw new AppError(AppErrorCode.INVALID_REQUEST, {
-          message: 'AI features are not configured. Please contact support to enable AI features.',
-        });
-      }
-
-      logger.info({
-        event: 'ai.detect-recipients.start',
-        envelopeId,
-        userId: session.user.id,
-        teamId: team.id,
-      });
-
-      // Return streaming response with NDJSON
-      return streamText(c, async (stream) => {
-        // Start keepalive to prevent connection timeout
-        let interval: NodeJS.Timeout | null = setInterval(() => {
-          void stream.writeln(JSON.stringify({ type: 'keepalive' }));
-        }, KEEPALIVE_INTERVAL_MS);
-
-        try {
-          const recipients = await detectRecipientsFromEnvelope({
-            envelopeId,
-            userId: session.user.id,
-            teamId: team.id,
-            onProgress: (progress) => {
-              void stream.writeln(
-                JSON.stringify({
-                  type: 'progress',
-                  pagesProcessed: progress.pagesProcessed,
-                  totalPages: progress.totalPages,
-                  recipientsDetected: progress.recipientsDetected,
-                }),
-              );
-            },
-          });
-
-          // Clear keepalive before sending final response
-          if (interval) {
-            clearInterval(interval);
-            interval = null;
-          }
-
-          logger.info({
-            event: 'ai.detect-recipients.complete',
-            envelopeId,
-            userId: session.user.id,
-            teamId: team.id,
-            recipientCount: recipients.length,
-          });
-
-          await stream.writeln(
-            JSON.stringify({
-              type: 'complete',
-              recipients,
-            }),
-          );
-        } catch (error) {
-          // Clear keepalive on error
-          if (interval) {
-            clearInterval(interval);
-          }
-
-          // The logger below it stringifies the error, using `console.error`
-          // to attempt to get a stack trace
-          console.error(error);
-
-          logger.error({
-            event: 'ai.detect-recipients.error',
-            error,
-          });
-
-          const message = error instanceof AppError ? error.message : 'Failed to detect recipients';
-
-          await stream.writeln(
-            JSON.stringify({
-              type: 'error',
-              message,
-            }),
-          );
-        }
-      });
-    } catch (error) {
-      // Handle errors that occur before streaming starts
-      logger.error({
-        event: 'ai.detect-recipients.error',
-        error,
-      });
-
-      if (error instanceof AppError) {
-        const { status, body } = AppError.toRestAPIError(error);
-
-        return c.json(body, status);
-      }
-
-      return c.json({ error: 'Failed to detect recipients' }, 500);
-    }
-  },
-);

apps/remix/server/api/ai/detect-recipients.types.ts

@@ -1,16 +0,0 @@
-import { z } from 'zod';
-
-import { ZDetectedRecipientSchema } from '@documenso/lib/server-only/ai/envelope/detect-recipients/schema';
-
-export const ZDetectRecipientsRequestSchema = z.object({
-  envelopeId: z.string().min(1).describe('The ID of the envelope to detect recipients from.'),
-  teamId: z.number().describe('The ID of the team the envelope belongs to.'),
-});
-
-export type TDetectRecipientsRequest = z.infer<typeof ZDetectRecipientsRequestSchema>;
-
-export const ZDetectRecipientsResponseSchema = z.object({
-  recipients: z.array(ZDetectedRecipientSchema),
-});
-
-export type TDetectRecipientsResponse = z.infer<typeof ZDetectRecipientsResponseSchema>;

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

@@ -1,9 +0,0 @@
-import { Hono } from 'hono';
-
-import type { HonoEnv } from '../../router';
-import { detectFieldsRoute } from './detect-fields';
-import { detectRecipientsRoute } from './detect-recipients';
-
-export const aiRoute = new Hono<HonoEnv>()
-  .route('/detect-recipients', detectRecipientsRoute)
-  .route('/detect-fields', detectFieldsRoute);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

apps/remix/server/router.ts

@@ -12,11 +12,10 @@ import { API_V2_BETA_URL, API_V2_URL } from '@documenso/lib/constants/app';
 import { jobsClient } from '@documenso/lib/jobs/client';
 import { TelemetryClient } from '@documenso/lib/server-only/telemetry/telemetry-client';
 import { getIpAddress } from '@documenso/lib/universal/get-ip-address';
-import { env } from '@documenso/lib/utils/env';
 import { logger } from '@documenso/lib/utils/logger';
 import { openApiDocument } from '@documenso/trpc/server/open-api';
 
-import { aiRoute } from './api/ai/route';
+import { aiRoute } from './api/document-analysis/index';
 import { downloadRoute } from './api/download/download';
 import { filesRoute } from './api/files/files';
 import { type AppContext, appContext } from './context';
@@ -52,21 +51,6 @@ const rateLimitMiddleware = rateLimiter({
   },
 });
 
-const aiRateLimitMiddleware = rateLimiter({
-  windowMs: 60 * 1000, // 1 minute
-  limit: 3, // 3 requests per window
-  keyGenerator: (c) => {
-    try {
-      return getIpAddress(c.req.raw);
-    } catch (error) {
-      return 'unknown';
-    }
-  },
-  message: {
-    error: 'Too many requests, please try again later.',
-  },
-});
-
 /**
  * Attach session and context to requests.
  */
@@ -103,7 +87,6 @@ app.route('/api/auth', auth);
 app.route('/api/files', filesRoute);
 
 // AI route.
-app.use('/api/ai/*', aiRateLimitMiddleware);
 app.route('/api/ai', aiRoute);
 
 // API servers.
@@ -136,8 +119,6 @@ app.use(`${API_V2_BETA_URL}/*`, async (c) =>
 
 // Start telemetry client for anonymous usage tracking.
 // Can be disabled by setting DOCUMENSO_DISABLE_TELEMETRY=true
-if (env('NODE_ENV') !== 'development') {
-  void TelemetryClient.start();
-}
+void TelemetryClient.start();
 
 export default app;

apps/remix/vite.config.ts

@@ -51,7 +51,6 @@ export default defineConfig({
   ssr: {
     noExternal: ['react-dropzone', 'plausible-tracker'],
     external: [
-      '@napi-rs/canvas',
       '@node-rs/bcrypt',
       '@prisma/client',
       '@documenso/tailwind-config',
@@ -65,7 +64,6 @@ export default defineConfig({
     include: ['prop-types', 'file-selector', 'attr-accept'],
     exclude: [
       'node_modules',
-      '@napi-rs/canvas',
       '@node-rs/bcrypt',
       '@documenso/pdf-sign',
       'sharp',
@@ -96,7 +94,6 @@ export default defineConfig({
   build: {
     rollupOptions: {
       external: [
-        '@napi-rs/canvas',
         '@node-rs/bcrypt',
         '@documenso/pdf-sign',
         '@aws-sdk/cloudfront-signer',

docker/Dockerfile

@@ -70,7 +70,6 @@ COPY --from=builder /app/out/json/ .
 COPY --from=builder /app/out/package-lock.json ./package-lock.json
 
 COPY --from=builder /app/lingui.config.ts ./lingui.config.ts
-COPY --from=builder /app/patches ./patches
 
 RUN npm ci
 
@@ -109,8 +108,6 @@ WORKDIR /app
 COPY --from=builder --chown=nodejs:nodejs /app/out/json/ .
 # Copy the tailwind config files across
 COPY --from=builder --chown=nodejs:nodejs /app/out/full/packages/tailwind-config ./packages/tailwind-config
-# Copy the patches across
-COPY --from=builder --chown=nodejs:nodejs /app/patches ./patches
 
 RUN npm ci --only=production
 

package.json

@@ -5,7 +5,7 @@
     "apps/*",
     "packages/*"
   ],
-  "version": "2.2.5",
+  "version": "2.1.0",
   "scripts": {
     "postinstall": "patch-package",
     "build": "turbo run build",
@@ -61,10 +61,12 @@
     "dotenv-cli": "^11.0.0",
     "eslint": "^8.57.0",
     "husky": "^9.1.7",
+    "kysely": "0.28.8",
     "lint-staged": "^16.2.7",
     "nanoid": "^5.1.6",
     "nodemailer": "^7.0.10",
-    "pdfjs-dist": "5.4.449",
+    "patch-package": "^8.0.1",
+    "pdfjs-dist": "5.4.296",
     "pino": "^9.14.0",
     "pino-pretty": "^13.1.2",
     "playwright": "1.56.1",
@@ -89,18 +91,18 @@
     "@documenso/prisma": "*",
     "@lingui/conf": "^5.6.0",
     "@lingui/core": "^5.6.0",
-    "ai": "^5.0.104",
+    "ai": "^5.0.82",
     "inngest-cli": "^1.13.7",
     "luxon": "^3.7.2",
-    "patch-package": "^8.0.1",
+    "mupdf": "^1.0.0",
     "posthog-node": "4.18.0",
     "react": "^18",
     "typescript": "5.6.2",
     "zod": "^3.25.76"
   },
   "overrides": {
-    "pdfjs-dist": "5.4.449",
+    "pdfjs-dist": "5.4.296",
     "typescript": "5.6.2",
     "zod": "^3.25.76"
   }
-}
+}

packages/app-tests/e2e/api/v2/embedding-presign.spec.ts

@@ -1,9 +1,6 @@
 import { expect, test } from '@playwright/test';
-import type { APIRequestContext } from 'playwright-core';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import type { CreateEmbeddingPresignTokenOptions } from '@documenso/lib/server-only/embedding-presign/create-embedding-presign-token';
-import type { VerifyEmbeddingPresignTokenOptions } from '@documenso/lib/server-only/embedding-presign/verify-embedding-presign-token';
 import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
 import { seedUser } from '@documenso/prisma/seed/users';
 
@@ -20,7 +17,18 @@ test.describe('Embedding Presign API', () => {
       expiresIn: null,
     });
 
-    const response = await createPresignToken(request, token);
+    const response = await request.post(
+      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v2-beta/embedding/create-presign-token`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          apiToken: token,
+        },
+      },
+    );
 
     const responseData = await response.json();
 
@@ -46,9 +54,19 @@ test.describe('Embedding Presign API', () => {
       expiresIn: null,
     });
 
-    const response = await createPresignToken(request, token, {
-      expiresIn: 120, // 2 hours
-    });
+    const response = await request.post(
+      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v2-beta/embedding/create-presign-token`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          apiToken: token,
+          expiresIn: 120, // 2 hours
+        },
+      },
+    );
 
     const responseData = await response.json();
 
@@ -74,9 +92,19 @@ test.describe('Embedding Presign API', () => {
       expiresIn: null,
     });
 
-    const response = await createPresignToken(request, token, {
-      expiresIn: 0, // Immediate expiration
-    });
+    const response = await request.post(
+      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v2-beta/embedding/create-presign-token`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          apiToken: token,
+          expiresIn: 0, // Immediate expiration
+        },
+      },
+    );
 
     expect(response.ok()).toBeTruthy();
     expect(response.status()).toBe(200);
@@ -101,7 +129,18 @@ test.describe('Embedding Presign API', () => {
     });
 
     // First create a token
-    const createResponse = await createPresignToken(request, token);
+    const createResponse = await request.post(
+      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v2-beta/embedding/create-presign-token`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          apiToken: token,
+        },
+      },
+    );
 
     expect(createResponse.ok()).toBeTruthy();
     const createResponseData = await createResponse.json();
@@ -111,9 +150,18 @@ test.describe('Embedding Presign API', () => {
     const presignToken = createResponseData.token;
 
     // Then verify it
-    const verifyResponse = await verifyPresignToken(request, token, {
-      token: presignToken,
-    });
+    const verifyResponse = await request.post(
+      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v2-beta/embedding/verify-presign-token`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          token: presignToken,
+        },
+      },
+    );
 
     expect(verifyResponse.ok()).toBeTruthy();
     expect(verifyResponse.status()).toBe(200);
@@ -135,87 +183,18 @@ test.describe('Embedding Presign API', () => {
       expiresIn: null,
     });
 
-    const response = await verifyPresignToken(request, token, {
-      token: 'invalid-token',
-    });
-
-    const responseData = await response.json();
-
-    console.log('Invalid token response:', responseData);
-
-    expect(response.ok()).toBeTruthy();
-    expect(response.status()).toBe(200);
-
-    expect(responseData.success).toBe(false);
-  });
-
-  test('verifyEmbeddingPresignToken: should verify a valid scoped token', async ({ request }) => {
-    const { user, team } = await seedUser();
-
-    const { token } = await createApiToken({
-      userId: user.id,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    // First create a token
-    const createResponse = await createPresignToken(request, token, {
-      scope: 'documentId:1',
-    });
-
-    expect(createResponse.ok()).toBeTruthy();
-    const createResponseData = await createResponse.json();
-
-    console.log('Create response:', createResponseData);
-
-    const presignToken = createResponseData.token;
-
-    // Then verify it
-    const verifyResponse = await verifyPresignToken(request, token, {
-      token: presignToken,
-      scope: 'documentId:1',
-    });
-
-    expect(verifyResponse.ok()).toBeTruthy();
-    expect(verifyResponse.status()).toBe(200);
-
-    const verifyResponseData = await verifyResponse.json();
-
-    console.log('Verify response:', verifyResponseData);
-
-    expect(verifyResponseData.success).toBe(true);
-  });
-
-  test('verifyEmbeddingPresignToken: should reject a scope mismatched token', async ({
-    request,
-  }) => {
-    const { user, team } = await seedUser();
-
-    const { token } = await createApiToken({
-      userId: user.id,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    // First create a token
-    const createResponse = await createPresignToken(request, token, {
-      scope: 'documentId:1',
-    });
-
-    expect(createResponse.ok()).toBeTruthy();
-    const createResponseData = await createResponse.json();
-
-    console.log('Create response:', createResponseData);
-
-    const presignToken = createResponseData.token;
-
-    // Then verify it
-    const response = await verifyPresignToken(request, token, {
-      token: presignToken,
-      scope: 'documentId:2',
-    });
+    const response = await request.post(
+      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v2-beta/embedding/verify-presign-token`,
+      {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+        },
+        data: {
+          token: 'invalid-token',
+        },
+      },
+    );
 
     const responseData = await response.json();
 
@@ -227,40 +206,3 @@ test.describe('Embedding Presign API', () => {
     expect(responseData.success).toBe(false);
   });
 });
-
-const createPresignToken = async (
-  request: APIRequestContext,
-  apiToken: string,
-  data?: Partial<CreateEmbeddingPresignTokenOptions>,
-) => {
-  return await request.post(
-    `${NEXT_PUBLIC_WEBAPP_URL()}/api/v2-beta/embedding/create-presign-token`,
-    {
-      headers: {
-        Authorization: `Bearer ${apiToken}`,
-        'Content-Type': 'application/json',
-      },
-      data: {
-        apiToken,
-        ...data,
-      },
-    },
-  );
-};
-
-const verifyPresignToken = async (
-  request: APIRequestContext,
-  apiToken: string,
-  data: VerifyEmbeddingPresignTokenOptions,
-) => {
-  return await request.post(
-    `${NEXT_PUBLIC_WEBAPP_URL()}/api/v2-beta/embedding/verify-presign-token`,
-    {
-      headers: {
-        Authorization: `Bearer ${apiToken}`,
-        'Content-Type': 'application/json',
-      },
-      data,
-    },
-  );
-};

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

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

packages/app-tests/e2e/api/v2/test-unauthorized-api-access.spec.ts

@@ -3103,7 +3103,7 @@ test.describe('Document API V2', () => {
         expect(res.status()).toBe(404);
       });
 
-      test('should allow authorized access to envelope use endpoint', async ({ request }) => {
+      test('should allow authorized access to envelope use endpoint', async ({ page, request }) => {
         const doc = await seedTemplate({
           title: 'Team template 1',
           userId: userA.id,
@@ -4313,62 +4313,5 @@ test.describe('Document API V2', () => {
         expect(res.status()).toBe(200);
       });
     });
-
-    test.describe('Envelope audit logs endpoint', () => {
-      test('should block unauthorized access to envelope audit logs endpoint', async ({
-        request,
-      }) => {
-        const doc = await seedBlankDocument(userA, teamA.id);
-
-        const res = await request.get(
-          `${WEBAPP_BASE_URL}/api/v2-beta/envelope/${doc.id}/audit-log`,
-          {
-            headers: { Authorization: `Bearer ${tokenB}` },
-          },
-        );
-
-        expect(res.ok()).toBeFalsy();
-        expect(res.status()).toBe(404);
-      });
-
-      test('should allow authorized access to envelope audit logs endpoint', async ({
-        request,
-      }) => {
-        const doc = await seedBlankDocument(userA, teamA.id);
-
-        // Add a recipient which will trigger an audit log.
-        await request.post(`${WEBAPP_BASE_URL}/api/v2-beta/envelope/recipient/create-many`, {
-          headers: { Authorization: `Bearer ${tokenA}` },
-          data: {
-            envelopeId: doc.id,
-            data: [
-              {
-                name: 'Test',
-                email: 'test@example.com',
-                role: RecipientRole.SIGNER,
-              },
-            ],
-          },
-        });
-
-        const res = await request.get(
-          `${WEBAPP_BASE_URL}/api/v2-beta/envelope/${doc.id}/audit-log`,
-          {
-            headers: { Authorization: `Bearer ${tokenA}` },
-          },
-        );
-
-        expect(res.ok()).toBeTruthy();
-        expect(res.status()).toBe(200);
-
-        const data = await res.json();
-
-        expect(Array.isArray(data.data)).toBe(true);
-        expect(data.count).toEqual(1);
-        expect(data.data[0].type).toEqual('RECIPIENT_CREATED');
-        expect(data.currentPage).toBeGreaterThanOrEqual(1);
-        expect(data.perPage).toBeGreaterThanOrEqual(1);
-      });
-    });
   });
 });

packages/app-tests/e2e/document-flow/autosave-fields-step.spec.ts

@@ -89,8 +89,9 @@ test.describe('AutoSave Fields Step', () => {
       });
 
       expect(retrievedFields.length).toBe(3);
-      expect(retrievedFields.filter((field) => field.type === 'SIGNATURE')).toHaveLength(2);
-      expect(retrievedFields.filter((field) => field.type === 'TEXT')).toHaveLength(1);
+      expect(retrievedFields[0].type).toBe('SIGNATURE');
+      expect(retrievedFields[1].type).toBe('TEXT');
+      expect(retrievedFields[2].type).toBe('SIGNATURE');
     }).toPass();
   });
 
@@ -213,8 +214,10 @@ test.describe('AutoSave Fields Step', () => {
       });
 
       expect(retrievedFields.length).toBe(4);
-      expect(retrievedFields.filter((field) => field.type === 'SIGNATURE')).toHaveLength(3);
-      expect(retrievedFields.filter((field) => field.type === 'TEXT')).toHaveLength(1);
+      expect(retrievedFields[0].type).toBe('SIGNATURE');
+      expect(retrievedFields[1].type).toBe('TEXT');
+      expect(retrievedFields[2].type).toBe('SIGNATURE');
+      expect(retrievedFields[3].type).toBe('SIGNATURE');
     }).toPass();
   });
 
@@ -256,16 +259,10 @@ test.describe('AutoSave Fields Step', () => {
       });
 
       expect(retrievedFields.length).toBe(2);
-      const textField = retrievedFields.find((field) => field.type === 'TEXT');
-      const signatureField = retrievedFields.find((field) => field.type === 'SIGNATURE');
-
-      expect(signatureField).toBeDefined();
-      expect(textField).toBeDefined();
-
-      if (!signatureField || !textField) {
-        throw new Error('No signature or text field');
-      }
+      expect(retrievedFields[0].type).toBe('SIGNATURE');
+      expect(retrievedFields[1].type).toBe('TEXT');
 
+      const textField = retrievedFields[1];
       expect(textField.fieldMeta).toBeDefined();
 
       if (

packages/app-tests/e2e/documents/delete-documents.spec.ts

@@ -9,7 +9,6 @@ import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin, apiSignout } from '../fixtures/authentication';
 import { checkDocumentTabCount } from '../fixtures/documents';
-import { expectToastTextToBeVisible, openDropdownMenu } from '../fixtures/generic';
 
 test.describe.configure({ mode: 'serial' });
 
@@ -84,13 +83,14 @@ test('[DOCUMENTS]: deleting a completed document should not remove it from recip
   });
 
   // Open document action menu.
-  const documentActionBtn = page
+  await page
     .locator('tr', { hasText: 'Document 1 - Completed' })
-    .getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, documentActionBtn);
+    .getByTestId('document-table-action-btn')
+    .click();
+
+  await page.waitForTimeout(200);
 
   // delete document
-  await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeVisible();
   await page.getByRole('menuitem', { name: 'Delete' }).click();
   await page.getByPlaceholder("Type 'delete' to confirm").fill('delete');
   await page.getByRole('button', { name: 'Delete' }).click();
@@ -128,13 +128,14 @@ test('[DOCUMENTS]: deleting a pending document should remove it from recipients'
   });
 
   // Open document action menu.
-  const documentActionBtn = page
+  await page
     .locator('tr', { hasText: 'Document 1 - Pending' })
-    .getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, documentActionBtn);
+    .getByTestId('document-table-action-btn')
+    .click();
+
+  await page.waitForTimeout(200);
 
   // delete document
-  await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeVisible();
   await page.getByRole('menuitem', { name: 'Delete' }).click();
   await page.getByPlaceholder("Type 'delete' to confirm").fill('delete');
   await page.getByRole('button', { name: 'Delete' }).click();
@@ -168,17 +169,19 @@ test('[DOCUMENTS]: deleting draft documents should permanently remove it', async
   });
 
   // Open document action menu.
-  const documentActionBtn = page
+  await page
     .locator('tr', { hasText: 'Document 1 - Draft' })
-    .getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, documentActionBtn);
+    .getByTestId('document-table-action-btn')
+    .click();
 
-  await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeVisible(); // Required to reduce flakiness.
+  await page.waitForTimeout(200);
+
+  // delete document
   await page.getByRole('menuitem', { name: 'Delete' }).click();
   await expect(page.getByPlaceholder("Type 'delete' to confirm")).not.toBeVisible();
   await page.getByRole('button', { name: 'Delete' }).click();
 
-  await expectToastTextToBeVisible(page, 'Document deleted');
+  await page.waitForTimeout(2500);
 
   await expect(page.getByRole('row', { name: /Document 1 - Draft/ })).not.toBeVisible();
 
@@ -200,13 +203,14 @@ test('[DOCUMENTS]: deleting pending documents should permanently remove it', asy
   });
 
   // Open document action menu.
-  const documentActionBtn = page
+  await page
     .locator('tr', { hasText: 'Document 1 - Pending' })
-    .getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, documentActionBtn);
+    .getByTestId('document-table-action-btn')
+    .click();
+
+  await page.waitForTimeout(200);
 
   // Delete document.
-  await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeVisible();
   await page.getByRole('menuitem', { name: 'Delete' }).click();
   await page.getByPlaceholder("Type 'delete' to confirm").fill('delete');
   await page.getByRole('button', { name: 'Delete' }).click();
@@ -235,13 +239,14 @@ test('[DOCUMENTS]: deleting completed documents as an owner should hide it from
   });
 
   // Open document action menu.
-  const documentActionBtn = page
+  await page
     .locator('tr', { hasText: 'Document 1 - Completed' })
-    .getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, documentActionBtn);
+    .getByTestId('document-table-action-btn')
+    .click();
+
+  await page.waitForTimeout(200);
 
   // Delete document.
-  await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeVisible();
   await page.getByRole('menuitem', { name: 'Delete' }).click();
   await page.getByPlaceholder("Type 'delete' to confirm").fill('delete');
   await page.getByRole('button', { name: 'Delete' }).click();
@@ -287,24 +292,36 @@ test('[DOCUMENTS]: deleting documents as a recipient should only hide it for the
   });
 
   // Open document action menu.
-  const completedDocActionBtn = page
-    .locator('tr', { hasText: 'Document 1 - Completed' })
-    .getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, completedDocActionBtn);
+  await expect(async () => {
+    await page
+      .locator('tr', { hasText: 'Document 1 - Completed' })
+      .getByTestId('document-table-action-btn')
+      .click();
+
+    await page.waitForTimeout(1000);
+
+    await expect(page.getByRole('menuitem', { name: 'Hide' })).toBeVisible();
+  }).toPass();
 
   // Delete document.
-  await expect(page.getByRole('menuitem', { name: 'Hide' })).toBeVisible();
+  await page.getByRole('menuitem', { name: 'Hide' }).waitFor({ state: 'visible' });
   await page.getByRole('menuitem', { name: 'Hide' }).click({ force: true });
   await page.getByRole('button', { name: 'Hide' }).click({ force: true });
   await page.waitForTimeout(2000);
 
-  const pendingDocActionBtn = page
-    .locator('tr', { hasText: 'Document 1 - Pending' })
-    .getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, pendingDocActionBtn);
+  await expect(async () => {
+    await page
+      .locator('tr', { hasText: 'Document 1 - Pending' })
+      .getByTestId('document-table-action-btn')
+      .click();
+
+    await page.waitForTimeout(1000);
+
+    await expect(page.getByRole('menuitem', { name: 'Hide' })).toBeVisible();
+  }).toPass();
 
   // Delete document.
-  await expect(page.getByRole('menuitem', { name: 'Hide' })).toBeVisible();
+  await page.getByRole('menuitem', { name: 'Hide' }).waitFor({ state: 'visible' });
   await page.getByRole('menuitem', { name: 'Hide' }).click({ force: true });
   await page.getByRole('button', { name: 'Hide' }).click({ force: true });
 

packages/app-tests/e2e/fixtures/generic.ts

@@ -1,4 +1,3 @@
-import type { Locator } from '@playwright/test';
 import { type Page, expect } from '@playwright/test';
 
 export const expectTextToBeVisible = async (page: Page, text: string) => {
@@ -8,22 +7,3 @@ export const expectTextToBeVisible = async (page: Page, text: string) => {
 export const expectTextToNotBeVisible = async (page: Page, text: string) => {
   await expect(page.getByText(text).first()).not.toBeVisible();
 };
-
-export const expectToastTextToBeVisible = async (page: Page, text: string) => {
-  await expect(page.locator('[role="status"]').getByText(text)).toBeVisible();
-};
-
-export const openDropdownMenu = async (page: Page, dropdownButton: Locator) => {
-  await page.waitForTimeout(500); // Initial timeout incase table remounts which will close the dropdown.
-  await dropdownButton.focus();
-  await page.keyboard.press('Enter');
-
-  await page.waitForTimeout(500);
-  await page.keyboard.press('Escape');
-  await page.waitForTimeout(500);
-
-  await dropdownButton.focus();
-  await page.keyboard.press('Enter');
-
-  await expect(page.getByRole('menuitem').first()).toBeVisible();
-};

packages/app-tests/e2e/folders/team-account-folders.spec.ts

@@ -9,7 +9,7 @@ import { seedTeamMember } from '@documenso/prisma/seed/teams';
 import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
 
 import { apiSignin } from '../fixtures/authentication';
-import { expectTextToBeVisible, openDropdownMenu } from '../fixtures/generic';
+import { expectTextToBeVisible } from '../fixtures/generic';
 
 test.describe.configure({ mode: 'parallel' });
 
@@ -117,9 +117,7 @@ test('[TEAMS]: can pin a document folder', async ({ page }) => {
     redirectPath: `/t/${team.url}/documents`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Pin' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Pin' }).click();
 
   await page.reload();
@@ -144,9 +142,7 @@ test('[TEAMS]: can unpin a document folder', async ({ page }) => {
     redirectPath: `/t/${team.url}/documents`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Unpin' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Unpin' }).click();
 
   await page.reload();
@@ -170,9 +166,7 @@ test('[TEAMS]: can rename a document folder', async ({ page }) => {
     redirectPath: `/t/${team.url}/documents`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Settings' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Settings' }).click();
 
   await page.getByLabel('Name').fill('Team Archive');
@@ -197,9 +191,7 @@ test('[TEAMS]: document folder visibility is visible to team member', async ({ p
     redirectPath: `/t/${team.url}/documents`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Settings' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Settings' }).click();
 
   await expect(page.getByRole('combobox', { name: 'Visibility' })).toBeVisible();
@@ -228,9 +220,7 @@ test('[TEAMS]: document folder can be moved to another document folder', async (
     redirectPath: `/t/${team.url}/documents`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button').nth(0);
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').nth(0).click();
   await page.getByRole('menuitem', { name: 'Move' }).click();
 
   await page.getByRole('button', { name: 'Team Clients' }).click();
@@ -281,9 +271,7 @@ test('[TEAMS]: document folder and its contents can be deleted', async ({ page }
     redirectPath: `/t/${team.url}/documents`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Delete' }).click();
 
   await page.getByRole('textbox').fill(`delete ${folder.name}`);
@@ -292,8 +280,12 @@ test('[TEAMS]: document folder and its contents can be deleted', async ({ page }
   await page.goto(`/t/${team.url}/documents`);
 
   await expect(page.locator(`[data-folder-id="${folder.id}"]`)).not.toBeVisible();
-  await expect(page.getByText(proposal.title)).toBeVisible();
-  await expect(page.getByText(report.title)).toBeVisible();
+  await expect(page.getByText(proposal.title)).not.toBeVisible();
+
+  await page.goto(`/t/${team.url}/documents/f/${folder.id}`);
+
+  await expect(page.getByText(report.title)).not.toBeVisible();
+  await expect(page.locator(`[data-folder-id="${reportsFolder.id}"]`)).not.toBeVisible();
 });
 
 test('[TEAMS]: create folder button is visible on templates page', async ({ page }) => {
@@ -418,9 +410,7 @@ test('[TEAMS]: can pin a template folder', async ({ page }) => {
     redirectPath: `/t/${team.url}/templates`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Pin' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Pin' }).click();
 
   await page.reload();
@@ -446,9 +436,7 @@ test('[TEAMS]: can unpin a template folder', async ({ page }) => {
     redirectPath: `/t/${team.url}/templates`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Unpin' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Unpin' }).click();
 
   await page.reload();
@@ -474,9 +462,7 @@ test('[TEAMS]: can rename a template folder', async ({ page }) => {
     redirectPath: `/t/${team.url}/templates`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Settings' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Settings' }).click();
 
   await page.getByLabel('Name').fill('Updated Team Template Folder');
@@ -502,9 +488,7 @@ test('[TEAMS]: template folder visibility is not visible to team member', async
     redirectPath: `/t/${team.url}/templates`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Settings' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Settings' }).click();
 
   await expect(page.getByRole('menuitem', { name: 'Visibility' })).not.toBeVisible();
@@ -535,9 +519,7 @@ test('[TEAMS]: template folder can be moved to another template folder', async (
     redirectPath: `/t/${team.url}/templates`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button').nth(0);
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').nth(0).click();
   await page.getByRole('menuitem', { name: 'Move' }).click();
 
   await page.getByRole('button', { name: 'Team Client Templates' }).click();
@@ -590,9 +572,7 @@ test('[TEAMS]: template folder can be deleted', async ({ page }) => {
     redirectPath: `/t/${team.url}/templates`,
   });
 
-  const folderMoreBtn = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn);
-  await expect(page.getByRole('menuitem', { name: 'Delete' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Delete' }).click();
 
   await page.getByRole('textbox').fill(`delete ${folder.name}`);
@@ -781,9 +761,7 @@ test('[TEAMS]: folder inherits team visibility settings', async ({ page }) => {
 
   await page.goto(`/t/${team.url}/documents/`);
 
-  const folderMoreBtn1 = page.getByTestId('folder-card-more-button');
-  await openDropdownMenu(page, folderMoreBtn1);
-  await expect(page.getByRole('menuitem', { name: 'Settings' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').click();
   await page.getByRole('menuitem', { name: 'Settings' }).click();
 
   await expect(page.getByRole('combobox', { name: 'Visibility' })).toHaveText('Admins only');
@@ -803,9 +781,7 @@ test('[TEAMS]: folder inherits team visibility settings', async ({ page }) => {
 
   await page.goto(`/t/${team.url}/documents`);
 
-  const folderMoreBtn2 = page.getByTestId('folder-card-more-button').nth(0);
-  await openDropdownMenu(page, folderMoreBtn2);
-  await expect(page.getByRole('menuitem', { name: 'Settings' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').nth(0).click();
   await page.getByRole('menuitem', { name: 'Settings' }).click();
 
   await expect(page.getByRole('combobox', { name: 'Visibility' })).toHaveText('Managers and above');
@@ -825,9 +801,7 @@ test('[TEAMS]: folder inherits team visibility settings', async ({ page }) => {
 
   await page.goto(`/t/${team.url}/documents/`);
 
-  const folderMoreBtn3 = page.getByTestId('folder-card-more-button').nth(0);
-  await openDropdownMenu(page, folderMoreBtn3);
-  await expect(page.getByRole('menuitem', { name: 'Settings' })).toBeVisible();
+  await page.getByTestId('folder-card-more-button').nth(0).click();
   await page.getByRole('menuitem', { name: 'Settings' }).click();
 
   await expect(page.getByRole('combobox', { name: 'Visibility' })).toHaveText('Everyone');
@@ -992,9 +966,7 @@ test('[TEAMS]: team member can move documents to everyone folder', async ({ page
   await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();
 
   const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });
-  const docActionBtn = everyoneDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move' })).toBeVisible();
+  await everyoneDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move' }).click();
 
   await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();
@@ -1046,9 +1018,7 @@ test('[TEAMS]: team manager can move manager document to manager folder', async
   await expect(page.getByText('[TEST] Manager Document')).toBeVisible();
 
   const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });
-  const docActionBtn = managerDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await managerDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();
@@ -1101,9 +1071,7 @@ test('[TEAMS]: team manager can move manager document to everyone folder', async
   await expect(page.getByText('[TEST] Manager Document')).toBeVisible();
 
   const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });
-  const docActionBtn = managerDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await managerDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();
@@ -1156,9 +1124,7 @@ test('[TEAMS]: team manager can move everyone document to manager folder', async
   await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();
 
   const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });
-  const docActionBtn = everyoneDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await everyoneDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();
@@ -1211,9 +1177,7 @@ test('[TEAMS]: team admin can move admin document to admin folder', async ({ pag
   await expect(page.getByText('[TEST] Admin Document')).toBeVisible();
 
   const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });
-  const docActionBtn = adminDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await adminDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();
@@ -1264,9 +1228,7 @@ test('[TEAMS]: team admin can move admin document to manager folder', async ({ p
   await expect(page.getByText('[TEST] Admin Document')).toBeVisible();
 
   const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });
-  const docActionBtn = adminDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await adminDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();
@@ -1317,9 +1279,7 @@ test('[TEAMS]: team admin can move admin document to everyone folder', async ({
   await expect(page.getByText('[TEST] Admin Document')).toBeVisible();
 
   const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });
-  const docActionBtn = adminDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await adminDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();
@@ -1370,9 +1330,7 @@ test('[TEAMS]: team admin can move manager document to admin folder', async ({ p
   await expect(page.getByText('[TEST] Manager Document')).toBeVisible();
 
   const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });
-  const docActionBtn = managerDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await managerDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click({ force: true });
 
   await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();
@@ -1423,9 +1381,7 @@ test('[TEAMS]: team admin can move manager document to manager folder', async ({
   await expect(page.getByText('[TEST] Manager Document')).toBeVisible();
 
   const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });
-  const docActionBtn = managerDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await managerDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click({ force: true });
 
   await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();
@@ -1476,9 +1432,7 @@ test('[TEAMS]: team admin can move manager document to everyone folder', async (
   await expect(page.getByText('[TEST] Manager Document')).toBeVisible();
 
   const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });
-  const docActionBtn = managerDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await managerDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click({ force: true });
 
   await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();
@@ -1529,9 +1483,7 @@ test('[TEAMS]: team admin can move everyone document to admin folder', async ({
   await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();
 
   const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });
-  const docActionBtn = everyoneDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await everyoneDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();
@@ -1582,9 +1534,7 @@ test('[TEAMS]: team admin can move everyone document to manager folder', async (
   await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();
 
   const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });
-  const docActionBtn = everyoneDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await everyoneDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();
@@ -1635,9 +1585,7 @@ test('[TEAMS]: team admin can move everyone document to everyone folder', async
   await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();
 
   const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });
-  const docActionBtn = everyoneDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await everyoneDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();
@@ -1682,9 +1630,7 @@ test('[TEAMS]: team owner can move admin document to admin folder', async ({ pag
   await expect(page.getByText('[TEST] Admin Document')).toBeVisible();
 
   const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });
-  const docActionBtn = adminDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await adminDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();
@@ -1729,9 +1675,7 @@ test('[TEAMS]: team owner can move admin document to manager folder', async ({ p
   await expect(page.getByText('[TEST] Admin Document')).toBeVisible();
 
   const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });
-  const docActionBtn = adminDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await adminDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();
@@ -1776,9 +1720,7 @@ test('[TEAMS]: team owner can move admin document to everyone folder', async ({
   await expect(page.getByText('[TEST] Admin Document')).toBeVisible();
 
   const adminDocRow = page.getByRole('row', { name: /\[TEST\] Admin Document/ });
-  const docActionBtn = adminDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await adminDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();
@@ -1823,9 +1765,7 @@ test('[TEAMS]: team owner can move manager document to admin folder', async ({ p
   await expect(page.getByText('[TEST] Manager Document')).toBeVisible();
 
   const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });
-  const docActionBtn = managerDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await managerDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();
@@ -1870,9 +1810,7 @@ test('[TEAMS]: team owner can move manager document to manager folder', async ({
   await expect(page.getByText('[TEST] Manager Document')).toBeVisible();
 
   const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });
-  const docActionBtn = managerDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await managerDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();
@@ -1917,9 +1855,7 @@ test('[TEAMS]: team owner can move manager document to everyone folder', async (
   await expect(page.getByText('[TEST] Manager Document')).toBeVisible();
 
   const managerDocRow = page.getByRole('row', { name: /\[TEST\] Manager Document/ });
-  const docActionBtn = managerDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await managerDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();
@@ -1964,9 +1900,7 @@ test('[TEAMS]: team owner can move everyone document to admin folder', async ({
   await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();
 
   const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });
-  const docActionBtn = everyoneDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await everyoneDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Admin Folder' })).toBeVisible();
@@ -2011,9 +1945,7 @@ test('[TEAMS]: team owner can move everyone document to manager folder', async (
   await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();
 
   const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });
-  const docActionBtn = everyoneDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await everyoneDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Manager Folder' })).toBeVisible();
@@ -2058,9 +1990,7 @@ test('[TEAMS]: team owner can move everyone document to everyone folder', async
   await expect(page.getByText('[TEST] Everyone Document')).toBeVisible();
 
   const everyoneDocRow = page.getByRole('row', { name: /\[TEST\] Everyone Document/ });
-  const docActionBtn = everyoneDocRow.getByTestId('document-table-action-btn');
-  await openDropdownMenu(page, docActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Move to Folder' })).toBeVisible();
+  await everyoneDocRow.getByTestId('document-table-action-btn').click();
   await page.getByRole('menuitem', { name: 'Move to Folder' }).click();
 
   await expect(page.getByRole('button', { name: 'Everyone Folder' })).toBeVisible();

packages/app-tests/e2e/organisations/manage-organisation.spec.ts

@@ -6,11 +6,7 @@ import { seedOrganisationMembers } from '@documenso/prisma/seed/organisations';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin, apiSignout } from '../fixtures/authentication';
-import {
-  expectTextToBeVisible,
-  expectTextToNotBeVisible,
-  openDropdownMenu,
-} from '../fixtures/generic';
+import { expectTextToBeVisible, expectTextToNotBeVisible } from '../fixtures/generic';
 
 test('[ORGANISATIONS]: create and delete organisation', async ({ page }) => {
   const { user, organisation } = await seedUser({
@@ -403,9 +399,7 @@ test('[ORGANISATIONS]: manage groups and members', async ({ page }) => {
   await expect(page.getByText('Team members have been added').first()).toBeVisible();
 
   // Update CUSTOM_GROUP_B
-  const updateBtn = page.getByRole('row', { name: 'CUSTOM_GROUP_B' }).getByRole('button');
-  await openDropdownMenu(page, updateBtn);
-  await expect(page.getByRole('menuitem', { name: 'Update role' })).toBeVisible();
+  await page.getByRole('row', { name: 'CUSTOM_GROUP_B' }).getByRole('button').click();
   await page.getByRole('menuitem', { name: 'Update role' }).click();
   await page.getByRole('combobox').click();
   await page.getByRole('option', { name: 'Team Admin' }).click();
@@ -415,9 +409,7 @@ test('[ORGANISATIONS]: manage groups and members', async ({ page }) => {
   await page.reload();
 
   // Delete CUSTOM_GROUP_B
-  const deleteBtn = page.getByRole('row', { name: 'CUSTOM_GROUP_B' }).getByRole('button');
-  await openDropdownMenu(page, deleteBtn);
-  await expect(page.getByRole('menuitem', { name: 'Remove' })).toBeVisible();
+  await page.getByRole('row', { name: 'CUSTOM_GROUP_B' }).getByRole('button').click();
   await page.getByRole('menuitem', { name: 'Remove' }).click();
   await page.getByRole('button', { name: 'Delete' }).click();
   await expectTextToBeVisible(page, 'You have successfully removed this group from the team.');
@@ -485,9 +477,7 @@ test('[ORGANISATIONS]: member invites', async ({ page }) => {
   await expect(page.getByText(user2.email)).toBeVisible();
   await expect(page.getByText(user3.email)).toBeVisible();
 
-  const inviteActionBtn = page.getByRole('row', { name: user3.email }).getByRole('button');
-  await openDropdownMenu(page, inviteActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Remove' })).toBeVisible();
+  await page.getByRole('row', { name: user3.email }).getByRole('button').click();
   await page.getByRole('menuitem', { name: 'Remove' }).click();
   await expect(page.getByText('Invitation has been deleted').first()).toBeVisible();
   await expect(page.getByText(user3.email)).not.toBeVisible();
@@ -518,9 +508,7 @@ test('[ORGANISATIONS]: member invites', async ({ page }) => {
   await expect(page.getByText(user.email)).toBeVisible();
   await expect(page.getByText(user2.email)).toBeVisible();
 
-  const memberActionBtn = page.getByRole('row', { name: user2.email }).getByRole('button');
-  await openDropdownMenu(page, memberActionBtn);
-  await expect(page.getByRole('menuitem', { name: 'Remove' })).toBeVisible();
+  await page.getByRole('row', { name: user2.email }).getByRole('button').click();
   await page.getByRole('menuitem', { name: 'Remove' }).click();
   await page.getByRole('button', { name: 'Remove' }).click();
   await expect(page.getByText('You have successfully removed').first()).toBeVisible();
@@ -534,9 +522,7 @@ test('[ORGANISATIONS]: member invites', async ({ page }) => {
   await expect(page.getByText(user.email)).toBeVisible();
   await expect(page.getByText(user2.email)).toBeVisible();
 
-  const orgMemberBtn = page.getByRole('row', { name: user2.email }).getByRole('button');
-  await openDropdownMenu(page, orgMemberBtn);
-  await expect(page.getByRole('menuitem', { name: 'Remove' })).toBeVisible();
+  await page.getByRole('row', { name: user2.email }).getByRole('button').click();
   await page.getByRole('menuitem', { name: 'Remove' }).click();
   await page.getByRole('button', { name: 'Delete' }).click();
   await expect(page.getByText('You have successfully removed this user').first()).toBeVisible();

packages/app-tests/e2e/public-profiles/public-profiles.spec.ts

@@ -1,12 +1,10 @@
 import { expect, test } from '@playwright/test';
 
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { prisma } from '@documenso/prisma';
 import { seedDirectTemplate } from '@documenso/prisma/seed/templates';
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
-import { expectToastTextToBeVisible } from '../fixtures/generic';
 
 test('[PUBLIC_PROFILE]: create team profile', async ({ page }) => {
   const { user, team } = await seedUser();
@@ -46,9 +44,6 @@ test('[PUBLIC_PROFILE]: create team profile', async ({ page }) => {
     .fill('public-direct-template-description');
   await page.getByRole('button', { name: 'Update' }).click();
 
-  // Wait for toast
-  await expectToastTextToBeVisible(page, 'Template has been updated');
-
   // Check that public profile is disabled.
   await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/p/${publicProfileUrl}`);
   await expect(page.locator('body')).toContainText('404 Profile not found');
@@ -56,21 +51,7 @@ test('[PUBLIC_PROFILE]: create team profile', async ({ page }) => {
   // Go back to public profile page.
   await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/t/${team.url}/settings/public-profile`);
   await page.getByRole('switch').click();
-
-  // Expect profile to be enabled via db.
-  await expect
-    .poll(
-      async () => {
-        const profile = await prisma.teamProfile.findFirst({
-          where: { teamId: team.id },
-        });
-        return profile?.enabled;
-      },
-      {
-        timeout: 1000,
-      },
-    )
-    .toBeTruthy();
+  await page.waitForTimeout(1000);
 
   // Assert values.
   await page.goto(`${NEXT_PUBLIC_WEBAPP_URL()}/p/${publicProfileUrl}`);