Merge branch 'main' into feature/pdf-placeholder-selection-fields

.agents/plans/brisk-cobalt-river-pdf-placeholder-selection-fields.md

@@ -0,0 +1,222 @@
+---
+date: 2026-05-07
+title: Pdf Placeholder Selection Fields
+---
+
+## Summary
+
+Extend PDF placeholders so radio and dropdown fields can be configured from the existing Documenso placeholder syntax:
+
+```text
+{{FIELD_TYPE, RECIPIENT, key=value, key=value}}
+```
+
+Do not introduce a new delimiter style. Existing applications may already generate placeholders in this format, so the new selection-field behavior should fit into it.
+
+## Goals
+
+- Keep the current placeholder grammar unchanged.
+- Support checkbox placeholders with option lists, checked values, validation, direction, required, read-only, and font size.
+- Support radio placeholders with option lists, default/preselected values, direction, required, read-only, and font size.
+- Support dropdown placeholders with option lists, default value, required, read-only, and font size.
+- Use `options` as the only public list key in PDF placeholders.
+- Convert `options` into internal `fieldMeta.values` during parsing.
+- Make generated fields usable immediately in the editor, signing UI, preview renderer, and final PDF export.
+
+## Non-Goals
+
+- No semicolon placeholder syntax.
+- No `values` alias in PDF placeholder syntax.
+- No database migration.
+- No behavior change for existing placeholders such as `{{text, r1, required=true}}`.
+
+## Placeholder Syntax
+
+Use the existing comma-separated placeholder format:
+
+```text
+{{checkbox, r1, options=Email|SMS|Phone, checked=Email|Phone, validationRule=atLeast, validationLength=1}}
+{{radio, r1, options=Card|Bank transfer|Check, defaultValue=Check}}
+{{radio, r1, options=Basic|Pro|Enterprise, selected=Pro, direction=horizontal}}
+{{dropdown, r1, options=United States|Canada|United Kingdom}}
+{{dropdown, r2, options=Sales|Legal|Finance, defaultValue=Legal}}
+```
+
+Use `|` inside `options` because `,` is already the top-level placeholder delimiter.
+
+Parsing rules:
+
+- Split top-level placeholder tokens on unescaped commas.
+- Split metadata tokens on the first unescaped equals sign.
+- Split `options` on unescaped pipes.
+- Trim option values and drop empty values.
+- Preserve option order.
+- Support escaped delimiters: `\,`, `\=`, and `\|`.
+- Treat field type values case-insensitively.
+
+## Field Type Mapping
+
+- `checkbox` maps to `FieldType.CHECKBOX`.
+- `radio` maps to `FieldType.RADIO`.
+- `dropdown` maps to `FieldType.DROPDOWN`.
+
+## Metadata Mapping
+
+### Checkbox
+
+Example:
+
+```text
+{{checkbox, r1, options=Email|SMS|Phone, checked=Email|Phone, validationRule=atLeast, validationLength=1}}
+```
+
+Normalize to:
+
+```ts
+{
+  type: FieldType.CHECKBOX,
+  fieldMeta: {
+    type: 'checkbox',
+    validationRule: 'Select at least',
+    validationLength: 1,
+    values: [
+      { id: 1, value: 'Email', checked: true },
+      { id: 2, value: 'SMS', checked: false },
+      { id: 3, value: 'Phone', checked: true },
+    ],
+  },
+}
+```
+
+Accepted keys:
+
+- `options`
+- `checked`
+- `direction=vertical|horizontal`
+- `validationRule=atLeast|exactly|atMost`
+- `validationLength=1`
+- `required=true|false`
+- `readOnly=true|false`
+- `fontSize=12`
+
+Map checkbox validation aliases internally: `atLeast` -> `Select at least`, `exactly` -> `Select exactly`, `atMost` -> `Select at most`.
+
+Checkbox placeholders do not support `label` or `placeholder` metadata.
+
+### Radio
+
+Example:
+
+```text
+{{radio, r1, options=Card|Bank transfer|Check, selected=Bank transfer}}
+```
+
+Normalize to:
+
+```ts
+{
+  type: FieldType.RADIO,
+  fieldMeta: {
+    type: 'radio',
+    values: [
+      { id: 1, value: 'Card', checked: false },
+      { id: 2, value: 'Bank transfer', checked: true },
+      { id: 3, value: 'Check', checked: false },
+    ],
+  },
+}
+```
+
+Accepted keys:
+
+- `options`
+- `selected`, `default`, or `defaultValue`
+- `direction=vertical|horizontal`
+- `required=true|false`
+- `readOnly=true|false`
+- `fontSize=12`
+
+Radio placeholders do not support `label` or `placeholder` metadata.
+
+### Dropdown
+
+Example:
+
+```text
+{{dropdown, r1, options=Sales|Legal|Finance, defaultValue=Legal}}
+```
+
+Normalize to:
+
+```ts
+{
+  type: FieldType.DROPDOWN,
+  fieldMeta: {
+    type: 'dropdown',
+    values: [{ value: 'Sales' }, { value: 'Legal' }, { value: 'Finance' }],
+    defaultValue: 'Legal',
+  },
+}
+```
+
+Accepted keys:
+
+- `options`
+- `selected`, `default`, or `defaultValue`
+- `required=true|false`
+- `readOnly=true|false`
+- `fontSize=12`
+
+`defaultValue` should only be set if it matches one parsed option.
+
+Dropdown placeholders do not support `label` or `placeholder` metadata.
+
+## Code Touchpoints
+
+- `packages/lib/server-only/pdf/helpers.ts`
+  - Extend `parseFieldMetaFromPlaceholder` so `options` normalizes into checkbox/radio/dropdown `fieldMeta.values`.
+  - Add delimiter-aware helpers for commas, equals signs, and pipes.
+- `packages/lib/server-only/pdf/auto-place-fields.ts`
+  - Replace plain comma splitting with delimiter-aware splitting.
+  - Preserve the existing positional structure: field type, recipient, metadata.
+- `packages/lib/types/field-meta.ts`
+  - Keep current internal schemas: checkbox/radio/dropdown still store options as `fieldMeta.values`.
+- `packages/ui/primitives/document-flow/field-content.tsx`
+  - Display a radio fallback when a placeholder-created radio has no options.
+- Docs:
+  - `apps/docs/content/docs/users/documents/advanced/pdf-placeholders.mdx`
+  - `apps/docs/content/docs/developers/api/fields.mdx`
+
+## Test Plan
+
+Unit tests:
+
+- `options=Yes|No|Maybe` becomes stable radio values.
+- `selected=No` marks only the matching radio option checked.
+- Checkbox `options`, `checked`, `validationRule`, and `validationLength` normalize correctly.
+- Dropdown `options` and `defaultValue` normalize correctly.
+- Escaped delimiters parse correctly, for example `options=Sales\|Ops|Legal\, Compliance|A\=B`.
+
+E2E/API tests:
+
+- Add a PDF fixture with checkbox, radio, and dropdown placeholders using the current syntax.
+- Verify created fields have schema-compatible metadata and expected options/defaults.
+
+Suggested verification:
+
+```bash
+npm run test -w @documenso/lib -- server-only/pdf/helpers.test.ts
+npm run test:dev -w @documenso/app-tests -- e2e/auto-placing-fields/auto-place-fields-document.spec.ts
+npm run test:dev -w @documenso/app-tests -- e2e/envelope-editor-v2/envelope-fields.spec.ts
+npx tsc --noEmit -p packages/lib/tsconfig.json
+npx tsc --noEmit -p apps/remix/tsconfig.json
+```
+
+Do not use `npm run build` for routine verification unless explicitly requested.
+
+## Decisions
+
+- Keep the existing placeholder format.
+- Use only `options` publicly.
+- Keep `values` as an internal metadata field only.
+- Use `|` as the option delimiter inside `options`.

.agents/plans/wild-indigo-wave-rejected-expired-recipient-filters.md

@@ -1,146 +0,0 @@
----
-date: 2026-05-28
-title: Rejected Expired Recipient Filters
----
-
-## Context
-
-Customers need to find (a) envelopes/documents in the `REJECTED` state and (b) envelopes
-with at least one recipient whose signing link has **expired**. Today the UI only exposes
-`INBOX / PENDING / COMPLETED / DRAFT / ALL` tabs, and the public API has no way to filter by
-expired recipient links — forcing a fetch-all-`PENDING`-then-inspect-each-recipient workaround.
-
-Two key facts from exploration shaped this plan:
-
-- **`REJECTED` is already fully wired in the backend** — the where-clause (`find-documents.ts`),
-  stats counts (`get-stats.ts`), tRPC response schema, `ExtendedDocumentStatus` enum, and the
-  `FRIENDLY_STATUS_MAP` display all handle it. It is simply absent from the UI tab array.
-- **Renewing expired links already works.** `resendDocument` refreshes `expiresAt` and clears
-  `expirationNotifiedAt` for unsigned, non-CC recipients (`resend-document.ts:98-121`), exposed
-  publicly via `POST /api/v2/document/redistribute` and `/api/v2/envelope/redistribute` and via the
-  resend/redistribute UI dialogs. No new renew mechanism is needed — only documentation/wording.
-
-Expiration is a per-recipient condition (not an envelope status). The approved design models it
-in the UI as an `EXPIRED` **pseudo-status tab** (reusing the existing tab machinery, mirroring how
-`REJECTED` works) and in the public API as an orthogonal boolean `hasExpiredRecipients`. Both share
-one EXISTS predicate.
-
-Definition of "expired recipient" (matches `isRecipientExpired`, `packages/lib/utils/recipients.ts:118`):
-a `Recipient` with `expiresAt IS NOT NULL AND expiresAt <= now() AND signingStatus = NOT_SIGNED AND role != CC`.
-
-## Approach
-
-### A. Shared EXISTS predicate (reused 4x, justified)
-Add a local `hasExpiredRecipient(eb)` helper — modeled on the existing per-file `recipientExists` /
-`senderEmailIs` helpers — to `find-documents.ts`, `get-stats.ts`, and `find-envelopes.ts`. It is the
-single source of truth for the expired condition above (using `new Date()` for `now`, matching the
-`period` filter's `.toJSDate()` style).
-
-### B. REJECTED tab (UI only — backend already done)
-- `apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx`: add
-  `ExtendedDocumentStatus.REJECTED` to the tab array (lines 149-155). Count badge, highlight, and
-  `?status=REJECTED` filtering already work via existing machinery.
-
-### C. EXPIRED pseudo-status (UI + internal stats)
-1. `packages/prisma/types/extended-document-status.ts`: add `EXPIRED: 'EXPIRED'`. Internal-only —
-   the public `DocumentStatus` enum is unaffected. This intentionally surfaces TS errors at the three
-   exhaustive/`Record<ExtendedDocumentStatus>` sites below, forcing them to be handled.
-2. `packages/lib/server-only/document/find-documents.ts`:
-   - Add `.with(ExtendedDocumentStatus.EXPIRED, ...)` to **both** `applyPersonalFilters` and
-     `applyTeamFilters`, mirroring the `COMPLETED` branch's access control (deleted + visibility +
-     owner/recipient access) with `hasExpiredRecipient(eb)` AND-ed in. Do **not** constrain
-     `Envelope.status` — the EXISTS already restricts to unsigned recipients.
-3. `packages/lib/server-only/document/get-stats.ts`:
-   - Add an `expiredQuery` mirroring `pendingQuery`'s access control + `hasExpiredRecipient(eb)`.
-   - Add it to the `Promise.all`, add `[ExtendedDocumentStatus.EXPIRED]: expired` to the `stats`
-     record. **Do not** add `expired` to the `all` sum (it overlaps `PENDING`).
-4. `packages/trpc/server/document-router/find-documents-internal.types.ts`: add
-   `[ExtendedDocumentStatus.EXPIRED]: z.number()` to the `stats` response object. (`status` already
-   accepts the extended enum via `z.nativeEnum(ExtendedDocumentStatus)`.)
-5. `apps/remix/app/components/general/document/document-status.tsx`: add an `EXPIRED` entry to
-   `FRIENDLY_STATUS_MAP` — `label: msg` Expired, an icon (e.g. lucide `TimerOff`, matching the
-   `/sign/$token/expired` page), and a distinct color (e.g. `text-orange-500`) to differentiate from
-   `REJECTED` (red).
-6. `documents._index.tsx`: add `[ExtendedDocumentStatus.EXPIRED]: 0` to the `stats` `useState`
-   initializer and `ExtendedDocumentStatus.EXPIRED` to the tab array. Final order:
-   `INBOX, PENDING, COMPLETED, DRAFT, REJECTED, EXPIRED, ALL`.
-7. (Optional, recommended) `apps/remix/app/components/tables/documents-table-empty-state.tsx`: add
-   tailored `EXPIRED` and `REJECTED` empty-state copy (currently both fall through to `.otherwise()`).
-
-### D. Public API boolean `hasExpiredRecipients` (document + envelope, v2)
-1. `packages/lib/server-only/document/find-documents.ts`: add `hasExpiredRecipients?: boolean` to
-   `FindDocumentsOptions`; when true, apply `.where((eb) => hasExpiredRecipient(eb))` inside
-   `buildBaseQuery` (orthogonal/additive to any `status`).
-2. `packages/trpc/server/document-router/find-documents.types.ts`: add a query-safe boolean
-   `hasExpiredRecipients` to `ZFindDocumentsRequestSchema` with a `.describe(...)`. Mirror the
-   existing boolean-query-param handling in `find-document-audit-logs.types.ts`
-   (`filterForRecentActivity`) — avoid raw `z.coerce.boolean()` (the "false" -> true footgun); use a
-   string transform if needed. Pass it through in `find-documents.ts` (public handler).
-3. `packages/lib/server-only/envelope/find-envelopes.ts`: add `hasExpiredRecipients?: boolean` to
-   `FindEnvelopesOptions` + the `hasExpiredRecipient(eb)` helper + the additive `.where`.
-4. `packages/trpc/server/envelope-router/find-envelopes.types.ts`: add the same param to
-   `ZFindEnvelopesRequestSchema`; pass it through in the envelope-router find handler.
-   The param auto-appears in the generated `/api/v2/openapi.json`.
-
-Note: REST v1 `GET /api/v1/documents` is deprecated and lacks status filtering — left unchanged.
-`REJECTED` is already a valid public `status` value (`DocumentStatus.REJECTED`), so no API change is
-needed for rejected filtering.
-
-### E. Renew expired links — documentation only
-No functional change. Document that resending renews expired links:
-- Update the `.description` in `packages/trpc/server/document-router/redistribute-document.types.ts`
-  and `packages/trpc/server/envelope-router/redistribute-envelope.types.ts` to state that
-  redistributing refreshes the signing-link expiration for unsigned recipients.
-- Optionally adjust resend/redistribute dialog copy
-  (`apps/remix/app/components/dialogs/document-resend-dialog.tsx`,
-  `envelope-redistribute-dialog.tsx`) to mention it renews expired links.
-
-## Files To Modify (summary)
-
-| Area | File |
-|------|------|
-| Enum | `packages/prisma/types/extended-document-status.ts` |
-| Where-clause + API option | `packages/lib/server-only/document/find-documents.ts` |
-| Stats counts | `packages/lib/server-only/document/get-stats.ts` |
-| Envelope find (API) | `packages/lib/server-only/envelope/find-envelopes.ts` |
-| Internal tRPC stats schema | `packages/trpc/server/document-router/find-documents-internal.types.ts` |
-| Public doc API schema + handler | `packages/trpc/server/document-router/find-documents.types.ts`, `find-documents.ts` |
-| Public envelope API schema + handler | `packages/trpc/server/envelope-router/find-envelopes.types.ts`, `find-envelopes.ts` |
-| Status display | `apps/remix/app/components/general/document/document-status.tsx` |
-| Tabs + stats init | `apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx` |
-| Empty state (optional) | `apps/remix/app/components/tables/documents-table-empty-state.tsx` |
-| Renew docs | `redistribute-document.types.ts`, `redistribute-envelope.types.ts` (+ resend dialogs, optional) |
-
-## Reused Utilities / Patterns
-- `recipientExists` / `senderEmailIs` (per-file Kysely EXISTS helpers) — the template for the new
-  `hasExpiredRecipient` helper.
-- `REJECTED` branches in `find-documents.ts` (lines 279, 416) and `rejectedQuery` in `get-stats.ts`
-  (line 227) — the template for the `EXPIRED` branches / `expiredQuery`.
-- `isRecipientExpired` (`packages/lib/utils/recipients.ts:118`) — defines the `expiresAt <= now`
-  semantics to match.
-- Existing tab machinery in `documents._index.tsx` (`getTabHref`, count badge, personal-org `.filter`)
-  — works unchanged for the new tabs.
-- `resendDocument` / `trpc.document.redistribute` / `trpc.envelope.redistribute` — existing renew path.
-
-## Verification
-1. **Typecheck** (the enum change forces all exhaustive/Record sites): `npm run typecheck -w @documenso/remix`.
-2. **Seed + UI** (dev server already running): seed a team via `seedTeam`, send a document, then:
-   - Reject one as a recipient -> it appears under the new **Rejected** tab with a count.
-   - Force expiry (set a recipient `expiresAt` in the past, e.g. via Prisma Studio or a short
-     `envelopeExpirationPeriod`) -> the doc appears under the new **Expired** tab with a count, and the
-     count excludes signed/CC recipients.
-3. **Public API**: `GET /api/v2/document?hasExpiredRecipients=true` and
-   `GET /api/v2/envelope?hasExpiredRecipients=true` (Bearer API token) return only envelopes with >=1
-   expired unsigned recipient; confirm `GET /api/v2/document?status=REJECTED` works. Verify the param
-   appears in `/api/v2/openapi.json`.
-4. **Renew**: on an expired doc, run resend/redistribute (UI dialog or
-   `POST /api/v2/document/redistribute`) -> recipient `expiresAt` is refreshed, the doc leaves the
-   Expired tab, and the signing link no longer redirects to `/sign/$token/expired`.
-5. **E2E** (optional): extend `packages/app-tests/e2e/envelopes/envelope-expiration-send.spec.ts`
-   with an Expired-tab assertion.
-6. Do **not** modify/commit `packages/lib/translations/*.po`; run `npm run translate` only if needed
-   for new `msg`/`Trans` strings, and keep generated `.po` files out of the branch.
-
-## Open Questions
-- Exact icon/color for the `EXPIRED` tab (proposed: `TimerOff`, `text-orange-500`).
-- Whether to add the optional tailored empty-state copy now or defer.

ARCHITECTURE.md

@@ -42,8 +42,8 @@ Documenso is an open-source document signing platform built as a **monorepo** us
 | Package                    | Description                                              | Port |
 | -------------------------- | -------------------------------------------------------- | ---- |
 | `@documenso/remix`         | Main application - React Router (Remix) with Hono server | 3000 |
+| `@documenso/documentation` | Documentation site (Next.js + Nextra)                    | 3002 |
 | `@documenso/openpage-api`  | Public analytics API                                     | 3003 |
-| `@documenso/docs`          | Documentation site                                       | 3004 |
 
 ### Core Packages (`packages/`)
 

apps/docs/content/docs/developers/api/documents.mdx

@@ -6,8 +6,6 @@ description: Create, manage, and send documents for signing via the API.
 import { Callout } from 'fumadocs-ui/components/callout';
 import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 
-<EnvelopeWarning />
-
 <Callout type="warn">
   This guide may not reflect the latest endpoints or parameters. For an always up-to-date reference,
   see the [OpenAPI Reference](https://openapi.documenso.com).

apps/docs/content/docs/developers/api/index.mdx

@@ -5,8 +5,6 @@ description: Complete reference for the Documenso REST API.
 
 import { Callout } from 'fumadocs-ui/components/callout';
 
-<EnvelopeWarning />
-
 <Callout type="warn">
   The guides below cover common API patterns but may not reflect the latest endpoints or parameters.
   For an always up-to-date reference, see the [OpenAPI Reference](https://openapi.documenso.com).

apps/docs/content/docs/developers/api/meta.json

@@ -8,7 +8,6 @@
     "teams",
     "rate-limits",
     "versioning",
-    "migrate-to-envelopes",
     "developer-mode",
     "common-errors"
   ]

apps/docs/content/docs/developers/api/migrate-to-envelopes.mdx

@@ -1,249 +0,0 @@
----
-title: Migrating to Envelopes
-description: Why Documenso unified documents and templates into envelopes, and how to migrate from the deprecated document and template create endpoints.
----
-
-import { Accordion, Accordions } from 'fumadocs-ui/components/accordion';
-import { Callout } from 'fumadocs-ui/components/callout';
-import { Step, Steps } from 'fumadocs-ui/components/steps';
-import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
-
-## Summary
-
-The following items have been deprecated and will be removed on the <strong>1st of March 2027</strong>:
-
-- <strong>API V1</strong>
-- <strong>A subset of SDK/API V2 endpoints</strong>
-- <strong>Legacy documents and templates</strong>
-- <strong>EmbedCreateDocumentV1</strong>
-- <strong>EmbedCreateTemplateV1</strong>
-- <strong>EmbedUpdateDocumentV1</strong>
-- <strong>EmbedUpdateTemplateV1</strong>
-
-The beta endpoint `/api/v2-beta` will also be removed. Use `/api/v2` instead, which is a drop-in replacement.
-
-Nothing breaks before 1st of March 2027, so you can migrate at your own pace.
-
-## What are legacy documents and templates
-
-These are documents and templates created by the following endpoints:
-
-- `POST /api/v2/document/create`
-- `POST /api/v2/document/create/beta`
-- `POST /api/v2/template/create`
-- `POST /api/v2/template/create/beta`
-- `POST /api/v1/documents`
-- `POST /api/v1/templates`
-- `POST /api/v1/templates/create-document`
-- `POST /api/v1/templates/generate-document`
-
-## What replaces legacy documents and templates
-
-At the end of 2025 we introduced a unified system for documents and templates, called <strong>envelopes</strong>.
-
-We still reference documents and templates throughout the documentation and application to distinguish them, but internally they are envelopes.
-
-Moving to the envelope system gives you:
-
-- **Multiple PDFs in one envelope.** Send several documents to sign in a single request.
-- **One API for documents and templates.** Learn one set of endpoints instead of two misaligned ones.
-- **A better editor and signing experience** for you and your recipients.
-
-## How to migrate
-
-{/* prettier-ignore */}
-<Steps>
-  <Step>
-    ### Switch to the envelope endpoints
-
-    Replace each deprecated endpoint with its `/api/v2/envelope/*` equivalent from the [mapping tables](#endpoint-mapping-reference) below.
-  </Step>
-  <Step>
-    ### Set the envelope `type` on create
-
-    A single endpoint, `POST /api/v2/envelope/create`, can create both documents and templates. Set `type` to `DOCUMENT` or `TEMPLATE`. You can now upload more than one PDF using the `files` field.
-  </Step>
-  <Step>
-    ### Update how you store IDs
-
-    Envelope IDs are **strings** (for example `envelope_abc123`), not numbers. Update any code that stores, parses, or compares IDs.
-  </Step>
-  <Step>
-    ### Test, then remove the old calls
-
-    Verify the new flow against your account, then delete the deprecated calls.
-  </Step>
-</Steps>
-
-The main data differences are as follows:
-- ID format changed from number to string (e.g. `42` to `envelope_abc123`)
-- pageNumber becomes page
-- pageX becomes positionX
-- pageY becomes positionY
-
-See the [Documents API](/docs/developers/api/documents) and [Templates API](/docs/developers/api/templates) for the full envelope reference.
-
-### Deprecated V1 API Endpoints
-
-Full reference in the [V1 OpenAPI reference](https://openapi-v1.documenso.com).
-
-| Deprecated endpoint                                      | Replacement                                           |
-| -------------------------------------------------------- | ----------------------------------------------------- |
-| `GET /api/v1/documents`                                  | `GET /api/v2/envelope`                                |
-| `GET /api/v1/documents/{id}`                             | `GET /api/v2/envelope/{envelopeId}`                   |
-| `POST /api/v1/documents`                                 | `POST /api/v2/envelope/create`                        |
-| `POST /api/v1/documents/{id}/send`                       | `POST /api/v2/envelope/distribute`                    |
-| `POST /api/v1/documents/{id}/resend`                     | `POST /api/v2/envelope/redistribute`                  |
-| `DELETE /api/v1/documents/{id}`                          | `POST /api/v2/envelope/delete`                        |
-| `GET /api/v1/documents/{id}/download`                    | `GET /api/v2/envelope/item/{envelopeItemId}/download` |
-| `POST /api/v1/documents/{id}/recipients`                 | `POST /api/v2/envelope/recipient/create-many`         |
-| `PATCH /api/v1/documents/{id}/recipients/{recipientId}`  | `POST /api/v2/envelope/recipient/update-many`         |
-| `DELETE /api/v1/documents/{id}/recipients/{recipientId}` | `POST /api/v2/envelope/recipient/delete`              |
-| `POST /api/v1/documents/{id}/fields`                     | `POST /api/v2/envelope/field/create-many`             |
-| `PATCH /api/v1/documents/{id}/fields/{fieldId}`          | `POST /api/v2/envelope/field/update-many`             |
-| `DELETE /api/v1/documents/{id}/fields/{fieldId}`         | `POST /api/v2/envelope/field/delete`                  |
-| `GET /api/v1/templates`                                  | `GET /api/v2/envelope` (with `type=TEMPLATE`)         |
-| `GET /api/v1/templates/{id}`                             | `GET /api/v2/envelope/{envelopeId}`                   |
-| `POST /api/v1/templates`                                 | `POST /api/v2/envelope/create` (`type=TEMPLATE`)      |
-| `DELETE /api/v1/templates/{id}`                          | `POST /api/v2/envelope/delete`                        |
-| `POST /api/v1/templates/{templateId}/create-document`    | `POST /api/v2/envelope/use`                           |
-| `POST /api/v1/templates/{templateId}/generate-document`  | `POST /api/v2/envelope/use`                           |
-
-### Deprecated V2 API Endpoints
-
-Full reference in the [V2 OpenAPI reference](https://openapi.documenso.com).
-
-#### Documents
-
-| Deprecated endpoint                               | Replacement                                           |
-| ------------------------------------------------- | ----------------------------------------------------- |
-| `GET /api/v2/document`                            | `GET /api/v2/envelope`                                |
-| `GET /api/v2/document/{documentId}`               | `GET /api/v2/envelope/{envelopeId}`                   |
-| `POST /api/v2/document/get-many`                  | `POST /api/v2/envelope/get-many`                      |
-| `POST /api/v2/document/create`                    | `POST /api/v2/envelope/create`                        |
-| `POST /api/v2/document/create/beta`               | `POST /api/v2/envelope/create`                        |
-| `POST /api/v2/document/update`                    | `POST /api/v2/envelope/update`                        |
-| `POST /api/v2/document/delete`                    | `POST /api/v2/envelope/delete`                        |
-| `POST /api/v2/document/duplicate`                 | `POST /api/v2/envelope/duplicate`                     |
-| `POST /api/v2/document/distribute`                | `POST /api/v2/envelope/distribute`                    |
-| `POST /api/v2/document/redistribute`              | `POST /api/v2/envelope/redistribute`                  |
-| `GET /api/v2/document/attachment`                 | `GET /api/v2/envelope/attachment`                     |
-| `POST /api/v2/document/attachment/create`         | `POST /api/v2/envelope/attachment/create`             |
-| `POST /api/v2/document/attachment/update`         | `POST /api/v2/envelope/attachment/update`             |
-| `POST /api/v2/document/attachment/delete`         | `POST /api/v2/envelope/attachment/delete`             |
-| `GET /api/v2/document/{documentId}/download`      | `GET /api/v2/envelope/item/{envelopeItemId}/download` |
-| `GET /api/v2/document/{documentId}/download-beta` | `GET /api/v2/envelope/item/{envelopeItemId}/download` |
-
-#### Templates
-
-| Deprecated endpoint                   | Replacement                                      |
-| ------------------------------------- | ------------------------------------------------ |
-| `GET /api/v2/template`                | `GET /api/v2/envelope` (with `type=TEMPLATE`)    |
-| `GET /api/v2/template/{templateId}`   | `GET /api/v2/envelope/{envelopeId}`              |
-| `POST /api/v2/template/get-many`      | `POST /api/v2/envelope/get-many`                 |
-| `POST /api/v2/template/create`        | `POST /api/v2/envelope/create` (`type=TEMPLATE`) |
-| `POST /api/v2/template/create/beta`   | `POST /api/v2/envelope/create` (`type=TEMPLATE`) |
-| `POST /api/v2/template/update`        | `POST /api/v2/envelope/update`                   |
-| `POST /api/v2/template/duplicate`     | `POST /api/v2/envelope/duplicate`                |
-| `POST /api/v2/template/delete`        | `POST /api/v2/envelope/delete`                   |
-| `POST /api/v2/template/use`           | `POST /api/v2/envelope/use`                      |
-| `POST /api/v2/template/direct/create` | **Pending replacement**                               |
-| `POST /api/v2/template/direct/delete` | **Pending replacement**                               |
-| `POST /api/v2/template/direct/toggle` | **Pending replacement**                               |
-
-#### Document fields
-
-| Deprecated endpoint                       | Replacement                               |
-| ----------------------------------------- | ----------------------------------------- |
-| `GET /api/v2/document/field/{fieldId}`    | `GET /api/v2/envelope/field/{fieldId}`    |
-| `POST /api/v2/document/field/create`      | `POST /api/v2/envelope/field/create-many` |
-| `POST /api/v2/document/field/create-many` | `POST /api/v2/envelope/field/create-many` |
-| `POST /api/v2/document/field/update`      | `POST /api/v2/envelope/field/update-many` |
-| `POST /api/v2/document/field/update-many` | `POST /api/v2/envelope/field/update-many` |
-| `POST /api/v2/document/field/delete`      | `POST /api/v2/envelope/field/delete`      |
-
-#### Template fields
-
-| Deprecated endpoint                       | Replacement                               |
-| ----------------------------------------- | ----------------------------------------- |
-| `GET /api/v2/template/field/{fieldId}`    | `GET /api/v2/envelope/field/{fieldId}`    |
-| `POST /api/v2/template/field/create`      | `POST /api/v2/envelope/field/create-many` |
-| `POST /api/v2/template/field/create-many` | `POST /api/v2/envelope/field/create-many` |
-| `POST /api/v2/template/field/update`      | `POST /api/v2/envelope/field/update-many` |
-| `POST /api/v2/template/field/update-many` | `POST /api/v2/envelope/field/update-many` |
-| `POST /api/v2/template/field/delete`      | `POST /api/v2/envelope/field/delete`      |
-
-#### Document recipients
-
-| Deprecated endpoint                            | Replacement                                    |
-| ---------------------------------------------- | ---------------------------------------------- |
-| `GET /api/v2/document/recipient/{recipientId}` | `GET /api/v2/envelope/recipient/{recipientId}` |
-| `POST /api/v2/document/recipient/create`       | `POST /api/v2/envelope/recipient/create-many`  |
-| `POST /api/v2/document/recipient/create-many`  | `POST /api/v2/envelope/recipient/create-many`  |
-| `POST /api/v2/document/recipient/update`       | `POST /api/v2/envelope/recipient/update-many`  |
-| `POST /api/v2/document/recipient/update-many`  | `POST /api/v2/envelope/recipient/update-many`  |
-| `POST /api/v2/document/recipient/delete`       | `POST /api/v2/envelope/recipient/delete`       |
-
-#### Template recipients
-
-| Deprecated endpoint                            | Replacement                                    |
-| ---------------------------------------------- | ---------------------------------------------- |
-| `GET /api/v2/template/recipient/{recipientId}` | `GET /api/v2/envelope/recipient/{recipientId}` |
-| `POST /api/v2/template/recipient/create`       | `POST /api/v2/envelope/recipient/create-many`  |
-| `POST /api/v2/template/recipient/create-many`  | `POST /api/v2/envelope/recipient/create-many`  |
-| `POST /api/v2/template/recipient/update`       | `POST /api/v2/envelope/recipient/update-many`  |
-| `POST /api/v2/template/recipient/update-many`  | `POST /api/v2/envelope/recipient/update-many`  |
-| `POST /api/v2/template/recipient/delete`       | `POST /api/v2/envelope/recipient/delete`       |
-
-### Embedding components
-
-| Deprecated component    | Replacement           |
-| ----------------------- | --------------------- |
-| `EmbedCreateDocumentV1` | `EmbedCreateEnvelope` |
-| `EmbedCreateTemplateV1` | `EmbedCreateEnvelope` |
-| `EmbedUpdateDocumentV1` | `EmbedUpdateEnvelope` |
-| `EmbedUpdateTemplateV1` | `EmbedUpdateEnvelope` |
-
-See the [embedding guide](/docs/developers/embedding) for the envelope components.
-
-## FAQ
-
-<Accordions>
-  <Accordion title="What happens on 1 March 2027?">
-    The deprecated V1 API, the V2 endpoints listed above, and the V1 embedding components are removed.
-    Requests to them will fail, so migrate to the envelope API before that date.
-  </Accordion>
-  <Accordion title="Will my existing documents and templates keep working?">
-    Yes. Documents and templates you already created remain in your account and continue to work. They will automatically be converted to envelopes. Only
-    the deprecated endpoints you call are going away. Your data is not deleted.
-  </Accordion>
-  <Accordion title="Do I need a new API token?">
-    No. Authentication is unchanged. The same API token works for the envelope endpoints under
-    `https://app.documenso.com/api/v2`.
-  </Accordion>
-  <Accordion title="What is the difference between a document and a template now?">
-    Both are envelopes, distinguished by a `type` field of `DOCUMENT` or `TEMPLATE`. They share the same
-    endpoints, recipients, fields, and attachments.
-  </Accordion>
-  <Accordion title="I use an official SDK, what should I do?">
-    The function calls to the legacy endpoints will break on the 1st of March 2027. Update to the latest SDK version and switch to its envelope methods.
-    The deprecated document and template methods map to the envelope endpoints in the tables above.
-  </Accordion>
-  <Accordion title="I need more time or help migrating">
-    Reach out to [support@documenso.com](mailto:support@documenso.com) with your use case and we will
-    help you plan the migration.
-  </Accordion>
-</Accordions>
-
-## Getting help
-
-- [V2 OpenAPI reference](https://openapi.documenso.com): the up-to-date envelope API.
-- [V1 OpenAPI reference](https://openapi-v1.documenso.com): the deprecated V1 API.
-- [support@documenso.com](mailto:support@documenso.com): migration questions and extensions.
-
-## See also
-
-- [Documents API](/docs/developers/api/documents): create and manage envelopes
-- [Templates API](/docs/developers/api/templates): work with templates and direct links
-- [Fields API](/docs/developers/api/fields) and [Recipients API](/docs/developers/api/recipients)
-- [API Versioning](/docs/developers/api/versioning): how Documenso versions the public API

apps/docs/content/docs/developers/api/rate-limits.mdx

@@ -11,21 +11,10 @@ Documenso enforces rate limits on all API endpoints to ensure service stability.
 
 ## HTTP Rate Limits
 
-The rate limit applies to:
-
-- `/api/v1/*`
-- `/api/v2/*`
-- `/api/v2-beta/*`
-
-**Limit:** 1000 requests per minute per IP address  
+**Limit:** 100 requests per minute per IP address  
 **Response:** 429 Too Many Requests
 
-<Callout type="info">
-  This is the global per-IP ceiling. Your organisation may have its own rate limits configured below
-  this value, in which case you can be rate-limited before reaching the global limit.
-</Callout>
-
-### Global per-IP 429 Response
+### Rate Limit Response
 
 ```json
 {
@@ -33,22 +22,10 @@ The rate limit applies to:
 }
 ```
 
-### Rate Limit Headers
-
-Responses from `/api/v1/*`, `/api/v2/*`, and `/api/v2-beta/*` include these headers. The only
-exception is CORS preflight (`OPTIONS`) requests, which are answered before the rate limiter runs
-and carry no rate limit headers:
-
-| Header                  | Description                                                            |
-| ----------------------- | ---------------------------------------------------------------------- |
-| `X-RateLimit-Limit`     | Maximum requests allowed in the current global window                  |
-| `X-RateLimit-Remaining` | Requests remaining in the current global window                        |
-| `X-RateLimit-Reset`     | End of the current global window, as a Unix epoch timestamp in seconds |
-
-A 429 response from a windowed limiter also includes `Retry-After`, in seconds, with a minimum
-value of `1`. The global API limit uses fixed, epoch-aligned one-minute buckets, so the actual wait
-until the next window is between 1 and 60 seconds. Honor `Retry-After` exactly instead of sleeping
-for a fixed 60 seconds. See the [Retry-After handling example](/docs/developers/examples/common-workflows#error-handling-patterns).
+<Callout type="warn">
+  No rate limit headers are currently provided. When you receive a 429 response, wait at least 60
+  seconds before retrying.
+</Callout>
 
 ## Resource Limits
 
@@ -62,55 +39,24 @@ Beyond HTTP rate limits, your account has usage limits based on your subscriptio
 | Total Recipients | 10   | Unlimited | Unlimited   | Unlimited  |
 | Direct Templates | 3    | Unlimited | Unlimited   | Unlimited  |
 
-### Organisation Limit 429 Responses
+### Error Response
 
-Organisation windowed limits and organisation monthly quotas produce 429 responses whose body
-shape depends on the API version, and neither matches the global per-IP limiter's
-`{ "error": "..." }` body.
-
-On `/api/v1/*`, the body contains only a message:
+When you exceed a resource limit:
 
 ```json
 {
-  "message": "Too many requests, please try again later. Contact support if you require higher limits."
+  "error": "You have reached your document limit for this month. Please upgrade your plan.",
+  "code": "LIMIT_EXCEEDED",
+  "statusCode": 400
 }
 ```
 
-On `/api/v2/*` and `/api/v2-beta/*`, the body is a structured error object:
-
-```json
-{
-  "message": "Too many requests, please try again later. Contact support if you require higher limits.",
-  "code": "TOO_MANY_REQUESTS",
-  "data": {
-    "code": "TOO_MANY_REQUESTS",
-    "httpStatus": 429,
-    "appError": {
-      "code": "TOO_MANY_REQUESTS",
-      "message": "Too many requests, please try again later. Contact support if you require higher limits."
-    }
-  }
-}
-```
-
-Organisation windowed limit responses include the `X-RateLimit-*` headers and `Retry-After` for
-their own window. Monthly quota responses carry no quota-specific rate limit headers or
-`Retry-After` because the quota is not a time window; rely on the status code and message instead.
-
 ## Error Codes
 
-| Code                | Status | Description                                                        |
-| ------------------- | ------ | ------------------------------------------------------------------ |
-| `TOO_MANY_REQUESTS` | 429    | Global per-IP, organisation windowed, or monthly quota exceeded    |
-| `LIMIT_EXCEEDED`    | 400    | Resource usage limit exceeded                                      |
-
-There are three sources of `TOO_MANY_REQUESTS` responses:
-
-1. The global per-IP limit, returning the `{ "error": "..." }` body shown above.
-2. Organisation windowed rate limits for the `api`, `document`, and `email` counters.
-3. Organisation monthly quotas for the same three counters. Every authenticated API request
-   consumes the `api` counter, so any endpoint can return this 429 once the monthly API quota is
-   exhausted — not just envelope-related ones.
+| Code                | Status | Description                   |
+| ------------------- | ------ | ----------------------------- |
+| `TOO_MANY_REQUESTS` | 429    | HTTP rate limit exceeded      |
+| `LIMIT_EXCEEDED`    | 400    | Resource usage limit exceeded |
 
 ---
 

apps/docs/content/docs/developers/api/templates.mdx

@@ -6,8 +6,6 @@ description: Create documents from reusable templates via API.
 import { Callout } from 'fumadocs-ui/components/callout';
 import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 
-<EnvelopeWarning />
-
 <Callout type="warn">
   This guide may not reflect the latest endpoints or parameters. For an always up-to-date reference,
   see the [OpenAPI Reference](https://openapi.documenso.com).

apps/docs/content/docs/developers/api/versioning.mdx

@@ -5,8 +5,6 @@ description: Versioning information for the Documenso public API.
 
 import { Callout } from 'fumadocs-ui/components/callout';
 
-<EnvelopeWarning />
-
 ## Overview
 
 Documenso uses API versioning to manage changes to the public API. This allows us to introduce new features, fix bugs, and make other changes without breaking existing integrations.
@@ -21,16 +19,7 @@ Also, we may deprecate certain features or endpoints in the API. When we depreca
 
 ---
 
-## Documents, Templates, and Envelopes
-
-Documenso has unified documents and templates into a single resource called an **envelope**. New integrations should create documents and templates through the `/envelope/*` endpoints. The `POST /document/create` and `POST /template/create` endpoints (including their `/beta` variants) are deprecated in favor of `POST /envelope/create`.
-
-See [Migrating to the Envelope API](/docs/developers/api/migrate-to-envelopes) for the rationale and step-by-step migration examples.
-
----
-
 ## See Also
 
-- [Migrating to the Envelope API](/docs/developers/api/migrate-to-envelopes) - Move from the document and template create endpoints
 - [Authentication](/docs/developers/getting-started/authentication) - API authentication guide
 - [Rate Limits](/docs/developers/api/rate-limits) - API rate limit details

apps/docs/content/docs/developers/examples/common-workflows.mdx

@@ -8,8 +8,6 @@ import { Callout } from 'fumadocs-ui/components/callout';
 import { Step, Steps } from 'fumadocs-ui/components/steps';
 import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 
-<EnvelopeWarning />
-
 ## Workflow 1: Send a Document for Signature
 
 The most common workflow: upload a PDF, add recipients with signature fields, and send for signing.
@@ -474,7 +472,7 @@ Send the same document to multiple recipients in parallel. Useful for policy ack
     <code>distributeDocument: true</code>
   </Step>
   <Step>
-    Process in batches with a short delay to respect rate limits (e.g. 1000 requests/minute)
+    Process in batches with a short delay to respect rate limits (e.g. 100 requests/minute)
   </Step>
 </Steps>
 
@@ -640,8 +638,8 @@ done
 </Tabs>
 
 <Callout type="info">
-  The API allows 1000 requests per minute (your organisation may have its own lower limit). For large
-  batches, implement rate limiting with delays between requests to avoid hitting limits.
+  The API allows 100 requests per minute. For large batches, implement rate limiting with delays
+  between requests to avoid hitting limits.
 </Callout>
 
 ---
@@ -1000,12 +998,9 @@ async function fetchWithRetry(
       // Retry on rate limit
       if (response.status === 429) {
         const retryAfter = response.headers.get('Retry-After');
-        // Honor Retry-After exactly; the cap only applies to the exponential fallback.
-        const delay = retryAfter
-          ? parseInt(retryAfter) * 1000
-          : Math.min(baseDelayMs * Math.pow(2, attempt), maxDelayMs);
+        const delay = retryAfter ? parseInt(retryAfter) * 1000 : baseDelayMs * Math.pow(2, attempt);
         console.log(`Rate limited, waiting ${delay}ms...`);
-        await new Promise((resolve) => setTimeout(resolve, delay));
+        await new Promise((resolve) => setTimeout(resolve, Math.min(delay, maxDelayMs)));
         continue;
       }
 

apps/docs/content/docs/developers/examples/index.mdx

@@ -3,8 +3,6 @@ title: Examples
 description: Common integration patterns and end-to-end workflows.
 ---
 
-<EnvelopeWarning />
-
 <Cards>
   <Card
     title="Common Workflows"

apps/docs/content/docs/developers/getting-started/authentication.mdx

@@ -7,8 +7,6 @@ import { Accordion, Accordions } from 'fumadocs-ui/components/accordion';
 import { Callout } from 'fumadocs-ui/components/callout';
 import { Step, Steps } from 'fumadocs-ui/components/steps';
 
-<EnvelopeWarning />
-
 ## Prerequisites
 
 - A Documenso account (cloud or self-hosted)

apps/docs/content/docs/developers/getting-started/first-api-call.mdx

@@ -7,8 +7,6 @@ import { Callout } from 'fumadocs-ui/components/callout';
 import { Step, Steps } from 'fumadocs-ui/components/steps';
 import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 
-<EnvelopeWarning />
-
 ## Prerequisites
 
 Before starting, you need:
@@ -485,7 +483,7 @@ The API returns standard HTTP status codes and JSON error responses:
 
 ### Handling Rate Limits
 
-The API allows 1000 requests per minute per IP address. Your organisation may have its own lower rate limits. When rate limited, wait at least 60 seconds before retrying:
+The API allows 100 requests per minute per IP address. When rate limited, wait at least 60 seconds before retrying:
 
 ```javascript
 async function fetchWithRetry(url, options, maxRetries = 3) {

apps/docs/content/docs/developers/getting-started/index.mdx

@@ -3,8 +3,6 @@ title: Getting Started
 description: Get your API key and make your first API call.
 ---
 
-<EnvelopeWarning />
-
 <Cards>
   <Card
     title="Authentication"

apps/docs/content/docs/developers/index.mdx

@@ -3,8 +3,6 @@ title: Developer Guide
 description: Integrate Documenso into your applications using the REST API, webhooks, and embedding options.
 ---
 
-<EnvelopeWarning />
-
 ## Getting Started
 
 <Cards>

apps/docs/content/docs/developers/webhooks/events.mdx

@@ -33,14 +33,13 @@ All webhook events share a common structure:
 
 | Field            | Type      | Description                                            |
 | ---------------- | --------- | ------------------------------------------------------ |
-| `id`             | number    | Legacy numeric v1 document or template ID              |
-| `envelopeId`     | string    | Canonical v2 identifier (`envelope_` + 16 characters)  |
+| `id`             | number    | Document or template ID                                |
 | `externalId`     | string?   | External identifier for integration                    |
 | `userId`         | number    | Owner's user ID                                        |
 | `authOptions`    | object?   | Document-level authentication options                  |
 | `formValues`     | object?   | PDF form values associated with the document           |
 | `title`          | string    | Document or template title                             |
-| `status`         | string    | Current status: `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED`, `CANCELLED` |
+| `status`         | string    | Current status: `DRAFT`, `PENDING`, `COMPLETED`        |
 | `visibility`     | string    | Document visibility setting                            |
 | `createdAt`      | datetime  | Document creation timestamp                            |
 | `updatedAt`      | datetime  | Last modification timestamp                            |
@@ -48,8 +47,8 @@ All webhook events share a common structure:
 | `deletedAt`      | datetime? | Deletion timestamp                                     |
 | `teamId`         | number?   | Team ID if document belongs to a team                  |
 | `templateId`     | number?   | Template ID if created from a template                 |
-| `source`         | string    | Source: `DOCUMENT`, `TEMPLATE`, or `TEMPLATE_DIRECT_LINK` |
-| `documentMeta`   | object?   | Nullable document metadata (subject, message, signing options) |
+| `source`         | string    | Source: `DOCUMENT` or `TEMPLATE`                       |
+| `documentMeta`   | object    | Document metadata (subject, message, signing options)  |
 | `recipients`     | array     | List of recipient objects                              |
 | `Recipient`      | array     | List of recipient objects (legacy, same as recipients) |
 
@@ -61,6 +60,7 @@ All webhook events share a common structure:
 | `subject`                  | string? | Email subject line                      |
 | `message`                  | string? | Email message body                      |
 | `timezone`                 | string  | Timezone for date display               |
+| `password`                 | string? | Document access password (if set)       |
 | `dateFormat`               | string  | Date format string                      |
 | `redirectUrl`              | string? | URL to redirect after signing           |
 | `signingOrder`             | string  | `PARALLEL` or `SEQUENTIAL`              |
@@ -77,9 +77,8 @@ All webhook events share a common structure:
 | Field                  | Type      | Description                                |
 | ---------------------- | --------- | ------------------------------------------ |
 | `id`                   | number    | Recipient ID                               |
-| `envelopeId`           | string    | Canonical parent envelope ID               |
-| `documentId`           | number?   | Legacy parent document ID; null for templates |
-| `templateId`           | number?   | Legacy parent template ID; null for documents |
+| `documentId`           | number?   | Parent document ID                         |
+| `templateId`           | number?   | Template ID if created from a template     |
 | `email`                | string    | Recipient email address                    |
 | `name`                 | string    | Recipient name                             |
 | `token`                | string    | Unique signing token                       |
@@ -95,8 +94,6 @@ All webhook events share a common structure:
 | `sendStatus`           | string    | `NOT_SENT` or `SENT`                       |
 | `rejectionReason`      | string?   | Reason if recipient rejected               |
 
-Use `recipient.envelopeId` as the reliable parent link. The legacy `documentId` and `templateId` fields depend on the parent envelope type, so one of them is always null.
-
 ---
 
 ## Document Lifecycle Events
@@ -114,7 +111,6 @@ Triggered when a new document is created.
   "event": "DOCUMENT_CREATED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "externalId": null,
     "userId": 1,
     "authOptions": null,
@@ -133,8 +129,9 @@ Triggered when a new document is created.
       "id": "doc_meta_123",
       "subject": "Please sign this document",
       "message": "Hello, please review and sign this document.",
-      "timezone": "Etc/UTC",
-      "dateFormat": "yyyy-MM-dd hh:mm a",
+      "timezone": "UTC",
+      "password": null,
+      "dateFormat": "MM/DD/YYYY",
       "redirectUrl": null,
       "signingOrder": "PARALLEL",
       "allowDictateNextSigner": false,
@@ -148,7 +145,6 @@ Triggered when a new document is created.
     "recipients": [
       {
         "id": 52,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 10,
         "templateId": null,
         "email": "signer@example.com",
@@ -170,7 +166,6 @@ Triggered when a new document is created.
     "Recipient": [
       {
         "id": 52,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 10,
         "templateId": null,
         "email": "signer@example.com",
@@ -208,7 +203,6 @@ The document status changes to `PENDING` and recipients have `sendStatus: "SENT"
   "event": "DOCUMENT_SENT",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "externalId": null,
     "userId": 1,
     "authOptions": null,
@@ -227,8 +221,9 @@ The document status changes to `PENDING` and recipients have `sendStatus: "SENT"
       "id": "doc_meta_123",
       "subject": "Please sign this document",
       "message": "Hello, please review and sign this document.",
-      "timezone": "Etc/UTC",
-      "dateFormat": "yyyy-MM-dd hh:mm a",
+      "timezone": "UTC",
+      "password": null,
+      "dateFormat": "MM/DD/YYYY",
       "redirectUrl": null,
       "signingOrder": "PARALLEL",
       "allowDictateNextSigner": false,
@@ -242,7 +237,6 @@ The document status changes to `PENDING` and recipients have `sendStatus: "SENT"
     "recipients": [
       {
         "id": 52,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 10,
         "templateId": null,
         "email": "signer@example.com",
@@ -264,7 +258,6 @@ The document status changes to `PENDING` and recipients have `sendStatus: "SENT"
     "Recipient": [
       {
         "id": 52,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 10,
         "templateId": null,
         "email": "signer@example.com",
@@ -302,14 +295,12 @@ The recipient's `readStatus` changes to `OPENED`.
   "event": "DOCUMENT_OPENED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "status": "PENDING",
     "title": "contract.pdf",
     "source": "DOCUMENT",
     "recipients": [
       {
         "id": 52,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "email": "signer@example.com",
         "name": "John Doe",
         "role": "SIGNER",
@@ -337,7 +328,6 @@ The recipient's `signingStatus` changes to `SIGNED` and `signedAt` is populated.
   "event": "DOCUMENT_SIGNED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "status": "COMPLETED",
     "title": "contract.pdf",
     "source": "DOCUMENT",
@@ -345,7 +335,6 @@ The recipient's `signingStatus` changes to `SIGNED` and `signedAt` is populated.
     "recipients": [
       {
         "id": 51,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "email": "signer@example.com",
         "name": "John Doe",
         "role": "SIGNER",
@@ -372,14 +361,12 @@ Triggered when an individual recipient completes their required action (signing,
   "event": "DOCUMENT_RECIPIENT_COMPLETED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "status": "PENDING",
     "title": "contract.pdf",
     "source": "DOCUMENT",
     "recipients": [
       {
         "id": 52,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "email": "signer@example.com",
         "name": "John Doe",
         "role": "SIGNER",
@@ -408,7 +395,6 @@ The document status changes to `COMPLETED` and `completedAt` is set.
   "event": "DOCUMENT_COMPLETED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "externalId": null,
     "userId": 1,
     "authOptions": null,
@@ -427,8 +413,9 @@ The document status changes to `COMPLETED` and `completedAt` is set.
       "id": "doc_meta_123",
       "subject": "Please sign this document",
       "message": "Hello, please review and sign this document.",
-      "timezone": "Etc/UTC",
-      "dateFormat": "yyyy-MM-dd hh:mm a",
+      "timezone": "UTC",
+      "password": null,
+      "dateFormat": "MM/DD/YYYY",
       "redirectUrl": null,
       "signingOrder": "PARALLEL",
       "allowDictateNextSigner": false,
@@ -442,7 +429,6 @@ The document status changes to `COMPLETED` and `completedAt` is set.
     "recipients": [
       {
         "id": 50,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 10,
         "templateId": null,
         "email": "reviewer@example.com",
@@ -465,7 +451,6 @@ The document status changes to `COMPLETED` and `completedAt` is set.
       },
       {
         "id": 51,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 10,
         "templateId": null,
         "email": "signer@example.com",
@@ -490,7 +475,6 @@ The document status changes to `COMPLETED` and `completedAt` is set.
     "Recipient": [
       {
         "id": 50,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 10,
         "templateId": null,
         "email": "reviewer@example.com",
@@ -513,7 +497,6 @@ The document status changes to `COMPLETED` and `completedAt` is set.
       },
       {
         "id": 51,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 10,
         "templateId": null,
         "email": "signer@example.com",
@@ -554,14 +537,12 @@ The recipient's `signingStatus` changes to `REJECTED` and `rejectionReason` cont
   "event": "DOCUMENT_REJECTED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "status": "PENDING",
     "title": "contract.pdf",
     "source": "DOCUMENT",
     "recipients": [
       {
         "id": 52,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "email": "signer@example.com",
         "name": "John Doe",
         "role": "SIGNER",
@@ -580,7 +561,7 @@ The recipient's `signingStatus` changes to `REJECTED` and `rejectionReason` cont
 
 ### `document.cancelled`
 
-Triggered when a pending document is explicitly cancelled with `POST /envelope/cancel`, or when a document owner or team member deletes a document. Deleting a draft or pending document hard-deletes it, while deleting a completed document soft-deletes it.
+Triggered when the document owner or a team member deletes a document. Draft and pending documents are hard-deleted, while completed documents are soft-deleted.
 
 This event is **not** triggered when a recipient hides a document from their inbox.
 
@@ -591,7 +572,6 @@ This event is **not** triggered when a recipient hides a document from their inb
   "event": "DOCUMENT_CANCELLED",
   "payload": {
     "id": 7,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "externalId": null,
     "userId": 3,
     "authOptions": null,
@@ -611,6 +591,7 @@ This event is **not** triggered when a recipient hides a document from their inb
       "subject": "",
       "message": "",
       "timezone": "Etc/UTC",
+      "password": null,
       "dateFormat": "yyyy-MM-dd hh:mm a",
       "redirectUrl": "",
       "signingOrder": "PARALLEL",
@@ -625,7 +606,6 @@ This event is **not** triggered when a recipient hides a document from their inb
     "recipients": [
       {
         "id": 7,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 7,
         "templateId": null,
         "email": "signer@example.com",
@@ -647,7 +627,6 @@ This event is **not** triggered when a recipient hides a document from their inb
     "Recipient": [
       {
         "id": 7,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "documentId": 7,
         "templateId": null,
         "email": "signer@example.com",
@@ -672,45 +651,6 @@ This event is **not** triggered when a recipient hides a document from their inb
 }
 ```
 
-### `recipient.expired`
-
-Triggered when a recipient's signing deadline passes on a pending document before they sign or reject it.
-
-**Event name:** `RECIPIENT_EXPIRED`
-
-The recipient's `expiresAt` contains the signing deadline, and `expirationNotifiedAt` is set when the expiration is processed.
-
-```json
-{
-  "event": "RECIPIENT_EXPIRED",
-  "payload": {
-    "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
-    "status": "PENDING",
-    "title": "contract.pdf",
-    "source": "DOCUMENT",
-    "recipients": [
-      {
-        "id": 52,
-        "envelopeId": "envelope_abcdefhiklmnorst",
-        "documentId": 10,
-        "templateId": null,
-        "email": "signer@example.com",
-        "name": "John Doe",
-        "role": "SIGNER",
-        "expiresAt": "2024-04-22T11:51:00.000Z",
-        "expirationNotifiedAt": "2024-04-22T11:52:00.000Z",
-        "readStatus": "OPENED",
-        "signingStatus": "NOT_SIGNED",
-        "sendStatus": "SENT"
-      }
-    ]
-  },
-  "createdAt": "2024-04-22T11:52:00.000Z",
-  "webhookEndpoint": "https://your-endpoint.com/webhook"
-}
-```
-
 ### `document.reminder.sent`
 
 Triggered when a reminder email is sent to a recipient who has not yet completed their action.
@@ -722,14 +662,12 @@ Triggered when a reminder email is sent to a recipient who has not yet completed
   "event": "DOCUMENT_REMINDER_SENT",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "status": "PENDING",
     "title": "contract.pdf",
     "source": "DOCUMENT",
     "recipients": [
       {
         "id": 52,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "email": "signer@example.com",
         "name": "John Doe",
         "role": "SIGNER",
@@ -748,7 +686,7 @@ Triggered when a reminder email is sent to a recipient who has not yet completed
 
 ## Template Events
 
-Template events track changes to reusable document templates. Template payloads use the same structure as document payloads. For `TEMPLATE_CREATED`, `TEMPLATE_UPDATED`, and `TEMPLATE_DELETED` the template's own legacy numeric ID is in `id` and `templateId` is `null`. Only `TEMPLATE_USED` — whose payload describes the new document envelope created from the template — carries the originating template's legacy ID in `templateId`, with `source` set to `TEMPLATE`.
+Template events track changes to reusable document templates. Template payloads use the same structure as document payloads, with `source` set to `TEMPLATE` and `templateId` populated.
 
 ### `template.created`
 
@@ -761,10 +699,9 @@ Triggered when a new template is created.
   "event": "TEMPLATE_CREATED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "title": "My Template",
     "status": "DRAFT",
-    "templateId": null,
+    "templateId": 10,
     "source": "TEMPLATE",
     "recipients": []
   },
@@ -784,10 +721,9 @@ Triggered when a template's settings, recipients, or fields are modified.
   "event": "TEMPLATE_UPDATED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "title": "My Updated Template",
     "status": "DRAFT",
-    "templateId": null,
+    "templateId": 10,
     "source": "TEMPLATE",
     "recipients": []
   },
@@ -807,10 +743,9 @@ Triggered when a template is deleted.
   "event": "TEMPLATE_DELETED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "title": "Deleted Template",
     "status": "DRAFT",
-    "templateId": null,
+    "templateId": 10,
     "source": "TEMPLATE",
     "recipients": []
   },
@@ -830,7 +765,6 @@ Triggered when a document is created from a template. This event fires alongside
   "event": "TEMPLATE_USED",
   "payload": {
     "id": 10,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "title": "Document from Template",
     "status": "DRAFT",
     "templateId": 10,
@@ -857,8 +791,7 @@ Triggered when a document is created from a template. This event fires alongside
 | `DOCUMENT_RECIPIENT_COMPLETED` | Recipient completes their action           | Recipient `signingStatus: "SIGNED"`, `signedAt` set          |
 | `DOCUMENT_COMPLETED`         | All recipients complete actions               | `status: "COMPLETED"`, `completedAt` set                     |
 | `DOCUMENT_REJECTED`          | Recipient rejects document                   | Recipient `signingStatus: "REJECTED"`, `rejectionReason` set |
-| `DOCUMENT_CANCELLED`         | Pending document explicitly cancelled, or document deleted | `status: "CANCELLED"` after explicit cancellation; deletion may remove or soft-delete the document |
-| `RECIPIENT_EXPIRED`          | Recipient signing deadline passes            | Recipient `expiresAt` passed, `expirationNotifiedAt` set           |
+| `DOCUMENT_CANCELLED`         | Owner or team member deletes document        | Document cancelled or deleted                                |
 | `DOCUMENT_REMINDER_SENT`     | Reminder email sent to recipient             | No status changes                                            |
 
 ### Template Events
@@ -888,7 +821,7 @@ When processing webhook events:
     **Process idempotently** — Webhooks may be retried, so handle duplicate events
   </Step>
   <Step>
-    **Respond quickly** — Return a `2xx` status code within 10 seconds
+    **Respond quickly** — Return a 200 status code within 30 seconds
   </Step>
 </Steps>
 

apps/docs/content/docs/developers/webhooks/index.mdx

@@ -42,14 +42,12 @@ Documenso supports webhook events for the full document lifecycle (created, sent
   "event": "DOCUMENT_COMPLETED",
   "payload": {
     "id": 123,
-    "envelopeId": "envelope_abcdefhiklmnorst",
     "title": "Contract",
     "status": "COMPLETED",
     "completedAt": "2024-01-15T10:30:00.000Z",
     "recipients": [
       {
         "id": 1,
-        "envelopeId": "envelope_abcdefhiklmnorst",
         "email": "signer@example.com",
         "signingStatus": "SIGNED"
       }
@@ -60,8 +58,6 @@ Documenso supports webhook events for the full document lifecycle (created, sent
 }
 ```
 
-`payload.id` is the legacy numeric v1 ID. Use `payload.envelopeId` as the canonical v2 identifier. Each recipient repeats `envelopeId` as the reliable parent link because the legacy `documentId` and `templateId` fields depend on the parent envelope type, leaving one of them null.
-
 ---
 
 ## See Also

apps/docs/content/docs/developers/webhooks/setup.mdx

@@ -148,7 +148,7 @@ func main() {
 </Tabs>
 
 <Callout type="warn">
-  Always respond with a `2xx` status within 10 seconds. Documenso will retry failed deliveries according to the configured background-job provider.
+  Always respond with a `200 OK` status within 30 seconds. Documenso will retry failed deliveries.
 </Callout>
 
 ## Configuring Webhooks in Documenso via the Dashboard
@@ -184,7 +184,7 @@ Fill in the following fields:
 
 | Field | Description |
 | ----- | ----------- |
-| **Webhook URL** | The HTTP or HTTPS endpoint that will receive webhook events |
+| **Webhook URL** | The HTTPS endpoint that will receive webhook events |
 | **Events** | Select which events should trigger this webhook |
 | **Secret** (optional) | A secret key used to sign the payload for verification |
 </Step>
@@ -202,21 +202,12 @@ Your webhook endpoint must meet these requirements:
 
 | Requirement | Details |
 | ----------- | ------- |
-| **Protocol** | HTTP and HTTPS are accepted; use HTTPS in production |
-| **Response** | Must return a `2xx` status code within 10 seconds |
+| **Protocol** | HTTPS required (HTTP not allowed in production) |
+| **Response** | Must return `2xx` status code within 30 seconds |
 | **Method** | Must accept HTTP POST requests |
 | **Content-Type** | Must accept `application/json` payloads |
 | **Availability** | Must be publicly accessible from the internet |
 
-<Callout type="warn">
-  Documenso performs a best-effort check that rejects webhook URLs which use or resolve to private
-  or loopback addresses. This is not a complete SSRF mitigation — it does not cover DNS rebinding
-  and fails open on DNS lookup errors or timeouts — so self-hosted deployments should still enforce
-  network-level egress rules. Self-hosters that need to deliver to a hostname resolving to a
-  private address can add that hostname to the comma-separated
-  `NEXT_PRIVATE_WEBHOOK_SSRF_BYPASS_HOSTS` environment variable.
-</Callout>
-
 <Callout type="info">
   For local development, use a tunneling service like [ngrok](https://ngrok.com) or [localtunnel](https://localtunnel.me) to expose your local server.
 </Callout>
@@ -234,8 +225,7 @@ When creating a webhook, you can subscribe to one or more events:
 | `DOCUMENT_RECIPIENT_COMPLETED` | A recipient completes their required action |
 | `DOCUMENT_COMPLETED` | All recipients have completed their actions |
 | `DOCUMENT_REJECTED` | A recipient rejects the document |
-| `DOCUMENT_CANCELLED` | A pending document is explicitly cancelled or a document owner deletes it |
-| `RECIPIENT_EXPIRED` | A recipient's signing deadline passes before they sign or reject |
+| `DOCUMENT_CANCELLED` | The document owner deletes the document |
 | `DOCUMENT_REMINDER_SENT` | A reminder email is sent to a recipient |
 | `TEMPLATE_CREATED` | A new template is created |
 | `TEMPLATE_UPDATED` | A template is modified |
@@ -328,17 +318,17 @@ Documenso will attempt to deliver the same payload again
 
 ## Retry Policy
 
-A delivery fails when the endpoint returns a non-`2xx` response, the 10-second timeout expires, or the request fails. Redirects are not followed, so `3xx` responses also fail. Network and SSRF-blocked requests are recorded with response code `0`.
+When a webhook delivery fails (non-2xx response or timeout), Documenso automatically retries with exponential backoff:
 
-For self-hosted deployments, retries are handled by the background-job provider selected with `NEXT_PRIVATE_JOBS_PROVIDER`:
+| Attempt | Delay |
+| ------- | ----- |
+| 1 | Immediate |
+| 2 | 1 minute |
+| 3 | 5 minutes |
+| 4 | 30 minutes |
+| 5 | 2 hours |
 
-| Provider | Total attempts | Retry timing |
-| -------- | -------------- | ------------ |
-| Local (default) | 4 | Back-to-back, with no backoff |
-| BullMQ | 3 | Exponential backoff starting at 1 second |
-| Inngest | 5 | Inngest platform backoff |
-
-Only the individual delivery (`WebhookCall`) record is marked as failed. Documenso does not automatically disable the webhook or apply a circuit breaker, so future matching events continue to be delivered. After automatic attempts are exhausted, you can manually resend a failed delivery from the dashboard.
+After 5 failed attempts, the webhook is marked as failed and no further automatic retries occur. You can manually resend failed webhooks from the dashboard.
 
 <Callout type="warn">
   If your endpoint consistently fails, consider reviewing your server logs and ensuring your endpoint meets all [URL requirements](#webhook-url-requirements).

apps/docs/content/docs/developers/webhooks/verification.mdx

@@ -255,7 +255,6 @@ const validEvents = [
   'DOCUMENT_REJECTED',
   'DOCUMENT_CANCELLED',
   'DOCUMENT_REMINDER_SENT',
-  'RECIPIENT_EXPIRED',
   'TEMPLATE_CREATED',
   'TEMPLATE_UPDATED',
   'TEMPLATE_DELETED',

apps/docs/content/docs/policies/fair-use.mdx

@@ -41,17 +41,12 @@ When a limit is reached, requests return a `429 Too Many Requests` response with
 
 | Action | Limit | Window |
 | --- | --- | --- |
-| API requests (v1 and v2) | 1000 requests | 1 minute |
+| API requests (v1 and v2) | 100 requests | 1 minute |
 | File uploads | 20 requests | 1 minute |
 | AI features | 3 requests | 1 minute |
 
 Authentication endpoints (login, signup, password reset, etc.) are also rate-limited to protect against abuse.
 
-<Callout type="info">
-  The API request limit above is the global per-IP ceiling. Individual organisations also have their
-  own rate limits, which may be configured below this value.
-</Callout>
-
 <Callout type="info">
   Rate limits may vary by plan. Enterprise plans can include higher or custom limits. Contact
   [sales](https://documen.so/sales) for details.

apps/docs/content/docs/self-hosting/configuration/organisation-limits.mdx

@@ -13,7 +13,7 @@ There are three distinct kinds of limit:
 | ---------------------- | ------------------------------------------------- | ----------------------- |
 | Resource quota         | Documents, emails, and API requests **per month** | Yes — per claim and org |
 | Resource rate limit    | The same resources over a short window (e.g. `1h`) | Yes — per claim and org |
-| Global HTTP rate limit | API requests per IP (1000/min, hardcoded)         | No — see [Limitations](#limitations) |
+| Global HTTP rate limit | API requests per IP (100/min, hardcoded)          | No — see [Limitations](#limitations) |
 
 ## Prerequisites
 
@@ -91,7 +91,7 @@ Monthly quota usage is keyed to the **UTC calendar month**. There is no schedule
 
 ## Limitations
 
-The **global HTTP rate limit is not configurable.** Documenso enforces a hardcoded **1000 requests per minute per IP address** on its API endpoint groups (`/api/v1`, `/api/v2`, and the tRPC API are limited separately), returning `429 Too Many Requests`. It is a per-IP safeguard applied at the HTTP layer — not per-organisation, not stored on any claim, and not adjustable from the admin panel. See [Rate Limits](/docs/developers/api/rate-limits).
+The **global HTTP rate limit is not configurable.** Documenso enforces a hardcoded **100 requests per minute per IP address** on its API endpoint groups (`/api/v1`, `/api/v2`, and the tRPC API are limited separately), returning `429 Too Many Requests`. It is a per-IP safeguard applied at the HTTP layer — not per-organisation, not stored on any claim, and not adjustable from the admin panel. See [Rate Limits](/docs/developers/api/rate-limits).
 
 ## Troubleshooting
 

apps/docs/content/docs/users/documents/advanced/pdf-placeholders.mdx

@@ -109,6 +109,37 @@ You can customize fields by adding options after the recipient identifier:
 | `maxValue`     | Number        | Maximum allowed value |
 | `numberFormat` | Format string | Number display format |
 
+### Selection Field Options
+
+Checkbox, radio, and dropdown placeholders can define their selectable choices via the `options` property.
+Separate choices with pipe (`|`) characters.
+Checkbox, radio, and dropdown placeholders do not support `label` or `placeholder` metadata.
+
+| Option             | Applies To                | Values                   | Description                              |
+| ------------------ | ------------------------- | ------------------------ | ---------------------------------------- |
+| `options`          | Checkbox, Radio, Dropdown | `Option 1|Option 2`      | Selectable choices                       |
+| `checked`          | Checkbox                  | `Option 1|Option 2`      | Pre-checked choices                      |
+| `selected`         | Radio, Dropdown           | One option value         | Pre-selected/default choice              |
+| `default`          | Radio, Dropdown           | One option value         | Alias for `selected`                     |
+| `defaultValue`     | Radio, Dropdown           | One option value         | Alias for `selected`                     |
+| `direction`        | Checkbox, Radio           | `vertical`, `horizontal` | Option layout                            |
+| `validationRule`   | Checkbox                  | `atLeast`, `exactly`, `atMost` | Checkbox selection validation rule       |
+| `validationLength` | Checkbox                  | Number (e.g., `1`)       | Checkbox validation option count         |
+| `required`         | Checkbox, Radio, Dropdown | `true`, `false`          | Whether the field must be completed      |
+| `readOnly`         | Checkbox, Radio, Dropdown | `true`, `false`          | Whether the pre-selected value is locked |
+| `fontSize`         | Checkbox, Radio, Dropdown | Number (e.g., `12`)      | Field text size                          |
+
+For checkbox validation, `validationLength` defines the option count:
+- `atLeast` means at least that many options must be selected
+- `exactly` means exactly that many options must be selected
+- `atMost` means at most that many options must be selected
+
+If an option needs a literal delimiter, escape it with a backslash:
+
+```
+{{dropdown, r1, options=Sales\|Ops|Legal\, Compliance|A\=B}}
+```
+
 ### Examples with Options
 
 ```
@@ -116,6 +147,10 @@ You can customize fields by adding options after the recipient identifier:
 {{number, r1, minValue=0, maxValue=100, value=50}}
 {{name, r1, fontSize=14}}
 {{text, r2, readOnly=true, text=Contract #12345}}
+{{checkbox, r1, options=Email|SMS|Phone, checked=Email|Phone, validationRule=atLeast, validationLength=1}}
+{{radio, r1, options=Card|Bank transfer|Check, selected=Check}}
+{{dropdown, r1, options=United States|Canada|United Kingdom}}
+{{dropdown, r2, options=Sales|Legal|Finance, defaultValue=Legal}}
 ```
 
 <Callout type="info">

apps/docs/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "build": "next build",
+    "build": "NEXT_IGNORE_INCORRECT_LOCKFILE=true next build",
     "dev": "next dev",
     "start": "next start",
     "types:check": "fumadocs-mdx && next typegen && tsc --noEmit",

apps/docs/src/components/mdx/envelope-warning.tsx

@@ -1,19 +0,0 @@
-import { Callout } from 'fumadocs-ui/components/callout';
-
-const MIGRATION_GUIDE_HREF = '/docs/developers/api/migrate-to-envelopes';
-
-/**
- * Deprecation banner steering API consumers away from the legacy document and
- * template create endpoints and towards the unified Envelope API.
- *
- * Registered globally in `mdx-components.tsx`, so it can be used in any MDX page
- * as `<EnvelopeWarning />` without an explicit import.
- */
-export function EnvelopeWarning() {
-  return (
-    <Callout type="error">
-      <strong>Documents and templates are being deprecated and replaced by envelopes.</strong>{' '}
-      <a href={MIGRATION_GUIDE_HREF}>Read the migration guide here.</a>
-    </Callout>
-  );
-}

apps/docs/src/mdx-components.tsx

@@ -1,7 +1,6 @@
 import * as TabsComponents from 'fumadocs-ui/components/tabs';
 import defaultMdxComponents from 'fumadocs-ui/mdx';
 import type { MDXComponents } from 'mdx/types';
-import { EnvelopeWarning } from '@/components/mdx/envelope-warning';
 import { Mermaid } from '@/components/mdx/mermaid';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -10,7 +9,6 @@ export function getMDXComponents(components?: MDXComponents): any {
     ...defaultMdxComponents,
     ...TabsComponents,
     Mermaid,
-    EnvelopeWarning,
     ...components,
   };
 }

apps/remix/app/components/dialogs/branding-preferences-reset-dialog.tsx

@@ -1,119 +0,0 @@
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import { Trans } from '@lingui/react/macro';
-import { useState } from 'react';
-
-export type BrandingPreferencesResetDialogProps = {
-  hasAdvancedBranding: boolean;
-  isSubmitting: boolean;
-  onReset: () => Promise<void>;
-  trigger?: React.ReactNode;
-};
-
-export const BrandingPreferencesResetDialog = ({
-  hasAdvancedBranding,
-  isSubmitting,
-  onReset,
-  trigger,
-}: BrandingPreferencesResetDialogProps) => {
-  const [open, setOpen] = useState(false);
-  const [isResetting, setIsResetting] = useState(false);
-
-  const isLoading = isSubmitting || isResetting;
-
-  const handleResetToDefaults = async () => {
-    setIsResetting(true);
-
-    try {
-      await onReset();
-      setOpen(false);
-    } catch {
-      // The submit handler surfaces its own error toast. Keep the dialog open
-      // so the user can retry.
-    } finally {
-      setIsResetting(false);
-    }
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !isLoading && setOpen(value)}>
-      <DialogTrigger asChild>
-        {trigger ?? (
-          <Button variant="destructive" type="button" size="sm" disabled={isLoading}>
-            <Trans>Reset to defaults</Trans>
-          </Button>
-        )}
-      </DialogTrigger>
-
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Reset branding preferences</Trans>
-          </DialogTitle>
-
-          <DialogDescription>
-            <Trans>
-              This will reset all branding preferences to their default values and save the changes immediately.
-            </Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Alert variant="warning">
-          <AlertDescription>
-            <p>
-              <Trans>Once confirmed, the following will be reset:</Trans>
-            </p>
-
-            <ul className="mt-0.5 list-inside list-disc">
-              <li>
-                <Trans>Custom branding enabled setting</Trans>
-              </li>
-              <li>
-                <Trans>Branding logo</Trans>
-              </li>
-              <li>
-                <Trans>Brand website and brand details</Trans>
-              </li>
-              <li>
-                <Trans>Brand colours, including background, foreground, primary, and border colours</Trans>
-              </li>
-
-              {hasAdvancedBranding && (
-                <>
-                  <li>
-                    <Trans>Border radius</Trans>
-                  </li>
-                  <li>
-                    <Trans>Custom CSS</Trans>
-                  </li>
-                </>
-              )}
-            </ul>
-          </AlertDescription>
-        </Alert>
-
-        <DialogFooter>
-          <DialogClose asChild>
-            <Button type="button" variant="secondary" disabled={isLoading}>
-              <Trans>Cancel</Trans>
-            </Button>
-          </DialogClose>
-
-          <Button type="button" variant="destructive" loading={isLoading} onClick={() => void handleResetToDefaults()}>
-            <Trans>Reset to defaults</Trans>
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};

apps/remix/app/components/dialogs/document-preferences-reset-dialog.tsx

@@ -1,141 +0,0 @@
-import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import { Trans } from '@lingui/react/macro';
-import { useState } from 'react';
-
-export type DocumentPreferencesResetDialogProps = {
-  isSubmitting: boolean;
-  onReset: () => Promise<void>;
-  showAiFeatures?: boolean;
-  showDocumentVisibility?: boolean;
-  showIncludeSenderDetails?: boolean;
-};
-
-export const DocumentPreferencesResetDialog = ({
-  isSubmitting,
-  onReset,
-  showAiFeatures = false,
-  showDocumentVisibility = false,
-  showIncludeSenderDetails = false,
-}: DocumentPreferencesResetDialogProps) => {
-  const [open, setOpen] = useState(false);
-  const [isResetting, setIsResetting] = useState(false);
-
-  const isLoading = isSubmitting || isResetting;
-
-  const handleResetToDefaults = async () => {
-    setIsResetting(true);
-
-    try {
-      await onReset();
-      setOpen(false);
-    } catch {
-      // The submit handler surfaces its own error toast. Keep the dialog open
-      // so the user can retry.
-    } finally {
-      setIsResetting(false);
-    }
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !isLoading && setOpen(value)}>
-      <DialogTrigger asChild>
-        <Button variant="destructive" type="button" size="sm" disabled={isLoading}>
-          <Trans>Reset to defaults</Trans>
-        </Button>
-      </DialogTrigger>
-
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Reset document preferences</Trans>
-          </DialogTitle>
-
-          <DialogDescription>
-            <Trans>
-              This will reset all document preferences to their default values and save the changes immediately.
-            </Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Alert variant="warning">
-          <AlertDescription>
-            <p>
-              <Trans>Once confirmed, the following will be reset:</Trans>
-            </p>
-
-            <ul className="mt-0.5 list-inside list-disc">
-              {showDocumentVisibility && (
-                <li>
-                  <Trans>Default document visibility</Trans>
-                </li>
-              )}
-              <li>
-                <Trans>Default document language</Trans>
-              </li>
-              <li>
-                <Trans>Default date format</Trans>
-              </li>
-              <li>
-                <Trans>Default time zone</Trans>
-              </li>
-              <li>
-                <Trans>Default signature settings</Trans>
-              </li>
-              {showIncludeSenderDetails && (
-                <li>
-                  <Trans>Send on behalf of team</Trans>
-                </li>
-              )}
-              <li>
-                <Trans>Include the signing certificate in the document</Trans>
-              </li>
-              <li>
-                <Trans>Include the audit logs in the document</Trans>
-              </li>
-              <li>
-                <Trans>Default recipients</Trans>
-              </li>
-              <li>
-                <Trans>Delegate document ownership</Trans>
-              </li>
-              <li>
-                <Trans>Default envelope expiration</Trans>
-              </li>
-              <li>
-                <Trans>Default signing reminders</Trans>
-              </li>
-              {showAiFeatures && (
-                <li>
-                  <Trans>AI features</Trans>
-                </li>
-              )}
-            </ul>
-          </AlertDescription>
-        </Alert>
-
-        <DialogFooter>
-          <DialogClose asChild>
-            <Button type="button" variant="secondary" disabled={isLoading}>
-              <Trans>Cancel</Trans>
-            </Button>
-          </DialogClose>
-
-          <Button type="button" variant="destructive" loading={isLoading} onClick={() => void handleResetToDefaults()}>
-            <Trans>Reset to defaults</Trans>
-          </Button>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};

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

@@ -7,7 +7,6 @@ import {
 } from '@documenso/lib/constants/branding';
 import { DEFAULT_BRAND_COLORS, DEFAULT_BRAND_RADIUS } from '@documenso/lib/constants/theme';
 import { ZCssVarsSchema } from '@documenso/lib/types/css-vars';
-import { normalizeBrandingColors } from '@documenso/lib/utils/normalize-branding-colors';
 import { cn } from '@documenso/ui/lib/utils';
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@documenso/ui/primitives/accordion';
 import { Button } from '@documenso/ui/primitives/button';
@@ -24,7 +23,6 @@ import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
-import { BrandingPreferencesResetDialog } from '~/components/dialogs/branding-preferences-reset-dialog';
 import { useOptionalCurrentTeam } from '~/providers/team';
 import { useCspNonce } from '~/utils/nonce';
 
@@ -76,7 +74,6 @@ export function BrandingPreferencesForm({
 
   const [previewUrl, setPreviewUrl] = useState<string>('');
   const [hasLoadedPreview, setHasLoadedPreview] = useState(false);
-  const [colorPickerKey, setColorPickerKey] = useState(0);
 
   const parsedColors = ZCssVarsSchema.safeParse(settings.brandingColors);
   const initialColors = parsedColors.success ? parsedColors.data : {};
@@ -99,42 +96,6 @@ export function BrandingPreferencesForm({
 
   const isBrandingEnabled = form.watch('brandingEnabled');
 
-  const hasResetBrandingColors =
-    settings.brandingColors === null ||
-    settings.brandingColors === undefined ||
-    (parsedColors.success && normalizeBrandingColors(parsedColors.data) === null);
-
-  // Only show the reset action when the saved settings actually differ from the
-  // defaults, so it never renders as a pointless disabled button.
-  const isResetToDefaultsVisible =
-    settings.brandingEnabled !== (canInherit ? null : false) ||
-    !!settings.brandingLogo ||
-    !!settings.brandingUrl ||
-    !!settings.brandingCompanyDetails ||
-    !!settings.brandingCss ||
-    !hasResetBrandingColors;
-
-  const handleResetToDefaults = async () => {
-    const data: TBrandingPreferencesFormSchema = {
-      brandingEnabled: canInherit ? null : false,
-      brandingLogo: null,
-      brandingUrl: '',
-      brandingCompanyDetails: '',
-      brandingColors: {},
-      brandingCss: '',
-    };
-
-    await onFormSubmit(data);
-
-    if (previewUrl.startsWith('blob:')) {
-      URL.revokeObjectURL(previewUrl);
-    }
-
-    setPreviewUrl('');
-    setColorPickerKey((key) => key + 1);
-    form.reset(data);
-  };
-
   const getSavedLogoPreviewUrl = () => {
     if (!settings.brandingLogo) {
       return '';
@@ -436,7 +397,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`background-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.background}
@@ -460,7 +420,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`foreground-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.foreground}
@@ -484,7 +443,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`primary-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.primary}
@@ -508,7 +466,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`primary-foreground-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.primaryForeground}
@@ -532,7 +489,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`border-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.border}
@@ -556,7 +512,6 @@ export function BrandingPreferencesForm({
                         </FormDescription>
                         <FormControl>
                           <ColorPicker
-                            key={`ring-${colorPickerKey}`}
                             nonce={nonce}
                             value={field.value ?? ''}
                             defaultValue={DEFAULT_BRAND_COLORS.ring}
@@ -638,15 +593,6 @@ export function BrandingPreferencesForm({
             isDirty={hasUnsavedChanges}
             isSubmitting={form.formState.isSubmitting}
             onReset={handleReset}
-            resetToDefaults={
-              isResetToDefaultsVisible ? (
-                <BrandingPreferencesResetDialog
-                  hasAdvancedBranding={hasAdvancedBranding}
-                  isSubmitting={form.formState.isSubmitting}
-                  onReset={handleResetToDefaults}
-                />
-              ) : undefined
-            }
           />
         </fieldset>
       </form>

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

@@ -11,10 +11,10 @@ import { isValidLanguageCode, SUPPORTED_LANGUAGE_CODES, SUPPORTED_LANGUAGES } fr
 import { TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import type { TDefaultRecipients } from '@documenso/lib/types/default-recipients';
 import { ZDefaultRecipientsSchema } from '@documenso/lib/types/default-recipients';
-import { type TDocumentMetaDateFormat, ZDocumentMetaDateFormatSchema } from '@documenso/lib/types/document-meta';
-import { generateDefaultOrganisationSettings, isPersonalLayout } from '@documenso/lib/utils/organisations';
+import { type TDocumentMetaDateFormat, ZDocumentMetaTimezoneSchema } from '@documenso/lib/types/document-meta';
+import { isPersonalLayout } from '@documenso/lib/utils/organisations';
 import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
-import { extractTeamSignatureSettings, generateDefaultTeamSettings } from '@documenso/lib/utils/teams';
+import { extractTeamSignatureSettings } from '@documenso/lib/utils/teams';
 import { DocumentSignatureSettingsTooltip } from '@documenso/ui/components/document/document-signature-settings-tooltip';
 import { ExpirationPeriodPicker } from '@documenso/ui/components/document/expiration-period-picker';
 import { ReminderSettingsPicker } from '@documenso/ui/components/document/reminder-settings-picker';
@@ -37,11 +37,11 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { msg, t } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { DocumentVisibility, OrganisationType, type RecipientRole, type TeamGlobalSettings } from '@prisma/client';
+import type { TeamGlobalSettings } from '@prisma/client';
+import { DocumentVisibility, OrganisationType, type RecipientRole } from '@prisma/client';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
-import { DocumentPreferencesResetDialog } from '~/components/dialogs/document-preferences-reset-dialog';
 import { useOptionalCurrentTeam } from '~/providers/team';
 
 import { DefaultRecipientsMultiSelectCombobox } from '../general/default-recipients-multiselect-combobox';
@@ -93,26 +93,6 @@ export type DocumentPreferencesFormProps = {
   onFormSubmit: (data: TDocumentPreferencesFormSchema) => Promise<void>;
 };
 
-const getDocumentPreferencesFormValues = (settings: SettingsSubset): TDocumentPreferencesFormSchema => {
-  const parsedDocumentDateFormat = ZDocumentMetaDateFormatSchema.safeParse(settings.documentDateFormat);
-
-  return {
-    documentVisibility: settings.documentVisibility,
-    documentLanguage: isValidLanguageCode(settings.documentLanguage) ? settings.documentLanguage : null,
-    documentTimezone: settings.documentTimezone,
-    documentDateFormat: parsedDocumentDateFormat.success ? parsedDocumentDateFormat.data : null,
-    includeSenderDetails: settings.includeSenderDetails,
-    includeSigningCertificate: settings.includeSigningCertificate,
-    includeAuditLog: settings.includeAuditLog,
-    signatureTypes: extractTeamSignatureSettings({ ...settings }),
-    defaultRecipients: settings.defaultRecipients ? ZDefaultRecipientsSchema.parse(settings.defaultRecipients) : null,
-    delegateDocumentOwnership: settings.delegateDocumentOwnership,
-    aiFeaturesEnabled: settings.aiFeaturesEnabled,
-    envelopeExpirationPeriod: settings.envelopeExpirationPeriod ?? null,
-    reminderSettings: settings.reminderSettings ?? null,
-  };
-};
-
 export const DocumentPreferencesForm = ({
   settings,
   onFormSubmit,
@@ -133,7 +113,7 @@ export const DocumentPreferencesForm = ({
     documentVisibility: z.nativeEnum(DocumentVisibility).nullable(),
     documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES).nullable(),
     documentTimezone: z.string().nullable(),
-    documentDateFormat: ZDocumentMetaDateFormatSchema.nullable(),
+    documentDateFormat: ZDocumentMetaTimezoneSchema.nullable(),
     includeSenderDetails: z.boolean().nullable(),
     includeSigningCertificate: z.boolean().nullable(),
     includeAuditLog: z.boolean().nullable(),
@@ -147,33 +127,26 @@ export const DocumentPreferencesForm = ({
     reminderSettings: ZEnvelopeReminderSettings.nullable(),
   });
 
-  const defaultValues = getDocumentPreferencesFormValues(settings);
-  const defaultSettings = canInherit ? generateDefaultTeamSettings() : generateDefaultOrganisationSettings();
-  const baseResetValues = getDocumentPreferencesFormValues(defaultSettings);
-  const resetValues = {
-    ...baseResetValues,
-    aiFeaturesEnabled: isAiFeaturesConfigured ? baseResetValues.aiFeaturesEnabled : defaultValues.aiFeaturesEnabled,
-  };
-
   const form = useForm<TDocumentPreferencesFormSchema>({
-    defaultValues,
+    defaultValues: {
+      documentVisibility: settings.documentVisibility,
+      documentLanguage: isValidLanguageCode(settings.documentLanguage) ? settings.documentLanguage : null,
+      documentTimezone: settings.documentTimezone,
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      documentDateFormat: settings.documentDateFormat as TDocumentMetaDateFormat | null,
+      includeSenderDetails: settings.includeSenderDetails,
+      includeSigningCertificate: settings.includeSigningCertificate,
+      includeAuditLog: settings.includeAuditLog,
+      signatureTypes: extractTeamSignatureSettings({ ...settings }),
+      defaultRecipients: settings.defaultRecipients ? ZDefaultRecipientsSchema.parse(settings.defaultRecipients) : null,
+      delegateDocumentOwnership: settings.delegateDocumentOwnership,
+      aiFeaturesEnabled: settings.aiFeaturesEnabled,
+      envelopeExpirationPeriod: settings.envelopeExpirationPeriod ?? null,
+      reminderSettings: settings.reminderSettings ?? null,
+    },
     resolver: zodResolver(ZDocumentPreferencesFormSchema),
   });
 
-  // Parse both sides through the schema so we compare canonical representations
-  const parsedCurrentValues = ZDocumentPreferencesFormSchema.safeParse(defaultValues);
-  const parsedResetValues = ZDocumentPreferencesFormSchema.safeParse(resetValues);
-
-  const isResetToDefaultsVisible =
-    !parsedCurrentValues.success ||
-    !parsedResetValues.success ||
-    JSON.stringify(parsedCurrentValues.data) !== JSON.stringify(parsedResetValues.data);
-
-  const handleResetToDefaults = async () => {
-    await onFormSubmit(resetValues);
-    form.reset(resetValues);
-  };
-
   const handleFormSubmit = form.handleSubmit(async (data) => {
     try {
       await onFormSubmit(data);
@@ -799,17 +772,6 @@ export const DocumentPreferencesForm = ({
             isDirty={form.formState.isDirty}
             isSubmitting={form.formState.isSubmitting}
             onReset={() => form.reset()}
-            resetToDefaults={
-              isResetToDefaultsVisible ? (
-                <DocumentPreferencesResetDialog
-                  isSubmitting={form.formState.isSubmitting}
-                  onReset={handleResetToDefaults}
-                  showAiFeatures={isAiFeaturesConfigured}
-                  showDocumentVisibility={!isPersonalLayoutMode}
-                  showIncludeSenderDetails={!isPersonalLayoutMode && !isPersonalOrganisation}
-                />
-              ) : undefined
-            }
           />
         </fieldset>
       </form>

apps/remix/app/components/forms/form-sticky-save-bar.tsx

@@ -3,17 +3,12 @@ import { Button } from '@documenso/ui/primitives/button';
 import { Trans, useLingui } from '@lingui/react/macro';
 import { AnimatePresence, motion } from 'framer-motion';
 import { AlertTriangleIcon } from 'lucide-react';
-import { type ReactNode, useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 
 export type FormStickySaveBarProps = {
   isDirty: boolean;
   isSubmitting: boolean;
   onReset: () => void;
-  /**
-   * Slot for a "reset to defaults" action, rendered before the Undo button. Hidden while
-   * the bar is floating so it never appears in the unsaved-changes island.
-   */
-  resetToDefaults?: ReactNode;
 };
 
 /**
@@ -29,7 +24,7 @@ export type FormStickySaveBarProps = {
  * shared-layout morph). A 1px sentinel below it detects the stuck state so we can toggle
  * the pill chrome.
  */
-export const FormStickySaveBar = ({ isDirty, isSubmitting, onReset, resetToDefaults }: FormStickySaveBarProps) => {
+export const FormStickySaveBar = ({ isDirty, isSubmitting, onReset }: FormStickySaveBarProps) => {
   const { t } = useLingui();
 
   const sentinelRef = useRef<HTMLDivElement>(null);
@@ -105,8 +100,6 @@ export const FormStickySaveBar = ({ isDirty, isSubmitting, onReset, resetToDefau
         </AnimatePresence>
 
         <div className="ml-auto flex flex-shrink-0 items-center gap-x-2">
-          {!isFloating && resetToDefaults}
-
           {isDirty && (
             <Button type="button" variant="secondary" size="sm" onClick={onReset} disabled={isSubmitting}>
               <Trans>Undo</Trans>

apps/remix/app/components/general/admin-license-card.tsx

@@ -1,4 +1,3 @@
-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import type { TCachedLicense } from '@documenso/lib/types/license';
 import { SUBSCRIPTION_CLAIM_FEATURE_FLAGS } from '@documenso/lib/types/subscription';
 import { trpc } from '@documenso/trpc/react';
@@ -10,7 +9,6 @@ import { Trans, useLingui } from '@lingui/react/macro';
 import {
   ArrowRightIcon,
   CheckCircle2Icon,
-  CopyIcon,
   EyeIcon,
   EyeOffIcon,
   KeyRoundIcon,
@@ -31,8 +29,6 @@ type AdminLicenseCardProps = {
 
 export const AdminLicenseCard = ({ licenseData }: AdminLicenseCardProps) => {
   const { t, i18n } = useLingui();
-  const { toast } = useToast();
-  const [, copy] = useCopyToClipboard();
   const [isLicenseKeyVisible, setIsLicenseKeyVisible] = useState(false);
 
   const { license } = licenseData || {};
@@ -151,24 +147,6 @@ export const AdminLicenseCard = ({ licenseData }: AdminLicenseCardProps) => {
             >
               {isLicenseKeyVisible ? <EyeOffIcon className="h-3.5 w-3.5" /> : <EyeIcon className="h-3.5 w-3.5" />}
             </Button>
-
-            <Button
-              type="button"
-              variant="ghost"
-              size="sm"
-              className="h-6 w-6 p-0 text-muted-foreground"
-              aria-label={t`Copy license key`}
-              onClick={async () =>
-                copy(license.licenseKey).then(() => {
-                  toast({
-                    title: t`Copied to clipboard`,
-                    description: t`The license key has been copied to your clipboard`,
-                  });
-                })
-              }
-            >
-              <CopyIcon className="h-3.5 w-3.5" />
-            </Button>
           </div>
         </div>
 

apps/remix/app/components/general/app-command-menu.types.ts

@@ -1,36 +0,0 @@
-import type { MessageDescriptor } from '@lingui/core';
-import type { LucideIcon } from 'lucide-react';
-
-export type PromptItem = {
-  id: string;
-  label: string | MessageDescriptor;
-  sublabel?: string;
-  path?: string;
-  onAction?: () => void;
-  icon?: LucideIcon;
-  initials?: string;
-  shortcut?: string;
-  isChecked?: boolean;
-};
-
-export type PromptCategory = {
-  id: string;
-  label: MessageDescriptor;
-  items: PromptItem[];
-  /**
-   * The number of actual results, excluding utility rows such as the
-   * "View all results" link.
-   */
-  count: number;
-  /**
-   * The count shown on the category chip, or null to not show a chip at all.
-   * Categories which only contain hardcoded page links have no chip.
-   */
-  chipCount: number | null;
-  isCapped: boolean;
-  /**
-   * Global admin categories are marked with a globe icon to distinguish them
-   * from the equally named personal categories.
-   */
-  isGlobal: boolean;
-};

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

@@ -1,23 +0,0 @@
-import { Trans } from '@lingui/react/macro';
-import { AlertTriangleIcon } from 'lucide-react';
-
-export const DirectTemplateInvalidPageView = () => {
-  return (
-    <div className="mx-auto flex h-[70vh] w-full max-w-md flex-col items-center justify-center">
-      <div>
-        <AlertTriangleIcon className="h-10 w-10 text-destructive" />
-
-        <h1 className="mt-4 font-semibold text-3xl">
-          <Trans>Invalid direct link template</Trans>
-        </h1>
-
-        <p className="mt-2 text-muted-foreground text-sm">
-          <Trans>
-            This direct link template cannot be used because one or more signers do not have a signature field assigned.
-            Please contact the sender to update the template.
-          </Trans>
-        </p>
-      </div>
-    </div>
-  );
-};

apps/remix/app/components/general/document/document-status.tsx

@@ -4,7 +4,7 @@ import { cn } from '@documenso/ui/lib/utils';
 import type { MessageDescriptor } from '@lingui/core';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { CheckCircle2, Clock, File, TimerOff, XCircle } from 'lucide-react';
+import { CheckCircle2, Clock, File, XCircle } from 'lucide-react';
 import type { LucideIcon } from 'lucide-react/dist/lucide-react';
 import type { HTMLAttributes } from 'react';
 
@@ -46,12 +46,6 @@ export const FRIENDLY_STATUS_MAP: Record<ExtendedDocumentStatus, FriendlyStatus>
     icon: XCircle,
     color: 'text-red-500 dark:text-red-300',
   },
-  EXPIRED: {
-    label: msg`Expired`,
-    labelExtended: msg`Document expired`,
-    icon: TimerOff,
-    color: 'text-orange-500 dark:text-orange-300',
-  },
   INBOX: {
     label: msg`Inbox`,
     labelExtended: msg`Document inbox`,

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

@@ -54,7 +54,6 @@ import { useCurrentTeam } from '~/providers/team';
 
 import { EnvelopeEditorFieldDragDrop } from './envelope-editor-fields-drag-drop';
 import { EnvelopeEditorFieldsPageRenderer } from './envelope-editor-fields-page-renderer';
-import { EnvelopeEditorInvalidDirectTemplateAlert } from './envelope-editor-invalid-direct-template-alert';
 import { EnvelopeRendererFileSelector } from './envelope-file-selector';
 import { EnvelopeRecipientSelector } from './envelope-recipient-selector';
 
@@ -239,8 +238,6 @@ export const EnvelopeEditorFieldsPage = () => {
           }
         />
 
-        <EnvelopeEditorInvalidDirectTemplateAlert />
-
         {/* Document View */}
         <div className="mt-4 flex h-full flex-col items-center justify-center">
           {envelope.recipients.length === 0 && (

apps/remix/app/components/general/envelope-editor/envelope-editor-invalid-direct-template-alert.tsx

@@ -1,55 +0,0 @@
-import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
-import { getRecipientsWithMissingFields } from '@documenso/lib/utils/recipients';
-import { cn } from '@documenso/ui/lib/utils';
-import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
-import { Trans } from '@lingui/react/macro';
-import { useMemo } from 'react';
-
-export type EnvelopeEditorInvalidDirectTemplateAlertProps = {
-  className?: string;
-};
-
-/**
- * Warns that a direct link template cannot be used because one or more signers
- * are missing a signature field.
- */
-export const EnvelopeEditorInvalidDirectTemplateAlert = ({
-  className,
-}: EnvelopeEditorInvalidDirectTemplateAlertProps) => {
-  const { envelope, isTemplate } = useCurrentEnvelopeEditor();
-
-  const signersMissingSignatureFields = useMemo(() => {
-    if (!isTemplate || !envelope.directLink?.enabled) {
-      return [];
-    }
-
-    return getRecipientsWithMissingFields(envelope.recipients, envelope.fields);
-  }, [isTemplate, envelope.directLink, envelope.recipients, envelope.fields]);
-
-  if (signersMissingSignatureFields.length === 0) {
-    return null;
-  }
-
-  return (
-    <Alert
-      variant="destructive"
-      className={cn('mx-auto w-full max-w-[800px] flex-row items-start gap-3 rounded-sm', className)}
-    >
-      <AlertTitle>
-        <Trans>Invalid direct link template</Trans>
-      </AlertTitle>
-
-      <AlertDescription>
-        <Trans>
-          Recipients cannot use this direct link template because the following signers are missing a signature field
-        </Trans>
-
-        <ul className="list-disc pl-5">
-          {signersMissingSignatureFields.map((recipient, i) => (
-            <li key={recipient.id}>{recipient.email || recipient.name || `Recipient ${i + 1}`}</li>
-          ))}
-        </ul>
-      </AlertDescription>
-    </Alert>
-  );
-};

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

@@ -22,7 +22,6 @@ import { match } from 'ts-pattern';
 import { EnvelopeGenericPageRenderer } from '~/components/general/envelope-editor/envelope-generic-page-renderer';
 import { EnvelopePdfViewer } from '~/components/general/pdf-viewer/envelope-pdf-viewer';
 
-import { EnvelopeEditorInvalidDirectTemplateAlert } from './envelope-editor-invalid-direct-template-alert';
 import { EnvelopeRendererFileSelector } from './envelope-file-selector';
 
 export const EnvelopeEditorPreviewPage = () => {
@@ -229,8 +228,6 @@ export const EnvelopeEditorPreviewPage = () => {
           {/* Horizontal envelope item selector */}
           <EnvelopeRendererFileSelector className="px-0" fields={editorFields.localFields} />
 
-          <EnvelopeEditorInvalidDirectTemplateAlert className="mb-4" />
-
           <Alert variant="warning" className="mx-auto max-w-[800px]">
             <AlertTitle>
               <Trans>Preview Mode</Trans>

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

@@ -7,12 +7,7 @@ import { useOptionalSession } from '@documenso/lib/client-only/providers/session
 import type { TDetectedRecipientSchema } from '@documenso/lib/server-only/ai/envelope/detect-recipients/schema';
 import { ZRecipientAuthOptionsSchema } from '@documenso/lib/types/document-auth';
 import { nanoid } from '@documenso/lib/universal/id';
-import {
-  isAssistantLastSigner,
-  isCcRecipient,
-  normalizeRecipientSigningOrders,
-  canRecipientBeModified as utilCanRecipientBeModified,
-} from '@documenso/lib/utils/recipients';
+import { canRecipientBeModified as utilCanRecipientBeModified } from '@documenso/lib/utils/recipients';
 import { trpc } from '@documenso/trpc/react';
 import { RecipientActionAuthSelect } from '@documenso/ui/components/recipient/recipient-action-auth-select';
 import {
@@ -161,12 +156,16 @@ export const EnvelopeEditorRecipientForm = () => {
   }, [watchedSigners]);
 
   const normalizeSigningOrders = (signers: typeof watchedSigners) => {
-    return normalizeRecipientSigningOrders(signers, (signer) => canRecipientBeModified(signer.id));
+    return signers
+      .sort((a, b) => (a.signingOrder ?? 0) - (b.signingOrder ?? 0))
+      .map((signer, index) => ({ ...signer, signingOrder: index + 1 }));
   };
 
-  const activeRecipientCount = watchedSigners.filter((signer) => !isCcRecipient(signer)).length;
-
-  const { fields: signers, remove: removeSigner } = useFieldArray({
+  const {
+    append: appendSigner,
+    fields: signers,
+    remove: removeSigner,
+  } = useFieldArray({
     control,
     name: 'signers',
     keyName: 'nativeId',
@@ -209,31 +208,14 @@ export const EnvelopeEditorRecipientForm = () => {
     return utilCanRecipientBeModified(recipient, fields);
   };
 
-  const appendNormalizedSigner = (signer: (typeof watchedSigners)[number], shouldFocus = false) => {
-    const updatedSigners = normalizeSigningOrders([...form.getValues('signers'), signer]);
-
-    form.setValue('signers', updatedSigners, {
-      shouldValidate: true,
-      shouldDirty: true,
-    });
-
-    if (shouldFocus) {
-      const signerIndex = updatedSigners.findIndex((updatedSigner) => updatedSigner.formId === signer.formId);
-
-      if (signerIndex !== -1) {
-        requestAnimationFrame(() => form.setFocus(`signers.${signerIndex}.email`));
-      }
-    }
-  };
-
   const onAddSigner = () => {
-    appendNormalizedSigner({
+    appendSigner({
       formId: nanoid(12),
       name: '',
       email: '',
       role: RecipientRole.SIGNER,
       actionAuth: [],
-      signingOrder: activeRecipientCount + 1,
+      signingOrder: signers.length > 0 ? (signers[signers.length - 1]?.signingOrder ?? 0) + 1 : 1,
     });
   };
 
@@ -341,16 +323,18 @@ export const EnvelopeEditorRecipientForm = () => {
 
       form.setFocus(`signers.${emptySignerIndex}.email`);
     } else {
-      appendNormalizedSigner(
+      appendSigner(
         {
           formId: nanoid(12),
           name: currentEditorName ?? '',
           email: currentEditorEmail ?? '',
           role: RecipientRole.SIGNER,
           actionAuth: [],
-          signingOrder: activeRecipientCount + 1,
+          signingOrder: signers.length > 0 ? (signers[signers.length - 1]?.signingOrder ?? 0) + 1 : 1,
+        },
+        {
+          shouldFocus: true,
         },
-        true,
       );
 
       void form.trigger('signers');
@@ -385,14 +369,18 @@ export const EnvelopeEditorRecipientForm = () => {
 
       items.splice(insertIndex, 0, reorderedSigner);
 
-      const updatedSigners = normalizeSigningOrders(items);
+      const updatedSigners = items.map((signer, index) => ({
+        ...signer,
+        signingOrder: !canRecipientBeModified(signer.id) ? signer.signingOrder : index + 1,
+      }));
 
       form.setValue('signers', updatedSigners, {
         shouldValidate: true,
         shouldDirty: true,
       });
 
-      if (isAssistantLastSigner(updatedSigners)) {
+      const lastSigner = updatedSigners[updatedSigners.length - 1];
+      if (lastSigner.role === RecipientRole.ASSISTANT) {
         toast({
           title: t`Warning: Assistant as last signer`,
           description: t`Having an assistant as the last signer means they will be unable to take any action as there are no subsequent signers to assist.`,
@@ -423,19 +411,18 @@ export const EnvelopeEditorRecipientForm = () => {
         return;
       }
 
-      const updatedSigners = normalizeSigningOrders(
-        currentSigners.map((signer, idx) => ({
-          ...signer,
-          role: idx === index ? role : signer.role,
-        })),
-      );
+      const updatedSigners = currentSigners.map((signer, idx) => ({
+        ...signer,
+        role: idx === index ? role : signer.role,
+        signingOrder: !canRecipientBeModified(signer.id) ? signer.signingOrder : idx + 1,
+      }));
 
       form.setValue('signers', updatedSigners, {
         shouldValidate: true,
         shouldDirty: true,
       });
 
-      if (role === RecipientRole.ASSISTANT && isAssistantLastSigner(updatedSigners)) {
+      if (role === RecipientRole.ASSISTANT && index === updatedSigners.length - 1) {
         toast({
           title: t`Warning: Assistant as last signer`,
           description: t`Having an assistant as the last signer means they will be unable to take any action as there are no subsequent signers to assist.`,
@@ -460,30 +447,22 @@ export const EnvelopeEditorRecipientForm = () => {
       const currentSigners = form.getValues('signers');
       const signer = currentSigners[index];
 
-      if (isCcRecipient(signer)) {
-        return;
-      }
+      // Remove signer from current position and insert at new position
+      const remainingSigners = currentSigners.filter((_, idx) => idx !== index);
+      const newPosition = Math.min(Math.max(0, newOrder - 1), currentSigners.length - 1);
+      remainingSigners.splice(newPosition, 0, signer);
 
-      const nonCcSigners = currentSigners.filter((s) => !isCcRecipient(s));
-      const ccSigners = currentSigners.filter((s) => isCcRecipient(s));
-      const currentSigningOrderIndex = nonCcSigners.findIndex((s) => s.formId === signer.formId);
-
-      if (currentSigningOrderIndex === -1) {
-        return;
-      }
-
-      const [reorderedSigner] = nonCcSigners.splice(currentSigningOrderIndex, 1);
-      const newPosition = Math.min(Math.max(0, newOrder - 1), nonCcSigners.length);
-      nonCcSigners.splice(newPosition, 0, reorderedSigner);
-
-      const updatedSigners = normalizeSigningOrders([...nonCcSigners, ...ccSigners]);
+      const updatedSigners = remainingSigners.map((s, idx) => ({
+        ...s,
+        signingOrder: !canRecipientBeModified(s.id) ? s.signingOrder : idx + 1,
+      }));
 
       form.setValue('signers', updatedSigners, {
         shouldValidate: true,
         shouldDirty: true,
       });
 
-      if (signer.role === RecipientRole.ASSISTANT && isAssistantLastSigner(updatedSigners)) {
+      if (signer.role === RecipientRole.ASSISTANT && newPosition === remainingSigners.length - 1) {
         toast({
           title: t`Warning: Assistant as last signer`,
           description: t`Having an assistant as the last signer means they will be unable to take any action as there are no subsequent signers to assist.`,
@@ -497,12 +476,10 @@ export const EnvelopeEditorRecipientForm = () => {
     setShowSigningOrderConfirmation(false);
 
     const currentSigners = form.getValues('signers');
-    const updatedSigners = normalizeSigningOrders(
-      currentSigners.map((signer) => ({
-        ...signer,
-        role: signer.role === RecipientRole.ASSISTANT ? RecipientRole.SIGNER : signer.role,
-      })),
-    );
+    const updatedSigners = currentSigners.map((signer) => ({
+      ...signer,
+      role: signer.role === RecipientRole.ASSISTANT ? RecipientRole.SIGNER : signer.role,
+    }));
 
     form.setValue('signers', updatedSigners, {
       shouldValidate: true,
@@ -819,7 +796,6 @@ export const EnvelopeEditorRecipientForm = () => {
                         isDragDisabled={
                           !isSigningOrderSequential ||
                           isSubmitting ||
-                          isCcRecipient(signer) ||
                           !canRecipientBeModified(signer.id) ||
                           !signer.signingOrder
                         }
@@ -843,11 +819,7 @@ export const EnvelopeEditorRecipientForm = () => {
                               })}
                             >
                               <div className="flex flex-row items-center gap-x-2">
-                                {isSigningOrderSequential && isCcRecipient(signer) && (
-                                  <div className="mt-auto h-10 w-[4.25rem] flex-shrink-0" />
-                                )}
-
-                                {isSigningOrderSequential && !isCcRecipient(signer) && (
+                                {isSigningOrderSequential && (
                                   <FormField
                                     control={form.control}
                                     name={`signers.${index}.signingOrder`}
@@ -863,7 +835,7 @@ export const EnvelopeEditorRecipientForm = () => {
                                         <FormControl>
                                           <Input
                                             type="number"
-                                            max={activeRecipientCount}
+                                            max={signers.length}
                                             data-testid="signing-order-input"
                                             className={cn(
                                               'w-10 text-center',
@@ -1004,6 +976,7 @@ export const EnvelopeEditorRecipientForm = () => {
                                           onValueChange={(value) => {
                                             // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
                                             handleRoleChange(index, value as RecipientRole);
+                                            field.onChange(value);
                                           }}
                                           disabled={
                                             snapshot.isDragging || isSubmitting || !canRecipientBeModified(signer.id)

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

@@ -26,7 +26,6 @@ import { ErrorCode as DropzoneErrorCode, type FileRejection, useDropzone } from
 
 import { EnvelopeItemDeleteDialog } from '~/components/dialogs/envelope-item-delete-dialog';
 
-import { EnvelopeEditorInvalidDirectTemplateAlert } from './envelope-editor-invalid-direct-template-alert';
 import { EnvelopeEditorRecipientForm } from './envelope-editor-recipient-form';
 import { EnvelopeItemTitleInput } from './envelope-editor-title-input';
 
@@ -450,9 +449,6 @@ export const EnvelopeEditorUploadPage = () => {
   return (
     <div className="mx-auto max-w-4xl space-y-6 p-8">
       <input {...getReplaceInputProps()} />
-
-      <EnvelopeEditorInvalidDirectTemplateAlert className="max-w-none" />
-
       <Card backdropBlur={false} className="border">
         <CardHeader className="pb-3">
           <CardTitle>

apps/remix/app/components/general/use-admin-search-categories.ts

@@ -1,144 +0,0 @@
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { DO_NOT_INVALIDATE_QUERY_ON_MUTATION, SKIP_QUERY_BATCH_META } from '@documenso/lib/constants/trpc';
-import { isAdmin } from '@documenso/lib/utils/is-admin';
-import { extractInitials } from '@documenso/lib/utils/recipient-formatter';
-import { trpc as trpcReact } from '@documenso/trpc/react';
-import type { TAdminSearchResultType } from '@documenso/trpc/server/admin-router/admin-search.types';
-import { ADMIN_SEARCH_MAX_QUERY_LENGTH } from '@documenso/trpc/server/admin-router/admin-search.types';
-
-import type { MessageDescriptor } from '@lingui/core';
-import { msg } from '@lingui/core/macro';
-import { keepPreviousData } from '@tanstack/react-query';
-import type { LucideIcon } from 'lucide-react';
-import { ArrowRightIcon, Building2Icon, CreditCardIcon, FileTextIcon, UserIcon, UsersIcon } from 'lucide-react';
-import { useMemo } from 'react';
-import type { PromptCategory, PromptItem } from './app-command-menu.types';
-
-/**
- * The maximum number of results the admin search returns per resource type.
- */
-const ADMIN_SEARCH_RESULTS_CAP = 5;
-
-const ADMIN_GROUP_LABELS: Record<TAdminSearchResultType, MessageDescriptor> = {
-  document: msg`Documents`,
-  user: msg`Users`,
-  organisation: msg`Organisations`,
-  team: msg`Teams`,
-  recipient: msg`Recipients`,
-  subscription: msg`Subscriptions`,
-};
-
-const ADMIN_GROUP_ICONS: Record<TAdminSearchResultType, LucideIcon> = {
-  document: FileTextIcon,
-  user: UserIcon,
-  organisation: Building2Icon,
-  team: UsersIcon,
-  recipient: UserIcon,
-  subscription: CreditCardIcon,
-};
-
-/**
- * Admin list pages which support prefilling their search from the URL, used
- * for the "View all results" links on capped groups. Teams, recipients and
- * subscriptions have no admin list pages.
- */
-const ADMIN_GROUP_LIST_PATHS: Partial<Record<TAdminSearchResultType, (_query: string) => string>> = {
-  document: (query) => `/admin/documents?term=${encodeURIComponent(query)}`,
-  user: (query) => `/admin/users?search=${encodeURIComponent(query)}`,
-  organisation: (query) => `/admin/organisations?query=${encodeURIComponent(query)}`,
-};
-
-export type UseAdminSearchCategoriesOptions = {
-  /**
-   * The trimmed, debounced search query.
-   */
-  query: string;
-  open: boolean;
-};
-
-/**
- * The isolated admin portion of the command prompt: searches every admin
- * resource and maps the results to prompt categories marked as global.
- *
- * Returns no categories and never queries for non admin users. The admin
- * search endpoint is additionally guarded server side by the admin procedure.
- */
-export const useAdminSearchCategories = ({ query, open }: UseAdminSearchCategoriesOptions) => {
-  const { user } = useSession();
-
-  const isUserAdmin = isAdmin(user);
-
-  // Admin searches hit every resource table, so require a longer query unless
-  // it is a number, which could be a resource ID of any length. Queries over
-  // the endpoint's length limit are skipped entirely instead of being sent
-  // and rejected.
-  const hasValidAdminSearch =
-    isUserAdmin && query.length <= ADMIN_SEARCH_MAX_QUERY_LENGTH && (query.length > 3 || /^\d+$/.test(query));
-
-  const {
-    data: adminSearchData,
-    isFetching,
-    isError,
-  } = trpcReact.admin.search.useQuery(
-    {
-      query,
-    },
-    {
-      enabled: open && hasValidAdminSearch,
-      placeholderData: keepPreviousData,
-      // Retyping is the retry in a search-as-you-type flow: fail fast so the
-      // prompt can surface an honest error state instead of retrying.
-      retry: false,
-      ...SKIP_QUERY_BATCH_META,
-      ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
-    },
-  );
-
-  const categories = useMemo((): PromptCategory[] => {
-    if (!hasValidAdminSearch || !adminSearchData) {
-      return [];
-    }
-
-    return adminSearchData.groups.map((group) => {
-      const isCapped = group.results.length >= ADMIN_SEARCH_RESULTS_CAP;
-      const buildListPath = ADMIN_GROUP_LIST_PATHS[group.type];
-
-      const items: PromptItem[] = group.results.map((result) => ({
-        id: `admin-${group.type}-${result.value}`,
-        label: result.label,
-        sublabel: result.sublabel,
-        path: result.path,
-        icon: ADMIN_GROUP_ICONS[group.type],
-        initials: group.type === 'user' || group.type === 'recipient' ? extractInitials(result.label) : undefined,
-      }));
-
-      // Capped groups link to the full admin list page with the search
-      // prefilled so the cap is never a dead end.
-      if (isCapped && buildListPath) {
-        items.push({
-          id: `admin-${group.type}-view-all`,
-          label: msg`View all results`,
-          path: buildListPath(query),
-          icon: ArrowRightIcon,
-        });
-      }
-
-      return {
-        id: `admin-${group.type}`,
-        label: ADMIN_GROUP_LABELS[group.type],
-        items,
-        count: group.results.length,
-        chipCount: group.results.length,
-        isCapped,
-        isGlobal: true,
-      };
-    });
-  }, [hasValidAdminSearch, adminSearchData, query]);
-
-  return {
-    isUserAdmin,
-    categories,
-    isFetching,
-    isError,
-  };
-};

apps/remix/app/components/tables/documents-table-empty-state.tsx

@@ -1,7 +1,7 @@
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { Bird, CheckCircle2, TimerOff, XCircle } from 'lucide-react';
+import { Bird, CheckCircle2, XCircle } from 'lucide-react';
 import { match } from 'ts-pattern';
 
 export type DocumentsTableEmptyStateProps = { status: ExtendedDocumentStatus };
@@ -29,16 +29,6 @@ export const DocumentsTableEmptyState = ({ status }: DocumentsTableEmptyStatePro
       message: msg`There are no cancelled documents. Documents you cancel will remain here as a record that they were distributed.`,
       icon: XCircle,
     }))
-    .with(ExtendedDocumentStatus.REJECTED, () => ({
-      title: msg`No rejected documents`,
-      message: msg`There are no rejected documents. Documents that a recipient declines to sign will appear here.`,
-      icon: XCircle,
-    }))
-    .with(ExtendedDocumentStatus.EXPIRED, () => ({
-      title: msg`No expired documents`,
-      message: msg`There are no documents with expired signing links. You can redistribute a document to renew its expiration.`,
-      icon: TimerOff,
-    }))
     .with(ExtendedDocumentStatus.ALL, () => ({
       title: msg`We're all empty`,
       message: msg`You have not yet created or received any documents. To create a document please upload one.`,

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

@@ -88,7 +88,7 @@ export default function OrganisationSettingsDocumentPage() {
           typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
           uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
           drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
-          delegateDocumentOwnership,
+          delegateDocumentOwnership: delegateDocumentOwnership,
           aiFeaturesEnabled,
           envelopeExpirationPeriod: envelopeExpirationPeriod ?? undefined,
           reminderSettings: reminderSettings ?? undefined,

apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx

@@ -76,7 +76,6 @@ export default function DocumentsPage() {
     [ExtendedDocumentStatus.COMPLETED]: 0,
     [ExtendedDocumentStatus.REJECTED]: 0,
     [ExtendedDocumentStatus.CANCELLED]: 0,
-    [ExtendedDocumentStatus.EXPIRED]: 0,
     [ExtendedDocumentStatus.INBOX]: 0,
     [ExtendedDocumentStatus.ALL]: 0,
   });
@@ -158,8 +157,6 @@ export default function DocumentsPage() {
                   ExtendedDocumentStatus.COMPLETED,
                   ExtendedDocumentStatus.CANCELLED,
                   ExtendedDocumentStatus.DRAFT,
-                  ExtendedDocumentStatus.REJECTED,
-                  ExtendedDocumentStatus.EXPIRED,
                   ExtendedDocumentStatus.ALL,
                 ]
                   .filter((value) => {

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

@@ -82,7 +82,7 @@ export default function TeamsSettingsPage() {
                 uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
                 drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
               }),
-          delegateDocumentOwnership,
+          delegateDocumentOwnership: delegateDocumentOwnership,
         },
       });
 

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

@@ -7,7 +7,6 @@ import { getEnvelopeForDirectTemplateSigning } from '@documenso/lib/server-only/
 import { getTemplateByDirectLinkToken } from '@documenso/lib/server-only/template/get-template-by-direct-link-token';
 import { DocumentAccessAuth } from '@documenso/lib/types/document-auth';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
-import { getRecipientsWithMissingFields } from '@documenso/lib/utils/recipients';
 import { prisma } from '@documenso/prisma';
 import { Plural } from '@lingui/react/macro';
 import { UsersIcon } from 'lucide-react';
@@ -15,7 +14,6 @@ import { redirect } from 'react-router';
 import { match } from 'ts-pattern';
 
 import { Header as AuthenticatedHeader } from '~/components/general/app-header';
-import { DirectTemplateInvalidPageView } from '~/components/general/direct-template/direct-template-invalid-page';
 import { DirectTemplatePageView } from '~/components/general/direct-template/direct-template-page';
 import { DirectTemplateAuthPageView } from '~/components/general/direct-template/direct-template-signing-auth-page';
 import { DocumentSigningAuthPageView } from '~/components/general/document-signing/document-signing-auth-page';
@@ -72,18 +70,8 @@ const handleV1Loader = async ({ params, request }: Route.LoaderArgs) => {
     };
   }
 
-  const recipientsWithMissingFields = getRecipientsWithMissingFields(template.recipients, template.fields);
-
-  if (recipientsWithMissingFields.length > 0) {
-    return {
-      isAccessAuthValid: true,
-      isTemplateMissingSignatures: true,
-    } as const;
-  }
-
   return {
     isAccessAuthValid: true,
-    isTemplateMissingSignatures: false,
     template: {
       ...template,
       folder: null,
@@ -108,7 +96,6 @@ const handleV2Loader = async ({ params, request }: Route.LoaderArgs) => {
     .then((envelopeForSigning) => {
       return {
         isDocumentAccessValid: true,
-        isTemplateMissingSignatures: false,
         envelopeForSigning,
       } as const;
     })
@@ -121,13 +108,6 @@ const handleV2Loader = async ({ params, request }: Route.LoaderArgs) => {
         } as const;
       }
 
-      if (error.code === AppErrorCode.MISSING_SIGNATURE_FIELD) {
-        return {
-          isDocumentAccessValid: true,
-          isTemplateMissingSignatures: true,
-        } as const;
-      }
-
       throw new Response('Not Found', { status: 404 });
     });
 };
@@ -201,10 +181,6 @@ const DirectSigningPageV1 = ({ data }: { data: Awaited<ReturnType<typeof handleV
     return <DirectTemplateAuthPageView />;
   }
 
-  if (data.isTemplateMissingSignatures) {
-    return <DirectTemplateInvalidPageView />;
-  }
-
   const { template, directTemplateRecipient } = data;
 
   return (
@@ -259,10 +235,6 @@ const DirectSigningPageV2 = ({ data }: { data: Awaited<ReturnType<typeof handleV
     return <DocumentSigningAuthPageView email={''} emailHasAccount={true} />;
   }
 
-  if (data.isTemplateMissingSignatures) {
-    return <DirectTemplateInvalidPageView />;
-  }
-
   const { envelope, recipient } = data.envelopeForSigning;
 
   const { derivedRecipientAccessAuth } = extractDocumentAuthMethods({

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

@@ -1,15 +1,98 @@
-import { redirect } from 'react-router';
+import { prisma } from '@documenso/prisma';
+import { Button } from '@documenso/ui/primitives/button';
+import { Trans } from '@lingui/react/macro';
+import { OrganisationMemberInviteStatus } from '@prisma/client';
+import { Link } from 'react-router';
 
 import type { Route } from './+types/organisation.decline.$token';
 
-export function loader({ params }: Route.LoaderArgs) {
+export async function loader({ params }: Route.LoaderArgs) {
   const { token } = params;
 
   if (!token) {
-    throw redirect('/');
+    return {
+      state: 'InvalidLink',
+    } as const;
   }
 
-  // Declining now happens on the invite page via tRPC. Redirect there with the
-  // `action=decline` flag so it renders the decline-only view (no accept).
-  throw redirect(`/organisation/invite/${token}?action=decline`);
+  const organisationMemberInvite = await prisma.organisationMemberInvite.findUnique({
+    where: {
+      token,
+    },
+    include: {
+      organisation: {
+        select: {
+          name: true,
+        },
+      },
+    },
+  });
+
+  if (!organisationMemberInvite) {
+    return {
+      state: 'InvalidLink',
+    } as const;
+  }
+
+  if (organisationMemberInvite.status !== OrganisationMemberInviteStatus.DECLINED) {
+    await prisma.organisationMemberInvite.update({
+      where: {
+        id: organisationMemberInvite.id,
+      },
+      data: {
+        status: OrganisationMemberInviteStatus.DECLINED,
+      },
+    });
+  }
+
+  return {
+    state: 'Success',
+    organisationName: organisationMemberInvite.organisation.name,
+  } as const;
+}
+
+export default function DeclineInvitationPage({ loaderData }: Route.ComponentProps) {
+  const data = loaderData;
+
+  if (data.state === 'InvalidLink') {
+    return (
+      <div className="w-screen max-w-lg px-4">
+        <div className="w-full">
+          <h1 className="font-semibold text-4xl">
+            <Trans>Invalid token</Trans>
+          </h1>
+
+          <p className="mt-2 mb-4 text-muted-foreground text-sm">
+            <Trans>This token is invalid or has expired. No action is needed.</Trans>
+          </p>
+
+          <Button asChild>
+            <Link to="/">
+              <Trans>Return</Trans>
+            </Link>
+          </Button>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="w-screen max-w-lg px-4">
+      <h1 className="font-semibold text-4xl">
+        <Trans>Invitation declined</Trans>
+      </h1>
+
+      <p className="mt-2 mb-4 text-muted-foreground text-sm">
+        <Trans>
+          You have declined the invitation from <strong>{data.organisationName}</strong> to join their organisation.
+        </Trans>
+      </p>
+
+      <Button asChild>
+        <Link to="/">
+          <Trans>Return to Home</Trans>
+        </Link>
+      </Button>
+    </div>
+  );
 }

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

@@ -1,15 +1,9 @@
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
-import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { acceptOrganisationInvitation } from '@documenso/lib/server-only/organisation/accept-organisation-invitation';
 import { prisma } from '@documenso/prisma';
-import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import { Trans, useLingui } from '@lingui/react/macro';
-import { OrganisationMemberInviteStatus } from '@prisma/client';
-import { useState } from 'react';
-import { Link, useSearchParams } from 'react-router';
-import { match } from 'ts-pattern';
+import { Trans } from '@lingui/react/macro';
+import { Link } from 'react-router';
 
 import type { Route } from './+types/organisation.invite.$token';
 
@@ -43,22 +37,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     } as const;
   }
 
-  const organisationName = organisationMemberInvite.organisation.name;
-
-  if (organisationMemberInvite.status === OrganisationMemberInviteStatus.ACCEPTED) {
-    return {
-      state: 'AlreadyAccepted',
-      organisationName,
-    } as const;
-  }
-
-  if (organisationMemberInvite.status === OrganisationMemberInviteStatus.DECLINED) {
-    return {
-      state: 'AlreadyDeclined',
-      organisationName,
-    } as const;
-  }
-
   const user = await prisma.user.findFirst({
     where: {
       email: {
@@ -71,13 +49,26 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     },
   });
 
+  // Directly convert the team member invite to a team member if they already have an account.
+  if (user) {
+    await acceptOrganisationInvitation({ token: organisationMemberInvite.token });
+  }
+
+  if (!user) {
+    return {
+      state: 'LoginRequired',
+      email: organisationMemberInvite.email,
+      organisationName: organisationMemberInvite.organisation.name,
+    } as const;
+  }
+
+  const isSessionUserTheInvitedUser = user.id === session.user?.id;
+
   return {
-    state: 'Pending',
-    token: organisationMemberInvite.token,
+    state: 'Success',
     email: organisationMemberInvite.email,
-    organisationName,
-    userExists: user !== null,
-    isSessionUserTheInvitedUser: user !== null && user.id === session.user?.id,
+    organisationName: organisationMemberInvite.organisation.name,
+    isSessionUserTheInvitedUser,
   } as const;
 }
 
@@ -106,253 +97,57 @@ export default function AcceptInvitationPage({ loaderData }: Route.ComponentProp
     );
   }
 
-  if (data.state === 'AlreadyAccepted') {
+  if (data.state === 'LoginRequired') {
     return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="font-semibold text-4xl">
-            <Trans>Invitation already accepted</Trans>
-          </h1>
-
-          <p className="mt-2 mb-4 text-muted-foreground text-sm">
-            <Trans>
-              You are already a member of <strong>{data.organisationName}</strong>.
-            </Trans>
-          </p>
-
-          <Button asChild>
-            <Link to="/">
-              <Trans>Continue</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  if (data.state === 'AlreadyDeclined') {
-    return <InvitationDeclined organisationName={data.organisationName} />;
-  }
-
-  return (
-    <PendingInvitation
-      token={data.token}
-      email={data.email}
-      organisationName={data.organisationName}
-      userExists={data.userExists}
-      isSessionUserTheInvitedUser={data.isSessionUserTheInvitedUser}
-    />
-  );
-}
-
-type PendingInvitationProps = {
-  token: string;
-  email: string;
-  organisationName: string;
-  userExists: boolean;
-  isSessionUserTheInvitedUser: boolean;
-};
-
-type InvitationResult = 'idle' | 'accepted' | 'declined';
-
-type AcceptFailureReason = 'CapExceeded' | 'SubscriptionInactive' | 'Unknown';
-
-const PendingInvitation = ({
-  token,
-  email,
-  organisationName,
-  userExists,
-  isSessionUserTheInvitedUser,
-}: PendingInvitationProps) => {
-  const { t } = useLingui();
-  const { toast } = useToast();
-  const { refreshSession } = useOptionalSession();
-
-  const [searchParams] = useSearchParams();
-  const actionIsDecline = searchParams.get('action') === 'decline';
-
-  const [result, setResult] = useState<InvitationResult>('idle');
-  const [acceptFailureReason, setAcceptFailureReason] = useState<AcceptFailureReason | null>(null);
-
-  const acceptInvitation = trpc.organisation.member.invite.accept.useMutation({
-    onSuccess: async () => {
-      await refreshSession();
-
-      setResult('accepted');
-    },
-    onError: (err) => {
-      const error = AppError.parseError(err);
-
-      const failureReason = match(error.code)
-        .with(AppErrorCode.LIMIT_EXCEEDED, () => 'CapExceeded' as const)
-        .with('SUBSCRIPTION_INACTIVE', () => 'SubscriptionInactive' as const)
-        .otherwise(() => 'Unknown' as const);
-
-      setAcceptFailureReason(failureReason);
-    },
-  });
-
-  const declineInvitation = trpc.organisation.member.invite.decline.useMutation({
-    onSuccess: async () => {
-      await refreshSession();
-
-      setResult('declined');
-    },
-    onError: () => {
-      toast({
-        title: t`Something went wrong`,
-        description: t`Unable to decline this invitation at this time.`,
-        variant: 'destructive',
-        duration: 10000,
-      });
-    },
-  });
-
-  if (result === 'accepted') {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="font-semibold text-4xl">
-            <Trans>Invitation accepted!</Trans>
-          </h1>
-
-          <p className="mt-2 mb-4 text-muted-foreground text-sm">
-            <Trans>
-              You have accepted an invitation from <strong>{organisationName}</strong> to join their organisation.
-            </Trans>
-          </p>
-
-          {isSessionUserTheInvitedUser ? (
-            <Button asChild>
-              <Link to="/">
-                <Trans>Continue</Trans>
-              </Link>
-            </Button>
-          ) : (
-            <Button asChild>
-              <Link to={`/signin#email=${encodeURIComponent(email)}`}>
-                <Trans>Continue to login</Trans>
-              </Link>
-            </Button>
-          )}
-        </div>
-      </div>
-    );
-  }
-
-  if (result === 'declined') {
-    return <InvitationDeclined organisationName={organisationName} />;
-  }
-
-  // Accepting requires an account (acceptance keys off the invited email).
-  // Declining does not, so we only gate account creation on the accept flow.
-  if (!actionIsDecline && !userExists) {
-    return (
-      <div className="w-screen max-w-lg px-4">
-        <div className="w-full">
-          <h1 className="font-semibold text-4xl">
-            <Trans>Organisation invitation</Trans>
-          </h1>
-
-          <p className="mt-2 text-muted-foreground text-sm">
-            <Trans>
-              You have been invited by <strong>{organisationName}</strong> to join their organisation.
-            </Trans>
-          </p>
-
-          <p className="mt-1 mb-4 text-muted-foreground text-sm">
-            <Trans>To accept this invitation you must create an account.</Trans>
-          </p>
-
-          <Button asChild>
-            <Link to={`/signup#email=${encodeURIComponent(email)}`}>
-              <Trans>Create account</Trans>
-            </Link>
-          </Button>
-        </div>
-      </div>
-    );
-  }
-
-  const isPending = acceptInvitation.isPending || declineInvitation.isPending;
-
-  return (
-    <div className="w-screen max-w-lg px-4">
-      <div className="w-full">
+      <div>
         <h1 className="font-semibold text-4xl">
           <Trans>Organisation invitation</Trans>
         </h1>
 
-        <p className="mt-2 mb-4 text-muted-foreground text-sm">
+        <p className="mt-2 text-muted-foreground text-sm">
           <Trans>
-            You have been invited to join <strong>{organisationName}</strong> on Documenso.
+            You have been invited by <strong>{data.organisationName}</strong> to join their organisation.
           </Trans>
         </p>
 
-        {acceptFailureReason && (
-          <p className="mt-2 mb-4 text-destructive text-sm">
-            {match(acceptFailureReason)
-              .with('CapExceeded', () => (
-                <Trans>
-                  <strong>{organisationName}</strong> has reached its member limit. Please contact the organisation
-                  administrator to upgrade their plan before accepting this invitation.
-                </Trans>
-              ))
-              .with('SubscriptionInactive', () => (
-                <Trans>
-                  <strong>{organisationName}</strong> does not have an active subscription. Please contact the
-                  organisation administrator to renew their plan before accepting this invitation.
-                </Trans>
-              ))
-              .with('Unknown', () => (
-                <Trans>
-                  We were unable to add you to <strong>{organisationName}</strong> at this time. Please try again later,
-                  or contact the organisation administrator.
-                </Trans>
-              ))
-              .exhaustive()}
-          </p>
-        )}
+        <p className="mt-1 mb-4 text-muted-foreground text-sm">
+          <Trans>To accept this invitation you must create an account.</Trans>
+        </p>
 
-        <div className="flex items-center gap-x-4">
-          <Button
-            variant="destructive"
-            onClick={async () => declineInvitation.mutateAsync({ token })}
-            loading={declineInvitation.isPending}
-            disabled={isPending}
-          >
-            <Trans>Decline</Trans>
-          </Button>
-
-          {!actionIsDecline && (
-            <Button
-              onClick={async () => acceptInvitation.mutateAsync({ token })}
-              loading={acceptInvitation.isPending}
-              disabled={isPending}
-            >
-              <Trans>Accept</Trans>
-            </Button>
-          )}
-        </div>
+        <Button asChild>
+          <Link to={`/signup#email=${encodeURIComponent(data.email)}`}>
+            <Trans>Create account</Trans>
+          </Link>
+        </Button>
       </div>
-    </div>
-  );
-};
+    );
+  }
 
-const InvitationDeclined = ({ organisationName }: { organisationName: string }) => {
   return (
-    <div className="w-screen max-w-lg px-4">
-      <div className="w-full">
-        <h1 className="font-semibold text-4xl">
-          <Trans>Invitation declined</Trans>
-        </h1>
+    <div>
+      <h1 className="font-semibold text-4xl">
+        <Trans>Invitation accepted!</Trans>
+      </h1>
 
-        <p className="mt-2 mb-4 text-muted-foreground text-sm">
-          <Trans>
-            You have declined the invitation from <strong>{organisationName}</strong> to join their organisation.
-          </Trans>
-        </p>
-      </div>
+      <p className="mt-2 mb-4 text-muted-foreground text-sm">
+        <Trans>
+          You have accepted an invitation from <strong>{data.organisationName}</strong> to join their organisation.
+        </Trans>
+      </p>
+
+      {data.isSessionUserTheInvitedUser ? (
+        <Button asChild>
+          <Link to="/">
+            <Trans>Continue</Trans>
+          </Link>
+        </Button>
+      ) : (
+        <Button asChild>
+          <Link to={`/signin#email=${encodeURIComponent(data.email)}`}>
+            <Trans>Continue to login</Trans>
+          </Link>
+        </Button>
+      )}
     </div>
   );
-};
+}

apps/remix/app/utils/toast-error-messages.ts

@@ -32,10 +32,6 @@ export const getDirectTemplateErrorMessage = (code: string): ToastMessageDescrip
   return match(code)
     .with('RECIPIENT_LIMIT_EXCEEDED', () => RECIPIENT_LIMIT_EXCEEDED_ERROR_MESSAGE)
     .with(AppErrorCode.TOO_MANY_REQUESTS, () => FAIR_USE_LIMIT_EXCEEDED_ERROR_MESSAGE)
-    .with(AppErrorCode.MISSING_SIGNATURE_FIELD, () => ({
-      title: msg`Missing signature fields`,
-      description: msg`This direct link template cannot be used because one or more signers do not have a signature field assigned.`,
-    }))
     .otherwise(() => ({
       title: msg`Something went wrong`,
       description: msg`We were unable to submit this document at this time. Please try again later.`,
@@ -81,10 +77,6 @@ export const getTemplateUseErrorMessage = (code: string): ToastMessageDescriptor
       title: msg`Error`,
       description: msg`The document was created but could not be sent to recipients.`,
     }))
-    .with(AppErrorCode.MISSING_SIGNATURE_FIELD, () => ({
-      title: msg`Missing signature fields`,
-      description: msg`The document could not be sent because some signers do not have a signature field. Please edit the template and add a signature field for each signer.`,
-    }))
     .with(AppErrorCode.INVALID_BODY, AppErrorCode.INVALID_REQUEST, () => ({
       title: msg`Error`,
       description: msg`The document could not be created because of missing or invalid information. Please review the template's recipients and fields.`,

apps/remix/package.json

@@ -106,5 +106,5 @@
     "vite-plugin-babel-macros": "^1.0.6",
     "vite-tsconfig-paths": "^5.1.4"
   },
-  "version": "2.16.0"
+  "version": "2.15.0"
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@documenso/root",
-  "version": "2.16.0",
+  "version": "2.15.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "2.16.0",
+      "version": "2.15.0",
       "hasInstallScript": true,
       "workspaces": [
         "apps/*",
@@ -366,7 +366,7 @@
     },
     "apps/remix": {
       "name": "@documenso/remix",
-      "version": "2.16.0",
+      "version": "2.15.0",
       "dependencies": {
         "@cantoo/pdf-lib": "^2.5.3",
         "@documenso/api": "*",
@@ -2952,6 +2952,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT OR Apache-2.0",
       "optional": true,
       "os": [
@@ -2969,6 +2972,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT OR Apache-2.0",
       "optional": true,
       "os": [
@@ -2986,6 +2992,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT OR Apache-2.0",
       "optional": true,
       "os": [
@@ -3003,6 +3012,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT OR Apache-2.0",
       "optional": true,
       "os": [
@@ -25014,6 +25026,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -25030,6 +25045,9 @@
       "cpu": [
         "arm64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -25046,6 +25064,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -25062,6 +25083,9 @@
       "cpu": [
         "x64"
       ],
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [

package.json

@@ -5,7 +5,7 @@
     "apps/*",
     "packages/*"
   ],
-  "version": "2.16.0",
+  "version": "2.15.0",
   "scripts": {
     "postinstall": "patch-package",
     "build": "turbo run build",

packages/api/v1/openapi.ts

@@ -11,7 +11,7 @@ export const OpenAPIV1 = Object.assign(
         title: 'Documenso API',
         version: '1.0.0',
         description:
-          'API V1 has been deprecated. For more details, see https://docs.documenso.com/docs/developers/api/migrate-to-envelopes. \n\nThe Documenso API for retrieving, creating, updating and deleting documents.',
+          'API V1 is deprecated, but will continue to be supported. For more details, see https://docs.documenso.com/developers/public-api. \n\nThe Documenso API for retrieving, creating, updating and deleting documents.',
       },
       servers: [
         {

packages/app-tests/e2e/admin/global-search.spec.ts

@@ -1,439 +0,0 @@
-import { seedPendingDocument } from '@documenso/prisma/seed/documents';
-import { seedUser } from '@documenso/prisma/seed/users';
-import { expect, test } from '@playwright/test';
-import { customAlphabet } from 'nanoid';
-
-import { apiSignin } from '../fixtures/authentication';
-import { openCommandMenu } from '../fixtures/command-menu';
-
-test.describe.configure({ mode: 'parallel' });
-
-const nanoid = customAlphabet('1234567890abcdef', 10);
-
-const ADMIN_PROMPT_PLACEHOLDER = 'Search documents, users, organisations…';
-
-test('[ADMIN][GLOBAL_SEARCH]: numeric query shows verified user result and navigates', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: targetUser } = await seedUser();
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first().fill(String(targetUser.id));
-
-  await expect(page.getByText('Global Users', { exact: true })).toBeVisible();
-
-  // The category chips include the admin groups with their result counts.
-  await expect(page.getByRole('button', { name: /Global Users/ })).toBeVisible();
-
-  const userOption = page.getByRole('option').filter({ hasText: targetUser.email }).first();
-
-  // Admin results are real links so they support native link behaviour such
-  // as opening in a new tab.
-  await expect(userOption.getByRole('link')).toHaveAttribute('href', `/admin/users/${targetUser.id}`);
-
-  await userOption.click();
-
-  await page.waitForURL(`/admin/users/${targetUser.id}`);
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: numeric query shows verified team result and navigates', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { team: targetTeam } = await seedUser();
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first().fill(String(targetTeam.id));
-
-  await expect(page.getByText('Global Teams', { exact: true })).toBeVisible();
-
-  await page.getByRole('option').filter({ hasText: targetTeam.url }).first().click();
-
-  await page.waitForURL(`/admin/teams/${targetTeam.id}`);
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: text query shows document result and navigates', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: sender, team } = await seedUser();
-
-  const document = await seedPendingDocument(sender, team.id, [], {
-    createDocumentOptions: { title: `admin-ui-search-${nanoid()}` },
-  });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first().fill(document.title);
-
-  await expect(page.getByText('Global Documents', { exact: true })).toBeVisible();
-
-  await page.getByRole('option').filter({ hasText: document.secondaryId }).first().click();
-
-  await page.waitForURL(`/admin/documents/${document.id}`);
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: envelope_ prefixed query resolves exact document', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: sender, team } = await seedUser();
-
-  const document = await seedPendingDocument(sender, team.id, [], {
-    createDocumentOptions: { title: `admin-ui-search-${nanoid()}` },
-  });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first().fill(document.id);
-
-  await expect(page.getByText('Global Documents', { exact: true })).toBeVisible();
-  await expect(page.getByRole('option').filter({ hasText: document.title }).first()).toBeVisible();
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: admin search requires more than 3 characters unless numeric', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  const adminSearchRequests: string[] = [];
-
-  page.on('request', (request) => {
-    if (request.url().includes('admin.search')) {
-      adminSearchRequests.push(request.url());
-    }
-  });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  const input = page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first();
-
-  // A 3 character non-numeric query must not trigger the admin search. The
-  // personal document search fires for any non-empty query, so its response
-  // is the synchronization anchor proving the debounced queries have fired.
-  const documentSearchResponse = page.waitForResponse((response) => response.url().includes('document.search'));
-
-  await input.fill('abc');
-
-  await documentSearchResponse;
-
-  await expect(page.getByText(/^Global /)).toHaveCount(0);
-  expect(adminSearchRequests).toHaveLength(0);
-
-  // A numeric query fires regardless of length.
-  const adminSearchRequest = page.waitForRequest((request) => request.url().includes('admin.search'));
-
-  await input.fill('7');
-
-  await adminSearchRequest;
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: search bar position stays fixed while searching', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: targetUser } = await seedUser();
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  const input = page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first();
-
-  const initialY = (await input.boundingBox())?.y;
-
-  expect(initialY).toBeGreaterThan(0);
-
-  // The height of the prompt may change as results come and go, but the
-  // search bar must never move.
-  await input.fill(String(targetUser.id));
-
-  await expect(page.getByText('Global Users', { exact: true })).toBeVisible();
-
-  const resultsY = (await input.boundingBox())?.y;
-
-  expect(resultsY).toBe(initialY);
-
-  // The search bar must not move when there are no results at all.
-  await input.fill('zzzz-no-such-thing-9x7q');
-
-  await expect(page.getByText('No results for')).toBeVisible();
-
-  const emptyY = (await input.boundingBox())?.y;
-
-  expect(emptyY).toBe(initialY);
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: default view shows the document page links outside a team context', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  // Admin pages have no current team, the page links must still show.
-  await page.goto('/admin/stats');
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await expect(page.getByRole('option').filter({ hasText: 'All documents' })).toBeVisible();
-  await expect(page.getByRole('option').filter({ hasText: 'Draft documents' })).toBeVisible();
-  await expect(page.getByRole('option').filter({ hasText: 'All templates' })).toBeVisible();
-
-  // Chips only show for categories with actual results, not for the
-  // hardcoded page links.
-  await expect(page.getByRole('button', { name: /^Documents/ })).toHaveCount(0);
-  await expect(page.getByRole('button', { name: /^Templates/ })).toHaveCount(0);
-  await expect(page.getByRole('button', { name: /^Settings/ })).toBeVisible();
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: theme can be changed from the prompt', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await page.getByRole('option').filter({ hasText: 'Change theme' }).first().click();
-
-  // The sub page has a contextual placeholder and a back option.
-  await expect(page.getByPlaceholder('Search themes…')).toBeVisible();
-  await expect(page.getByRole('option').filter({ hasText: 'Back' }).first()).toBeVisible();
-
-  await expect(page.getByRole('option').filter({ hasText: 'Dark Mode' })).toBeVisible();
-
-  await page.getByRole('option').filter({ hasText: 'Dark Mode' }).first().click();
-
-  await expect(page.locator('html')).toHaveClass(/dark/);
-
-  // The back option returns to the root view.
-  await page.getByRole('option').filter({ hasText: 'Back' }).first().click();
-
-  await expect(page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first()).toBeVisible();
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: capped admin groups offer a view all link', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  const namePrefix = `viewall-${nanoid()}`;
-
-  // Seed enough users sharing a name prefix to hit the 5 result cap.
-  for (let i = 0; i < 5; i++) {
-    await seedUser({ name: `${namePrefix}-${i}` });
-  }
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first().fill(namePrefix);
-
-  await expect(page.getByText('Global Users', { exact: true })).toBeVisible();
-
-  const viewAllOption = page.getByRole('option').filter({ hasText: 'View all results' }).first();
-
-  await expect(viewAllOption.getByRole('link')).toHaveAttribute(
-    'href',
-    `/admin/users?search=${encodeURIComponent(namePrefix)}`,
-  );
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: first result is highlighted after every search', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: firstUser } = await seedUser();
-  const { user: secondUser } = await seedUser();
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  const input = page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first();
-
-  // First search selects the first result.
-  await input.fill(String(firstUser.id));
-
-  await expect(page.getByRole('option').filter({ hasText: firstUser.email }).first()).toBeVisible();
-  await expect(page.locator('[cmdk-item]').first()).toHaveAttribute('aria-selected', 'true');
-
-  // A subsequent search with entirely new results must select the first
-  // result again.
-  await input.fill(String(secondUser.id));
-
-  await expect(page.getByRole('option').filter({ hasText: secondUser.email }).first()).toBeVisible();
-  await expect(page.locator('[cmdk-item]').first()).toHaveAttribute('aria-selected', 'true');
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: static items match fuzzy queries', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  // "setg" is a non-contiguous abbreviation of "Settings".
-  await page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first().fill('setg');
-
-  // Wait for the debounced filter to apply first, "Draft documents" can
-  // never match "setg" under either matching strategy.
-  await expect(page.getByRole('option').filter({ hasText: 'Draft documents' })).toHaveCount(0);
-
-  await expect(page.getByRole('option').filter({ hasText: 'Settings' }).first()).toBeVisible();
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: page scrollbar is hidden while the prompt is open', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await expect
-    .poll(async () => await page.evaluate(() => getComputedStyle(document.documentElement).overflow))
-    .toBe('hidden');
-
-  await page.keyboard.press('Escape');
-
-  await expect
-    .poll(async () => await page.evaluate(() => getComputedStyle(document.documentElement).overflow))
-    .toBe('visible');
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: non-admin gets the prompt without the admin search', async ({ page }) => {
-  const { user, team } = await seedUser({ isAdmin: false });
-
-  const document = await seedPendingDocument(user, team.id, []);
-
-  const adminSearchRequests: string[] = [];
-
-  page.on('request', (request) => {
-    if (request.url().includes('admin.search')) {
-      adminSearchRequests.push(request.url());
-    }
-  });
-
-  await apiSignin({ page, email: user.email });
-
-  // Non-admins get the same prompt with a non-admin placeholder.
-  await openCommandMenu(page, 'Type a command or search...');
-
-  await expect(page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER)).toHaveCount(0);
-
-  await page.getByPlaceholder('Type a command or search...').first().fill(document.title);
-
-  // Wait for the regular (non-admin) search to resolve so we know the
-  // debounced queries have fired.
-  await expect(page.getByRole('option', { name: document.title })).toBeVisible();
-
-  await expect(page.getByText(/^Global /)).toHaveCount(0);
-  expect(adminSearchRequests).toHaveLength(0);
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: typing on a sub page fires no search requests', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  const searchRequests: string[] = [];
-
-  page.on('request', (request) => {
-    if (/api\/trpc\/(document|template|admin)\.search/.test(request.url())) {
-      searchRequests.push(request.url());
-    }
-  });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await page.getByRole('option').filter({ hasText: 'Change theme' }).first().click();
-
-  const input = page.getByPlaceholder('Search themes…');
-
-  await expect(input).toBeVisible();
-
-  // Long enough to pass the admin search threshold if it were enabled.
-  await input.fill('dark');
-
-  // The client-side filter applying proves the typing registered.
-  await expect(page.getByRole('option').filter({ hasText: 'Dark Mode' })).toBeVisible();
-  await expect(page.getByRole('option').filter({ hasText: 'Light Mode' })).toHaveCount(0);
-
-  // Wait out the 200ms search debounce with a wide margin before asserting
-  // that no requests fired: there is no response to anchor on when the
-  // desired behaviour is "no requests at all".
-  await page.waitForTimeout(750);
-
-  expect(searchRequests).toHaveLength(0);
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: failed searches show an error state instead of no results', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  await page.route(/api\/trpc\/(document|template|admin)\.search/, async (route) => {
-    await route.fulfill({ status: 500, contentType: 'application/json', body: '{}' });
-  });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first().fill('zzzz-no-such-thing-9x7q');
-
-  // A failed search must be honest about it, not claim there are no results.
-  await expect(page.getByText('Something went wrong')).toBeVisible();
-  await expect(page.getByText('No results for')).toHaveCount(0);
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: partial search failure still shows results with a notice', async ({ page }) => {
-  const { user: adminUser, team } = await seedUser({ isAdmin: true });
-
-  const document = await seedPendingDocument(adminUser, team.id, [], {
-    createDocumentOptions: { title: `partial-fail-${nanoid()}` },
-  });
-
-  // Only the admin search fails: the personal searches succeed.
-  await page.route(/api\/trpc\/admin\.search/, async (route) => {
-    await route.fulfill({ status: 500, contentType: 'application/json', body: '{}' });
-  });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  await page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first().fill(document.title);
-
-  // The successful personal document search must still render its results.
-  await expect(page.getByRole('option', { name: document.title })).toBeVisible();
-
-  // The failed admin search must be flagged rather than silently dropped.
-  await expect(page.getByText('Some searches failed')).toBeVisible();
-});
-
-test('[ADMIN][GLOBAL_SEARCH]: over-length query skips the admin search without erroring', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  const adminSearchRequests: string[] = [];
-
-  page.on('request', (request) => {
-    if (request.url().includes('admin.search')) {
-      adminSearchRequests.push(request.url());
-    }
-  });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  await openCommandMenu(page, ADMIN_PROMPT_PLACEHOLDER);
-
-  // The admin search endpoint rejects queries longer than 100 characters, so
-  // the client must not send them. The personal searches accept up to 1024
-  // characters and still run, anchoring the debounced query flush.
-  const documentSearchResponse = page.waitForResponse((response) => response.url().includes('document.search'));
-
-  await page.getByPlaceholder(ADMIN_PROMPT_PLACEHOLDER).first().fill('a'.repeat(150));
-
-  await documentSearchResponse;
-
-  // The personal searches ran and found nothing: the honest empty state, with
-  // no error in sight.
-  await expect(page.getByText('No results for')).toBeVisible();
-  await expect(page.getByText('Something went wrong')).toHaveCount(0);
-
-  expect(adminSearchRequests).toHaveLength(0);
-});

packages/app-tests/e2e/api/trpc/admin/admin-search.spec.ts

@@ -1,249 +0,0 @@
-import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { seedPendingDocument } from '@documenso/prisma/seed/documents';
-import { seedUser } from '@documenso/prisma/seed/users';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-import { customAlphabet } from 'nanoid';
-
-import { apiSignin } from '../../../fixtures/authentication';
-
-const nanoid = customAlphabet('1234567890abcdef', 10);
-
-const WEBAPP_BASE_URL = NEXT_PUBLIC_WEBAPP_URL();
-
-test.describe.configure({ mode: 'parallel' });
-
-type AdminSearchGroup = {
-  type: string;
-  results: Array<{ label: string; sublabel?: string; path: string; value: string }>;
-};
-
-const callAdminSearch = async (page: Page, query: string) => {
-  const inputParam = encodeURIComponent(JSON.stringify({ json: { query } }));
-  const url = `${WEBAPP_BASE_URL}/api/trpc/admin.search?input=${inputParam}`;
-
-  const res = await page.context().request.get(url);
-
-  return {
-    res,
-    groups: res.ok()
-      ? // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        ((await res.json()).result.data.json.groups as AdminSearchGroup[])
-      : null,
-  };
-};
-
-const findGroup = (groups: AdminSearchGroup[] | null, type: string) =>
-  (groups ?? []).find((group) => group.type === type);
-
-// ─── Access control ──────────────────────────────────────────────────────────
-
-test('[ADMIN][TRPC][SEARCH]: unauthenticated request is rejected with 401', async ({ page }) => {
-  const { res } = await callAdminSearch(page, 'anything');
-
-  expect(res.ok()).toBeFalsy();
-  expect(res.status()).toBe(401);
-});
-
-test('[ADMIN][TRPC][SEARCH]: non-admin authenticated user is rejected with 401', async ({ page }) => {
-  const { user: nonAdminUser } = await seedUser({ isAdmin: false });
-
-  await apiSignin({ page, email: nonAdminUser.email });
-
-  const { res } = await callAdminSearch(page, 'anything');
-
-  expect(res.ok()).toBeFalsy();
-  expect(res.status()).toBe(401);
-});
-
-// ─── Numeric queries: verified ID lookups ────────────────────────────────────
-
-test('[ADMIN][TRPC][SEARCH]: numeric query returns verified user and team rows', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: targetUser, team: targetTeam } = await seedUser();
-
-  await apiSignin({ page, email: adminUser.email });
-
-  // Search by user ID.
-  const userSearch = await callAdminSearch(page, String(targetUser.id));
-
-  expect(userSearch.res.ok()).toBeTruthy();
-
-  const userGroup = findGroup(userSearch.groups, 'user');
-  expect(userGroup).toBeDefined();
-  expect(userGroup?.results).toHaveLength(1);
-  expect(userGroup?.results[0].path).toBe(`/admin/users/${targetUser.id}`);
-  expect(userGroup?.results[0].sublabel).toContain(targetUser.email);
-
-  // The cmdk `value` contract: value must contain the raw query.
-  expect(userGroup?.results[0].value).toContain(String(targetUser.id));
-
-  // Search by team ID.
-  const teamSearch = await callAdminSearch(page, String(targetTeam.id));
-
-  expect(teamSearch.res.ok()).toBeTruthy();
-
-  const teamGroup = findGroup(teamSearch.groups, 'team');
-  expect(teamGroup).toBeDefined();
-  expect(teamGroup?.results).toHaveLength(1);
-  expect(teamGroup?.results[0].path).toBe(`/admin/teams/${targetTeam.id}`);
-  expect(teamGroup?.results[0].label).toBe(targetTeam.name);
-});
-
-test('[ADMIN][TRPC][SEARCH]: numeric query returns verified document and recipient rows', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: sender, team } = await seedUser();
-  const { user: recipientUser } = await seedUser();
-
-  const document = await seedPendingDocument(sender, team.id, [recipientUser]);
-  const legacyDocumentId = document.secondaryId.replace('document_', '');
-  const recipient = document.recipients[0];
-
-  await apiSignin({ page, email: adminUser.email });
-
-  // Search by legacy document ID (bare number).
-  const documentSearch = await callAdminSearch(page, legacyDocumentId);
-
-  expect(documentSearch.res.ok()).toBeTruthy();
-
-  const documentGroup = findGroup(documentSearch.groups, 'document');
-  expect(documentGroup).toBeDefined();
-  expect(documentGroup?.results).toHaveLength(1);
-  expect(documentGroup?.results[0].path).toBe(`/admin/documents/${document.id}`);
-  expect(documentGroup?.results[0].label).toBe(document.title);
-
-  // Search by recipient ID: links to the parent document.
-  const recipientSearch = await callAdminSearch(page, String(recipient.id));
-
-  expect(recipientSearch.res.ok()).toBeTruthy();
-
-  const recipientGroup = findGroup(recipientSearch.groups, 'recipient');
-  expect(recipientGroup).toBeDefined();
-  expect(recipientGroup?.results).toHaveLength(1);
-  expect(recipientGroup?.results[0].path).toBe(`/admin/documents/${document.id}`);
-  expect(recipientGroup?.results[0].label).toBe(recipient.email);
-  expect(recipientGroup?.results[0].sublabel).toBe(`#${recipient.id} · ${recipient.name} · ${document.title}`);
-
-  // Search by the full document_<id> secondary ID: exercises the prefix branch.
-  const secondaryIdSearch = await callAdminSearch(page, document.secondaryId);
-
-  expect(secondaryIdSearch.res.ok()).toBeTruthy();
-
-  const secondaryIdGroup = findGroup(secondaryIdSearch.groups, 'document');
-  expect(secondaryIdGroup).toBeDefined();
-  expect(secondaryIdGroup?.results[0].path).toBe(`/admin/documents/${document.id}`);
-});
-
-test('[ADMIN][TRPC][SEARCH]: numeric query with no matches returns no groups', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  const { res, groups } = await callAdminSearch(page, '999999999');
-
-  expect(res.ok()).toBeTruthy();
-  expect(groups).toEqual([]);
-});
-
-test('[ADMIN][TRPC][SEARCH]: oversized number does not error and falls back to text search', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: sender, team } = await seedUser();
-
-  // 99999999999999 exceeds Int4, so it cannot be an ID lookup: it must be
-  // treated as text (and must not 500).
-  const oversizedNumber = '99999999999999';
-
-  const document = await seedPendingDocument(sender, team.id, [], {
-    createDocumentOptions: { title: `${oversizedNumber}-${nanoid()}` },
-  });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  const { res, groups } = await callAdminSearch(page, oversizedNumber);
-
-  expect(res.ok()).toBeTruthy();
-
-  const documentGroup = findGroup(groups, 'document');
-  expect(documentGroup).toBeDefined();
-  expect(documentGroup?.results.map((result) => result.path)).toContain(`/admin/documents/${document.id}`);
-});
-
-// ─── Prefixed ID queries: exact lookups ──────────────────────────────────────
-
-test('[ADMIN][TRPC][SEARCH]: envelope_ and org_ prefixes resolve exact matches', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: sender, organisation, team } = await seedUser();
-
-  const document = await seedPendingDocument(sender, team.id, []);
-
-  await apiSignin({ page, email: adminUser.email });
-
-  // envelope_<id> resolves the document.
-  const envelopeSearch = await callAdminSearch(page, document.id);
-
-  expect(envelopeSearch.res.ok()).toBeTruthy();
-
-  const documentGroup = findGroup(envelopeSearch.groups, 'document');
-  expect(documentGroup).toBeDefined();
-  expect(documentGroup?.results[0].path).toBe(`/admin/documents/${document.id}`);
-
-  // Only the document group is returned for a recognized prefix.
-  expect(envelopeSearch.groups).toHaveLength(1);
-
-  // org_<id> resolves the organisation.
-  const orgSearch = await callAdminSearch(page, organisation.id);
-
-  expect(orgSearch.res.ok()).toBeTruthy();
-
-  const orgGroup = findGroup(orgSearch.groups, 'organisation');
-  expect(orgGroup).toBeDefined();
-  expect(orgGroup?.results[0].path).toBe(`/admin/organisations/${organisation.id}`);
-  expect(orgGroup?.results[0].label).toBe(organisation.name);
-
-  // Only the organisation group is returned for a recognized prefix.
-  expect(orgSearch.groups).toHaveLength(1);
-});
-
-// ─── Free text queries ───────────────────────────────────────────────────────
-
-test('[ADMIN][TRPC][SEARCH]: text query matches documents by title and users by email', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-  const { user: sender, team } = await seedUser();
-
-  // A unique title: the default seeded title is shared across the whole suite,
-  // and global search only returns the newest few matches.
-  const document = await seedPendingDocument(sender, team.id, [], {
-    createDocumentOptions: { title: `admin-search-${nanoid()}` },
-  });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  // Search by document title.
-  const titleSearch = await callAdminSearch(page, document.title);
-
-  expect(titleSearch.res.ok()).toBeTruthy();
-
-  const documentGroup = findGroup(titleSearch.groups, 'document');
-  expect(documentGroup).toBeDefined();
-  expect(documentGroup?.results.map((result) => result.path)).toContain(`/admin/documents/${document.id}`);
-
-  // Search by user email (emails are unique nanoid-based, so this is specific).
-  const emailSearch = await callAdminSearch(page, sender.email);
-
-  expect(emailSearch.res.ok()).toBeTruthy();
-
-  const userGroup = findGroup(emailSearch.groups, 'user');
-  expect(userGroup).toBeDefined();
-  expect(userGroup?.results[0].path).toBe(`/admin/users/${sender.id}`);
-});
-
-test('[ADMIN][TRPC][SEARCH]: gibberish query returns no groups', async ({ page }) => {
-  const { user: adminUser } = await seedUser({ isAdmin: true });
-
-  await apiSignin({ page, email: adminUser.email });
-
-  const { res, groups } = await callAdminSearch(page, 'zzzz-no-such-thing-9x7q');
-
-  expect(res.ok()).toBeTruthy();
-  expect(groups).toEqual([]);
-});

packages/app-tests/e2e/api/v1/document-sending.spec.ts

@@ -2,20 +2,10 @@ import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
 import { mapSecondaryIdToDocumentId } from '@documenso/lib/utils/envelope';
 import { prisma } from '@documenso/prisma';
-import {
-  DocumentSigningOrder,
-  DocumentStatus,
-  FieldType,
-  RecipientRole,
-  SendStatus,
-  SigningStatus,
-} from '@documenso/prisma/client';
+import { FieldType, RecipientRole } from '@documenso/prisma/client';
 import { seedBlankDocument, seedPendingDocumentWithFullFields } from '@documenso/prisma/seed/documents';
 import { seedUser } from '@documenso/prisma/seed/users';
 import { expect, test } from '@playwright/test';
-import { nanoid } from 'nanoid';
-
-import { signSignaturePad } from '../../fixtures/signature';
 
 test.describe('Document API', () => {
   test('sendDocument: should respect sendCompletionEmails setting', async ({ request }) => {
@@ -442,194 +432,4 @@ test.describe('Document API', () => {
     expect(response.ok()).toBeTruthy();
     expect(response.status()).toBe(200);
   });
-
-  test('sendDocument: should complete document immediately when all recipients are CC', async ({ request }) => {
-    const { user, team } = await seedUser();
-
-    // Create a blank document and get it with envelope items
-    const blankDocument = await seedBlankDocument(user, team.id);
-    const document = await prisma.envelope.findUniqueOrThrow({
-      where: { id: blankDocument.id },
-      include: { envelopeItems: true },
-    });
-
-    // Add two CC recipients without any fields, mirroring the production
-    // state where CC recipients are created pre-signed.
-    for (const email of ['cc1@example.com', 'cc2@example.com']) {
-      await prisma.recipient.create({
-        data: {
-          email,
-          name: 'Test CC',
-          role: RecipientRole.CC,
-          signingStatus: SigningStatus.SIGNED,
-          sendStatus: SendStatus.SENT,
-          token: nanoid(),
-          envelopeId: document.id,
-        },
-      });
-    }
-
-    const { token } = await createApiToken({
-      userId: user.id,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    const response = await request.post(
-      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v1/documents/${mapSecondaryIdToDocumentId(document.secondaryId)}/send`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-          'Content-Type': 'application/json',
-        },
-        data: {},
-      },
-    );
-
-    expect(response.ok()).toBeTruthy();
-    expect(response.status()).toBe(200);
-
-    // The document seals asynchronously and completes without anyone signing.
-    await expect
-      .poll(
-        async () => {
-          const updatedDocument = await prisma.envelope.findFirstOrThrow({
-            where: { id: document.id },
-          });
-
-          return updatedDocument.status;
-        },
-        { timeout: 30_000 },
-      )
-      .toBe(DocumentStatus.COMPLETED);
-  });
-
-  test('sendDocument: should not block initial sequential send when CC recipient is first in signing order', async ({
-    request,
-    page,
-  }) => {
-    const { user, team } = await seedUser();
-
-    // Create a blank document and get it with envelope items
-    const blankDocument = await seedBlankDocument(user, team.id);
-    const document = await prisma.envelope.findUniqueOrThrow({
-      where: { id: blankDocument.id },
-      include: { envelopeItems: true },
-    });
-
-    await prisma.documentMeta.update({
-      where: { id: document.documentMetaId },
-      data: { signingOrder: DocumentSigningOrder.SEQUENTIAL },
-    });
-
-    // CC recipient first in the signing order, mirroring the production
-    // state where CC recipients are created pre-signed.
-    await prisma.recipient.create({
-      data: {
-        email: 'cc@example.com',
-        name: 'Test CC',
-        role: RecipientRole.CC,
-        signingOrder: 1,
-        signingStatus: SigningStatus.SIGNED,
-        sendStatus: SendStatus.SENT,
-        token: nanoid(),
-        envelopeId: document.id,
-      },
-    });
-
-    const [signerA, signerB] = await Promise.all(
-      [
-        { email: 'signer-a@example.com', name: 'Signer A', signingOrder: 2 },
-        { email: 'signer-b@example.com', name: 'Signer B', signingOrder: 3 },
-      ].map(async ({ email, name, signingOrder }) =>
-        prisma.recipient.create({
-          data: {
-            email,
-            name,
-            role: RecipientRole.SIGNER,
-            signingOrder,
-            token: nanoid(),
-            envelopeId: document.id,
-            fields: {
-              create: {
-                type: FieldType.SIGNATURE,
-                page: 1,
-                positionX: signingOrder * 10,
-                positionY: 10,
-                width: 5,
-                height: 5,
-                customText: '',
-                inserted: false,
-                envelopeId: document.id,
-                envelopeItemId: document.envelopeItems[0].id,
-                fieldMeta: { type: 'signature', fontSize: 14 },
-              },
-            },
-          },
-        }),
-      ),
-    );
-
-    const { token } = await createApiToken({
-      userId: user.id,
-      teamId: team.id,
-      tokenName: 'test',
-      expiresIn: null,
-    });
-
-    const response = await request.post(
-      `${NEXT_PUBLIC_WEBAPP_URL()}/api/v1/documents/${mapSecondaryIdToDocumentId(document.secondaryId)}/send`,
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-          'Content-Type': 'application/json',
-        },
-        data: {},
-      },
-    );
-
-    expect(response.ok()).toBeTruthy();
-    expect(response.status()).toBe(200);
-
-    // The CC recipient at order 1 must not block signer A at order 2.
-    await page.goto(`/sign/${signerA.token}`);
-    await expect(page).not.toHaveURL(`/sign/${signerA.token}/waiting`);
-    await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-
-    // Signer B at order 3 must still wait for signer A.
-    await page.goto(`/sign/${signerB.token}`);
-    await expect(page).toHaveURL(`/sign/${signerB.token}/waiting`);
-
-    // Sign as signer A then signer B.
-    for (const signer of [signerA, signerB]) {
-      await page.goto(`/sign/${signer.token}`);
-      await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-      await signSignaturePad(page);
-
-      const signerField = await prisma.field.findFirstOrThrow({
-        where: { recipientId: signer.id },
-      });
-
-      await page.locator(`#field-${signerField.id}`).getByRole('button').click();
-
-      await page.getByRole('button', { name: 'Complete' }).click();
-      await page.getByRole('button', { name: 'Sign' }).click();
-      await page.waitForURL(`/sign/${signer.token}/complete`);
-    }
-
-    // The document completes without any action from the CC recipient.
-    await expect
-      .poll(
-        async () => {
-          const updatedDocument = await prisma.envelope.findFirstOrThrow({
-            where: { id: document.id },
-          });
-
-          return updatedDocument.status;
-        },
-        { timeout: 30_000 },
-      )
-      .toBe(DocumentStatus.COMPLETED);
-  });
 });

packages/app-tests/e2e/api/v1/organisation-rate-limits.spec.ts

@@ -50,7 +50,7 @@ import type { Organisation, Team, User } from '@prisma/client';
  *
  * --- GLOBAL LIMIT AWARENESS ---
  * apps/remix/server/router.ts applies a GLOBAL per-IP limiter to /api/v1/*:
- *   apiV1RateLimit = 1000 requests / 1 minute (action `api.v1`, see rate-limits.ts).
+ *   apiV1RateLimit = 100 requests / 1 minute (action `api.v1`, see rate-limits.ts).
  * Every per-org limit/quota configured here is kept FAR below that ceiling (single
  * digits) and the suite runs serially so the shared-IP global bucket is never the
  * thing that trips. A global-limit 429 is shaped `{ error }` whereas an org-limit
@@ -62,7 +62,7 @@ const WEBAPP_BASE_URL = NEXT_PUBLIC_WEBAPP_URL();
 const baseUrl = `${WEBAPP_BASE_URL}/api/v1`;
 
 // Run serially: all workers share one IP, and the global /api/v1 limiter is
-// per-IP. Serial execution keeps the shared global bucket well under 1000/min.
+// per-IP. Serial execution keeps the shared global bucket well under 100/min.
 test.describe.configure({ mode: 'serial' });
 
 // This suite is only meaningful with real rate limiting enabled. CI sets the
@@ -125,7 +125,7 @@ const setClaimLimits = async (team: Team, limits: ClaimLimits) => {
  * GLOBAL /api/v1 IP bucket so a fresh scenario starts from zero.
  *
  * - The org windowed limiter keys its rows `ip:org:<id>`.
- * - The GLOBAL limiter (apps/remix/server/router.ts -> apiV1RateLimit, 1000/min
+ * - The GLOBAL limiter (apps/remix/server/router.ts -> apiV1RateLimit, 100/min
  *   per IP, action `api.v1`) is shared by EVERY v1 request from this test client.
  *   Across the suite (and especially across repeated local runs within the same
  *   minute) that shared bucket would otherwise fill up and trip BEFORE the org

packages/app-tests/e2e/api/v2/find-documents.spec.ts

@@ -1,13 +1,7 @@
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
 import { prisma } from '@documenso/prisma';
-import {
-  DocumentStatus,
-  DocumentVisibility,
-  RecipientRole,
-  SigningStatus,
-  TeamMemberRole,
-} from '@documenso/prisma/client';
+import { DocumentStatus, DocumentVisibility, TeamMemberRole } from '@documenso/prisma/client';
 import {
   seedBlankDocument,
   seedCompletedDocument,
@@ -1566,307 +1560,3 @@ test.describe('Find Documents API - Adversarial: Cross-Team templateId', () => {
     expect(ownTemplate!.data[0].title).toBe('TeamA Doc from Template');
   });
 });
-
-test.describe('Find Documents API - Expired Recipient Filter', () => {
-  const PAST = new Date(Date.now() - 24 * 60 * 60 * 1000);
-  const FUTURE = new Date(Date.now() + 24 * 60 * 60 * 1000);
-
-  test('hasExpiredRecipients=true returns only docs with an expired, unsigned, non-CC recipient', async ({
-    request,
-  }) => {
-    const { user, team } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    const { token } = await createApiToken({
-      userId: user.id,
-      teamId: team.id,
-      tokenName: 'expired-token',
-      expiresIn: null,
-    });
-
-    const expiredDoc = await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired Recipient Doc' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: expiredDoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    const activeDoc = await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'Active Recipient Doc' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: activeDoc.id },
-      data: { expiresAt: FUTURE },
-    });
-
-    await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'No Expiry Doc' },
-    });
-
-    const { json } = await findDocuments(request, token, { hasExpiredRecipients: 'true' });
-    const titles = json!.data.map((d) => d.title);
-    expect(titles).toContain('Expired Recipient Doc');
-    expect(titles).not.toContain('Active Recipient Doc');
-    expect(titles).not.toContain('No Expiry Doc');
-    expect(json!.count).toBe(1);
-  });
-
-  test('hasExpiredRecipients=false (and omitted) does not filter by expiry', async ({ request }) => {
-    const { user, team } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    const { token } = await createApiToken({
-      userId: user.id,
-      teamId: team.id,
-      tokenName: 'expired-false-token',
-      expiresIn: null,
-    });
-
-    const expiredDoc = await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired Doc' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: expiredDoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'Active Doc' },
-    });
-
-    // "false" must NOT be coerced to true — both docs should be returned.
-    const { json: falseJson } = await findDocuments(request, token, { hasExpiredRecipients: 'false' });
-    expect(falseJson!.count).toBe(2);
-
-    const { json: omittedJson } = await findDocuments(request, token);
-    expect(omittedJson!.count).toBe(2);
-  });
-
-  test('excludes signed and CC recipients from the expired filter', async ({ request }) => {
-    const { user, team } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    const { token } = await createApiToken({
-      userId: user.id,
-      teamId: team.id,
-      tokenName: 'expired-exclude-token',
-      expiresIn: null,
-    });
-
-    const signedDoc = await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired but Signed' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: signedDoc.id },
-      data: { expiresAt: PAST, signingStatus: SigningStatus.SIGNED },
-    });
-
-    const ccDoc = await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired but CC' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: ccDoc.id },
-      data: { expiresAt: PAST, role: RecipientRole.CC },
-    });
-
-    const validDoc = await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired Unsigned Signer' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: validDoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    const { json } = await findDocuments(request, token, { hasExpiredRecipients: 'true' });
-    const titles = json!.data.map((d) => d.title);
-    expect(titles).toContain('Expired Unsigned Signer');
-    expect(titles).not.toContain('Expired but Signed');
-    expect(titles).not.toContain('Expired but CC');
-    expect(json!.count).toBe(1);
-  });
-});
-
-// ─── Adversarial: Expired Recipient Filter cross-tenant isolation ────────────
-// The expired filter adds an EXISTS subquery over Recipient. These tests ensure
-// that predicate never widens visibility past the caller's team/access scope.
-
-test.describe('Find Documents API - Adversarial: Cross-Team Expired Recipient Filter', () => {
-  const PAST = new Date(Date.now() - 24 * 60 * 60 * 1000);
-
-  test('token scoped to team A must NOT see team B docs with expired recipients', async ({ request }) => {
-    const { user: userA, team: teamA } = await seedUser();
-    const { user: userB, team: teamB } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    const { token: tokenA } = await createApiToken({
-      userId: userA.id,
-      teamId: teamA.id,
-      tokenName: 'teamA-expired-token',
-      expiresIn: null,
-    });
-
-    // Team A: one expired doc the caller is legitimately allowed to see.
-    const teamADoc = await seedPendingDocument(userA, teamA.id, [recipient], {
-      createDocumentOptions: { title: 'TeamA Expired Doc' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamADoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    // Team B: an expired doc that must remain invisible to team A's token.
-    const teamBDoc = await seedPendingDocument(userB, teamB.id, [recipient], {
-      createDocumentOptions: { title: 'TeamB Expired Doc' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamBDoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    const { json } = await findDocuments(request, tokenA, { hasExpiredRecipients: 'true' });
-    const titles = json!.data.map((d) => d.title);
-    expect(titles).toContain('TeamA Expired Doc');
-    expect(titles).not.toContain('TeamB Expired Doc');
-    expect(json!.count).toBe(1);
-  });
-
-  test('shared recipient email across teams does not leak the other team expired docs', async ({ request }) => {
-    // A recipient with the SAME email is on expired docs in both teams. The
-    // filter must still scope strictly to the token's team.
-    const { user: userA, team: teamA } = await seedUser();
-    const { user: userB, team: teamB } = await seedUser();
-    const { user: sharedRecipient } = await seedUser();
-
-    const { token: tokenB } = await createApiToken({
-      userId: userB.id,
-      teamId: teamB.id,
-      tokenName: 'teamB-expired-token',
-      expiresIn: null,
-    });
-
-    const teamADoc = await seedPendingDocument(userA, teamA.id, [sharedRecipient], {
-      createDocumentOptions: { title: 'TeamA Shared-Recipient Expired' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamADoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    const teamBDoc = await seedPendingDocument(userB, teamB.id, [sharedRecipient], {
-      createDocumentOptions: { title: 'TeamB Shared-Recipient Expired' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamBDoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    const { json } = await findDocuments(request, tokenB, { hasExpiredRecipients: 'true' });
-    const titles = json!.data.map((d) => d.title);
-    expect(titles).toContain('TeamB Shared-Recipient Expired');
-    expect(titles).not.toContain('TeamA Shared-Recipient Expired');
-    expect(json!.count).toBe(1);
-  });
-
-  test('x-team-id spoofing with status=EXPIRED is rejected for a non-member', async ({ page }) => {
-    const { team: teamA, owner: ownerA } = await seedTeam();
-    const { team: teamB, owner: ownerB } = await seedTeam();
-    const { user: recipient } = await seedUser();
-
-    const teamADoc = await seedPendingDocument(ownerA, teamA.id, [recipient], {
-      createDocumentOptions: { title: 'TeamA Expired Secret' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamADoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    // ownerB is NOT a member of teamA.
-    await apiSignin({ page, email: ownerB.email });
-
-    const res = await trpcQuery(page, 'document.findDocumentsInternal', teamA.id, {
-      status: 'EXPIRED',
-      page: 1,
-      perPage: 100,
-    });
-
-    expect(res.ok()).toBeFalsy();
-    expect(res.status()).toBe(404);
-  });
-
-  test('EXPIRED pseudo-status via session only returns the caller team expired docs (positive control)', async ({
-    page,
-  }) => {
-    const { team: teamA, owner: ownerA } = await seedTeam();
-    const { team: teamB, owner: ownerB } = await seedTeam();
-    const { user: recipient } = await seedUser();
-
-    const teamADoc = await seedPendingDocument(ownerA, teamA.id, [recipient], {
-      createDocumentOptions: { title: 'TeamA Expired Visible' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamADoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    const teamBDoc = await seedPendingDocument(ownerB, teamB.id, [recipient], {
-      createDocumentOptions: { title: 'TeamB Expired Hidden' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamBDoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    await apiSignin({ page, email: ownerA.email });
-
-    const res = await trpcQuery(page, 'document.findDocumentsInternal', teamA.id, {
-      status: 'EXPIRED',
-      page: 1,
-      perPage: 100,
-    });
-
-    expect(res.ok()).toBeTruthy();
-    const data = await res.json();
-    const docs = data.result.data.json.data;
-    const titles = docs.map((d: { title: string }) => d.title);
-    expect(titles).toContain('TeamA Expired Visible');
-    expect(titles).not.toContain('TeamB Expired Hidden');
-  });
-
-  test('EXPIRED stats count is scoped to the caller team and excludes other-team expired docs', async ({ page }) => {
-    const { team: teamA, owner: ownerA } = await seedTeam();
-    const { team: teamB, owner: ownerB } = await seedTeam();
-    const { user: recipient } = await seedUser();
-
-    // One expired doc in team A.
-    const teamADoc = await seedPendingDocument(ownerA, teamA.id, [recipient], {
-      createDocumentOptions: { title: 'TeamA Expired For Stats' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamADoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    // Two expired docs in team B — must NOT bleed into team A's EXPIRED count.
-    for (const title of ['TeamB Expired For Stats 1', 'TeamB Expired For Stats 2']) {
-      const doc = await seedPendingDocument(ownerB, teamB.id, [recipient], {
-        createDocumentOptions: { title },
-      });
-      await prisma.recipient.updateMany({
-        where: { envelopeId: doc.id },
-        data: { expiresAt: PAST },
-      });
-    }
-
-    await apiSignin({ page, email: ownerA.email });
-
-    const res = await trpcQuery(page, 'document.findDocumentsInternal', teamA.id, {
-      page: 1,
-      perPage: 100,
-    });
-
-    expect(res.ok()).toBeTruthy();
-    const data = await res.json();
-    expect(data.result.data.json.stats.EXPIRED).toBe(1);
-  });
-});

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

@@ -1055,120 +1055,3 @@ test.describe('Find Envelopes API - Cross-User Isolation', () => {
     expect(titles).not.toContain('Member Org Team Env');
   });
 });
-
-test.describe('Find Envelopes API - Expired Recipient Filter', () => {
-  test('hasExpiredRecipients=true returns only envelopes with an expired, unsigned recipient', async ({ request }) => {
-    const { user, team } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    const { token } = await createApiToken({
-      userId: user.id,
-      teamId: team.id,
-      tokenName: 'env-expired-token',
-      expiresIn: null,
-    });
-
-    const expiredEnvelope = await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired Envelope' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: expiredEnvelope.id },
-      data: { expiresAt: new Date(Date.now() - 24 * 60 * 60 * 1000) },
-    });
-
-    await seedPendingDocument(user, team.id, [recipient], {
-      createDocumentOptions: { title: 'Active Envelope' },
-    });
-
-    const { json } = await findEnvelopes(request, token, {
-      type: EnvelopeType.DOCUMENT,
-      hasExpiredRecipients: 'true',
-    });
-    const titles = json!.data.map((d) => d.title);
-    expect(titles).toContain('Expired Envelope');
-    expect(titles).not.toContain('Active Envelope');
-    expect(json!.count).toBe(1);
-  });
-});
-
-// ─── Adversarial: Expired Recipient Filter cross-tenant isolation ────────────
-
-test.describe('Find Envelopes API - Adversarial: Cross-Team Expired Recipient Filter', () => {
-  const PAST = new Date(Date.now() - 24 * 60 * 60 * 1000);
-
-  test('token scoped to team A must NOT see team B envelopes with expired recipients', async ({ request }) => {
-    const { user: userA, team: teamA } = await seedUser();
-    const { user: userB, team: teamB } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    const { token: tokenA } = await createApiToken({
-      userId: userA.id,
-      teamId: teamA.id,
-      tokenName: 'env-teamA-expired-token',
-      expiresIn: null,
-    });
-
-    const teamAEnvelope = await seedPendingDocument(userA, teamA.id, [recipient], {
-      createDocumentOptions: { title: 'TeamA Expired Envelope' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamAEnvelope.id },
-      data: { expiresAt: PAST },
-    });
-
-    const teamBEnvelope = await seedPendingDocument(userB, teamB.id, [recipient], {
-      createDocumentOptions: { title: 'TeamB Expired Envelope' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamBEnvelope.id },
-      data: { expiresAt: PAST },
-    });
-
-    const { json } = await findEnvelopes(request, tokenA, {
-      type: EnvelopeType.DOCUMENT,
-      hasExpiredRecipients: 'true',
-    });
-    const titles = json!.data.map((d) => d.title);
-    expect(titles).toContain('TeamA Expired Envelope');
-    expect(titles).not.toContain('TeamB Expired Envelope');
-    expect(json!.count).toBe(1);
-  });
-
-  test('shared recipient email across teams does not leak the other team expired envelopes', async ({ request }) => {
-    const { user: userA, team: teamA } = await seedUser();
-    const { user: userB, team: teamB } = await seedUser();
-    const { user: sharedRecipient } = await seedUser();
-
-    const { token: tokenB } = await createApiToken({
-      userId: userB.id,
-      teamId: teamB.id,
-      tokenName: 'env-teamB-expired-token',
-      expiresIn: null,
-    });
-
-    const teamAEnvelope = await seedPendingDocument(userA, teamA.id, [sharedRecipient], {
-      createDocumentOptions: { title: 'TeamA Shared Expired Envelope' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamAEnvelope.id },
-      data: { expiresAt: PAST },
-    });
-
-    const teamBEnvelope = await seedPendingDocument(userB, teamB.id, [sharedRecipient], {
-      createDocumentOptions: { title: 'TeamB Shared Expired Envelope' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: teamBEnvelope.id },
-      data: { expiresAt: PAST },
-    });
-
-    const { json } = await findEnvelopes(request, tokenB, {
-      type: EnvelopeType.DOCUMENT,
-      hasExpiredRecipients: 'true',
-    });
-    const titles = json!.data.map((d) => d.title);
-    expect(titles).toContain('TeamB Shared Expired Envelope');
-    expect(titles).not.toContain('TeamA Shared Expired Envelope');
-    expect(json!.count).toBe(1);
-  });
-});

packages/app-tests/e2e/api/v2/organisation-rate-limits.spec.ts

@@ -37,7 +37,7 @@ import type { Organisation, Team, User } from '@prisma/client';
  *
  * --- GLOBAL LIMIT AWARENESS ---
  * apps/remix/server/router.ts applies a GLOBAL per-IP limiter to /api/v2/*:
- *   apiV2RateLimit = 1000 requests / 1 minute (see rate-limits.ts).
+ *   apiV2RateLimit = 100 requests / 1 minute (see rate-limits.ts).
  * Every per-org limit/quota configured here is kept FAR below that ceiling (single
  * digits) and the suite runs serially so the shared-IP global bucket is never the
  * thing that trips. A global-limit 429 is shaped `{ error }` whereas an org-limit
@@ -49,7 +49,7 @@ const WEBAPP_BASE_URL = NEXT_PUBLIC_WEBAPP_URL();
 const baseUrl = `${WEBAPP_BASE_URL}/api/v2-beta`;
 
 // Run serially: all workers share one IP, and the global /api/v2 limiter is
-// per-IP. Serial execution keeps the shared global bucket well under 1000/min.
+// per-IP. Serial execution keeps the shared global bucket well under 100/min.
 test.describe.configure({ mode: 'serial' });
 
 // This suite is only meaningful with real rate limiting enabled. CI sets the

packages/app-tests/e2e/command-menu/document-search.spec.ts

@@ -3,9 +3,6 @@ import { seedUser } from '@documenso/prisma/seed/users';
 import { expect, test } from '@playwright/test';
 
 import { apiSignin } from '../fixtures/authentication';
-import { openCommandMenu } from '../fixtures/command-menu';
-
-const COMMAND_MENU_PLACEHOLDER = 'Type a command or search...';
 
 test('[COMMAND_MENU]: should see sent documents', async ({ page }) => {
   const { user, team } = await seedUser();
@@ -17,9 +14,9 @@ test('[COMMAND_MENU]: should see sent documents', async ({ page }) => {
     email: user.email,
   });
 
-  await openCommandMenu(page, COMMAND_MENU_PLACEHOLDER);
+  await page.keyboard.press('Meta+K');
 
-  await page.getByPlaceholder(COMMAND_MENU_PLACEHOLDER).first().fill(document.title);
+  await page.getByPlaceholder('Type a command or search...').first().fill(document.title);
   await expect(page.getByRole('option', { name: document.title })).toBeVisible();
 });
 
@@ -33,9 +30,9 @@ test('[COMMAND_MENU]: should see received documents', async ({ page }) => {
     email: recipient.email,
   });
 
-  await openCommandMenu(page, COMMAND_MENU_PLACEHOLDER);
+  await page.keyboard.press('Meta+K');
 
-  await page.getByPlaceholder(COMMAND_MENU_PLACEHOLDER).first().fill(document.title);
+  await page.getByPlaceholder('Type a command or search...').first().fill(document.title);
   await expect(page.getByRole('option', { name: document.title })).toBeVisible();
 });
 
@@ -49,8 +46,8 @@ test('[COMMAND_MENU]: should be able to search by recipient', async ({ page }) =
     email: user.email,
   });
 
-  await openCommandMenu(page, COMMAND_MENU_PLACEHOLDER);
+  await page.keyboard.press('Meta+K');
 
-  await page.getByPlaceholder(COMMAND_MENU_PLACEHOLDER).first().fill(recipient.email);
+  await page.getByPlaceholder('Type a command or search...').first().fill(recipient.email);
   await expect(page.getByRole('option', { name: document.title })).toBeVisible();
 });

packages/app-tests/e2e/document-auth/next-recipient-dictation.spec.ts

@@ -2,14 +2,7 @@ import { prisma } from '@documenso/prisma';
 import { seedPendingDocumentWithFullFields } from '@documenso/prisma/seed/documents';
 import { seedUser } from '@documenso/prisma/seed/users';
 import { expect, test } from '@playwright/test';
-import {
-  DocumentSigningOrder,
-  DocumentStatus,
-  FieldType,
-  RecipientRole,
-  SendStatus,
-  SigningStatus,
-} from '@prisma/client';
+import { DocumentSigningOrder, DocumentStatus, FieldType, RecipientRole, SigningStatus } from '@prisma/client';
 
 import { signDirectSignaturePad, signSignaturePad } from '../fixtures/signature';
 
@@ -377,221 +370,3 @@ test('[NEXT_RECIPIENT_DICTATION]: should allow assistant to dictate next signer'
     expect(thirdRecipient.role).toBe(RecipientRole.SIGNER);
   }).toPass();
 });
-
-test('[NEXT_RECIPIENT_DICTATION]: should skip CC recipient when dictating next signer', async ({ page }) => {
-  const { user, team } = await seedUser();
-  const { user: firstSigner } = await seedUser();
-  const { user: ccUser } = await seedUser();
-  const { user: secondSigner } = await seedUser();
-
-  const { recipients, document } = await seedPendingDocumentWithFullFields({
-    owner: user,
-    teamId: team.id,
-    recipients: [firstSigner, ccUser, secondSigner],
-    recipientsCreateOptions: [
-      { signingOrder: 1 },
-      {
-        // CC recipients are created pre-signed, mirroring production behaviour.
-        signingOrder: 2,
-        role: RecipientRole.CC,
-        signingStatus: SigningStatus.SIGNED,
-        sendStatus: SendStatus.SENT,
-      },
-      { signingOrder: 3 },
-    ],
-    updateDocumentOptions: {
-      documentMeta: {
-        upsert: {
-          create: {
-            allowDictateNextSigner: true,
-            signingOrder: DocumentSigningOrder.SEQUENTIAL,
-          },
-          update: {
-            allowDictateNextSigner: true,
-            signingOrder: DocumentSigningOrder.SEQUENTIAL,
-          },
-        },
-      },
-    },
-  });
-
-  const firstRecipient = recipients.find((r) => r.email === firstSigner.email);
-  const ccRecipient = recipients.find((r) => r.email === ccUser.email);
-
-  if (!firstRecipient || !ccRecipient) {
-    throw new Error('Recipients not found');
-  }
-
-  // CC recipients cannot have fields.
-  await prisma.field.deleteMany({
-    where: {
-      recipientId: ccRecipient.id,
-    },
-  });
-
-  const { token, fields } = firstRecipient;
-
-  const signUrl = `/sign/${token}`;
-
-  await page.goto(signUrl);
-  await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-
-  await signSignaturePad(page);
-
-  // Fill in all fields
-  for (const field of fields) {
-    await page.locator(`#field-${field.id}`).getByRole('button').click();
-
-    if (field.type === FieldType.TEXT) {
-      await page.locator('#custom-text').fill('TEXT');
-      await page.getByRole('button', { name: 'Save' }).click();
-    }
-
-    await expect(page.locator(`#field-${field.id}`)).toHaveAttribute('data-inserted', 'true');
-  }
-
-  // Complete signing and verify the offered next recipient
-  await page.getByRole('button', { name: 'Complete' }).click();
-
-  await expect(page.getByRole('dialog')).toBeVisible();
-  await expect(page.getByText('Next Recipient Name')).toBeVisible();
-
-  // The dictation dialog must offer the second signer, not the CC recipient.
-  const dialog = page.getByRole('dialog');
-  await expect(dialog.getByLabel('Name')).toHaveValue(secondSigner.name ?? '');
-  await expect(dialog.getByLabel('Email')).toHaveValue(secondSigner.email);
-
-  // Submit and verify completion
-  await page.getByRole('button', { name: 'Sign' }).click();
-  await page.waitForURL(`${signUrl}/complete`);
-
-  // Verify document and recipient states
-  const updatedDocument = await prisma.envelope.findUniqueOrThrow({
-    where: { id: document.id },
-    include: {
-      recipients: {
-        orderBy: { signingOrder: 'asc' },
-      },
-    },
-  });
-
-  // Document should still be pending as the second signer has not signed
-  expect(updatedDocument.status).toBe(DocumentStatus.PENDING);
-
-  // The CC recipient must remain untouched
-  const updatedCcRecipient = updatedDocument.recipients[1];
-  expect(updatedCcRecipient.email).toBe(ccUser.email);
-  expect(updatedCcRecipient.role).toBe(RecipientRole.CC);
-  expect(updatedCcRecipient.signingStatus).toBe(SigningStatus.SIGNED);
-
-  // The second signer must remain the next pending recipient
-  const updatedSecondRecipient = updatedDocument.recipients[2];
-  expect(updatedSecondRecipient.email).toBe(secondSigner.email);
-  expect(updatedSecondRecipient.signingOrder).toBe(3);
-  expect(updatedSecondRecipient.signingStatus).toBe(SigningStatus.NOT_SIGNED);
-});
-
-test('[NEXT_RECIPIENT_DICTATION]: should not offer dictation when CC recipient is last', async ({ page }) => {
-  const { user, team } = await seedUser();
-  const { user: firstSigner } = await seedUser();
-  const { user: secondSigner } = await seedUser();
-  const { user: ccUser } = await seedUser();
-
-  const { recipients, document } = await seedPendingDocumentWithFullFields({
-    owner: user,
-    teamId: team.id,
-    recipients: [firstSigner, secondSigner, ccUser],
-    recipientsCreateOptions: [
-      { signingOrder: 1 },
-      { signingOrder: 2 },
-      {
-        // CC recipients are created pre-signed, mirroring production behaviour.
-        signingOrder: 3,
-        role: RecipientRole.CC,
-        signingStatus: SigningStatus.SIGNED,
-        sendStatus: SendStatus.SENT,
-      },
-    ],
-    updateDocumentOptions: {
-      documentMeta: {
-        upsert: {
-          create: {
-            allowDictateNextSigner: true,
-            signingOrder: DocumentSigningOrder.SEQUENTIAL,
-          },
-          update: {
-            allowDictateNextSigner: true,
-            signingOrder: DocumentSigningOrder.SEQUENTIAL,
-          },
-        },
-      },
-    },
-  });
-
-  const firstRecipient = recipients.find((r) => r.email === firstSigner.email);
-  const secondRecipient = recipients.find((r) => r.email === secondSigner.email);
-  const ccRecipient = recipients.find((r) => r.email === ccUser.email);
-
-  if (!firstRecipient || !secondRecipient || !ccRecipient) {
-    throw new Error('Recipients not found');
-  }
-
-  // CC recipients cannot have fields.
-  await prisma.field.deleteMany({
-    where: {
-      recipientId: ccRecipient.id,
-    },
-  });
-
-  // Sign as both signers in order.
-  for (const recipient of [firstRecipient, secondRecipient]) {
-    const { token, fields } = recipient;
-
-    const signUrl = `/sign/${token}`;
-
-    await page.goto(signUrl);
-    await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-
-    await signSignaturePad(page);
-
-    // Fill in all fields
-    for (const field of fields) {
-      await page.locator(`#field-${field.id}`).getByRole('button').click();
-
-      if (field.type === FieldType.TEXT) {
-        await page.locator('#custom-text').fill('TEXT');
-        await page.getByRole('button', { name: 'Save' }).click();
-      }
-
-      await expect(page.locator(`#field-${field.id}`)).toHaveAttribute('data-inserted', 'true');
-    }
-
-    // Complete signing
-    await page.getByRole('button', { name: 'Complete' }).click();
-
-    await expect(page.getByRole('dialog')).toBeVisible();
-
-    if (recipient.id === secondRecipient.id) {
-      // The last actionable signer must not be offered the CC recipient.
-      await expect(page.getByText('Next Recipient Name')).not.toBeVisible();
-    }
-
-    // Submit and verify completion
-    await page.getByRole('button', { name: 'Sign' }).click();
-    await page.waitForURL(`${signUrl}/complete`);
-  }
-
-  // The document completes without any action from the CC recipient.
-  await expect
-    .poll(
-      async () => {
-        const finalDocument = await prisma.envelope.findUniqueOrThrow({
-          where: { id: document.id },
-        });
-
-        return finalDocument.status;
-      },
-      { timeout: 30_000 },
-    )
-    .toBe(DocumentStatus.COMPLETED);
-});

packages/app-tests/e2e/document-flow/stepper-component.spec.ts

@@ -4,14 +4,7 @@ import { prisma } from '@documenso/prisma';
 import { seedBlankDocument, seedPendingDocumentWithFullFields } from '@documenso/prisma/seed/documents';
 import { seedUser } from '@documenso/prisma/seed/users';
 import { expect, test } from '@playwright/test';
-import {
-  DocumentSigningOrder,
-  DocumentStatus,
-  FieldType,
-  RecipientRole,
-  SendStatus,
-  SigningStatus,
-} from '@prisma/client';
+import { DocumentSigningOrder, DocumentStatus, FieldType, RecipientRole, SigningStatus } from '@prisma/client';
 import { DateTime } from 'luxon';
 
 import { apiSignin } from '../fixtures/authentication';
@@ -232,20 +225,15 @@ test('[DOCUMENT_FLOW]: should be able to create a document with multiple recipie
   await page.getByLabel('Receives copy').click();
   await page.getByRole('button', { name: 'Add Signer' }).click();
 
-  // CC recipients are kept last, so new rows are inserted above the CC row.
-  await expect(page.getByLabel('Email')).toHaveCount(3);
-
-  await page.getByLabel('Email').nth(1).fill('user3@example.com');
-  await page.getByLabel('Name').nth(1).fill('User 3');
-  await page.getByRole('combobox').nth(1).click();
+  await page.getByLabel('Email').nth(2).fill('user3@example.com');
+  await page.getByLabel('Name').nth(2).fill('User 3');
+  await page.getByRole('combobox').nth(2).click();
   await page.getByLabel('Needs to approve').click();
   await page.getByRole('button', { name: 'Add Signer' }).click();
 
-  await expect(page.getByLabel('Email')).toHaveCount(4);
-
-  await page.getByLabel('Email').nth(2).fill('user4@example.com');
-  await page.getByLabel('Name').nth(2).fill('User 4');
-  await page.getByRole('combobox').nth(2).click();
+  await page.getByLabel('Email').nth(3).fill('user4@example.com');
+  await page.getByLabel('Name').nth(3).fill('User 4');
+  await page.getByRole('combobox').nth(3).click();
   await page.getByLabel('Needs to view').click();
 
   await page.getByRole('button', { name: 'Continue' }).click();
@@ -673,182 +661,3 @@ test('[DOCUMENT_FLOW]: should prevent out-of-order signing in sequential mode',
   await expect(page).not.toHaveURL(`/sign/${activeRecipient?.token}/waiting`);
   await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
 });
-
-test('[DOCUMENT_FLOW]: should skip CC recipients in sequential signing order', async ({ page }) => {
-  const { user, team } = await seedUser();
-
-  const { document, recipients } = await seedPendingDocumentWithFullFields({
-    teamId: team.id,
-    owner: user,
-    recipients: ['signer1@example.com', 'cc@example.com', 'signer2@example.com'],
-    fields: [FieldType.SIGNATURE],
-    recipientsCreateOptions: [
-      { signingOrder: 1 },
-      {
-        // CC recipients are created pre-signed, mirroring production behaviour.
-        signingOrder: 2,
-        role: RecipientRole.CC,
-        signingStatus: SigningStatus.SIGNED,
-        sendStatus: SendStatus.SENT,
-      },
-      { signingOrder: 3 },
-    ],
-  });
-
-  await prisma.documentMeta.update({
-    where: {
-      id: document.documentMetaId,
-    },
-    data: {
-      signingOrder: DocumentSigningOrder.SEQUENTIAL,
-    },
-  });
-
-  const firstSigner = recipients.find((r) => r.email === 'signer1@example.com');
-  const ccRecipient = recipients.find((r) => r.email === 'cc@example.com');
-  const lastSigner = recipients.find((r) => r.email === 'signer2@example.com');
-
-  // CC recipients cannot have fields.
-  await prisma.field.deleteMany({
-    where: {
-      recipientId: ccRecipient?.id,
-    },
-  });
-
-  // Sequential order is enforced: the last signer must wait while the first signer is pending.
-  await page.goto(`/sign/${lastSigner?.token}`);
-  await expect(page).toHaveURL(`/sign/${lastSigner?.token}/waiting`);
-
-  // Sign as the first signer.
-  await page.goto(`/sign/${firstSigner?.token}`);
-  await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-  await signSignaturePad(page);
-
-  const firstSignerField = await prisma.field.findFirstOrThrow({
-    where: { recipientId: firstSigner?.id },
-  });
-
-  await page.locator(`#field-${firstSignerField.id}`).getByRole('button').click();
-
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await page.getByRole('button', { name: 'Sign' }).click();
-  await page.waitForURL(`/sign/${firstSigner?.token}/complete`);
-
-  // The CC recipient at order 2 must not block the last signer at order 3.
-  await page.goto(`/sign/${lastSigner?.token}`);
-  await expect(page).not.toHaveURL(`/sign/${lastSigner?.token}/waiting`);
-  await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-
-  await signSignaturePad(page);
-
-  const lastSignerField = await prisma.field.findFirstOrThrow({
-    where: { recipientId: lastSigner?.id },
-  });
-
-  await page.locator(`#field-${lastSignerField.id}`).getByRole('button').click();
-
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await page.getByRole('button', { name: 'Sign' }).click();
-  await page.waitForURL(`/sign/${lastSigner?.token}/complete`);
-
-  // The document completes without any action from the CC recipient.
-  await expect
-    .poll(
-      async () => {
-        const finalDocument = await prisma.envelope.findFirstOrThrow({
-          where: { id: document.id },
-        });
-
-        return finalDocument.status;
-      },
-      { timeout: 30_000 },
-    )
-    .toBe(DocumentStatus.COMPLETED);
-});
-
-test('[DOCUMENT_FLOW]: should skip unsigned CC recipients in sequential signing order', async ({ page }) => {
-  const { user, team } = await seedUser();
-
-  const { document, recipients } = await seedPendingDocumentWithFullFields({
-    teamId: team.id,
-    owner: user,
-    recipients: ['signer1@example.com', 'cc@example.com', 'signer2@example.com'],
-    fields: [FieldType.SIGNATURE],
-    recipientsCreateOptions: [
-      { signingOrder: 1 },
-      {
-        // Legacy/inconsistent data: a CC recipient that was never marked as signed.
-        signingOrder: 2,
-        role: RecipientRole.CC,
-        signingStatus: SigningStatus.NOT_SIGNED,
-      },
-      { signingOrder: 3 },
-    ],
-  });
-
-  await prisma.documentMeta.update({
-    where: {
-      id: document.documentMetaId,
-    },
-    data: {
-      signingOrder: DocumentSigningOrder.SEQUENTIAL,
-    },
-  });
-
-  const firstSigner = recipients.find((r) => r.email === 'signer1@example.com');
-  const ccRecipient = recipients.find((r) => r.email === 'cc@example.com');
-  const lastSigner = recipients.find((r) => r.email === 'signer2@example.com');
-
-  // CC recipients cannot have fields.
-  await prisma.field.deleteMany({
-    where: {
-      recipientId: ccRecipient?.id,
-    },
-  });
-
-  // Sign as the first signer.
-  await page.goto(`/sign/${firstSigner?.token}`);
-  await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-  await signSignaturePad(page);
-
-  const firstSignerField = await prisma.field.findFirstOrThrow({
-    where: { recipientId: firstSigner?.id },
-  });
-
-  await page.locator(`#field-${firstSignerField.id}`).getByRole('button').click();
-
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await page.getByRole('button', { name: 'Sign' }).click();
-  await page.waitForURL(`/sign/${firstSigner?.token}/complete`);
-
-  // The unsigned CC recipient at order 2 must not block the last signer at order 3.
-  await page.goto(`/sign/${lastSigner?.token}`);
-  await expect(page).not.toHaveURL(`/sign/${lastSigner?.token}/waiting`);
-  await expect(page.getByRole('heading', { name: 'Sign Document' })).toBeVisible();
-
-  await signSignaturePad(page);
-
-  const lastSignerField = await prisma.field.findFirstOrThrow({
-    where: { recipientId: lastSigner?.id },
-  });
-
-  await page.locator(`#field-${lastSignerField.id}`).getByRole('button').click();
-
-  await page.getByRole('button', { name: 'Complete' }).click();
-  await page.getByRole('button', { name: 'Sign' }).click();
-  await page.waitForURL(`/sign/${lastSigner?.token}/complete`);
-
-  // The document completes without any action from the CC recipient.
-  await expect
-    .poll(
-      async () => {
-        const finalDocument = await prisma.envelope.findFirstOrThrow({
-          where: { id: document.id },
-        });
-
-        return finalDocument.status;
-      },
-      { timeout: 30_000 },
-    )
-    .toBe(DocumentStatus.COMPLETED);
-});

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

@@ -10,14 +10,7 @@ import { seedOrganisationMembers } from '@documenso/prisma/seed/organisations';
 import { seedTeam, seedTeamEmail, seedTeamMember } from '@documenso/prisma/seed/teams';
 import { seedUser } from '@documenso/prisma/seed/users';
 import { expect, test } from '@playwright/test';
-import {
-  DocumentStatus,
-  DocumentVisibility,
-  OrganisationMemberRole,
-  RecipientRole,
-  SigningStatus,
-  TeamMemberRole,
-} from '@prisma/client';
+import { DocumentStatus, DocumentVisibility, OrganisationMemberRole, TeamMemberRole } from '@prisma/client';
 
 import { apiSignin, apiSignout } from '../fixtures/authentication';
 import { checkDocumentTabCount } from '../fixtures/documents';
@@ -1172,132 +1165,3 @@ test.describe('Find Documents UI - Sender Filter', () => {
     await expect(page.getByRole('link', { name: 'Member1 Sent Doc' })).toBeVisible();
   });
 });
-
-test.describe('Find Documents UI - Rejected and Expired Tabs', () => {
-  const PAST = new Date(Date.now() - 24 * 60 * 60 * 1000);
-
-  test('rejected tab lists rejected documents and counts them independently', async ({ page }) => {
-    const { user: owner, team } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    // A rejected document: envelope status REJECTED + a recipient who rejected.
-    const rejectedDoc = await seedPendingDocument(owner, team.id, [recipient], {
-      createDocumentOptions: { title: 'Rejected Doc' },
-    });
-    await prisma.envelope.update({
-      where: { id: rejectedDoc.id },
-      data: { status: DocumentStatus.REJECTED },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: rejectedDoc.id },
-      data: { signingStatus: SigningStatus.REJECTED },
-    });
-
-    // A plain pending document (noise — must not appear under Rejected).
-    await seedPendingDocument(owner, team.id, [recipient], {
-      createDocumentOptions: { title: 'Plain Pending Doc' },
-    });
-
-    await apiSignin({
-      page,
-      email: owner.email,
-      redirectPath: `/t/${team.url}/documents`,
-    });
-
-    await checkDocumentTabCount(page, 'Rejected', 1);
-    await expect(page.getByRole('link', { name: 'Rejected Doc' })).toBeVisible();
-    await expect(page.getByRole('link', { name: 'Plain Pending Doc' })).not.toBeVisible();
-  });
-
-  test('expired tab lists documents with an expired recipient and shows empty state otherwise', async ({ page }) => {
-    const { user: owner, team } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    const expiredDoc = await seedPendingDocument(owner, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired Doc' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: expiredDoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    // Active pending doc — recipient link not expired.
-    await seedPendingDocument(owner, team.id, [recipient], {
-      createDocumentOptions: { title: 'Active Doc' },
-    });
-
-    await apiSignin({
-      page,
-      email: owner.email,
-      redirectPath: `/t/${team.url}/documents`,
-    });
-
-    // Expired doc is still PENDING, so it appears under both Pending and Expired.
-    await checkDocumentTabCount(page, 'Pending', 2);
-    await checkDocumentTabCount(page, 'Expired', 1);
-    await expect(page.getByRole('link', { name: 'Expired Doc' })).toBeVisible();
-    await expect(page.getByRole('link', { name: 'Active Doc' })).not.toBeVisible();
-  });
-
-  test('expired tab excludes signed and CC recipients', async ({ page }) => {
-    const { user: owner, team } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    // Expired but already signed — must NOT count as expired.
-    const signedDoc = await seedPendingDocument(owner, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired Signed Doc' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: signedDoc.id },
-      data: { expiresAt: PAST, signingStatus: SigningStatus.SIGNED },
-    });
-
-    // Expired but CC — must NOT count as expired.
-    const ccDoc = await seedPendingDocument(owner, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired CC Doc' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: ccDoc.id },
-      data: { expiresAt: PAST, role: RecipientRole.CC },
-    });
-
-    // Expired, unsigned, non-CC — the only one that should appear.
-    const validDoc = await seedPendingDocument(owner, team.id, [recipient], {
-      createDocumentOptions: { title: 'Expired Valid Doc' },
-    });
-    await prisma.recipient.updateMany({
-      where: { envelopeId: validDoc.id },
-      data: { expiresAt: PAST },
-    });
-
-    await apiSignin({
-      page,
-      email: owner.email,
-      redirectPath: `/t/${team.url}/documents`,
-    });
-
-    await checkDocumentTabCount(page, 'Expired', 1);
-    await expect(page.getByRole('link', { name: 'Expired Valid Doc' })).toBeVisible();
-    await expect(page.getByRole('link', { name: 'Expired Signed Doc' })).not.toBeVisible();
-    await expect(page.getByRole('link', { name: 'Expired CC Doc' })).not.toBeVisible();
-  });
-
-  test('rejected and expired tabs show tailored empty states when nothing matches', async ({ page }) => {
-    const { user: owner, team } = await seedUser();
-    const { user: recipient } = await seedUser();
-
-    await seedPendingDocument(owner, team.id, [recipient], {
-      createDocumentOptions: { title: 'Just Pending' },
-    });
-
-    await apiSignin({
-      page,
-      email: owner.email,
-      redirectPath: `/t/${team.url}/documents`,
-    });
-
-    // count === 0 asserts the empty-document-state is visible.
-    await checkDocumentTabCount(page, 'Rejected', 0);
-    await checkDocumentTabCount(page, 'Expired', 0);
-  });
-});

packages/app-tests/e2e/envelope-editor-v2/envelope-direct-template-validation.spec.ts

@@ -1,76 +0,0 @@
-import { seedDirectTemplate } from '@documenso/prisma/seed/templates';
-import { seedUser } from '@documenso/prisma/seed/users';
-import { expect, type Page, test } from '@playwright/test';
-
-import { apiSignin } from '../fixtures/authentication';
-import { clickEnvelopeEditorStep } from '../fixtures/envelope-editor';
-
-const INVALID_DIRECT_TEMPLATE_ALERT_TITLE = 'Invalid direct link template';
-
-/**
- * Place a field on the PDF canvas in the envelope editor.
- */
-const placeFieldOnPdf = async (root: Page, fieldName: 'Signature' | 'Text', position: { x: number; y: number }) => {
-  await root.getByRole('button', { name: fieldName, exact: true }).click();
-
-  const canvas = root.locator('.konva-container canvas').first();
-  await expect(canvas).toBeVisible();
-  await canvas.click({ position });
-};
-
-/**
- * Seed a V2 direct template and open it in the native template editor.
- *
- * Only the native template editor is covered here: direct links only exist
- * for templates and are not part of the embedded editor surfaces.
- */
-const openDirectTemplateEditor = async (page: Page, options: { createDirectRecipientSignatureField: boolean }) => {
-  const { user, team } = await seedUser();
-
-  const template = await seedDirectTemplate({
-    title: `E2E Direct Template Validation ${Date.now()}`,
-    userId: user.id,
-    teamId: team.id,
-    internalVersion: 2,
-    createDirectRecipientSignatureField: options.createDirectRecipientSignatureField,
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/t/${team.url}/templates/${template.id}/edit`,
-  });
-
-  return { user, team, template };
-};
-
-test.describe('template editor', () => {
-  test('shows invalid direct template warning when a signer has no signature field', async ({ page }) => {
-    await openDirectTemplateEditor(page, { createDirectRecipientSignatureField: false });
-
-    await expect(page.getByText(INVALID_DIRECT_TEMPLATE_ALERT_TITLE)).toBeVisible();
-    await expect(page.getByText('are missing a signature field')).toBeVisible();
-  });
-
-  test('does not show the warning when all signers have signature fields', async ({ page }) => {
-    await openDirectTemplateEditor(page, { createDirectRecipientSignatureField: true });
-
-    // Wait for the editor to render before asserting the banner is absent.
-    await expect(page.getByTestId('envelope-editor-step-upload')).toBeVisible();
-    await expect(page.getByText(INVALID_DIRECT_TEMPLATE_ALERT_TITLE)).not.toBeVisible();
-  });
-
-  test('warning disappears after placing a signature field', async ({ page }) => {
-    await openDirectTemplateEditor(page, { createDirectRecipientSignatureField: false });
-
-    await expect(page.getByText(INVALID_DIRECT_TEMPLATE_ALERT_TITLE)).toBeVisible();
-
-    // Place a signature field for the direct recipient (auto-selected single recipient).
-    await clickEnvelopeEditorStep(page, 'addFields');
-    await expect(page.locator('.konva-container canvas').first()).toBeVisible();
-    await placeFieldOnPdf(page, 'Signature', { x: 120, y: 140 });
-
-    // The banner clears once the field is autosaved and the envelope state updates.
-    await expect(page.getByText(INVALID_DIRECT_TEMPLATE_ALERT_TITLE)).not.toBeVisible({ timeout: 15_000 });
-  });
-});

packages/app-tests/e2e/envelope-editor-v2/envelope-recipient-cc-order.spec.ts

@@ -1,155 +0,0 @@
-import { nanoid } from '@documenso/lib/universal/id';
-import { prisma } from '@documenso/prisma';
-import { seedBlankDocument } from '@documenso/prisma/seed/documents';
-import { seedUser } from '@documenso/prisma/seed/users';
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-import { DocumentSigningOrder, RecipientRole } from '@prisma/client';
-
-import { apiSignin } from '../fixtures/authentication';
-import {
-  assertRecipientRole,
-  getRecipientEmailInputs,
-  getRecipientRows,
-  getSigningOrderInputs,
-  openDocumentEnvelopeEditor,
-  setRecipientEmail,
-  setRecipientName,
-  setRecipientRole,
-  toggleSigningOrder,
-} from '../fixtures/envelope-editor';
-
-const SIGNER_A = { email: 'cc-order-signer-a@example.com', name: 'Signer A' };
-const SIGNER_B = { email: 'cc-order-signer-b@example.com', name: 'Signer B' };
-const CC_RECIPIENT = { email: 'cc-order-cc@example.com', name: 'CC Recipient' };
-
-const assertCcDisplayedLastWithNoOrderInput = async (root: Page) => {
-  // CC recipient is displayed last despite being added/stored mid-list.
-  await expect(getRecipientEmailInputs(root)).toHaveCount(3);
-  await expect(getRecipientEmailInputs(root).nth(0)).toHaveValue(SIGNER_A.email);
-  await expect(getRecipientEmailInputs(root).nth(1)).toHaveValue(SIGNER_B.email);
-  await expect(getRecipientEmailInputs(root).nth(2)).toHaveValue(CC_RECIPIENT.email);
-
-  await assertRecipientRole(root, 0, 'Needs to sign');
-  await assertRecipientRole(root, 1, 'Needs to sign');
-  await assertRecipientRole(root, 2, 'Receives copy');
-
-  // Only the two signers have signing order inputs, showing 1 and 2.
-  await expect(getSigningOrderInputs(root)).toHaveCount(2);
-  await expect(getSigningOrderInputs(root).nth(0)).toHaveValue('1');
-  await expect(getSigningOrderInputs(root).nth(1)).toHaveValue('2');
-
-  // The CC row itself renders no signing order input (placeholder div instead).
-  const ccRow = getRecipientRows(root).nth(2);
-  await expect(ccRow.locator('[data-testid="signing-order-input"]')).toHaveCount(0);
-};
-
-test.describe('document editor', () => {
-  test('CC recipient added mid-list is displayed last with no signing order input', async ({ page }) => {
-    const surface = await openDocumentEnvelopeEditor(page);
-    const { root } = surface;
-
-    await toggleSigningOrder(root, true);
-
-    // Add signer A into the initial empty row.
-    await setRecipientEmail(root, 0, SIGNER_A.email);
-    await setRecipientName(root, 0, SIGNER_A.name);
-
-    // Add the CC recipient second.
-    await root.getByRole('button', { name: 'Add Signer' }).click();
-    await setRecipientEmail(root, 1, CC_RECIPIENT.email);
-    await setRecipientName(root, 1, CC_RECIPIENT.name);
-    await setRecipientRole(root, 1, 'Receives copy');
-
-    // Once the row becomes CC, its signing order input disappears.
-    await expect(getSigningOrderInputs(root)).toHaveCount(1);
-
-    // Add signer B third. The new row is inserted before the CC recipient,
-    // which is kept last by the client-side sorting.
-    await root.getByRole('button', { name: 'Add Signer' }).click();
-    await expect(getRecipientEmailInputs(root).nth(2)).toHaveValue(CC_RECIPIENT.email);
-
-    await setRecipientEmail(root, 1, SIGNER_B.email);
-    await setRecipientName(root, 1, SIGNER_B.name);
-
-    await assertCcDisplayedLastWithNoOrderInput(root);
-
-    // The editor autosaves with a debounce, poll the DB until all three
-    // recipients have been persisted before reloading the page.
-    await expect
-      .poll(
-        async () => {
-          const recipients = await prisma.recipient.findMany({
-            where: { envelopeId: surface.envelopeId },
-          });
-
-          return recipients.length;
-        },
-        { timeout: 15_000 },
-      )
-      .toBe(3);
-
-    // Reload the editor and assert the CC recipient is still displayed last.
-    await root.reload();
-    await expect(root.getByRole('heading', { name: 'Recipients' })).toBeVisible();
-
-    await assertCcDisplayedLastWithNoOrderInput(root);
-  });
-
-  test('CC recipient seeded with mid-list signing order is displayed last', async ({ page }) => {
-    const { user, team } = await seedUser();
-
-    const document = await seedBlankDocument(user, team.id, {
-      internalVersion: 2,
-    });
-
-    // Seed a CC recipient directly in the DB with a mid-list signing order
-    // (2 of 3) BEFORE opening the editor, so the editor's autosave cannot
-    // race with the seeded recipients, and assert the editor renders it last.
-    await prisma.envelope.update({
-      where: { id: document.id },
-      data: {
-        documentMeta: {
-          update: { signingOrder: DocumentSigningOrder.SEQUENTIAL },
-        },
-        recipients: {
-          createMany: {
-            data: [
-              {
-                email: SIGNER_A.email,
-                name: SIGNER_A.name,
-                token: nanoid(),
-                role: RecipientRole.SIGNER,
-                signingOrder: 1,
-              },
-              {
-                email: CC_RECIPIENT.email,
-                name: CC_RECIPIENT.name,
-                token: nanoid(),
-                role: RecipientRole.CC,
-                signingOrder: 2,
-              },
-              {
-                email: SIGNER_B.email,
-                name: SIGNER_B.name,
-                token: nanoid(),
-                role: RecipientRole.SIGNER,
-                signingOrder: 3,
-              },
-            ],
-          },
-        },
-      },
-    });
-
-    await apiSignin({
-      page,
-      email: user.email,
-      redirectPath: `/t/${team.url}/documents/${document.id}/edit?step=uploadAndRecipients`,
-    });
-
-    await expect(page.getByRole('heading', { name: 'Recipients' })).toBeVisible();
-
-    await assertCcDisplayedLastWithNoOrderInput(page);
-  });
-});

packages/app-tests/e2e/fixtures/command-menu.ts

@@ -1,18 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect } from '@playwright/test';
-
-/**
- * Opens the app command menu via the keyboard shortcut.
- *
- * Retries the shortcut until the menu appears since the keypress is a no-op
- * when it happens before the page has hydrated.
- *
- * @param placeholder The search input placeholder to wait for, which differs
- *   between admin and non-admin users.
- */
-export const openCommandMenu = async (page: Page, placeholder: string) => {
-  await expect(async () => {
-    await page.keyboard.press('Meta+K');
-    await expect(page.getByPlaceholder(placeholder).first()).toBeVisible({ timeout: 1_000 });
-  }).toPass({ timeout: 15_000 });
-};

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

@@ -6,7 +6,6 @@ import { expect, test } from '@playwright/test';
 
 import { apiSignin } from '../fixtures/authentication';
 import { expectToastTextToBeVisible } from '../fixtures/generic';
-import { signSignaturePad } from '../fixtures/signature';
 
 test('[PUBLIC_PROFILE]: create team profile', async ({ page }) => {
   const { user, team } = await seedUser();
@@ -74,19 +73,8 @@ test('[PUBLIC_PROFILE]: create team profile', async ({ page }) => {
   await expect(page.locator('body')).toContainText('public-direct-template-title');
   await expect(page.locator('body')).toContainText('public-direct-template-description');
 
-  const directSignatureField = directTemplate.fields[0];
-
-  if (!directSignatureField) {
-    throw new Error('Expected seeded direct template signature field to exist');
-  }
-
   await page.getByRole('link', { name: 'Sign' }).click();
   await page.getByRole('button', { name: 'Continue' }).click();
-
-  await signSignaturePad(page);
-  await page.locator(`#field-${directSignatureField.id}`).getByRole('button').click();
-  await expect(page.locator(`#field-${directSignatureField.id}`)).toHaveAttribute('data-inserted', 'true');
-
   await page.getByRole('button', { name: 'Complete' }).click();
   await page.getByRole('button', { name: 'Sign' }).click();
 

packages/app-tests/e2e/teams/default-recipients.spec.ts

@@ -110,7 +110,7 @@ test.describe('Default Recipients', () => {
     await page.getByRole('button', { name: 'Add Signer' }).click();
 
     // Add a regular signer using the v2 editor
-    await page.getByTestId('signer-email-input').first().fill('regular-signer@documenso.com');
+    await page.getByTestId('signer-email-input').last().fill('regular-signer@documenso.com');
     await page
       .getByPlaceholder(/Recipient/)
       .first()

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

@@ -197,18 +197,7 @@ test('[DIRECT_TEMPLATES]: V1 direct template link auth access', async ({ page })
   await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
   await expect(page.getByLabel('Email')).toBeDisabled();
 
-  const directSignatureField = directTemplateWithAuth.fields[0];
-
-  if (!directSignatureField) {
-    throw new Error('Expected seeded direct template signature field to exist');
-  }
-
   await page.getByRole('button', { name: 'Continue' }).click();
-
-  await signSignaturePad(page);
-  await page.locator(`#field-${directSignatureField.id}`).getByRole('button').click();
-  await expect(page.locator(`#field-${directSignatureField.id}`)).toHaveAttribute('data-inserted', 'true');
-
   await page.getByRole('button', { name: 'Complete' }).click();
 
   await page.getByRole('button', { name: 'Sign' }).click();
@@ -246,37 +235,6 @@ test('[DIRECT_TEMPLATES]: V2 direct template link auth access', async ({ page })
   await page.goto(directTemplatePath);
 
   await expect(page.getByRole('heading', { name: 'Personal direct template link' })).toBeVisible();
-
-  const directSignatureField = directTemplateWithAuth.fields[0];
-
-  if (!directSignatureField) {
-    throw new Error('Expected seeded direct template signature field to exist');
-  }
-
-  // Wait for the PDF and the Konva canvas overlay to be ready.
-  await expect(page.locator('img[data-page-number]').first()).toBeVisible({ timeout: 30_000 });
-  const canvas = page.locator('.konva-container canvas').first();
-  await expect(canvas).toBeVisible({ timeout: 30_000 });
-
-  // Sign the direct template recipient's signature field via the canvas-based V2 UI.
-  await signSignaturePad(page);
-
-  const canvasBox = await canvas.boundingBox();
-
-  if (!canvasBox) {
-    throw new Error('Canvas bounding box not found');
-  }
-
-  const x =
-    (Number(directSignatureField.positionX) / 100) * canvasBox.width +
-    ((Number(directSignatureField.width) / 100) * canvasBox.width) / 2;
-  const y =
-    (Number(directSignatureField.positionY) / 100) * canvasBox.height +
-    ((Number(directSignatureField.height) / 100) * canvasBox.height) / 2;
-
-  await canvas.click({ position: { x, y } });
-  await expect(page.getByText('0 Fields Remaining').first()).toBeVisible({ timeout: 10_000 });
-
   await page.getByRole('button', { name: 'Complete' }).click();
   await expect(page.getByLabel('Your Email')).not.toBeVisible();
 
@@ -308,16 +266,6 @@ test('[DIRECT_TEMPLATES]: use direct template link with 1 recipient', async ({ p
 
   await expect(page.getByText('Next Recipient Name')).not.toBeVisible();
 
-  const directSignatureField = template.fields[0];
-
-  if (!directSignatureField) {
-    throw new Error('Expected seeded direct template signature field to exist');
-  }
-
-  await signSignaturePad(page);
-  await page.locator(`#field-${directSignatureField.id}`).getByRole('button').click();
-  await expect(page.locator(`#field-${directSignatureField.id}`)).toHaveAttribute('data-inserted', 'true');
-
   await page.getByRole('button', { name: 'Complete' }).click();
   await page.getByRole('button', { name: 'Sign' }).click();
   await page.waitForURL(/\/sign/);
@@ -351,13 +299,19 @@ test('[DIRECT_TEMPLATES]: V1 use direct template link with 2 recipients with nex
     },
   });
 
-  // The seeded direct template already includes a signature field for the direct recipient.
-  const directSignatureField = template.fields[0];
+  const directTemplateRecipient = template.recipients[0];
 
-  if (!directSignatureField) {
-    throw new Error('Expected seeded direct template signature field to exist');
+  if (!directTemplateRecipient) {
+    throw new Error('Expected direct template recipient to exist');
   }
 
+  // All SIGNER recipients need a signature field for sendDocument to dispatch emails.
+  const directSignatureField = await seedSignatureFieldForRecipient({
+    envelopeId: template.id,
+    recipientId: directTemplateRecipient.id,
+    positionY: 10,
+  });
+
   const originalName = 'Signer 2';
   const originalSecondSignerEmail = seedTestEmail();
 
@@ -459,13 +413,19 @@ test('[DIRECT_TEMPLATES]: V2 use direct template link with 2 recipients with nex
     },
   });
 
-  // The seeded direct template already includes a signature field for the direct recipient.
-  const directSignatureField = template.fields[0];
+  const directTemplateRecipient = template.recipients[0];
 
-  if (!directSignatureField) {
-    throw new Error('Expected seeded direct template signature field to exist');
+  if (!directTemplateRecipient) {
+    throw new Error('Expected direct template recipient to exist');
   }
 
+  // All SIGNER recipients need a signature field for sendDocument to dispatch emails.
+  const directSignatureField = await seedSignatureFieldForRecipient({
+    envelopeId: template.id,
+    recipientId: directTemplateRecipient.id,
+    positionY: 10,
+  });
+
   const originalName = 'Signer 2';
   const originalSecondSignerEmail = seedTestEmail();
 
@@ -561,48 +521,3 @@ test('[DIRECT_TEMPLATES]: V2 use direct template link with 2 recipients with nex
   expect(updatedSecondRecipient.email).toBe(newSecondSignerEmail);
   await expectSigningRequestJobForRecipient(updatedSecondRecipient.id);
 });
-
-test('[DIRECT_TEMPLATES]: V1 direct template without signature fields shows invalid template page', async ({
-  page,
-}) => {
-  const { user, team } = await seedUser();
-
-  const template = await seedDirectTemplate({
-    title: 'V1 invalid direct template',
-    userId: user.id,
-    teamId: team.id,
-    createDirectRecipientSignatureField: false,
-  });
-
-  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
-
-  await expect(page.getByRole('heading', { name: 'Invalid direct link template' })).toBeVisible();
-  await expect(page.getByText('This direct link template cannot be used because one or more signers')).toBeVisible();
-
-  // The signing flow must not render.
-  await expect(page.getByRole('heading', { name: 'General' })).not.toBeVisible();
-  await expect(page.getByRole('button', { name: 'Continue' })).not.toBeVisible();
-});
-
-test('[DIRECT_TEMPLATES]: V2 direct template without signature fields shows invalid template page', async ({
-  page,
-}) => {
-  const { user, team } = await seedUser();
-
-  const template = await seedDirectTemplate({
-    title: 'V2 invalid direct template',
-    userId: user.id,
-    teamId: team.id,
-    internalVersion: 2,
-    createDirectRecipientSignatureField: false,
-  });
-
-  await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
-
-  await expect(page.getByRole('heading', { name: 'Invalid direct link template' })).toBeVisible();
-  await expect(page.getByText('This direct link template cannot be used because one or more signers')).toBeVisible();
-
-  // The signing flow (PDF canvas) must not render.
-  await expect(page.locator('.konva-container canvas')).toHaveCount(0);
-  await expect(page.getByRole('button', { name: 'Complete' })).not.toBeVisible();
-});

packages/app-tests/e2e/templates/template-use-dialog.spec.ts

@@ -1,101 +0,0 @@
-import { FIELD_SIGNATURE_META_DEFAULT_VALUES } from '@documenso/lib/types/field-meta';
-import { prisma } from '@documenso/prisma';
-import { seedTemplate } from '@documenso/prisma/seed/templates';
-import { seedUser } from '@documenso/prisma/seed/users';
-import { expect, test } from '@playwright/test';
-import { DocumentStatus, FieldType } from '@prisma/client';
-
-import { apiSignin } from '../fixtures/authentication';
-import { expectToastTextToBeVisible } from '../fixtures/generic';
-
-const seedSignatureFieldForRecipient = async (options: { envelopeId: string; recipientId: number }) => {
-  const envelopeItem = await prisma.envelopeItem.findFirstOrThrow({
-    where: { envelopeId: options.envelopeId },
-  });
-
-  return await prisma.field.create({
-    data: {
-      envelopeId: options.envelopeId,
-      envelopeItemId: envelopeItem.id,
-      recipientId: options.recipientId,
-      type: FieldType.SIGNATURE,
-      page: 1,
-      positionX: 5,
-      positionY: 10,
-      width: 20,
-      height: 5,
-      customText: '',
-      inserted: false,
-      fieldMeta: FIELD_SIGNATURE_META_DEFAULT_VALUES,
-    },
-  });
-};
-
-test('[TEMPLATE_USE]: shows missing signature fields error when sending a template without signature fields', async ({
-  page,
-}) => {
-  const { user, team } = await seedUser();
-
-  // seedTemplate creates one SIGNER recipient and no fields.
-  await seedTemplate({
-    title: 'Template missing signature fields',
-    userId: user.id,
-    teamId: team.id,
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/t/${team.url}/templates`,
-  });
-
-  await page.getByRole('button', { name: 'Use Template' }).click();
-  await expect(page.getByRole('heading', { name: 'Create document from template' })).toBeVisible();
-
-  // Enable distribution so the document is sent on creation.
-  await page.locator('#distributeDocument').click();
-  await page.getByRole('button', { name: 'Create and send' }).click();
-
-  await expectToastTextToBeVisible(page, 'Missing signature fields');
-  await expectToastTextToBeVisible(
-    page,
-    'The document could not be sent because some signers do not have a signature field',
-  );
-});
-
-test('[TEMPLATE_USE]: creates and sends a document when signers have signature fields', async ({ page }) => {
-  const { user, team } = await seedUser();
-
-  const template = await seedTemplate({
-    title: 'Template with signature fields',
-    userId: user.id,
-    teamId: team.id,
-  });
-
-  await seedSignatureFieldForRecipient({
-    envelopeId: template.id,
-    recipientId: template.recipients[0].id,
-  });
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/t/${team.url}/templates`,
-  });
-
-  await page.getByRole('button', { name: 'Use Template' }).click();
-  await expect(page.getByRole('heading', { name: 'Create document from template' })).toBeVisible();
-
-  await page.locator('#distributeDocument').click();
-  await page.getByRole('button', { name: 'Create and send' }).click();
-
-  await page.waitForURL(new RegExp(`/t/${team.url}/documents/envelope_.*`));
-
-  const envelopeId = page.url().split('/').pop()?.split('?')[0];
-
-  const envelope = await prisma.envelope.findFirstOrThrow({
-    where: { id: envelopeId },
-  });
-
-  expect(envelope.status).toBe(DocumentStatus.PENDING);
-});

packages/ee/server-only/stripe/sync-stripe-customer-subscription.ts

@@ -5,7 +5,6 @@ import { INTERNAL_CLAIM_ID } from '@documenso/lib/types/subscription';
 import { prisma } from '@documenso/prisma';
 import { OrganisationType, type Prisma, SubscriptionStatus } from '@prisma/client';
 import { match } from 'ts-pattern';
-import { reconcileSeatBasedPlans } from './update-subscription-item-quantity';
 
 const LIVE_SUBSCRIPTION_STATUSES: Stripe.Subscription.Status[] = ['active', 'trialing', 'past_due'];
 
@@ -230,19 +229,6 @@ const handleLiveSubscription = async ({
       });
     }
   });
-
-  // Detect a billing-period roll by comparing the persisted period end with
-  // the freshly-fetched one — the convergent equivalent of the old
-  // `previous_attributes.current_period_start` signal. On renewal, reconcile
-  // the seat quantity and claim down to the actual member count. The reconcile
-  // itself no-ops for non-seat/unlimited plans and inactive subscriptions.
-  const previousPeriodEnd = organisation.subscription?.periodEnd ?? null;
-
-  const hasPeriodAdvanced = previousPeriodEnd !== null && periodEnd.getTime() > previousPeriodEnd.getTime();
-
-  if (hasPeriodAdvanced && !bypassClaimUpdate) {
-    await reconcileSeatBasedPlans(organisation.id);
-  }
 };
 
 /**

packages/ee/server-only/stripe/update-subscription-item-quantity.ts

@@ -3,7 +3,6 @@ import { stripe } from '@documenso/lib/server-only/stripe';
 import { appLog } from '@documenso/lib/utils/debugger';
 import { prisma } from '@documenso/prisma';
 import type { OrganisationClaim, Subscription } from '@prisma/client';
-import { SubscriptionStatus } from '@prisma/client';
 import type Stripe from 'stripe';
 
 import { isPriceSeatsBased } from './is-price-seats-based';
@@ -12,14 +11,12 @@ export type UpdateSubscriptionItemQuantityOptions = {
   subscriptionId: string;
   quantity: number;
   priceId: string;
-  prorationBehaviour: 'always_invoice' | 'none';
 };
 
 export const updateSubscriptionItemQuantity = async ({
   subscriptionId,
   quantity,
   priceId,
-  prorationBehaviour,
 }: UpdateSubscriptionItemQuantityOptions) => {
   const subscription = await stripe.subscriptions.retrieve(subscriptionId);
 
@@ -29,6 +26,7 @@ export const updateSubscriptionItemQuantity = async ({
     throw new Error('Subscription does not contain required item');
   }
 
+  const hasYearlyItem = items.find((item) => item.price.recurring?.interval === 'year');
   const oldQuantity = items[0].quantity;
 
   if (oldQuantity === quantity) {
@@ -40,12 +38,13 @@ export const updateSubscriptionItemQuantity = async ({
       id: item.id,
       quantity,
     })),
-    proration_behavior: prorationBehaviour,
-    // Need to "off_session" updates since adding 3DS will have payments
-    // not pass through for these immediate invoices.
-    off_session: true,
   };
 
+  // Only invoice immediately when changing the quantity of yearly item.
+  if (hasYearlyItem) {
+    subscriptionUpdatePayload.proration_behavior = 'always_invoice';
+  }
+
   await stripe.subscriptions.update(subscriptionId, subscriptionUpdatePayload);
 };
 
@@ -56,19 +55,15 @@ export const updateSubscriptionItemQuantity = async ({
  * via Stripe rather than enforcing a hard cap. A `memberCount` of `0` on the
  * organisation claim represents unlimited seats.
  *
- * Organisations without a subscription (e.g. after being downgraded to the
- * free plan) can pass `null`, in which case the claim cap is enforced
- * directly without the seats-based exemption.
- *
  * Should only be called from grow paths (invite/add). Reducing operations
  * must never be gated by this check.
  *
- * @param subscription - The organisation's Stripe subscription, if any.
+ * @param subscription - The organisation's Stripe subscription.
  * @param organisationClaim - The organisation claim.
- * @param quantity - The proposed total member count.
+ * @param quantity - The proposed total member + pending invite count.
  */
 export const assertMemberCountWithinCap = async (
-  subscription: Subscription | null,
+  subscription: Subscription,
   organisationClaim: OrganisationClaim,
   quantity: number,
 ) => {
@@ -80,12 +75,10 @@ export const assertMemberCountWithinCap = async (
   }
 
   // Seats-based plans don't have a hard cap; Stripe meters the usage.
-  if (subscription) {
-    const isSeatsBased = await isPriceSeatsBased(subscription.priceId);
+  const isSeatsBased = await isPriceSeatsBased(subscription.priceId);
 
-    if (isSeatsBased) {
-      return;
-    }
+  if (isSeatsBased) {
+    return;
   }
 
   if (quantity > maximumMemberCount) {
@@ -96,134 +89,48 @@ export const assertMemberCountWithinCap = async (
 };
 
 /**
- * Syncs the Stripe subscription quantity with the organisation's member count.
+ * Syncs the organisation's member count with the Stripe subscription quantity.
  *
- * This is a Stripe <-> Database sync operation.
- *
- * Note: `organisationClaim.memberCount` is the paid seat high-water mark for the
- * current billing period — the highest count we've already billed for.
+ * No-ops for plans that are not seats-based, and for organisations with
+ * unlimited seats (`organisationClaim.memberCount === 0`). Safe to call from
+ * both grow and shrink paths.
  *
  * @param subscription - The subscription to sync the member count with.
  * @param organisationClaim - The organisation claim.
- * @param quantity - The new total member count to sync.
- * @param mode - The member-count change that triggered the sync.
+ * @param quantity - The new total member + pending invite count to sync.
  */
 export const syncMemberCountWithStripeSeatPlan = async (
   subscription: Subscription,
   organisationClaim: OrganisationClaim,
   quantity: number,
-  mode: 'grow' | 'shrink',
 ) => {
-  // Unlimited seats — nothing to meter.
+  // Infinite seats means no sync needed.
   if (organisationClaim.memberCount === 0) {
     return;
   }
 
   const isSeatsBased = await isPriceSeatsBased(subscription.priceId);
 
-  // Only seat-based plans support seat syncing.
   if (!isSeatsBased) {
     return;
   }
 
-  // Whether to immediately invoice for new seats if the quantity is greater than
-  // the high-water mark.
-  const billsForNewSeats = mode === 'grow' && quantity > organisationClaim.memberCount;
-
-  appLog('BILLING', `Syncing seat based plan (${mode}, quantity ${quantity})`);
+  appLog('BILLING', 'Updating seat based plan');
 
   await updateSubscriptionItemQuantity({
     priceId: subscription.priceId,
     subscriptionId: subscription.planId,
     quantity,
-    prorationBehaviour: billsForNewSeats ? 'always_invoice' : 'none',
-  });
-
-  // Advance the high-water mark when billing for new seats; it is reset to the
-  // actual member count when the billing period rolls over. Re-adds and shrinks
-  // deliberately leave it untouched so a seat already paid for this period is
-  // never re-charged.
-  if (billsForNewSeats) {
-    await prisma.organisationClaim.update({
-      where: {
-        id: organisationClaim.id,
-      },
-      data: {
-        memberCount: quantity,
-      },
-    });
-  }
-};
-
-/**
- * Reconciles the organisation claim seat counter, and the stripe quantity with the
- * actual member count.
- *
- * Uses the member count as the authoritative source of truth. Meaning:
- * - Update the organisation claim with the member count
- * - Update the Stripe subscription quantity to the member count
- *
- * This should only be called when the billing period rolls over.
- */
-export const reconcileSeatBasedPlans = async (organisationId: string) => {
-  const organisation = await prisma.organisation.findFirst({
-    where: {
-      id: organisationId,
-    },
-    include: {
-      organisationClaim: true,
-      subscription: true,
-    },
-  });
-
-  if (!organisation || !organisation.subscription) {
-    return;
-  }
-
-  const { subscription, organisationClaim } = organisation;
-
-  // Stripe rejects quantity updates on canceled subscriptions. PAST_DUE is
-  // still live and a no-proration sync is safe, so it's allowed through.
-  if (subscription.status === SubscriptionStatus.INACTIVE) {
-    return;
-  }
-
-  // Unlimited seats — nothing to meter.
-  if (organisationClaim.memberCount === 0) {
-    return;
-  }
-
-  const isSeatsBased = await isPriceSeatsBased(subscription.priceId);
-
-  // Only seat-based plans support seat syncing.
-  if (!isSeatsBased) {
-    return;
-  }
-
-  const memberCount = await prisma.organisationMember.count({
-    where: {
-      organisationId,
-    },
-  });
-
-  // An organisation always retains its owner; never write the unlimited sentinel.
-  if (memberCount === 0) {
-    return;
-  }
-
-  await updateSubscriptionItemQuantity({
-    priceId: subscription.priceId,
-    subscriptionId: subscription.planId,
-    quantity: memberCount,
-    prorationBehaviour: 'none',
   });
 
+  // This should be automatically updated after the Stripe webhook is fired
+  // but we just manually adjust it here as well to avoid any race conditions.
   await prisma.organisationClaim.update({
     where: {
       id: organisationClaim.id,
     },
     data: {
-      memberCount,
+      memberCount: quantity,
     },
   });
 };

packages/ee/server-only/stripe/webhook/handler.ts

@@ -2,6 +2,7 @@ import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import type { Stripe } from '@documenso/lib/server-only/stripe';
 import { stripe } from '@documenso/lib/server-only/stripe';
 import { env } from '@documenso/lib/utils/env';
+
 import { syncStripeCustomerSubscription } from '../sync-stripe-customer-subscription';
 
 type StripeWebhookResponse = {

packages/lib/client-only/hooks/use-editor-recipients.ts

@@ -7,10 +7,9 @@ import { DocumentSigningOrder, RecipientRole } from '@prisma/client';
 import { useId } from 'react';
 import type { UseFormReturn } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
+import { prop, sortBy } from 'remeda';
 import { z } from 'zod';
 
-import { isCcRecipient, normalizeRecipientSigningOrders, sortRecipientsForSigningOrder } from '../../utils/recipients';
-
 const LocalRecipientSchema = z.object({
   formId: z.string().min(1),
   id: z.number().optional(),
@@ -95,13 +94,13 @@ export const useEditorRecipients = ({ envelope }: EditorRecipientsProps): UseEdi
       name: recipient.name,
       email: recipient.email,
       role: recipient.role,
-      signingOrder: isCcRecipient(recipient) ? undefined : (recipient.signingOrder ?? index + 1),
+      signingOrder: recipient.signingOrder ?? index + 1,
       actionAuth: ZRecipientAuthOptionsSchema.parse(recipient.authOptions)?.actionAuth ?? undefined,
     }));
 
     const signers: TLocalRecipient[] =
       formRecipients.length > 0
-        ? normalizeRecipientSigningOrders(sortRecipientsForSigningOrder(formRecipients))
+        ? sortBy(formRecipients, [prop('signingOrder'), 'asc'], [prop('id'), 'asc'])
         : [
             {
               formId: initialId,

packages/lib/errors/app-error.ts

@@ -36,13 +36,6 @@ export enum AppErrorCode {
    */
   ENVELOPE_TSP_LOCKED = 'ENVELOPE_TSP_LOCKED',
 
-  /**
-   * A signer recipient does not have a signature field assigned. Thrown when
-   * distributing an envelope or using a direct template where at least one
-   * signer has no signature field.
-   */
-  MISSING_SIGNATURE_FIELD = 'MISSING_SIGNATURE_FIELD',
-
   /**
    * CSC (Cloud Signature Consortium) error codes. See the CSC QES V1 spec
    * for the recovery taxonomy.
@@ -91,7 +84,6 @@ export const genericErrorCodeToTrpcErrorCodeMap: Record<string, { code: string;
   [AppErrorCode.ENVELOPE_CANCELLED]: { code: 'BAD_REQUEST', status: 400 },
   [AppErrorCode.ENVELOPE_LEGACY]: { code: 'BAD_REQUEST', status: 400 },
   [AppErrorCode.ENVELOPE_TSP_LOCKED]: { code: 'BAD_REQUEST', status: 400 },
-  [AppErrorCode.MISSING_SIGNATURE_FIELD]: { code: 'BAD_REQUEST', status: 400 },
   [AppErrorCode.CSC_INSTANCE_MODE_MISMATCH]: { code: 'BAD_REQUEST', status: 400 },
   [AppErrorCode.CSC_UNLICENSED]: { code: 'FORBIDDEN', status: 403 },
   [AppErrorCode.CSC_PROVIDER_INFO_FAILED]: { code: 'INTERNAL_SERVER_ERROR', status: 500 },
@@ -299,7 +291,6 @@ export class AppError extends Error {
         AppErrorCode.ENVELOPE_CANCELLED,
         AppErrorCode.ENVELOPE_LEGACY,
         AppErrorCode.ENVELOPE_TSP_LOCKED,
-        AppErrorCode.MISSING_SIGNATURE_FIELD,
         AppErrorCode.CSC_INSTANCE_MODE_MISMATCH,
         AppErrorCode.CSC_CREDENTIAL_LIST_EMPTY,
         AppErrorCode.CSC_CERT_INVALID,

packages/lib/jobs/client.ts

@@ -17,7 +17,6 @@ import { SEND_SIGNING_REJECTION_EMAILS_JOB_DEFINITION } from './definitions/emai
 import { SEND_SIGNING_EMAIL_JOB_DEFINITION } from './definitions/emails/send-signing-email';
 import { SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION } from './definitions/emails/send-team-deleted-email';
 import { ADMIN_DELETE_ORGANISATION_JOB_DEFINITION } from './definitions/internal/admin-delete-organisation';
-import { ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION } from './definitions/internal/alert-organisation-seat-drift';
 import { BACKPORT_SUBSCRIPTION_CLAIM_JOB_DEFINITION } from './definitions/internal/backport-subscription-claims';
 import { BULK_SEND_TEMPLATE_JOB_DEFINITION } from './definitions/internal/bulk-send-template';
 import { CANCEL_ORGANISATION_SUBSCRIPTION_JOB_DEFINITION } from './definitions/internal/cancel-organisation-subscription';
@@ -30,7 +29,6 @@ import { SEAL_DOCUMENT_JOB_DEFINITION } from './definitions/internal/seal-docume
 import { SEAL_DOCUMENT_SWEEP_JOB_DEFINITION } from './definitions/internal/seal-document-sweep';
 import { SEND_SIGNING_REMINDERS_SWEEP_JOB_DEFINITION } from './definitions/internal/send-signing-reminders-sweep';
 import { SYNC_EMAIL_DOMAINS_JOB_DEFINITION } from './definitions/internal/sync-email-domains';
-import { SYNC_ORGANISATION_SEATS_JOB_DEFINITION } from './definitions/internal/sync-organisation-seats';
 
 /**
  * The `as const` assertion is load bearing as it provides the correct level of type inference for
@@ -66,9 +64,7 @@ export const jobsClient = new JobClient([
   CLEANUP_RATE_LIMITS_JOB_DEFINITION,
   SYNC_EMAIL_DOMAINS_JOB_DEFINITION,
   ADMIN_DELETE_ORGANISATION_JOB_DEFINITION,
-  ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION,
   CANCEL_ORGANISATION_SUBSCRIPTION_JOB_DEFINITION,
-  SYNC_ORGANISATION_SEATS_JOB_DEFINITION,
 ] as const);
 
 export const jobs = jobsClient;

packages/lib/jobs/definitions/internal/alert-organisation-seat-drift.handler.ts

@@ -1,67 +0,0 @@
-import { mailer } from '@documenso/email/mailer';
-import { prisma } from '@documenso/prisma';
-import { IS_BILLING_ENABLED, SUPPORT_EMAIL } from '../../../constants/app';
-import { DOCUMENSO_INTERNAL_EMAIL } from '../../../constants/email';
-import type { JobRunIO } from '../../client/_internal/job';
-import type { TAlertOrganisationSeatDriftJobDefinition } from './alert-organisation-seat-drift';
-
-/**
- * Daily check for organisations whose member count exceeds their paid seat
- * count (`organisationClaim.memberCount`, where `0` means unlimited).
- */
-export const run = async ({ io }: { payload: TAlertOrganisationSeatDriftJobDefinition; io: JobRunIO }) => {
-  if (!IS_BILLING_ENABLED()) {
-    return;
-  }
-
-  const organisations = await prisma.organisation.findMany({
-    where: {
-      // Exclude unlimited-seat plans (memberCount === 0).
-      organisationClaim: {
-        memberCount: {
-          not: 0,
-        },
-      },
-    },
-    select: {
-      id: true,
-      name: true,
-      organisationClaim: {
-        select: {
-          memberCount: true,
-        },
-      },
-      _count: {
-        select: {
-          members: true,
-        },
-      },
-    },
-  });
-
-  const driftedOrganisations = organisations.filter(
-    (organisation) =>
-      organisation.organisationClaim !== null &&
-      organisation._count.members > organisation.organisationClaim.memberCount,
-  );
-
-  if (driftedOrganisations.length === 0) {
-    io.logger.info('No organisations exceed their paid seat count');
-
-    return;
-  }
-
-  await mailer.sendMail({
-    to: SUPPORT_EMAIL,
-    from: DOCUMENSO_INTERNAL_EMAIL,
-    subject: `[Billing] ${driftedOrganisations.length} organisation(s) exceed their paid seat count`,
-    text: [
-      `${driftedOrganisations.length} organisation(s) have more members than their paid seat count:`,
-      '',
-      ...driftedOrganisations.map(
-        (organisation) =>
-          `- ${organisation.name} (${organisation.id}): ${organisation._count.members} members vs ${organisation.organisationClaim?.memberCount ?? 0} paid seats`,
-      ),
-    ].join('\n'),
-  });
-};

packages/lib/jobs/definitions/internal/alert-organisation-seat-drift.ts

@@ -1,30 +0,0 @@
-import { z } from 'zod';
-
-import type { JobDefinition } from '../../client/_internal/job';
-
-const ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_ID = 'internal.alert-organisation-seat-drift';
-
-const ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_SCHEMA = z.object({});
-
-export type TAlertOrganisationSeatDriftJobDefinition = z.infer<
-  typeof ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_SCHEMA
->;
-
-export const ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION = {
-  id: ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_ID,
-  name: 'Alert Organisation Seat Drift',
-  version: '1.0.0',
-  trigger: {
-    name: ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_ID,
-    schema: ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_SCHEMA,
-    cron: '0 0 * * *', // Once a day at midnight.
-  },
-  handler: async ({ payload, io }) => {
-    const handler = await import('./alert-organisation-seat-drift.handler');
-
-    await handler.run({ payload, io });
-  },
-} as const satisfies JobDefinition<
-  typeof ALERT_ORGANISATION_SEAT_DRIFT_JOB_DEFINITION_ID,
-  TAlertOrganisationSeatDriftJobDefinition
->;

packages/lib/jobs/definitions/internal/sync-organisation-seats.handler.ts

@@ -1,54 +0,0 @@
-import { syncMemberCountWithStripeSeatPlan } from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
-import { prisma } from '@documenso/prisma';
-import { SubscriptionStatus } from '@prisma/client';
-import { IS_BILLING_ENABLED } from '../../../constants/app';
-import type { JobRunIO } from '../../client/_internal/job';
-import type { TSyncOrganisationSeatsJobDefinition } from './sync-organisation-seats';
-
-export const run = async ({ payload }: { payload: TSyncOrganisationSeatsJobDefinition; io: JobRunIO }) => {
-  const { organisationId } = payload;
-
-  if (!IS_BILLING_ENABLED()) {
-    return;
-  }
-
-  const organisation = await prisma.organisation.findUnique({
-    where: {
-      id: organisationId,
-    },
-    include: {
-      subscription: true,
-      organisationClaim: true,
-    },
-  });
-
-  if (!organisation || !organisation.subscription) {
-    return;
-  }
-
-  // Skip canceled/terminal subscriptions — Stripe rejects quantity updates on a
-  // canceled subscription. PAST_DUE is still live and a no-proration shrink is
-  // safe, so it's allowed through.
-  if (organisation.subscription.status === SubscriptionStatus.INACTIVE) {
-    return;
-  }
-
-  const memberCount = await prisma.organisationMember.count({
-    where: {
-      organisationId,
-    },
-  });
-
-  // An organisation always retains its owner; guarding zero avoids writing the
-  // unlimited sentinel to the claim.
-  if (memberCount === 0) {
-    return;
-  }
-
-  await syncMemberCountWithStripeSeatPlan(
-    organisation.subscription,
-    organisation.organisationClaim,
-    memberCount,
-    'shrink',
-  );
-};

packages/lib/jobs/definitions/internal/sync-organisation-seats.ts

@@ -1,29 +0,0 @@
-import { z } from 'zod';
-
-import type { JobDefinition } from '../../client/_internal/job';
-
-const SYNC_ORGANISATION_SEATS_JOB_DEFINITION_ID = 'internal.sync-organisation-seats';
-
-const SYNC_ORGANISATION_SEATS_JOB_DEFINITION_SCHEMA = z.object({
-  organisationId: z.string(),
-});
-
-export type TSyncOrganisationSeatsJobDefinition = z.infer<typeof SYNC_ORGANISATION_SEATS_JOB_DEFINITION_SCHEMA>;
-
-export const SYNC_ORGANISATION_SEATS_JOB_DEFINITION = {
-  id: SYNC_ORGANISATION_SEATS_JOB_DEFINITION_ID,
-  name: 'Sync Organisation Seats',
-  version: '1.0.0',
-  trigger: {
-    name: SYNC_ORGANISATION_SEATS_JOB_DEFINITION_ID,
-    schema: SYNC_ORGANISATION_SEATS_JOB_DEFINITION_SCHEMA,
-  },
-  handler: async ({ payload, io }) => {
-    const handler = await import('./sync-organisation-seats.handler');
-
-    await handler.run({ payload, io });
-  },
-} as const satisfies JobDefinition<
-  typeof SYNC_ORGANISATION_SEATS_JOB_DEFINITION_ID,
-  TSyncOrganisationSeatsJobDefinition
->;

packages/lib/server-only/admin/admin-global-search.ts

@@ -1,372 +0,0 @@
-import { prisma } from '@documenso/prisma';
-import { EnvelopeType } from '@prisma/client';
-
-export const ADMIN_SEARCH_RESULTS_PER_TYPE = 5;
-
-const MAX_POSTGRES_INT = 2147483647;
-
-const GROUP_ORDER = ['document', 'user', 'organisation', 'team', 'recipient', 'subscription'] as const;
-
-export type AdminGlobalSearchResultType = (typeof GROUP_ORDER)[number];
-
-export type AdminGlobalSearchResult = {
-  label: string;
-  sublabel?: string;
-  path: string;
-  value: string;
-};
-
-export type AdminGlobalSearchGroup = {
-  type: AdminGlobalSearchResultType;
-  results: AdminGlobalSearchResult[];
-};
-
-export type AdminGlobalSearchOptions = {
-  query: string;
-};
-
-type PartialResults = Partial<Record<AdminGlobalSearchResultType, AdminGlobalSearchResult[]>>;
-
-export const adminGlobalSearch = async ({ query }: AdminGlobalSearchOptions): Promise<AdminGlobalSearchGroup[]> => {
-  const trimmedQuery = query.trim();
-
-  if (trimmedQuery.length === 0) {
-    return [];
-  }
-
-  const resultsByType = await resolveSearch(trimmedQuery);
-
-  return GROUP_ORDER.map((type) => ({
-    type,
-    results: (resultsByType[type] ?? []).map((result) => ({
-      ...result,
-      // Append the raw query so cmdk's client-side filter never hides
-      // server-verified results.
-      value: `${result.value} ${trimmedQuery}`,
-    })),
-  })).filter((group) => group.results.length > 0);
-};
-
-const resolveSearch = async (query: string): Promise<PartialResults> => {
-  // Recognized ID prefixes resolve to a single exact lookup.
-  if (query.startsWith('envelope_')) {
-    return { document: await findDocumentsByExactId({ id: query }) };
-  }
-
-  if (query.startsWith('document_')) {
-    return { document: await findDocumentsByExactId({ secondaryId: query }) };
-  }
-
-  if (query.startsWith('org_')) {
-    return { organisation: await findOrganisationsByIdOrUrl(query) };
-  }
-
-  // Bare numbers are treated as verified ID lookups only. Oversized numbers
-  // fall through to text search.
-  const numericId = Number(query);
-
-  if (/^\d+$/.test(query) && numericId <= MAX_POSTGRES_INT) {
-    const [document, user, team, recipient, subscription] = await Promise.all([
-      findDocumentsByExactId({ secondaryId: `document_${numericId}` }),
-      findUsersById(numericId),
-      findTeamsById(numericId),
-      findRecipientsById(numericId),
-      findSubscriptionsById(numericId),
-    ]);
-
-    return { document, user, team, recipient, subscription };
-  }
-
-  // Free text searches all resource types in parallel.
-  const [document, user, organisation, team, recipient, subscription] = await Promise.all([
-    findDocumentsByText(query),
-    findUsersByText(query),
-    findOrganisationsByText(query),
-    findTeamsByText(query),
-    findRecipientsByText(query),
-    findSubscriptionsByText(query),
-  ]);
-
-  return {
-    document,
-    user,
-    organisation,
-    team,
-    recipient,
-    subscription,
-  };
-};
-
-const joinSublabel = (parts: Array<string | null | undefined>) =>
-  parts.filter((part) => part && part.length > 0).join(' · ') || undefined;
-
-// ─── Documents ────────────────────────────────────────────────────────────────
-
-const documentSelect = {
-  id: true,
-  title: true,
-  secondaryId: true,
-  user: { select: { email: true } },
-} as const;
-
-type DocumentRow = {
-  id: string;
-  title: string;
-  secondaryId: string;
-  user: { email: string };
-};
-
-const mapDocument = (envelope: DocumentRow): AdminGlobalSearchResult => ({
-  label: envelope.title,
-  sublabel: joinSublabel([envelope.secondaryId, envelope.user.email]),
-  path: `/admin/documents/${envelope.id}`,
-  value: `document ${envelope.id} ${envelope.secondaryId} ${envelope.title} ${envelope.user.email}`,
-});
-
-const findDocumentsByExactId = async (where: { id: string } | { secondaryId: string }) => {
-  const envelope = await prisma.envelope.findFirst({
-    where: { ...where, type: EnvelopeType.DOCUMENT },
-    select: documentSelect,
-  });
-
-  return envelope ? [mapDocument(envelope)] : [];
-};
-
-const findDocumentsByText = async (query: string) => {
-  const envelopes = await prisma.envelope.findMany({
-    where: {
-      type: EnvelopeType.DOCUMENT,
-      title: { contains: query, mode: 'insensitive' },
-    },
-    orderBy: { createdAt: 'desc' },
-    take: ADMIN_SEARCH_RESULTS_PER_TYPE,
-    select: documentSelect,
-  });
-
-  return envelopes.map(mapDocument);
-};
-
-// ─── Users ────────────────────────────────────────────────────────────────────
-
-const userSelect = {
-  id: true,
-  name: true,
-  email: true,
-} as const;
-
-type UserRow = { id: number; name: string | null; email: string };
-
-const mapUser = (user: UserRow): AdminGlobalSearchResult => ({
-  label: user.name || user.email,
-  sublabel: joinSublabel([`#${user.id}`, user.email]),
-  path: `/admin/users/${user.id}`,
-  value: `user ${user.id} ${user.name ?? ''} ${user.email}`,
-});
-
-const findUsersById = async (id: number) => {
-  const user = await prisma.user.findFirst({
-    where: { id },
-    select: userSelect,
-  });
-
-  return user ? [mapUser(user)] : [];
-};
-
-const findUsersByText = async (query: string) => {
-  const users = await prisma.user.findMany({
-    where: {
-      OR: [{ name: { contains: query, mode: 'insensitive' } }, { email: { contains: query, mode: 'insensitive' } }],
-    },
-    orderBy: { id: 'desc' },
-    take: ADMIN_SEARCH_RESULTS_PER_TYPE,
-    select: userSelect,
-  });
-
-  return users.map(mapUser);
-};
-
-// ─── Organisations ────────────────────────────────────────────────────────────
-
-const organisationSelect = {
-  id: true,
-  name: true,
-  owner: { select: { email: true } },
-} as const;
-
-type OrganisationRow = { id: string; name: string; owner: { email: string } };
-
-const mapOrganisation = (organisation: OrganisationRow): AdminGlobalSearchResult => ({
-  label: organisation.name,
-  sublabel: joinSublabel([organisation.id, organisation.owner.email]),
-  path: `/admin/organisations/${organisation.id}`,
-  value: `organisation ${organisation.id} ${organisation.name} ${organisation.owner.email}`,
-});
-
-const findOrganisationsByIdOrUrl = async (query: string) => {
-  const organisations = await prisma.organisation.findMany({
-    where: {
-      OR: [{ id: query }, { url: query }],
-    },
-    take: ADMIN_SEARCH_RESULTS_PER_TYPE,
-    select: organisationSelect,
-  });
-
-  return organisations.map(mapOrganisation);
-};
-
-const findOrganisationsByText = async (query: string) => {
-  const organisations = await prisma.organisation.findMany({
-    where: {
-      OR: [
-        { name: { contains: query, mode: 'insensitive' } },
-        { url: { contains: query, mode: 'insensitive' } },
-        { customerId: { contains: query, mode: 'insensitive' } },
-        { owner: { email: { contains: query, mode: 'insensitive' } } },
-      ],
-    },
-    orderBy: { createdAt: 'desc' },
-    take: ADMIN_SEARCH_RESULTS_PER_TYPE,
-    select: organisationSelect,
-  });
-
-  return organisations.map(mapOrganisation);
-};
-
-// ─── Teams ────────────────────────────────────────────────────────────────────
-
-const teamSelect = {
-  id: true,
-  name: true,
-  url: true,
-  organisation: { select: { name: true } },
-} as const;
-
-type TeamRow = { id: number; name: string; url: string; organisation: { name: string } };
-
-const mapTeam = (team: TeamRow): AdminGlobalSearchResult => ({
-  label: team.name,
-  sublabel: joinSublabel([`#${team.id}`, `/${team.url}`, team.organisation.name]),
-  path: `/admin/teams/${team.id}`,
-  value: `team ${team.id} ${team.name} ${team.url} ${team.organisation.name}`,
-});
-
-const findTeamsById = async (id: number) => {
-  const team = await prisma.team.findFirst({
-    where: { id },
-    select: teamSelect,
-  });
-
-  return team ? [mapTeam(team)] : [];
-};
-
-const findTeamsByText = async (query: string) => {
-  const teams = await prisma.team.findMany({
-    where: {
-      OR: [{ name: { contains: query, mode: 'insensitive' } }, { url: { contains: query, mode: 'insensitive' } }],
-    },
-    orderBy: { createdAt: 'desc' },
-    take: ADMIN_SEARCH_RESULTS_PER_TYPE,
-    select: teamSelect,
-  });
-
-  return teams.map(mapTeam);
-};
-
-// ─── Recipients ───────────────────────────────────────────────────────────────
-
-const recipientSelect = {
-  id: true,
-  name: true,
-  email: true,
-  envelope: { select: { id: true, title: true } },
-} as const;
-
-type RecipientRow = {
-  id: number;
-  name: string;
-  email: string;
-  envelope: { id: string; title: string };
-};
-
-const mapRecipient = (recipient: RecipientRow): AdminGlobalSearchResult => ({
-  label: recipient.email,
-  sublabel: joinSublabel([`#${recipient.id}`, recipient.name, recipient.envelope.title]),
-  path: `/admin/documents/${recipient.envelope.id}`,
-  value: `recipient ${recipient.id} ${recipient.name} ${recipient.email} ${recipient.envelope.title}`,
-});
-
-const findRecipientsById = async (id: number) => {
-  const recipient = await prisma.recipient.findFirst({
-    where: {
-      id,
-      envelope: { type: EnvelopeType.DOCUMENT },
-    },
-    select: recipientSelect,
-  });
-
-  return recipient ? [mapRecipient(recipient)] : [];
-};
-
-const findRecipientsByText = async (query: string) => {
-  const recipients = await prisma.recipient.findMany({
-    where: {
-      envelope: { type: EnvelopeType.DOCUMENT },
-      OR: [{ email: { contains: query, mode: 'insensitive' } }, { name: { contains: query, mode: 'insensitive' } }],
-    },
-    orderBy: { id: 'desc' },
-    take: ADMIN_SEARCH_RESULTS_PER_TYPE,
-    select: recipientSelect,
-  });
-
-  return recipients.map(mapRecipient);
-};
-
-// ─── Subscriptions ────────────────────────────────────────────────────────────
-
-const subscriptionSelect = {
-  id: true,
-  status: true,
-  planId: true,
-  customerId: true,
-  organisationId: true,
-} as const;
-
-type SubscriptionRow = {
-  id: number;
-  status: string;
-  planId: string;
-  customerId: string;
-  organisationId: string;
-};
-
-const mapSubscription = (subscription: SubscriptionRow): AdminGlobalSearchResult => ({
-  label: `Subscription #${subscription.id}`,
-  sublabel: joinSublabel([subscription.status, subscription.planId]),
-  path: `/admin/organisations/${subscription.organisationId}`,
-  value: `subscription ${subscription.id} ${subscription.planId} ${subscription.customerId}`,
-});
-
-const findSubscriptionsById = async (id: number) => {
-  const subscription = await prisma.subscription.findFirst({
-    where: { id },
-    select: subscriptionSelect,
-  });
-
-  return subscription ? [mapSubscription(subscription)] : [];
-};
-
-const findSubscriptionsByText = async (query: string) => {
-  const subscriptions = await prisma.subscription.findMany({
-    where: {
-      OR: [
-        { planId: { contains: query, mode: 'insensitive' } },
-        { customerId: { contains: query, mode: 'insensitive' } },
-      ],
-    },
-    orderBy: { createdAt: 'desc' },
-    take: ADMIN_SEARCH_RESULTS_PER_TYPE,
-    select: subscriptionSelect,
-  });
-
-  return subscriptions.map(mapSubscription);
-};

packages/lib/server-only/admin/get-documents-stats.ts

@@ -13,7 +13,7 @@ export const getDocumentStats = async () => {
     },
   });
 
-  const stats: Record<Exclude<ExtendedDocumentStatus, 'INBOX' | 'EXPIRED'>, number> = {
+  const stats: Record<Exclude<ExtendedDocumentStatus, 'INBOX'>, number> = {
     [ExtendedDocumentStatus.DRAFT]: 0,
     [ExtendedDocumentStatus.PENDING]: 0,
     [ExtendedDocumentStatus.COMPLETED]: 0,

packages/lib/server-only/document/find-documents.ts

@@ -16,7 +16,6 @@ import { match } from 'ts-pattern';
 
 import type { FindResultResponse } from '../../types/search-params';
 import { maskRecipientTokensForDocument } from '../../utils/mask-recipient-tokens-for-document';
-import { hasExpiredRecipient } from '../envelope/query-helpers';
 import { getTeamById } from '../team/get-team';
 
 export type PeriodSelectorValue = '' | '7d' | '14d' | '30d';
@@ -37,11 +36,6 @@ export type FindDocumentsOptions = {
   senderIds?: number[];
   query?: string;
   folderId?: string;
-  /**
-   * When true, restrict results to envelopes with at least one recipient whose signing
-   * link has expired. Orthogonal to `status` — applied additively.
-   */
-  hasExpiredRecipients?: boolean;
   /**
    * When true (default), use a windowed count that caps early for faster pagination.
    * When false, use a full COUNT(*) for exact totals — preferred for external API consumers.
@@ -121,7 +115,6 @@ export const findDocuments = async ({
   senderIds,
   query = '',
   folderId,
-  hasExpiredRecipients,
   useWindowedCount = true,
 }: FindDocumentsOptions) => {
   const user = await prisma.user.findFirstOrThrow({
@@ -206,11 +199,6 @@ export const findDocuments = async ({
       );
     }
 
-    // Expired recipient filter (orthogonal to status, additive)
-    if (hasExpiredRecipients) {
-      qb = qb.where((eb) => hasExpiredRecipient(eb));
-    }
-
     return qb;
   };
 
@@ -317,15 +305,6 @@ export const findDocuments = async ({
             ]),
           ),
       )
-      .with(ExtendedDocumentStatus.EXPIRED, () =>
-        qb.where((eb) =>
-          eb.and([
-            personalDeletedFilter(eb),
-            hasExpiredRecipient(eb),
-            eb.or([eb('Envelope.userId', '=', user.id), recipientExists(eb, user.email)]),
-          ]),
-        ),
-      )
       .exhaustive();
   };
 
@@ -476,18 +455,6 @@ export const findDocuments = async ({
           return eb.and([teamDeletedFilter(eb), visibilityFilter(eb), eb.or(accessBranches)]);
         }),
       )
-      .with(ExtendedDocumentStatus.EXPIRED, () =>
-        qb.where((eb) => {
-          const accessBranches = [eb('Envelope.teamId', '=', teamData.id)];
-
-          if (teamEmail) {
-            accessBranches.push(senderEmailIs(eb, teamEmail));
-            accessBranches.push(recipientExists(eb, teamEmail));
-          }
-
-          return eb.and([teamDeletedFilter(eb), visibilityFilter(eb), hasExpiredRecipient(eb), eb.or(accessBranches)]);
-        }),
-      )
       .exhaustive();
   };
 

packages/lib/server-only/document/get-stats.ts

@@ -8,7 +8,6 @@ import { DateTime } from 'luxon';
 
 import { STATS_COUNT_CAP } from '../../constants/document';
 import { TEAM_DOCUMENT_VISIBILITY_MAP } from '../../constants/teams';
-import { hasExpiredRecipient } from '../envelope/query-helpers';
 import { getTeamById } from '../team/get-team';
 
 // Kysely query builder type for Envelope queries.
@@ -254,19 +253,6 @@ export const getStats = async ({ userId, teamId, period, search = '', folderId,
       return eb.and([teamDeletedFilter(eb), visibilityFilter(eb), eb.or(accessBranches)]);
     });
 
-  // EXPIRED: docs visible to the team/user with at least one expired, unsigned recipient.
-  // Access control mirrors the EXPIRED branch in findDocuments so the count matches the listing.
-  const expiredQuery = buildBaseQuery().where((eb) => {
-    const accessBranches = [eb('Envelope.teamId', '=', team.id)];
-
-    if (teamEmail) {
-      accessBranches.push(senderEmailIs(eb, teamEmail));
-      accessBranches.push(recipientExists(eb, teamEmail));
-    }
-
-    return eb.and([teamDeletedFilter(eb), visibilityFilter(eb), hasExpiredRecipient(eb), eb.or(accessBranches)]);
-  });
-
   // INBOX: non-draft docs where team email is a NOT_SIGNED, non-CC recipient
   // Returns 0 if the team has no team email.
   const inboxQuery = teamEmail
@@ -288,17 +274,15 @@ export const getStats = async ({ userId, teamId, period, search = '', folderId,
 
   // ─── Execute all counts in parallel ──────────────────────────────────
 
-  const [draft, pending, completed, rejected, cancelled, expired, inbox] = await Promise.all([
+  const [draft, pending, completed, rejected, cancelled, inbox] = await Promise.all([
     cappedCount(draftQuery),
     cappedCount(pendingQuery),
     cappedCount(completedQuery),
     cappedCount(rejectedQuery),
     cappedCount(cancelledQuery),
-    cappedCount(expiredQuery),
     inboxQuery ? cappedCount(inboxQuery) : Promise.resolve(0),
   ]);
 
-  // `expired` is intentionally excluded from `all` — it overlaps PENDING.
   const all = Math.min(draft + pending + completed + rejected + cancelled + inbox, STATS_COUNT_CAP);
 
   const stats: Record<ExtendedDocumentStatus, number> = {
@@ -307,7 +291,6 @@ export const getStats = async ({ userId, teamId, period, search = '', folderId,
     [ExtendedDocumentStatus.COMPLETED]: completed,
     [ExtendedDocumentStatus.REJECTED]: rejected,
     [ExtendedDocumentStatus.CANCELLED]: cancelled,
-    [ExtendedDocumentStatus.EXPIRED]: expired,
     [ExtendedDocumentStatus.INBOX]: inbox,
     [ExtendedDocumentStatus.ALL]: all,
   };

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

@@ -194,7 +194,7 @@ export const sendDocument = async ({ id, userId, teamId, sendEmail, requestMetad
       .map((r) => (r.name ? `${r.name} (${r.email}, id: ${r.id})` : `${r.email} (id: ${r.id})`))
       .join(', ');
 
-    throw new AppError(AppErrorCode.MISSING_SIGNATURE_FIELD, {
+    throw new AppError(AppErrorCode.INVALID_REQUEST, {
       message: `The following recipients are missing required fields: ${missingRecipientDescriptions}. Signers must have at least one signature field.`,
     });
   }

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

@@ -57,7 +57,10 @@ export const UNSAFE_createEnvelopeItems = async ({
         flattenForm: envelope.type !== 'TEMPLATE',
       });
 
-      const { cleanedPdf, placeholders } = await extractPdfPlaceholders(normalized);
+      const { cleanedPdf, placeholders } = await extractPdfPlaceholders(normalized, {
+        envelopeId: envelope.id,
+        fileName: file.name,
+      });
 
       const { documentData } = await putPdfFileServerSide({
         name: file.name,

packages/lib/server-only/envelope-item/replace-envelope-item-pdf.ts

@@ -85,7 +85,10 @@ export const UNSAFE_replaceEnvelopeItemPdf = async ({
     flattenForm: envelope.type !== 'TEMPLATE',
   });
 
-  const { cleanedPdf, placeholders } = await extractPdfPlaceholders(normalized);
+  const { cleanedPdf, placeholders } = await extractPdfPlaceholders(normalized, {
+    envelopeId: envelope.id,
+    fileName: data.file.name,
+  });
 
   // Upload the new PDF and get a new DocumentData record.
   const { documentData: newDocumentData, filePageCount } = await putPdfFileServerSide({

packages/lib/server-only/envelope/find-envelopes.ts

@@ -7,7 +7,6 @@ import { TEAM_DOCUMENT_VISIBILITY_MAP } from '../../constants/teams';
 import type { FindResultResponse } from '../../types/search-params';
 import { maskRecipientTokensForDocument } from '../../utils/mask-recipient-tokens-for-document';
 import { getTeamById } from '../team/get-team';
-import { hasExpiredRecipient } from './query-helpers';
 
 export type FindEnvelopesOptions = {
   userId: number;
@@ -24,11 +23,6 @@ export type FindEnvelopesOptions = {
   };
   query?: string;
   folderId?: string;
-  /**
-   * When true, restrict results to envelopes with at least one recipient whose signing
-   * link has expired. Orthogonal to `status` — applied additively.
-   */
-  hasExpiredRecipients?: boolean;
   /**
    * When true (default), use a windowed count that caps early for faster pagination.
    * When false, use a full COUNT(*) for exact totals — preferred for external API consumers.
@@ -112,7 +106,6 @@ export const findEnvelopes = async ({
   orderBy,
   query = '',
   folderId,
-  hasExpiredRecipients,
   useWindowedCount = true,
 }: FindEnvelopesOptions) => {
   const user = await prisma.user.findFirstOrThrow({
@@ -189,11 +182,6 @@ export const findEnvelopes = async ({
     );
   }
 
-  // Expired recipient filter (orthogonal to status, additive)
-  if (hasExpiredRecipients) {
-    qb = qb.where((eb) => hasExpiredRecipient(eb));
-  }
-
   // ─── Access control ──────────────────────────────────────────────────
   //
   // An envelope is visible if ANY of:

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

@@ -5,7 +5,6 @@ import { match } from 'ts-pattern';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { DocumentAccessAuth, type TDocumentAuthMethods } from '../../types/document-auth';
 import { extractDocumentAuthMethods } from '../../utils/document-auth';
-import { getRecipientsWithMissingFields } from '../../utils/recipients';
 import { extractFieldAutoInsertValues } from '../document/send-document';
 import { getTeamSettings } from '../team/get-team-settings';
 import type { EnvelopeForSigningResponse } from './get-envelope-for-recipient-signing';
@@ -126,17 +125,6 @@ export const getEnvelopeForDirectTemplateSigning = async ({
     });
   }
 
-  const recipientsWithMissingFields = getRecipientsWithMissingFields(
-    envelope.recipients,
-    envelope.recipients.flatMap((envelopeRecipient) => envelopeRecipient.fields),
-  );
-
-  if (recipientsWithMissingFields.length > 0) {
-    throw new AppError(AppErrorCode.MISSING_SIGNATURE_FIELD, {
-      message: 'One or more signers on this direct template are missing a signature field',
-    });
-  }
-
   const settings = await getTeamSettings({ teamId: envelope.teamId });
 
   const sender = settings.includeSenderDetails

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

@@ -5,7 +5,7 @@ import EnvelopeSchema from '@documenso/prisma/generated/zod/modelSchema/Envelope
 import SignatureSchema from '@documenso/prisma/generated/zod/modelSchema/SignatureSchema';
 import TeamSchema from '@documenso/prisma/generated/zod/modelSchema/TeamSchema';
 import UserSchema from '@documenso/prisma/generated/zod/modelSchema/UserSchema';
-import { DocumentSigningOrder, DocumentStatus, EnvelopeType, RecipientRole, SigningStatus } from '@prisma/client';
+import { DocumentSigningOrder, DocumentStatus, EnvelopeType, SigningStatus } from '@prisma/client';
 import { z } from 'zod';
 
 import { AppError, AppErrorCode } from '../../errors/app-error';
@@ -266,11 +266,6 @@ export const getEnvelopeForRecipientSigning = async ({
 
   if (envelope.documentMeta.signingOrder === DocumentSigningOrder.SEQUENTIAL && currentRecipientIndex !== -1) {
     for (let i = 0; i < currentRecipientIndex; i++) {
-      // CC recipients have no action to take, so they can never block the flow.
-      if (envelope.recipients[i].role === RecipientRole.CC) {
-        continue;
-      }
-
       if (envelope.recipients[i].signingStatus !== SigningStatus.SIGNED) {
         isRecipientsTurn = false;
         break;

packages/lib/server-only/envelope/query-helpers.ts

@@ -1,27 +0,0 @@
-import { sql } from '@documenso/prisma';
-import type { DB } from '@documenso/prisma/generated/types';
-import { RecipientRole, SigningStatus } from '@prisma/client';
-import type { ExpressionBuilder } from 'kysely';
-
-// Expression builder type scoped to the Envelope table context.
-type EnvelopeExpressionBuilder = ExpressionBuilder<DB, 'Envelope'>;
-
-/**
- * Reusable EXISTS subquery: checks that the envelope has at least one recipient whose
- * signing link has expired — `expiresAt` in the past, still unsigned, and not a CC.
- *
- * This is the single source of truth for the "expired recipient" predicate used by
- * `findDocuments`, `findEnvelopes`, and `getStats`. It must stay in sync with
- * `isRecipientExpired` (packages/lib/utils/recipients.ts).
- */
-export const hasExpiredRecipient = (eb: EnvelopeExpressionBuilder) =>
-  eb.exists(
-    eb
-      .selectFrom('Recipient')
-      .whereRef('Recipient.envelopeId', '=', 'Envelope.id')
-      .where('Recipient.expiresAt', 'is not', null)
-      .where('Recipient.expiresAt', '<=', new Date())
-      .where('Recipient.signingStatus', '=', sql.lit(SigningStatus.NOT_SIGNED))
-      .where('Recipient.role', '!=', sql.lit(RecipientRole.CC))
-      .select(sql.lit(1).as('one')),
-  );

packages/lib/server-only/organisation/accept-organisation-invitation.ts

@@ -1,12 +1,7 @@
-import {
-  assertMemberCountWithinCap,
-  syncMemberCountWithStripeSeatPlan,
-} from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import { prisma } from '@documenso/prisma';
 import type { OrganisationGroup, OrganisationMemberRole } from '@prisma/client';
-import { OrganisationGroupType, OrganisationMemberInviteStatus, SubscriptionStatus } from '@prisma/client';
+import { OrganisationGroupType, OrganisationMemberInviteStatus } from '@prisma/client';
 
-import { IS_BILLING_ENABLED } from '../../constants/app';
 import { AppError, AppErrorCode } from '../../errors/app-error';
 import { jobs } from '../../jobs/client';
 import { generateDatabaseId } from '../../universal/id';
@@ -27,13 +22,6 @@ export const acceptOrganisationInvitation = async ({ token }: AcceptOrganisation
       organisation: {
         include: {
           groups: true,
-          organisationClaim: true,
-          subscription: true,
-          members: {
-            select: {
-              id: true,
-            },
-          },
         },
       },
     },
@@ -78,35 +66,6 @@ export const acceptOrganisationInvitation = async ({ token }: AcceptOrganisation
     return;
   }
 
-  const newMemberCount = organisation.members.length + 1;
-
-  // Billing occurs when a user accepts an invite.
-  // Assert that the new member count is within the cap and sync the seat plan with Stripe.
-  if (IS_BILLING_ENABLED()) {
-    const { subscription, organisationClaim } = organisation;
-
-    // A canceled subscription cannot have its seat quantity updated in Stripe,
-    // and an organisation with lapsed billing should not gain new members.
-    // Throw a deliberate error so the invite page can render an accurate
-    // message instead of an opaque Stripe failure.
-    if (subscription && subscription.status === SubscriptionStatus.INACTIVE) {
-      throw new AppError('SUBSCRIPTION_INACTIVE', {
-        message: 'The organisation subscription is inactive',
-      });
-    }
-
-    // Organisations can exist without a subscription (e.g. after being
-    // downgraded to the free plan). The claim cap remains authoritative in
-    // that case, surfacing LIMIT_EXCEEDED instead of an opaque "subscription
-    // not found" error.
-    await assertMemberCountWithinCap(subscription, organisationClaim, newMemberCount);
-
-    if (subscription) {
-      await syncMemberCountWithStripeSeatPlan(subscription, organisationClaim, newMemberCount, 'grow');
-    }
-  }
-
-  // Todo: Logging
   await addUserToOrganisation({
     userId: user.id,
     organisationId: organisation.id,

packages/lib/server-only/organisation/create-organisation-member-invites.ts

@@ -1,3 +1,7 @@
+import {
+  assertMemberCountWithinCap,
+  syncMemberCountWithStripeSeatPlan,
+} from '@documenso/ee/server-only/stripe/update-subscription-item-quantity';
 import { OrganisationInviteEmailTemplate } from '@documenso/email/templates/organisation-invite';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { ORGANISATION_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/organisations';
@@ -13,6 +17,7 @@ import { createElement } from 'react';
 
 import { getI18nInstance } from '../../client-only/providers/i18n-server';
 import { generateDatabaseId } from '../../universal/id';
+import { validateIfSubscriptionIsRequired } from '../../utils/billing';
 import { buildOrganisationWhereQuery } from '../../utils/organisations';
 import { renderEmailWithI18N } from '../../utils/render-email-with-i18n';
 import { getEmailContext } from '../email/get-email-context';
@@ -57,6 +62,8 @@ export const createOrganisationMemberInvites = async ({
         },
       },
       organisationGlobalSettings: true,
+      organisationClaim: true,
+      subscription: true,
     },
   });
 
@@ -64,6 +71,10 @@ export const createOrganisationMemberInvites = async ({
     throw new AppError(AppErrorCode.NOT_FOUND);
   }
 
+  const { organisationClaim } = organisation;
+
+  const subscription = validateIfSubscriptionIsRequired(organisation.subscription);
+
   const currentOrganisationMemberRole = await getMemberOrganisationRole({
     organisationId: organisation.id,
     reference: {
@@ -109,6 +120,19 @@ export const createOrganisationMemberInvites = async ({
     }),
   );
 
+  const numberOfCurrentMembers = organisation.members.length;
+  const numberOfCurrentInvites = organisation.invites.length;
+  const numberOfNewInvites = organisationMemberInvites.length;
+
+  const totalMemberCountWithInvites = numberOfCurrentMembers + numberOfCurrentInvites + numberOfNewInvites;
+
+  // Enforce the seat cap and sync billing for seat based plans.
+  if (subscription) {
+    await assertMemberCountWithinCap(subscription, organisationClaim, totalMemberCountWithInvites);
+
+    await syncMemberCountWithStripeSeatPlan(subscription, organisationClaim, totalMemberCountWithInvites);
+  }
+
   await prisma.organisationMemberInvite.createMany({
     data: organisationMemberInvites,
   });

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

@@ -1,8 +1,15 @@
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { type TFieldAndMeta, ZEnvelopeFieldAndMetaSchema } from '@documenso/lib/types/field-meta';
+import { logger } from '@documenso/lib/utils/logger';
 import { PDF, rgb } from '@libpdf/core';
 import type { FieldType, Recipient } from '@prisma/client';
 
-import { parseFieldMetaFromPlaceholder, parseFieldTypeFromPlaceholder } from './helpers';
+import {
+  parseFieldMetaFromPlaceholder,
+  parseFieldTypeFromPlaceholder,
+  parsePlaceholderData,
+  parseRawFieldMetaFromPlaceholder,
+} from './helpers';
 
 const PLACEHOLDER_REGEX = /\{\{([^}]+)\}\}/g;
 const DEFAULT_FIELD_HEIGHT_PERCENT = 2;
@@ -61,7 +68,15 @@ export type FieldToCreate = TFieldAndMeta & {
   height: number;
 };
 
-export const extractPlaceholdersFromPDF = async (pdf: Buffer): Promise<PlaceholderInfo[]> => {
+type ExtractPlaceholdersLogContext = {
+  envelopeId?: string;
+  fileName?: string;
+};
+
+export const extractPlaceholdersFromPDF = async (
+  pdf: Buffer,
+  logContext?: ExtractPlaceholdersLogContext,
+): Promise<PlaceholderInfo[]> => {
   const pdfDoc = await PDF.load(new Uint8Array(pdf));
 
   const placeholders: PlaceholderInfo[] = [];
@@ -85,7 +100,7 @@ export const extractPlaceholdersFromPDF = async (pdf: Buffer): Promise<Placehold
         continue;
       }
 
-      const placeholderData = innerMatch[1].split(',').map((property) => property.trim());
+      const placeholderData = parsePlaceholderData(innerMatch[1]);
       const [fieldTypeString, recipientOrMeta, ...fieldMetaData] = placeholderData;
 
       let fieldType: FieldType;
@@ -109,14 +124,51 @@ export const extractPlaceholdersFromPDF = async (pdf: Buffer): Promise<Placehold
 
       const recipient = recipientOrMeta;
 
-      const rawFieldMeta = Object.fromEntries(fieldMetaData.map((property) => property.split('=')));
+      /*
+        Parse and validate the field metadata. A malformed selection placeholder
+        (e.g. an unknown validation rule or a default value that doesn't match an
+        option) is skipped like an invalid field type rather than aborting the whole
+        upload, which may contain other valid placeholders and files.
+      */
+      let fieldAndMeta: TFieldAndMeta;
 
-      const parsedFieldMeta = parseFieldMetaFromPlaceholder(rawFieldMeta, fieldType);
+      try {
+        const rawFieldMeta = parseRawFieldMetaFromPlaceholder(fieldMetaData);
+        const parsedFieldMeta = parseFieldMetaFromPlaceholder(rawFieldMeta, fieldType);
 
-      const fieldAndMeta: TFieldAndMeta = ZEnvelopeFieldAndMetaSchema.parse({
-        type: fieldType,
-        fieldMeta: parsedFieldMeta,
-      });
+        const parsedFieldAndMeta = ZEnvelopeFieldAndMetaSchema.safeParse({
+          type: fieldType,
+          fieldMeta: parsedFieldMeta,
+        });
+
+        /*
+          Surface schema failures as INVALID_BODY (400) instead of letting the raw
+          ZodError bubble up to the caller as an INTERNAL_SERVER_ERROR (500).
+        */
+        if (!parsedFieldAndMeta.success) {
+          throw new AppError(AppErrorCode.INVALID_BODY, {
+            message: `Invalid field metadata for placeholder "${placeholder}": ${parsedFieldAndMeta.error.message}`,
+          });
+        }
+
+        fieldAndMeta = parsedFieldAndMeta.data;
+      } catch (error) {
+        const appError = AppError.parseError(error);
+
+        logger.warn(
+          {
+            envelopeId: logContext?.envelopeId,
+            fileName: logContext?.fileName,
+            placeholder,
+            page: page.index + 1,
+            code: appError.code,
+            message: appError.message,
+          },
+          'Skipping placeholder with invalid field metadata',
+        );
+
+        continue;
+      }
 
       /*
         LibPDF returns bbox in points with bottom-left origin.
@@ -182,8 +234,9 @@ export const removePlaceholdersFromPDF = async (pdf: Buffer, placeholders?: Plac
  */
 export const extractPdfPlaceholders = async (
   pdf: Buffer,
+  logContext?: ExtractPlaceholdersLogContext,
 ): Promise<{ cleanedPdf: Buffer; placeholders: PlaceholderInfo[] }> => {
-  const placeholders = await extractPlaceholdersFromPDF(pdf);
+  const placeholders = await extractPlaceholdersFromPDF(pdf, logContext);
 
   if (placeholders.length === 0) {
     return { cleanedPdf: pdf, placeholders: [] };

packages/lib/server-only/pdf/helpers.test.ts

@@ -0,0 +1,235 @@
+import { FieldType } from '@prisma/client';
+import { describe, expect, it } from 'vitest';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+import {
+  parseFieldMetaFromPlaceholder,
+  parseFieldTypeFromPlaceholder,
+  parsePlaceholderData,
+  parseRawFieldMetaFromPlaceholder,
+} from './helpers';
+
+const expectInvalidBody = (fn: () => unknown) => {
+  try {
+    fn();
+    expect.unreachable('Expected an AppError to be thrown');
+  } catch (error) {
+    expect(error).toBeInstanceOf(AppError);
+    expect((error as AppError).code).toBe(AppErrorCode.INVALID_BODY);
+  }
+};
+
+describe('parseFieldTypeFromPlaceholder function', () => {
+  it('maps known field type strings to the FieldType enum', () => {
+    expect(parseFieldTypeFromPlaceholder('signature')).toBe(FieldType.SIGNATURE);
+    expect(parseFieldTypeFromPlaceholder('radio')).toBe(FieldType.RADIO);
+    expect(parseFieldTypeFromPlaceholder('checkbox')).toBe(FieldType.CHECKBOX);
+    expect(parseFieldTypeFromPlaceholder('dropdown')).toBe(FieldType.DROPDOWN);
+  });
+
+  it('is case-insensitive and trims surrounding whitespace', () => {
+    expect(parseFieldTypeFromPlaceholder('  SiGnAtUrE  ')).toBe(FieldType.SIGNATURE);
+    expect(parseFieldTypeFromPlaceholder('RADIO')).toBe(FieldType.RADIO);
+  });
+
+  it('throws INVALID_BODY for an unknown field type', () => {
+    expectInvalidBody(() => parseFieldTypeFromPlaceholder('FILE'));
+  });
+});
+
+describe('parsePlaceholderData function', () => {
+  it('splits top-level parts on commas and trims each token', () => {
+    expect(parsePlaceholderData('SIGNATURE, r1, required=true')).toEqual(['SIGNATURE', 'r1', 'required=true']);
+  });
+
+  it('does not split on escaped commas', () => {
+    expect(parsePlaceholderData('dropdown, r1, options=Legal\\, Compliance|Sales')).toEqual([
+      'dropdown',
+      'r1',
+      'options=Legal\\, Compliance|Sales',
+    ]);
+  });
+});
+
+describe('parseRawFieldMetaFromPlaceholder function', () => {
+  it('splits each token into a key/value entry', () => {
+    expect(parseRawFieldMetaFromPlaceholder(['required=true', 'fontSize=12'])).toEqual({
+      required: 'true',
+      fontSize: '12',
+    });
+  });
+
+  it('only splits on the first unescaped equals sign', () => {
+    expect(parseRawFieldMetaFromPlaceholder(['label=a=b'])).toEqual({ label: 'a=b' });
+  });
+
+  it('drops tokens without a value and overwrites duplicate keys with the last', () => {
+    expect(parseRawFieldMetaFromPlaceholder(['required', 'fontSize=12', 'fontSize=14'])).toEqual({
+      fontSize: '14',
+    });
+  });
+});
+
+describe('parseFieldMetaFromPlaceholder function', () => {
+  describe('non-field-meta cases', () => {
+    it('returns undefined for signature and free signature fields', () => {
+      expect(parseFieldMetaFromPlaceholder({ required: 'true' }, FieldType.SIGNATURE)).toBeUndefined();
+      expect(parseFieldMetaFromPlaceholder({}, FieldType.FREE_SIGNATURE)).toBeUndefined();
+    });
+
+    it('returns undefined when there is no metadata', () => {
+      expect(parseFieldMetaFromPlaceholder({}, FieldType.TEXT)).toBeUndefined();
+    });
+  });
+
+  describe('generic metadata', () => {
+    it('coerces required/readOnly to booleans (case-insensitive)', () => {
+      expect(parseFieldMetaFromPlaceholder({ required: 'TRUE', readOnly: 'false' }, FieldType.TEXT)).toEqual({
+        type: 'text',
+        required: true,
+        readOnly: false,
+      });
+    });
+
+    it('coerces numeric properties to numbers', () => {
+      expect(parseFieldMetaFromPlaceholder({ fontSize: '14' }, FieldType.TEXT)).toEqual({
+        type: 'text',
+        fontSize: 14,
+      });
+    });
+
+    it('drops numeric properties that are not a number', () => {
+      const parsed = parseFieldMetaFromPlaceholder({ fontSize: 'abc' }, FieldType.TEXT);
+
+      expect(parsed).toEqual({ type: 'text' });
+      expect(parsed).not.toHaveProperty('fontSize');
+    });
+
+    it('keeps label/placeholder for non-selection fields', () => {
+      expect(parseFieldMetaFromPlaceholder({ label: 'Company Name', placeholder: 'Acme' }, FieldType.TEXT)).toEqual({
+        type: 'text',
+        label: 'Company Name',
+        placeholder: 'Acme',
+      });
+    });
+  });
+
+  describe('radio fields', () => {
+    it('builds stable values from options', () => {
+      expect(parseFieldMetaFromPlaceholder({ options: 'Yes|No|Maybe' }, FieldType.RADIO)).toEqual({
+        type: 'radio',
+        values: [
+          { id: 1, checked: false, value: 'Yes' },
+          { id: 2, checked: false, value: 'No' },
+          { id: 3, checked: false, value: 'Maybe' },
+        ],
+      });
+    });
+
+    it('marks only the selected option as checked', () => {
+      const parsed = parseFieldMetaFromPlaceholder({ options: 'Yes|No|Maybe', selected: 'No' }, FieldType.RADIO);
+
+      expect(parsed).toEqual({
+        type: 'radio',
+        values: [
+          { id: 1, checked: false, value: 'Yes' },
+          { id: 2, checked: true, value: 'No' },
+          { id: 3, checked: false, value: 'Maybe' },
+        ],
+      });
+    });
+
+    it('throws when a default value is provided without options', () => {
+      expectInvalidBody(() => parseFieldMetaFromPlaceholder({ selected: 'No' }, FieldType.RADIO));
+    });
+
+    it('throws when the default value does not match an option', () => {
+      expectInvalidBody(() => parseFieldMetaFromPlaceholder({ options: 'Yes|No', selected: 'Maybe' }, FieldType.RADIO));
+    });
+
+    it('throws when options is empty', () => {
+      expectInvalidBody(() => parseFieldMetaFromPlaceholder({ options: '' }, FieldType.RADIO));
+    });
+  });
+
+  describe('checkbox fields', () => {
+    it('builds values with checked state, validation rule alias and length', () => {
+      const parsed = parseFieldMetaFromPlaceholder(
+        {
+          options: 'Email|SMS|Phone',
+          checked: 'Email|Phone',
+          validationRule: 'atLeast',
+          validationLength: '1',
+        },
+        FieldType.CHECKBOX,
+      );
+
+      expect(parsed).toEqual({
+        type: 'checkbox',
+        validationRule: 'Select at least',
+        validationLength: 1,
+        values: [
+          { id: 1, checked: true, value: 'Email' },
+          { id: 2, checked: false, value: 'SMS' },
+          { id: 3, checked: true, value: 'Phone' },
+        ],
+      });
+    });
+
+    it('throws for an unknown validation rule', () => {
+      expectInvalidBody(() =>
+        parseFieldMetaFromPlaceholder({ options: 'A|B', validationRule: 'nope' }, FieldType.CHECKBOX),
+      );
+    });
+
+    it('throws when checked values are provided without options', () => {
+      expectInvalidBody(() => parseFieldMetaFromPlaceholder({ checked: 'A' }, FieldType.CHECKBOX));
+    });
+
+    it('throws when a checked value does not match an option', () => {
+      expectInvalidBody(() => parseFieldMetaFromPlaceholder({ options: 'A|B', checked: 'C' }, FieldType.CHECKBOX));
+    });
+  });
+
+  describe('dropdown fields', () => {
+    it('builds values and sets a matching default value', () => {
+      expect(
+        parseFieldMetaFromPlaceholder(
+          { options: 'United States|Canada|United Kingdom', defaultValue: 'Canada' },
+          FieldType.DROPDOWN,
+        ),
+      ).toEqual({
+        type: 'dropdown',
+        values: [{ value: 'United States' }, { value: 'Canada' }, { value: 'United Kingdom' }],
+        defaultValue: 'Canada',
+      });
+    });
+
+    it('throws when the default value does not match an option', () => {
+      expectInvalidBody(() => parseFieldMetaFromPlaceholder({ options: 'A|B', defaultValue: 'C' }, FieldType.DROPDOWN));
+    });
+  });
+
+  describe('selection field options parsing', () => {
+    it('trims option values and drops empty entries', () => {
+      expect(parseFieldMetaFromPlaceholder({ options: ' A ||  B  ' }, FieldType.DROPDOWN)).toEqual({
+        type: 'dropdown',
+        values: [{ value: 'A' }, { value: 'B' }],
+      });
+    });
+
+    it('parses escaped delimiters through the full placeholder pipeline', () => {
+      const [, , ...fieldMetaData] = parsePlaceholderData(
+        'dropdown, r1, options=Sales\\|Ops|Legal\\, Compliance|A\\=B',
+      );
+
+      const rawFieldMeta = parseRawFieldMetaFromPlaceholder(fieldMetaData);
+      const parsed = parseFieldMetaFromPlaceholder(rawFieldMeta, FieldType.DROPDOWN);
+
+      expect(parsed).toEqual({
+        type: 'dropdown',
+        values: [{ value: 'Sales|Ops' }, { value: 'Legal, Compliance' }, { value: 'A=B' }],
+      });
+    });
+  });
+});

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

@@ -45,6 +45,134 @@ type RecipientPlaceholderInfo = {
   recipientIndex: number;
 };
 
+const CHECKBOX_VALIDATION_RULE_BY_ALIAS: Record<string, string> = {
+  atLeast: 'Select at least',
+  exactly: 'Select exactly',
+  atMost: 'Select at most',
+};
+
+/*
+  Split a string on a delimiter, treating `\` as an escape for the next character.
+  Delimiters preceded by `\` are kept in the output instead of splitting (e.g. `\,`, `\=`, `\|`).
+
+  With delimiter ',' (top-level placeholder parts):
+  'radio, r1, options=Card/Check|Bank Transfer, selected=Bank Transfer'
+    -> ['radio', ' r1', ' options=Card/Check|Bank Transfer', ' selected=Bank Transfer']
+
+  With delimiter '=' (split one field metadata token into key + value):
+  'options=Card/Check|Bank Transfer'
+    -> ['options', 'Card/Check|Bank Transfer']
+
+  With delimiter '|' (split option list inside 'options='):
+  'Card/Check|Bank Transfer'
+    -> ['Card/Check', 'Bank Transfer']
+*/
+const splitPlaceholderToken = (value: string, delimiter: string): string[] => {
+  const parts: string[] = [];
+  let currentPart = '';
+
+  for (let index = 0; index < value.length; index++) {
+    const char = value[index];
+    const nextChar = value[index + 1];
+
+    if (char === '\\' && nextChar) {
+      currentPart += char + nextChar;
+      index++;
+      continue;
+    }
+
+    if (char === delimiter) {
+      parts.push(currentPart);
+      currentPart = '';
+      continue;
+    }
+
+    currentPart += char;
+  }
+
+  parts.push(currentPart);
+
+  return parts;
+};
+
+/*
+  Removes the escape backslashes left over after splitting, so \,=, \|, \\ become their literal characters.
+
+  E.g.
+  'Legal\, Compliance' -> 'Legal, Compliance'
+  'Card\|Check'        -> 'Card|Check'
+  'A\=B'               -> 'A=B'
+  'C\D'                -> 'C\D'
+*/
+const unescapePlaceholderValue = (value: string): string => {
+  return value.replace(/\\([,=|\\])/g, '$1');
+};
+
+/*
+  Cleans up a selection option/default after splitting:
+  unescapes literal delimiters, collapses repeated whitespace, and trims the ends.
+
+  E.g.
+  '  Legal\,   Compliance  ' -> 'Legal, Compliance'
+*/
+const normalizePlaceholderSelectionValue = (value: string): string => {
+  return unescapePlaceholderValue(value).replace(/\s+/g, ' ').trim();
+};
+
+/*
+  Split an options string into individual choices.
+  Splits on unescaped '|', then unescapes, trims, and drops empty entries.
+
+  E.g.
+  'Card/Check|Bank Transfer'     -> ['Card/Check', 'Bank Transfer']
+  'Card\\|Check|Bank Transfer'   -> ['Card|Check', 'Bank Transfer']
+*/
+const parsePlaceholderOptions = (value: string): string[] => {
+  return splitPlaceholderToken(value, '|')
+    .map((option) => normalizePlaceholderSelectionValue(option))
+    .filter((option) => option.length > 0);
+};
+
+/*
+  Split a placeholder string into top-level parts (field type, recipient, metadata).
+  Splits on unescaped commas, then trims whitespace.
+
+  E.g.
+  'SIGNATURE, r1, required=true'
+    -> ['SIGNATURE', 'r1', 'required=true']
+*/
+export const parsePlaceholderData = (value: string): string[] => {
+  return splitPlaceholderToken(value, ',').map((token) => token.trim());
+};
+
+/*
+  Transforms the field metadata string array into a record of key/value pairs.
+  Each token is split on the first unescaped '='; tokens with no key or no '=' are dropped.
+
+  E.g.
+  ['required=true', 'fontSize=12', 'label=a=b']
+    -> { required: 'true', fontSize: '12', label: 'a=b' }
+*/
+export const parseRawFieldMetaFromPlaceholder = (fieldMetaData: string[]): Record<string, string> => {
+  const rawFieldMeta: Record<string, string> = {};
+
+  for (const fieldMeta of fieldMetaData) {
+    // Split on the first '=' only; any further '=' stays part of the value (e.g. 'label=a=b').
+    const [rawKey, ...valueParts] = splitPlaceholderToken(fieldMeta, '=');
+
+    if (!rawKey || valueParts.length === 0) {
+      continue;
+    }
+
+    const key = rawKey.trim();
+    const value = valueParts.join('=').trim();
+
+    rawFieldMeta[key] = value;
+  }
+
+  return rawFieldMeta;
+};
+
 /*
   Parse field type string to FieldType enum.
   Normalizes the input (uppercase, trim) and validates it's a valid field type.
@@ -72,6 +200,169 @@ export const parseFieldTypeFromPlaceholder = (fieldTypeString: string): FieldTyp
     });
 };
 
+const getDefaultFieldMetaValue = (rawFieldMeta: Record<string, string>) => {
+  const defaultValue = rawFieldMeta.defaultValue ?? rawFieldMeta.default ?? rawFieldMeta.selected;
+
+  return defaultValue ? normalizePlaceholderSelectionValue(defaultValue) : undefined;
+};
+
+const parseCheckboxValidationRule = (value: string): string => {
+  const validationRule = CHECKBOX_VALIDATION_RULE_BY_ALIAS[value];
+
+  if (!validationRule) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: `Invalid checkbox placeholder validation rule: ${value}`,
+    });
+  }
+
+  return validationRule;
+};
+
+const parseSelectionFieldOptions = (
+  rawFieldMeta: Record<string, string>,
+  fieldType: FieldType,
+): string[] | undefined => {
+  const rawOptions = rawFieldMeta.options;
+
+  if (rawOptions === undefined) {
+    return;
+  }
+
+  const parsedOptions = parsePlaceholderOptions(rawOptions);
+
+  if (parsedOptions.length === 0) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: `${fieldType} placeholder options must contain at least one value`,
+    });
+  }
+
+  return parsedOptions;
+};
+
+const applyRadioFieldOptions = (parsedFieldMeta: Record<string, unknown>, rawFieldMeta: Record<string, string>) => {
+  const options = parseSelectionFieldOptions(rawFieldMeta, FieldType.RADIO);
+  const defaultValue = getDefaultFieldMetaValue(rawFieldMeta);
+
+  if (!options && defaultValue) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: 'Radio placeholder default value requires options',
+    });
+  }
+
+  if (!options) {
+    return;
+  }
+
+  const selectedOptionIndex = defaultValue ? options.findIndex((option) => option === defaultValue) : -1;
+
+  if (defaultValue && selectedOptionIndex === -1) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: `Radio placeholder default value "${defaultValue}" must match one of the options`,
+    });
+  }
+
+  parsedFieldMeta.values = options.map((option, index) => ({
+    id: index + 1,
+    checked: index === selectedOptionIndex,
+    value: option,
+  }));
+};
+
+const applyCheckboxFieldOptions = (parsedFieldMeta: Record<string, unknown>, rawFieldMeta: Record<string, string>) => {
+  const options = parseSelectionFieldOptions(rawFieldMeta, FieldType.CHECKBOX);
+  const checkedValues = rawFieldMeta.checked ? parsePlaceholderOptions(rawFieldMeta.checked) : [];
+
+  if (!options && checkedValues.length > 0) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: 'Checkbox placeholder checked values require options',
+    });
+  }
+
+  if (!options) {
+    return;
+  }
+
+  const unmatchedCheckedValues = checkedValues.filter((checkedValue) => !options.includes(checkedValue));
+
+  if (unmatchedCheckedValues.length > 0) {
+    const unmatchedCheckedValue = unmatchedCheckedValues[0];
+
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: [`Checkbox placeholder checked value "${unmatchedCheckedValue}"`, 'must match one of the options'].join(
+        ' ',
+      ),
+    });
+  }
+
+  parsedFieldMeta.values = options.map((option, index) => ({
+    id: index + 1,
+    checked: checkedValues.includes(option),
+    value: option,
+  }));
+};
+
+const applyDropdownFieldOptions = (parsedFieldMeta: Record<string, unknown>, rawFieldMeta: Record<string, string>) => {
+  const options = parseSelectionFieldOptions(rawFieldMeta, FieldType.DROPDOWN);
+  const defaultValue = getDefaultFieldMetaValue(rawFieldMeta);
+
+  if (!options && defaultValue) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: 'Dropdown placeholder default value requires options',
+    });
+  }
+
+  if (!options) {
+    return;
+  }
+
+  if (defaultValue && !options.includes(defaultValue)) {
+    throw new AppError(AppErrorCode.INVALID_BODY, {
+      message: `Dropdown placeholder default value "${defaultValue}" must match one of the options`,
+    });
+  }
+
+  parsedFieldMeta.values = options.map((option) => ({
+    value: option,
+  }));
+
+  if (defaultValue) {
+    parsedFieldMeta.defaultValue = defaultValue;
+  }
+};
+
+/*
+  Generic field metadata properties are simple properties consisting of a key and a value.
+  E.g. 'required=true', 'fontSize=12', 'textAlign=left'
+  They don't require special handling.
+
+  Special field metadata properties are complex properties consisting of a key and a value with multiple parts.
+  E.g. 'options=Card/Check|Bank Transfer', 'checked=Card|Check', 'selected=Bank Transfer'
+  They require special handling.
+*/
+const shouldSkipGenericFieldMetaParsing = (property: string, fieldType: FieldType): boolean => {
+  if (property === 'options' || property === 'default' || property === 'selected') {
+    return true;
+  }
+
+  const isSelectionField =
+    fieldType === FieldType.CHECKBOX || fieldType === FieldType.RADIO || fieldType === FieldType.DROPDOWN;
+
+  if (!isSelectionField) {
+    return false;
+  }
+
+  if (
+    property === 'label' ||
+    property === 'placeholder' ||
+    property === 'defaultValue' ||
+    (fieldType === FieldType.CHECKBOX && property === 'checked')
+  ) {
+    return true;
+  }
+
+  return false;
+};
+
 /*
   Transform raw field metadata from placeholder format to schema format.
   Users should provide properly capitalized property names (e.g., readOnly, fontSize, textAlign).
@@ -91,7 +382,7 @@ export const parseFieldMetaFromPlaceholder = (
 
   const fieldTypeString = String(fieldType).toLowerCase();
 
-  const parsedFieldMeta: Record<string, boolean | number | string> = {
+  const parsedFieldMeta: Record<string, unknown> = {
     type: fieldTypeString,
   };
 
@@ -104,24 +395,39 @@ export const parseFieldMetaFromPlaceholder = (
   const rawFieldMetaEntries = Object.entries(rawFieldMeta);
 
   for (const [property, value] of rawFieldMetaEntries) {
+    if (shouldSkipGenericFieldMetaParsing(property, fieldType)) {
+      continue;
+    }
+
+    const unescapedValue = unescapePlaceholderValue(value);
+
     if (property === 'readOnly' || property === 'required') {
-      parsedFieldMeta[property] = value === 'true';
+      parsedFieldMeta[property] = unescapedValue.toLowerCase() === 'true';
+    } else if (property === 'validationRule' && fieldType === FieldType.CHECKBOX) {
+      parsedFieldMeta[property] = parseCheckboxValidationRule(unescapedValue);
     } else if (
       property === 'fontSize' ||
       property === 'maxValue' ||
       property === 'minValue' ||
-      property === 'characterLimit'
+      property === 'characterLimit' ||
+      property === 'validationLength'
     ) {
-      const numValue = Number(value);
+      const numValue = Number(unescapedValue);
 
       if (!Number.isNaN(numValue)) {
         parsedFieldMeta[property] = numValue;
       }
     } else {
-      parsedFieldMeta[property] = value;
+      parsedFieldMeta[property] = unescapedValue;
     }
   }
 
+  match(fieldType)
+    .with(FieldType.RADIO, () => applyRadioFieldOptions(parsedFieldMeta, rawFieldMeta))
+    .with(FieldType.CHECKBOX, () => applyCheckboxFieldOptions(parsedFieldMeta, rawFieldMeta))
+    .with(FieldType.DROPDOWN, () => applyDropdownFieldOptions(parsedFieldMeta, rawFieldMeta))
+    .otherwise(() => undefined);
+
   return parsedFieldMeta;
 };
 

packages/lib/server-only/rate-limit/rate-limits.ts

@@ -84,13 +84,13 @@ export const syncSubscriptionRateLimit = createRateLimit({
 
 export const apiV1RateLimit = createRateLimit({
   action: 'api.v1',
-  max: 1000,
+  max: 100,
   window: '1m',
 });
 
 export const apiV2RateLimit = createRateLimit({
   action: 'api.v2',
-  max: 1000,
+  max: 100,
   window: '1m',
 });
 

packages/lib/server-only/recipient/get-is-recipient-turn.ts

@@ -1,5 +1,5 @@
 import { prisma } from '@documenso/prisma';
-import { DocumentSigningOrder, EnvelopeType, RecipientRole, SigningStatus } from '@prisma/client';
+import { DocumentSigningOrder, EnvelopeType, SigningStatus } from '@prisma/client';
 
 export type GetIsRecipientTurnOptions = {
   token: string;
@@ -38,11 +38,6 @@ export async function getIsRecipientsTurnToSign({ token }: GetIsRecipientTurnOpt
   }
 
   for (let i = 0; i < currentRecipientIndex; i++) {
-    // CC recipients have no action to take, so they can never block the flow.
-    if (recipients[i].role === RecipientRole.CC) {
-      continue;
-    }
-
     if (recipients[i].signingStatus !== SigningStatus.SIGNED) {
       return false;
     }