fix: back envelope editor state with synchronous external store

fix: use defaultFilter export for command scoring with cmdk v1
Merge remote-tracking branch 'origin/main' into spike/react-19
2026-08-16 19:41:57 +10:00 · 2026-07-28 17:18:18 +10:00 · 2026-07-24 17:10:54 +10:00 · 2026-07-24 17:09:36 +10:00 · 2026-07-23 14:40:27 +10:00 · 2026-07-21 16:23:47 +10:00
64 changed files with 1881 additions and 4230 deletions
@@ -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.
@@ -15,8 +15,6 @@ This guide provides a comprehensive troubleshooting matrix for the standard erro
 | `INVALID_REQUEST` | The overall request is malformed or invalid. | Review your API call parameters, including the URL, query parameters, and headers. Correct the request syntax. |
 | `RECIPIENT_EXPIRED` | The signing link or recipient access has expired. | Generate and resend a new invitation to the affected recipient. |
 | `LIMIT_EXCEEDED` | Your account usage quota has been exceeded. | Check your current plan limits. Upgrade your subscription or wait until your billing cycle renews. |
-| `MISSING_ENV_VAR` | A required environment variable is not configured on the server (500). | Primarily affects self-hosted instances: set the environment variable named in the error message and restart. On Documenso Cloud, contact support. |
-| `MISSING_SIGNATURE_FIELD` | A signer has no signature field placed on the document (400). Returned when distributing an envelope. | Add at least one signature field for every recipient with a signing role before calling `/envelope/distribute`. |
 | `NOT_FOUND` | The requested resource could not be found (404). | Verify the resource ID (envelope, document, webhook) passed in the URL. Ensure the resource has not been deleted. |
 | `NOT_IMPLEMENTED` | The requested feature is not currently supported by the server. | Consult the API documentation to verify available methods. Do not use this endpoint at this time. |
 | `NOT_SETUP` | The required configuration for this action is incomplete. | Access your account or integration settings and complete the necessary configuration before retrying. |
@@ -39,28 +37,7 @@ The following errors occur when attempting to perform actions on an envelope tha
 | `ENVELOPE_DRAFT` | The action cannot be performed because the envelope is still in a draft state. | Finalize the envelope configuration and transition it to the `PENDING` (sent) state before attempting this operation. |
 | `ENVELOPE_COMPLETED` | The action cannot be performed because the envelope is already completed. | No further modifications (e.g., adding signers, modifying documents) can be made to an envelope once the signing process is finished. |
 | `ENVELOPE_REJECTED` | The action cannot be performed because the envelope was rejected by a recipient. | The signing flow is permanently halted. Create a new envelope if you wish to resubmit the document. |
-| `ENVELOPE_CANCELLED` | The action cannot be performed because the envelope was cancelled (400). | Create a new envelope if you need to restart the signing process. |
 | `ENVELOPE_LEGACY` | The action cannot be performed because the envelope uses an obsolete format. | This envelope was created with a legacy version of the system. Recreate the envelope using the current API version to interact with it. |
-| `ENVELOPE_TSP_LOCKED` | An AES/QES envelope cannot be modified after it leaves the draft state (400). | Make changes while the envelope is in `DRAFT`, or create a new envelope. |
-
-## CSC Signing Errors
-
-These errors apply to Cloud Signature Consortium (CSC) signing flows.
-
-| Error Code | Description | Recommended Action |
-| :--- | :--- | :--- |
-| `CSC_INSTANCE_MODE_MISMATCH` | The requested signature level does not match the instance's CSC mode (400). | Use the signature level supported by the instance's signing configuration. |
-| `CSC_UNLICENSED` | CSC signing is not licensed for this instance (403). | Enable the CSC signing license before retrying. |
-| `CSC_PROVIDER_INFO_FAILED` | The CSC provider's discovery request failed or returned unusable information (500). | Check the provider URL, availability, and OAuth configuration. |
-| `CSC_PROVIDER_NO_TSA` | A timestamp authority is unavailable or unusable for CSC signing (500). | Configure `NEXT_PRIVATE_SIGNING_TIMESTAMP_AUTHORITY` and verify provider timestamp access. |
-| `CSC_CREDENTIAL_LIST_EMPTY` | The CSC provider returned no signing credentials for the authenticated user (400). | Enrol a signing credential with the provider, then authenticate again. |
-| `CSC_CERT_INVALID` | The selected signing certificate is missing, invalid, or outside its validity period (400). | Select or renew a valid certificate, then authenticate again. |
-| `CSC_ALGORITHM_REFUSED` | The signing credential uses an unsupported key or digest algorithm (400). | Select a credential that satisfies the instance's CSC algorithm policy. |
-| `CSC_SAD_EXPIRED_PRE_SIGN` | The signature activation data is missing, expired, or unreadable before signing (400). | Repeat the credential authorization flow. |
-| `CSC_TSP_TIMEOUT` | The trust service provider did not complete the signing request before the timeout (408). | Retry the signing request after checking provider availability. |
-| `CSC_EMBED_FAILED` | The returned CSC signature could not be embedded into the envelope items (400). | Restart the signing attempt. If it fails again, contact support. |
-| `CSC_BASE_DOCUMENT_MUTATED` | The document changed between signature preparation and signing (500). | Restart signing from the current envelope state. |
-| `CSC_REQUEST_FAILED` | A CSC provider request failed without a more specific CSC error (500). | Check provider availability and configuration, then retry. |

 ## See Also

@@ -32,9 +32,9 @@ A document object contains the following properties:
 | --------------- | -------------- | -------------------------------------------------------------- |
 | `id`            | string         | Unique identifier (e.g., `envelope_abc123`)                    |
 | `type`          | string         | `DOCUMENT` or `TEMPLATE`                                       |
-| `status`        | string         | Current status: `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED`, or `CANCELLED` |
+| `status`        | string         | Current status: `DRAFT`, `PENDING`, `COMPLETED`, or `REJECTED` |
 | `title`         | string         | Document title                                                 |
-| `source`        | string         | How the document was created: `DOCUMENT`, `TEMPLATE`, `TEMPLATE_DIRECT_LINK` |
+| `source`        | string         | How the document was created: `DOCUMENT`, `TEMPLATE`, `API`    |
 | `visibility`    | string         | Who can view: `EVERYONE`, `ADMIN`, `MANAGER_AND_ABOVE`         |
 | `externalId`    | string \| null | Your custom identifier for the document                        |
 | `createdAt`     | string         | ISO 8601 timestamp                                             |
@@ -53,7 +53,7 @@ A document object contains the following properties:
  "id": "envelope_abc123xyz",
  "type": "DOCUMENT",
  "status": "PENDING",
-  "source": "DOCUMENT",
+  "source": "API",
  "visibility": "EVERYONE",
  "title": "Service Agreement",
  "externalId": "contract-2025-001",
@@ -73,13 +73,13 @@ A document object contains the following properties:
  ],
  "fields": [
    {
-      "id": 123,
+      "id": "field_123",
      "type": "SIGNATURE",
      "page": 1,
-      "positionX": "10",
-      "positionY": "80",
-      "width": "30",
-      "height": "5",
+      "positionX": 10,
+      "positionY": 80,
+      "width": 30,
+      "height": 5,
      "recipientId": 1
    }
  ],
@@ -99,8 +99,6 @@ A document object contains the following properties:
 }
 ```

-Field position and size values are stored as decimals and serialized as strings in API responses.
-
 ## List Documents

 Retrieve a paginated list of documents.
@@ -116,7 +114,7 @@ GET /envelope
 | `page`             | integer | Page number (default: 1)                                      |
 | `perPage`          | integer | Results per page (default: 10, max: 100)                      |
 | `type`             | string  | Filter by `DOCUMENT` or `TEMPLATE`                            |
-| `status`           | string  | Filter by status: `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED`, `CANCELLED` |
+| `status`           | string  | Filter by status: `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED` |
 | `source`           | string  | Filter by creation source                                     |
 | `folderId`         | string  | Filter by folder ID                                           |
 | `orderByColumn`    | string  | Sort field (only `createdAt` supported)                       |
@@ -156,8 +154,8 @@ const response = await fetch(`${BASE_URL}/envelope`, {
  },
 });

-const { data, count } = await response.json();
-console.log(`Found ${count} documents`);
+const { data, pagination } = await response.json();
+console.log(`Found ${pagination.totalItems} documents`);

 // Filter by status
 const pendingResponse = await fetch(
@@ -199,10 +197,12 @@ const pendingDocs = await pendingResponse.json();
      ]
    }
  ],
-  "count": 42,
-  "currentPage": 1,
-  "perPage": 10,
-  "totalPages": 5
+  "pagination": {
+    "page": 1,
+    "perPage": 10,
+    "totalPages": 5,
+    "totalItems": 42
+  }
 }
 ```

@@ -628,72 +628,6 @@ The response includes signing URLs for each recipient:

 ---

-## Cancel Document
-
-Cancel a pending document. This changes its status from `PENDING` to `CANCELLED`.
-
-```
-POST /envelope/cancel
-```
-
-### Request Body
-
-| Field        | Type   | Required | Description                         |
-| ------------ | ------ | -------- | ----------------------------------- |
-| `envelopeId` | string | Yes      | Document ID                         |
-| `reason`     | string | No       | Reason for cancelling the document |
-
-### Code Examples
-
-<Tabs items={['curl', 'TypeScript']}>
-<Tab value="curl">
-```bash
-curl -X POST "https://app.documenso.com/api/v2/envelope/cancel" \
-  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "envelopeId": "envelope_abc123",
-    "reason": "The agreement is no longer needed."
-  }'
-```
-</Tab>
-<Tab value="TypeScript">
-```typescript
-const response = await fetch('https://app.documenso.com/api/v2/envelope/cancel', {
-  method: 'POST',
-  headers: {
-    Authorization: 'api_xxxxxxxxxxxxxxxx',
-    'Content-Type': 'application/json',
-  },
-  body: JSON.stringify({
-    envelopeId: 'envelope_abc123',
-    reason: 'The agreement is no longer needed.',
-  }),
-});
-
-const { success } = await response.json();
-```
-</Tab>
-</Tabs>
-
-### Response
-
-```json
-{
-  "success": true
-}
-```
-
-### Behavior
-
- Only documents in `PENDING` status can be cancelled. Other statuses return `400`.
- Cancellation is not idempotent. Cancelling the same document again returns `400`.
- The document owner and team members with `MANAGER` or higher permissions can cancel it. Requests for documents you cannot view return `404`; requests for visible documents without sufficient permissions return `401`.
- A successful cancellation fires the `DOCUMENT_CANCELLED` webhook.
- Cancellation emails are sent only to eligible non-CC, non-rejected recipients who were sent or opened the document.
-
---
-
 ## Delete Document

 Delete a document. Completed documents cannot be deleted.
@@ -736,7 +670,7 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/delete',

 const { success } = await response.json();

-```
+````
 </Tab>
 </Tabs>

@@ -746,7 +680,7 @@ const { success } = await response.json();
 {
  "success": true
 }
-```
+````

 ---

@@ -760,11 +694,9 @@ POST /envelope/get-many

 ### Request Body

-| Field      | Type   | Required | Description                                                                  |
-| ---------- | ------ | -------- | ---------------------------------------------------------------------------- |
-| `ids`      | object | Yes      | ID selector containing `type` and `ids`                                      |
-| `ids.type` | string | Yes      | `envelopeId`, `documentId`, or `templateId`                                  |
-| `ids.ids`  | array  | Yes      | 1-20 IDs: strings for `envelopeId`; numbers for `documentId` or `templateId` |
+| Field         | Type  | Required | Description           |
+| ------------- | ----- | -------- | --------------------- |
+| `envelopeIds` | array | Yes      | Array of document IDs |

 ### Code Examples

@@ -775,17 +707,12 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/get-many" \
  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
  -H "Content-Type: application/json" \
  -d '{
-    "ids": {
-      "type": "envelopeId",
-      "ids": ["envelope_abc123", "envelope_def456", "envelope_ghi789"]
-    }
+    "envelopeIds": ["envelope_abc123", "envelope_def456", "envelope_ghi789"]
  }'
 ```
 </Tab>
 <Tab value="TypeScript">
 ```typescript
-const requestedIds = ['envelope_abc123', 'envelope_def456', 'envelope_ghi789'];
-
 const response = await fetch('https://app.documenso.com/api/v2/envelope/get-many', {
  method: 'POST',
  headers: {
@@ -793,36 +720,16 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/get-many
    'Content-Type': 'application/json',
  },
  body: JSON.stringify({
-    ids: {
-      type: 'envelopeId',
-      ids: requestedIds,
-    },
+    envelopeIds: ['envelope_abc123', 'envelope_def456', 'envelope_ghi789'],
  }),
 });

-const { data } = await response.json();
+const documents = await response.json();

-```
+````
 </Tab>
 </Tabs>

-### Response
-
-```json
-{
-  "data": [
-    {
-      "id": "envelope_abc123",
-      "type": "DOCUMENT",
-      "status": "PENDING",
-      "title": "Service Agreement"
-    }
-  ]
-}
-```
-
-The endpoint silently omits envelopes you cannot access instead of returning `404`. Compare `data.length` with `requestedIds.length` to detect omissions.
-
 ---

 ## Document Statuses
@@ -833,7 +740,6 @@ The endpoint silently omits envelopes you cannot access instead of returning `40
 | `PENDING` | Document has been sent. Waiting for recipients to sign. |
 | `COMPLETED` | All recipients have signed. Document is sealed. |
 | `REJECTED` | A recipient rejected the document. |
-| `CANCELLED` | The document was cancelled by its owner or a team member with `MANAGER` or higher permissions. |

 ### Status Transitions

@@ -841,13 +747,11 @@ The endpoint silently omits envelopes you cannot access instead of returning `40
 flowchart LR
  DRAFT --> PENDING --> COMPLETED
  PENDING --> REJECTED
-  PENDING --> CANCELLED
 ```

 - **DRAFT to PENDING**: Call the distribute endpoint
 - **PENDING to COMPLETED**: All recipients complete their signing
 - **PENDING to REJECTED**: A recipient rejects the document
- **PENDING to CANCELLED**: The document owner or a team member with `MANAGER` or higher permissions cancels the document

 <Callout type="warn">
  You cannot modify recipients or fields after a document moves to `PENDING` status.
@@ -869,8 +773,8 @@ flowchart LR
 | Parameter  | Values                                      | Description               |
 | ---------- | ------------------------------------------- | ------------------------- |
 | `type`     | `DOCUMENT`, `TEMPLATE`                      | Filter by envelope type   |
-| `status`   | `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED`, `CANCELLED` | Filter by status          |
-| `source`   | `DOCUMENT`, `TEMPLATE`, `TEMPLATE_DIRECT_LINK`          | Filter by creation source |
+| `status`   | `DRAFT`, `PENDING`, `COMPLETED`, `REJECTED` | Filter by status          |
+| `source`   | `DOCUMENT`, `TEMPLATE`, `API`               | Filter by creation source |
 | `folderId` | string                                      | Filter by folder          |

 ### Sorting
@@ -896,10 +800,10 @@ async function getAllPendingDocuments() {
      },
    );

-    const { data, currentPage, totalPages } = await response.json();
+    const { data, pagination } = await response.json();
    documents.push(...data);

-    hasMore = currentPage < totalPages;
+    hasMore = page < pagination.totalPages;
    page++;
  }

@@ -19,13 +19,13 @@ import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 | `secondaryId`    | string         | Secondary identifier for audit logs          |
 | `type`           | string         | Field type (see [Field Types](#field-types)) |
 | `recipientId`    | number         | ID of the recipient assigned to this field   |
-| `envelopeId`     | string         | ID of the parent envelope                    |
+| `envelopeId`     | number         | ID of the parent envelope                    |
 | `envelopeItemId` | string         | ID of the PDF item the field is placed on    |
 | `page`           | number         | Page number (1-indexed)                      |
-| `positionX`      | string         | X coordinate as percentage (0-100), a decimal serialized as a string |
-| `positionY`      | string         | Y coordinate as percentage (0-100), a decimal serialized as a string |
-| `width`          | string         | Width as percentage of page (0-100), a decimal serialized as a string |
-| `height`         | string         | Height as percentage of page (0-100), a decimal serialized as a string |
+| `positionX`      | number         | X coordinate as percentage (0-100)           |
+| `positionY`      | number         | Y coordinate as percentage (0-100)           |
+| `width`          | number         | Width as percentage of page (0-100)          |
+| `height`         | number         | Height as percentage of page (0-100)         |
 | `customText`     | string         | Value entered by the recipient               |
 | `inserted`       | boolean        | Whether the field has been completed         |
 | `fieldMeta`      | object \| null | Type-specific configuration options          |
@@ -38,19 +38,18 @@ import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
  "secondaryId": "field_abc123",
  "type": "SIGNATURE",
  "recipientId": 123,
-  "envelopeId": "envelope_abcdefhiklmnorst",
-  "envelopeItemId": "envelope_item_abcdefhiklmnorst",
+  "envelopeId": 789,
+  "envelopeItemId": "envelope_item_xyz",
  "page": 1,
-  "positionX": "10",
-  "positionY": "80",
-  "width": "30",
-  "height": "5",
+  "positionX": 10,
+  "positionY": 80,
+  "width": 30,
+  "height": 5,
  "customText": "",
  "inserted": false,
  "fieldMeta": {
    "type": "signature",
-    "required": true,
-    "overflow": "auto"
+    "required": true
  }
 }
 ```
@@ -135,10 +134,10 @@ POST /envelope/field/create-many

 ### Request Body

-| Field        | Type   | Required | Description                     |
-| ------------ | ------ | -------- | ------------------------------- |
-| `envelopeId` | string | Yes      | The envelope ID                 |
-| `data`       | array  | Yes      | Array of field configurations   |
+| Field       | Type   | Required | Description                     |
+| ----------- | ------ | -------- | ------------------------------- |
+| `documentId`| number | Yes      | The document ID                 |
+| `fields`    | array  | Yes      | Array of field configurations   |

 ### Code Examples

@@ -149,32 +148,32 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/field/create-many" \
  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
  -H "Content-Type: application/json" \
  -d '{
-    "envelopeId": "envelope_abcdefhiklmnorst",
-    "data": [
+    "documentId": 123,
+    "fields": [
      {
        "type": "SIGNATURE",
        "recipientId": 456,
-        "page": 1,
-        "positionX": 10,
-        "positionY": 80,
+        "pageNumber": 1,
+        "pageX": 10,
+        "pageY": 80,
        "width": 30,
        "height": 5
      },
      {
        "type": "DATE",
        "recipientId": 456,
-        "page": 1,
-        "positionX": 50,
-        "positionY": 80,
+        "pageNumber": 1,
+        "pageX": 50,
+        "pageY": 80,
        "width": 20,
        "height": 3
      },
      {
        "type": "TEXT",
        "recipientId": 456,
-        "page": 1,
-        "positionX": 10,
-        "positionY": 70,
+        "pageNumber": 1,
+        "pageX": 10,
+        "pageY": 70,
        "width": 40,
        "height": 4,
        "fieldMeta": {
@@ -200,32 +199,32 @@ const response = await fetch(
      'Content-Type': 'application/json',
    },
    body: JSON.stringify({
-      envelopeId: 'envelope_abcdefhiklmnorst',
-      data: [
+      documentId: 123,
+      fields: [
        {
          type: 'SIGNATURE',
          recipientId: 456,
-          page: 1,
-          positionX: 10,
-          positionY: 80,
+          pageNumber: 1,
+          pageX: 10,
+          pageY: 80,
          width: 30,
          height: 5,
        },
        {
          type: 'DATE',
          recipientId: 456,
-          page: 1,
-          positionX: 50,
-          positionY: 80,
+          pageNumber: 1,
+          pageX: 50,
+          pageY: 80,
          width: 20,
          height: 3,
        },
        {
          type: 'TEXT',
          recipientId: 456,
-          page: 1,
-          positionX: 10,
-          positionY: 70,
+          pageNumber: 1,
+          pageX: 10,
+          pageY: 70,
          width: 40,
          height: 4,
          fieldMeta: {
@@ -240,8 +239,8 @@ const response = await fetch(
  }
 );

-const { data } = await response.json();
-console.log(`Created ${data.length} fields`);
+const { fields } = await response.json();
+console.log(`Created ${fields.length} fields`);

 ````
 </Tab>
@@ -251,68 +250,36 @@ console.log(`Created ${data.length} fields`);

 ```json
 {
-  "data": [
+  "fields": [
    {
      "id": 101,
-      "secondaryId": "field_abc123",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
      "type": "SIGNATURE",
      "recipientId": 456,
      "page": 1,
-      "positionX": "10",
-      "positionY": "80",
-      "width": "30",
-      "height": "5",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "signature",
-        "fontSize": 18,
-        "overflow": "auto"
-      }
+      "positionX": 10,
+      "positionY": 80,
+      "width": 30,
+      "height": 5
    },
    {
      "id": 102,
-      "secondaryId": "field_def456",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
      "type": "DATE",
      "recipientId": 456,
      "page": 1,
-      "positionX": "50",
-      "positionY": "80",
-      "width": "20",
-      "height": "3",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "date",
-        "fontSize": 12,
-        "textAlign": "left",
-        "overflow": "auto"
-      }
+      "positionX": 50,
+      "positionY": 80,
+      "width": 20,
+      "height": 3
    },
    {
      "id": 103,
-      "secondaryId": "field_ghi789",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
      "type": "TEXT",
      "recipientId": 456,
      "page": 1,
-      "positionX": "10",
-      "positionY": "70",
-      "width": "40",
-      "height": "4",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "text",
-        "label": "Job Title",
-        "placeholder": "Enter your job title",
-        "required": true
-      }
+      "positionX": 10,
+      "positionY": 70,
+      "width": 40,
+      "height": 4
    }
  ]
 }
@@ -332,8 +299,8 @@ POST /envelope/field/update-many

 | Field        | Type   | Required | Description                   |
 | ------------ | ------ | -------- | ----------------------------- |
-| `envelopeId` | string | Yes      | The envelope ID               |
-| `data`       | array  | Yes      | Array of field update objects |
+| `documentId` | number | Yes      | The document ID               |
+| `fields`     | array  | Yes      | Array of field update objects |

 ### Code Examples

@@ -344,17 +311,17 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/field/update-many" \
  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
  -H "Content-Type: application/json" \
  -d '{
-    "envelopeId": "envelope_abcdefhiklmnorst",
-    "data": [
+    "documentId": 123,
+    "fields": [
      {
        "id": 101,
        "type": "SIGNATURE",
-        "positionY": 85
+        "pageY": 85
      },
      {
        "id": 102,
        "type": "DATE",
-        "positionY": 85
+        "pageY": 85
      }
    ]
  }'
@@ -371,16 +338,16 @@ const response = await fetch(
      'Content-Type': 'application/json',
    },
    body: JSON.stringify({
-      envelopeId: 'envelope_abcdefhiklmnorst',
-      data: [
-        { id: 101, type: 'SIGNATURE', positionY: 85 },
-        { id: 102, type: 'DATE', positionY: 85 },
+      documentId: 123,
+      fields: [
+        { id: 101, type: 'SIGNATURE', pageY: 85 },
+        { id: 102, type: 'DATE', pageY: 85 },
      ],
    }),
  }
 );

-const { data } = await response.json();
+const { fields } = await response.json();

 ````
 </Tab>
@@ -390,48 +357,9 @@ const { data } = await response.json();

 ```json
 {
-  "data": [
-    {
-      "id": 101,
-      "secondaryId": "field_abc123",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
-      "type": "SIGNATURE",
-      "recipientId": 456,
-      "page": 1,
-      "positionX": "10",
-      "positionY": "85",
-      "width": "30",
-      "height": "5",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "signature",
-        "fontSize": 18,
-        "overflow": "auto"
-      }
-    },
-    {
-      "id": 102,
-      "secondaryId": "field_def456",
-      "envelopeId": "envelope_abcdefhiklmnorst",
-      "envelopeItemId": "envelope_item_abcdefhiklmnorst",
-      "type": "DATE",
-      "recipientId": 456,
-      "page": 1,
-      "positionX": "50",
-      "positionY": "85",
-      "width": "20",
-      "height": "3",
-      "customText": "",
-      "inserted": false,
-      "fieldMeta": {
-        "type": "date",
-        "fontSize": 12,
-        "textAlign": "left",
-        "overflow": "auto"
-      }
-    }
+  "fields": [
+    { "id": 101, "type": "SIGNATURE", "positionY": 85 },
+    { "id": 102, "type": "DATE", "positionY": 85 }
  ]
 }
 ````
@@ -515,8 +443,8 @@ Fields use percentage-based coordinates relative to the PDF page dimensions.
 (0,0) ─────────────────────────── (100,0)
  │                                   │
  │    ┌─────────┐                    │
-  │    │  Field  │ (positionX: 10,    │
-  │    │         │  positionY: 20,    │
+  │    │  Field  │ (pageX: 10,        │
+  │    │         │  pageY: 20,        │
  │    └─────────┘  width: 30,        │
  │                 height: 5)        │
  │                                   │
@@ -529,9 +457,9 @@ Fields use percentage-based coordinates relative to the PDF page dimensions.
 const field = {
  type: 'SIGNATURE',
  recipientId: 123,
-  page: 1,
-  positionX: 60, // 60% from left
-  positionY: 85, // 85% from top (near bottom)
+  pageNumber: 1,
+  pageX: 60, // 60% from left
+  pageY: 85, // 85% from top (near bottom)
  width: 30, // 30% of page width
  height: 8, // 8% of page height
 };
@@ -715,15 +643,15 @@ All field types support these base options:
 Create a document with a signature block containing multiple field types:

 ```typescript
-async function addSignatureBlock(envelopeId: string, recipientId: number) {
-  const data = [
+async function addSignatureBlock(documentId: number, recipientId: number) {
+  const fields = [
    // Signature
    {
      type: 'SIGNATURE',
      recipientId,
-      page: 1,
-      positionX: 10,
-      positionY: 80,
+      pageNumber: 1,
+      pageX: 10,
+      pageY: 80,
      width: 30,
      height: 8,
      fieldMeta: {
@@ -735,9 +663,9 @@ async function addSignatureBlock(envelopeId: string, recipientId: number) {
    {
      type: 'NAME',
      recipientId,
-      page: 1,
-      positionX: 10,
-      positionY: 90,
+      pageNumber: 1,
+      pageX: 10,
+      pageY: 90,
      width: 30,
      height: 4,
      fieldMeta: {
@@ -749,9 +677,9 @@ async function addSignatureBlock(envelopeId: string, recipientId: number) {
    {
      type: 'DATE',
      recipientId,
-      page: 1,
-      positionX: 50,
-      positionY: 80,
+      pageNumber: 1,
+      pageX: 50,
+      pageY: 80,
      width: 20,
      height: 4,
      fieldMeta: {
@@ -763,9 +691,9 @@ async function addSignatureBlock(envelopeId: string, recipientId: number) {
    {
      type: 'TEXT',
      recipientId,
-      page: 1,
-      positionX: 50,
-      positionY: 90,
+      pageNumber: 1,
+      pageX: 50,
+      pageY: 90,
      width: 30,
      height: 4,
      fieldMeta: {
@@ -782,7 +710,7 @@ async function addSignatureBlock(envelopeId: string, recipientId: number) {
      Authorization: 'api_xxxxxxxxxxxxxxxx',
      'Content-Type': 'application/json',
    },
-    body: JSON.stringify({ envelopeId, data }),
+    body: JSON.stringify({ documentId, fields }),
  });

  return response.json();
@@ -60,8 +60,8 @@ Authorization: api_xxxxxxxxxxxxxxxx
    href="/docs/developers/api/templates"
  />
  <Card
-    title="Team-scoped access"
-    description="Use team-scoped API tokens with envelope endpoints."
+    title="Teams"
+    description="Manage teams and team members."
    href="/docs/developers/api/teams"
  />
 </Cards>
@@ -119,7 +119,7 @@ Full reference in the [V2 OpenAPI reference](https://openapi.documenso.com).
 | ------------------------------------------------- | ----------------------------------------------------- |
 | `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` (body changes from `documentIds: number[]` to `ids: { type: "documentId"; ids: number[] }`) |
+| `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`                        |
@@ -140,7 +140,7 @@ Full reference in the [V2 OpenAPI reference](https://openapi.documenso.com).
 | ------------------------------------- | ------------------------------------------------ |
 | `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` (body changes from `templateIds: number[]` to `ids: { type: "templateId"; ids: number[] }`) |
+| `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`                   |
@@ -11,12 +11,6 @@ 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  
 **Response:** 429 Too Many Requests

@@ -25,7 +19,7 @@ The rate limit applies to:
  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 +27,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 +44,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 |

 ---

@@ -6,8 +6,6 @@ description: Add and manage envelope recipients 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).
@@ -18,7 +16,7 @@ import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
 ```json
 {
  "id": 123,
-  "envelopeId": "envelope_abcdefhiklmnorst",
+  "envelopeId": "clu1abc2def3ghi4jkl",
  "email": "signer@example.com",
  "name": "John Doe",
  "role": "SIGNER",
@@ -136,7 +134,7 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/recipient/create-many" \
  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
  -H "Content-Type: application/json" \
  -d '{
-    "envelopeId": "envelope_abcdefhiklmnorst",
+    "envelopeId": "clu1abc2def3ghi4jkl",
    "data": [
      {
        "email": "signer@example.com",
@@ -166,7 +164,7 @@ const response = await fetch(
      'Content-Type': 'application/json',
    },
    body: JSON.stringify({
-      envelopeId: 'envelope_abcdefhiklmnorst',
+      envelopeId: 'clu1abc2def3ghi4jkl',
      data: [
        {
          email: 'signer@example.com',
@@ -198,7 +196,7 @@ const { data: recipients } = await response.json();
  "data": [
    {
      "id": 789,
-      "envelopeId": "envelope_abcdefhiklmnorst",
+      "envelopeId": "clu1abc2def3ghi4jkl",
      "email": "signer@example.com",
      "name": "John Doe",
      "role": "SIGNER",
@@ -211,7 +209,7 @@ const { data: recipients } = await response.json();
    },
    {
      "id": 790,
-      "envelopeId": "envelope_abcdefhiklmnorst",
+      "envelopeId": "clu1abc2def3ghi4jkl",
      "email": "approver@example.com",
      "name": "Jane Smith",
      "role": "APPROVER",
@@ -264,7 +262,7 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/recipient/update-many" \
  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
  -H "Content-Type: application/json" \
  -d '{
-    "envelopeId": "envelope_abcdefhiklmnorst",
+    "envelopeId": "clu1abc2def3ghi4jkl",
    "data": [
      {
        "id": 789,
@@ -286,7 +284,7 @@ const response = await fetch(
      'Content-Type': 'application/json',
    },
    body: JSON.stringify({
-      envelopeId: 'envelope_abcdefhiklmnorst',
+      envelopeId: 'clu1abc2def3ghi4jkl',
      data: [
        {
          id: 789,
@@ -389,7 +387,7 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/recipien
    'Content-Type': 'application/json',
  },
  body: JSON.stringify({
-    envelopeId: 'envelope_abcdefhiklmnorst',
+    envelopeId: 'clu1abc2def3ghi4jkl',
    data: [
      {
        email: 'approver@example.com',
@@ -464,7 +462,7 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/recipien
    'Content-Type': 'application/json',
  },
  body: JSON.stringify({
-    envelopeId: 'envelope_abcdefhiklmnorst',
+    envelopeId: 'clu1abc2def3ghi4jkl',
    data: [
      {
        email: 'signer@example.com',
@@ -1,29 +1,44 @@
 ---
-title: Team-Scoped API Access
-description: Use team-scoped API tokens with document and template envelopes.
+title: Teams API
+description: Manage team resources, documents, and templates with team-scoped API tokens.
 ---

 import { Callout } from 'fumadocs-ui/components/callout';
 import { Step, Steps } from 'fumadocs-ui/components/steps';
 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).
 </Callout>

-## Team Context
+## Team Object

-<Callout type="info">
-  The V2 REST API does not expose `/team/*` endpoints. Create and manage teams, members, and team
-  settings in the Documenso web application. This page explains how a team-scoped token applies
-  that team context to supported API resources.
-</Callout>
+A team object contains the following properties:

-The API resolves the team from your token. You do not pass a team ID when creating, listing, or
-using envelopes. The token's team ID determines which resources the request can access.
+| Property          | Type           | Description                                         |
+| ----------------- | -------------- | --------------------------------------------------- |
+| `id`              | number         | Unique team identifier                              |
+| `name`            | string         | Team display name                                   |
+| `url`             | string         | Unique team URL slug                                |
+| `createdAt`       | string         | ISO 8601 timestamp                                  |
+| `avatarImageId`   | string \| null | ID of the team's avatar image                       |
+| `organisationId`  | string         | ID of the parent organisation                       |
+| `currentTeamRole` | string         | Your role in the team: `ADMIN`, `MANAGER`, `MEMBER` |
+
+### Example Team Object
+
+```json
+{
+  "id": 123,
+  "name": "Engineering",
+  "url": "engineering",
+  "createdAt": "2025-01-15T10:30:00.000Z",
+  "avatarImageId": null,
+  "organisationId": "org_abc123",
+  "currentTeamRole": "ADMIN"
+}
+```

 ## Team-Scoped API Tokens

@@ -141,26 +156,26 @@ Retrieve all documents belonging to the team:
 <Tab value="curl">
 ```bash
 # List all team documents
-curl -X GET "https://app.documenso.com/api/v2/envelope?type=DOCUMENT" \
+curl -X GET "https://app.documenso.com/api/v2/envelope" \
  -H "Authorization: api_team_xxxxxxxxxxxxxxxx"

 # Filter by status
-curl -X GET "https://app.documenso.com/api/v2/envelope?type=DOCUMENT&status=PENDING" \
+curl -X GET "https://app.documenso.com/api/v2/envelope?status=PENDING" \
  -H "Authorization: api_team_xxxxxxxxxxxxxxxx"
 ````

 </Tab>
 <Tab value="TypeScript">
 ```typescript
-const response = await fetch('https://app.documenso.com/api/v2/envelope?type=DOCUMENT', {
+const response = await fetch('https://app.documenso.com/api/v2/envelope', {
  method: 'GET',
  headers: {
    Authorization: TEAM_API_TOKEN,
  },
 });

-const { data, count } = await response.json();
-console.log(`Found ${count} team documents`);
+const { data, pagination } = await response.json();
+console.log(`Found ${pagination.totalItems} team documents`);

 ````
 </Tab>
@@ -175,11 +190,10 @@ Templates created with a team token are shared across the team.
 <Tabs items={['curl', 'TypeScript']}>
 <Tab value="curl">
 ```bash
-curl -X POST "https://app.documenso.com/api/v2/envelope/create" \
+curl -X POST "https://app.documenso.com/api/v2/template/create" \
  -H "Authorization: api_team_xxxxxxxxxxxxxxxx" \
  -H "Content-Type: multipart/form-data" \
  -F 'payload={
-    "type": "TEMPLATE",
    "title": "NDA Template",
    "recipients": [
      {
@@ -209,7 +223,6 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/create" \
 const form = new FormData();

 const payload = {
-  type: 'TEMPLATE',
  title: 'NDA Template',
  recipients: [
    {
@@ -236,7 +249,7 @@ form.append('files', fs.createReadStream('./nda-template.pdf'), {
  contentType: 'application/pdf',
 });

-const response = await fetch('https://app.documenso.com/api/v2/envelope/create', {
+const response = await fetch('https://app.documenso.com/api/v2/template/create', {
  method: 'POST',
  headers: {
    Authorization: TEAM_API_TOKEN,
@@ -244,8 +257,8 @@ const response = await fetch('https://app.documenso.com/api/v2/envelope/create',
  body: form,
 });

-const { id } = await response.json();
-console.log('Created team template envelope:', id);
+const template = await response.json();
+console.log('Created team template:', template.id);
 ````
 </Tab>
 </Tabs>
@@ -255,14 +268,14 @@ console.log('Created team template envelope:', id);
 <Tabs items={['curl', 'TypeScript']}>
 <Tab value="curl">
 ```bash
-curl -X GET "https://app.documenso.com/api/v2/envelope?type=TEMPLATE" \
+curl -X GET "https://app.documenso.com/api/v2/template" \
  -H "Authorization: api_team_xxxxxxxxxxxxxxxx"
 ````

 </Tab>
 <Tab value="TypeScript">
 ```typescript
-const response = await fetch('https://app.documenso.com/api/v2/envelope?type=TEMPLATE', {
+const response = await fetch('https://app.documenso.com/api/v2/template', {
  method: 'GET',
  headers: {
    Authorization: TEAM_API_TOKEN,
@@ -317,19 +330,19 @@ const SALES_TEAM_TOKEN = process.env.SALES_TEAM_API_TOKEN;
 const LEGAL_TEAM_TOKEN = process.env.LEGAL_TEAM_API_TOKEN;

 // Get pending documents from sales team
-const salesResponse = await fetch('https://app.documenso.com/api/v2/envelope?type=DOCUMENT&status=PENDING', {
+const salesResponse = await fetch('https://app.documenso.com/api/v2/envelope?status=PENDING', {
  headers: { Authorization: SALES_TEAM_TOKEN },
 });
 const salesDocs = await salesResponse.json();

 // Get completed documents from legal team
-const legalResponse = await fetch('https://app.documenso.com/api/v2/envelope?type=DOCUMENT&status=COMPLETED', {
+const legalResponse = await fetch('https://app.documenso.com/api/v2/envelope?status=COMPLETED', {
  headers: { Authorization: LEGAL_TEAM_TOKEN },
 });
 const legalDocs = await legalResponse.json();

-console.log(`Sales team: ${salesDocs.count} pending`);
-console.log(`Legal team: ${legalDocs.count} completed`);
+console.log(`Sales team: ${salesDocs.pagination.totalItems} pending`);
+console.log(`Legal team: ${legalDocs.pagination.totalItems} completed`);
 ```

 ## Error Responses
@@ -13,194 +13,7 @@ import { Tab, Tabs } from 'fumadocs-ui/components/tabs';
  see the [OpenAPI Reference](https://openapi.documenso.com).
 </Callout>

-## Use a Template Envelope
-
-New integrations should create a document from a template envelope with the Envelope API.
-
-```
-POST /envelope/use
-Content-Type: multipart/form-data
-```
-
-The request uses `multipart/form-data`:
-
-| Part      | Type    | Required | Description                                                        |
-| --------- | ------- | -------- | ------------------------------------------------------------------ |
-| `payload` | JSON    | Yes      | Template envelope ID, recipient details, and document settings     |
-| `files`   | File(s) | No       | Replacement PDFs referenced by entries in `customDocumentData`     |
-
-### Payload Schema
-
-| Field                | Type    | Required | Description                                                              |
-| -------------------- | ------- | -------- | ------------------------------------------------------------------------ |
-| `envelopeId`         | string  | Yes      | ID of the template envelope                                              |
-| `externalId`         | string  | No       | Your identifier for the created document envelope                        |
-| `recipients`         | array   | No       | Recipient details mapped to recipients in the template                    |
-| `distributeDocument` | boolean | No       | If `true`, create the document as pending and distribute it               |
-| `customDocumentData` | array   | No       | Maps uploaded replacement PDFs to template envelope items                 |
-| `folderId`           | string  | No       | Folder in which to create the document                                    |
-| `prefillFields`      | array   | No       | Field values to prefill before distribution                               |
-| `override`           | object  | No       | Template values to override for the created document                      |
-| `attachments`        | array   | No       | Link attachments to add to the document                                   |
-| `formValues`         | object  | No       | PDF form values to apply                                                   |
-
-Each recipient entry accepts the following fields:
-
-| Field          | Type    | Required | Description                                  |
-| -------------- | ------- | -------- | -------------------------------------------- |
-| `id`           | number  | Yes      | Recipient ID from the template envelope      |
-| `email`        | string  | Yes      | Recipient email address                      |
-| `name`         | string  | No       | Recipient display name                       |
-| `signingOrder` | number  | No       | Recipient position in sequential signing     |
-
-Each `customDocumentData` entry maps an uploaded file to a template item:
-
-| Field            | Type             | Required | Description                                                     |
-| ---------------- | ---------------- | -------- | --------------------------------------------------------------- |
-| `identifier`     | string \| number | Yes      | Uploaded filename or zero-based file index                      |
-| `envelopeItemId` | string           | Yes      | Template envelope item whose PDF the uploaded file replaces     |
-
-### Code Examples
-
-<Tabs items={['curl', 'TypeScript']}>
-<Tab value="curl">
-```bash
-curl -X POST "https://app.documenso.com/api/v2/envelope/use" \
-  -H "Authorization: api_xxxxxxxxxxxxxxxx" \
-  -F 'payload={
-    "envelopeId": "envelope_template123",
-    "externalId": "contract-2025-001",
-    "recipients": [
-      {
-        "id": 1,
-        "email": "john.doe@example.com",
-        "name": "John Doe"
-      }
-    ],
-    "prefillFields": [
-      {
-        "id": 101,
-        "type": "text",
-        "value": "Senior Software Engineer"
-      }
-    ],
-    "distributeDocument": false
-  }'
-```
-</Tab>
-<Tab value="TypeScript">
-```typescript
-const form = new FormData();
-
-form.append(
-  'payload',
-  JSON.stringify({
-    envelopeId: 'envelope_template123',
-    externalId: 'contract-2025-001',
-    recipients: [
-      {
-        id: 1,
-        email: 'john.doe@example.com',
-        name: 'John Doe',
-      },
-    ],
-    prefillFields: [
-      {
-        id: 101,
-        type: 'text',
-        value: 'Senior Software Engineer',
-      },
-    ],
-    distributeDocument: false,
-  }),
-);
-
-const response = await fetch('https://app.documenso.com/api/v2/envelope/use', {
-  method: 'POST',
-  headers: {
-    Authorization: 'api_xxxxxxxxxxxxxxxx',
-  },
-  body: form,
-});
-
-const document = await response.json();
-console.log('Created document envelope:', document.id);
-```
-</Tab>
-</Tabs>
-
-### Response
-
-```json
-{
-  "id": "envelope_document123",
-  "recipients": [
-    {
-      "id": 1,
-      "name": "John Doe",
-      "email": "john.doe@example.com",
-      "token": "recipient_token",
-      "role": "SIGNER",
-      "signingOrder": 1,
-      "signingUrl": "https://app.documenso.com/sign/recipient_token"
-    }
-  ]
-}
-```
-
-### Distribute the Created Envelope
-
-If you leave `distributeDocument` unset or set it to `false`, distribute the created document with
-`POST /envelope/distribute`. Its response confirms delivery and includes each recipient's signing URL.
-
-```typescript
-const distributionResponse = await fetch(
-  'https://app.documenso.com/api/v2/envelope/distribute',
-  {
-    method: 'POST',
-    headers: {
-      Authorization: 'api_xxxxxxxxxxxxxxxx',
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      envelopeId: document.id,
-    }),
-  },
-);
-
-const distribution = await distributionResponse.json();
-console.log('Signing URL:', distribution.recipients[0].signingUrl);
-```
-
-```json
-{
-  "success": true,
-  "id": "envelope_document123",
-  "recipients": [
-    {
-      "id": 1,
-      "name": "John Doe",
-      "email": "john.doe@example.com",
-      "token": "recipient_token",
-      "role": "SIGNER",
-      "signingOrder": 1,
-      "signingUrl": "https://app.documenso.com/sign/recipient_token"
-    }
-  ]
-}
-```
-
---
-
-## Deprecated Template Endpoint Reference
-
-<Callout type="warn">
-  Every `/template/*` endpoint below is deprecated. Use the Envelope API for new integrations and
-  follow [Migrating to Envelopes](/docs/developers/api/migrate-to-envelopes) to replace existing calls.
-  The legacy reference remains here to support migrations.
-</Callout>
-
-## Legacy Template Object
+## Template Object

 A template object contains the following properties:

@@ -278,7 +91,7 @@ A template object contains the following properties:
 }
 ```

-## List Templates (Deprecated)
+## List Templates

 Retrieve a paginated list of templates.

@@ -326,8 +139,8 @@ const response = await fetch(`${BASE_URL}/template`, {
  },
 });

-const { data, count } = await response.json();
-console.log(`Found ${count} templates`);
+const { data, pagination } = await response.json();
+console.log(`Found ${pagination.totalItems} templates`);

 // Filter by type
 const privateResponse = await fetch(
@@ -368,16 +181,18 @@ const privateTemplates = await privateResponse.json();
      ]
    }
  ],
-  "count": 25,
-  "currentPage": 1,
-  "perPage": 10,
-  "totalPages": 3
+  "pagination": {
+    "page": 1,
+    "perPage": 10,
+    "totalPages": 3,
+    "totalItems": 25
+  }
 }
 ```

 ---

-## Get Template (Deprecated)
+## Get Template

 Retrieve a single template by ID.

@@ -423,9 +238,9 @@ Returns the full template object including recipients, fields, and metadata.

 ---

-## Create Document from Template (Deprecated)
+## Create Document from Template

-Create a new document using the deprecated template endpoint.
+Create a new document using a template. This is the primary way to use templates programmatically.

 <Callout type="info">
  This endpoint does not support [PDF placeholder parsing](/docs/users/documents/advanced/pdf-placeholders). Use `POST /envelope/create` for placeholder-based field positioning.
@@ -600,57 +415,32 @@ const prefilledDocument = await prefillResponse.json();

 ### Response

-The endpoint returns the full legacy document object. The selected fields below show both the numeric
-legacy `id` and canonical `envelopeId`. Recipient entries do not include a `signingUrl`.
+Returns the created document object with recipients and signing URLs.

 ```json
 {
-  "id": 789,
-  "envelopeId": "envelope_xyz789",
+  "id": "envelope_xyz789",
+  "type": "DOCUMENT",
  "status": "PENDING",
-  "source": "TEMPLATE",
  "title": "Employment Contract",
+  "source": "TEMPLATE",
  "externalId": "contract-2025-001",
  "recipients": [
    {
      "id": 1,
-      "envelopeId": "envelope_xyz789",
-      "documentId": 789,
-      "templateId": null,
      "email": "john.doe@example.com",
      "name": "John Doe",
      "role": "SIGNER",
      "signingStatus": "NOT_SIGNED",
-      "signingOrder": 1
+      "signingUrl": "https://app.documenso.com/sign/abc123"
    }
  ]
 }
-```
-
-To send a document created with `distributeDocument: false` and receive signing links, call
-`POST /envelope/distribute` with its `envelopeId`:
-
-```typescript
-const document = await response.json();
-
-const distributionResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-  method: 'POST',
-  headers: {
-    Authorization: API_TOKEN,
-    'Content-Type': 'application/json',
-  },
-  body: JSON.stringify({
-    envelopeId: document.envelopeId,
-  }),
-});
-
-const distribution = await distributionResponse.json();
-console.log('Signing URL:', distribution.recipients[0].signingUrl);
-```
+````

 ---

-## Override Template Settings (Deprecated)
+## Override Template Settings

 When creating a document from a template, you can override various settings:

@@ -698,7 +488,7 @@ const response = await fetch(`${BASE_URL}/template/use`, {

 ---

-## Prefill Fields (Deprecated)
+## Prefill Fields

 Prefill field values when creating a document from a template. This is useful for populating known data before sending.

@@ -787,7 +577,7 @@ const response = await fetch(`${BASE_URL}/template/use`, {

 ---

-## Update Template (Deprecated)
+## Update Template

 Update a template's properties.

@@ -853,7 +643,7 @@ const template = await response.json();

 ---

-## Duplicate Template (Deprecated)
+## Duplicate Template

 Create a copy of an existing template.

@@ -905,7 +695,7 @@ console.log('New template ID:', duplicatedTemplate.id);

 ---

-## Delete Template (Deprecated)
+## Delete Template

 Delete a template.

@@ -964,7 +754,7 @@ const { success } = await response.json();

 ---

-## Direct Link Templates (Deprecated)
+## Direct Link Templates

 Direct link templates allow recipients to create and sign documents without requiring you to explicitly create each document. When a recipient visits the direct link, a new document is automatically created from the template.

@@ -1108,7 +898,7 @@ const { success } = await response.json();

 ---

-## Custom Document Data (Deprecated)
+## Custom Document Data

 When creating a document from a template, you can replace the template's PDF with a custom PDF by using the `customDocumentData` parameter. This is useful when you need to generate the PDF dynamically while reusing the template's recipient and field configuration.

@@ -1123,7 +913,7 @@ See the [OpenAPI Reference](https://openapi.documenso.com) for the full request

 ---

-## Template Types (Legacy)
+## Template Types

 | Type      | Description                                                        |
 | --------- | ------------------------------------------------------------------ |
@@ -1132,7 +922,7 @@ See the [OpenAPI Reference](https://openapi.documenso.com) for the full request

 ---

-## Complete Legacy Example: Contract Workflow (Deprecated)
+## Complete Example: Contract Workflow

 This example demonstrates a complete workflow for using templates to send contracts.

@@ -1206,29 +996,16 @@ async function sendEmploymentContract(employeeData: {
        subject: `Employment Contract for ${employeeData.name}`,
        message: `Hi ${employeeData.name},\n\nPlease review and sign your employment contract.`,
      },
-      distributeDocument: false,
+      distributeDocument: true,
      externalId: `emp-contract-${Date.now()}`,
    }),
  });

  const document = await documentResponse.json();

-  // 5. Distribute the envelope and get recipient signing links
-  const distributionResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-    method: 'POST',
-    headers: {
-      Authorization: API_TOKEN,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      envelopeId: document.envelopeId,
-    }),
-  });
-  const distribution = await distributionResponse.json();
-
  return {
-    envelopeId: document.envelopeId,
-    signingUrl: distribution.recipients[0].signingUrl,
+    documentId: document.id,
+    signingUrl: document.recipients[0].signingUrl,
  };
 }

@@ -1241,7 +1018,7 @@ const result = await sendEmploymentContract({
  startDate: '2025-03-01',
 });

-console.log('Document created:', result.envelopeId);
+console.log('Document created:', result.documentId);
 console.log('Signing URL:', result.signingUrl);
 ````

@@ -256,11 +256,8 @@ Use templates for repeatable document workflows. This example creates an employm
    Map template fields by label and build a <code>prefillFields</code> array
  </Step>
  <Step>
-    Call <code>POST /template/use</code> with recipients and prefill data
-  </Step>
-  <Step>
-    Distribute the returned envelope via <code>POST /envelope/distribute</code> and read its signing
-    links
+    Call <code>POST /template/use</code> with recipients, prefill data, and{' '}
+    <code>distributeDocument: true</code>
  </Step>
 </Steps>

@@ -294,7 +291,7 @@ type TemplateRecipient = {
 async function sendEmploymentContract(
  templateId: number,
  employee: EmployeeData,
-): Promise<{ documentId: number; signingUrl: string }> {
+): Promise<{ documentId: string; signingUrl: string }> {
  const templateResponse = await fetch(`${BASE_URL}/template/${templateId}`, {
    headers: { Authorization: API_TOKEN },
  });
@@ -371,6 +368,7 @@ async function sendEmploymentContract(
        subject: `Your Employment Contract at ${employee.department}`,
        message: `Hi ${employee.name},\n\nPlease review and sign your employment contract for the ${employee.position} position.\n\nStart date: ${employee.startDate}`,
      },
+      distributeDocument: true,
      externalId: `emp-${Date.now()}-${employee.email.split('@')[0]}`,
    }),
  });
@@ -382,25 +380,9 @@ async function sendEmploymentContract(

  const document = await createResponse.json();

-  const distributeResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-    method: 'POST',
-    headers: {
-      Authorization: API_TOKEN,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({ envelopeId: document.envelopeId }),
-  });
-
-  if (!distributeResponse.ok) {
-    const error = await distributeResponse.json();
-    throw new Error(`Failed to send document: ${error.message}`);
-  }
-
-  const distributeResult = await distributeResponse.json();
-
  return {
    documentId: document.id,
-    signingUrl: distributeResult.recipients[0].signingUrl,
+    signingUrl: document.recipients[0].signingUrl,
  };
 }

@@ -465,17 +447,12 @@ RESPONSE=$(curl -s -X POST "${BASE_URL}/template/use" \
      \"subject\": \"Your Employment Contract\",
      \"message\": \"Please review and sign your employment contract.\"
    },
+    \"distributeDocument\": true,
    \"externalId\": \"emp-$(date +%s)-alice\"
  }")

-ENVELOPE_ID=$(echo $RESPONSE | jq -r '.envelopeId')
-DISTRIBUTE_RESPONSE=$(curl -s -X POST "${BASE_URL}/envelope/distribute" \
-  -H "Authorization: ${API_TOKEN}" \
-  -H "Content-Type: application/json" \
-  -d "{\"envelopeId\": \"${ENVELOPE_ID}\"}")
-
-echo "Document created: $(echo $RESPONSE | jq -r '.id')"
-echo "Signing URL: $(echo $DISTRIBUTE_RESPONSE | jq -r '.recipients[0].signingUrl')"
+echo "Document created:"
+echo $RESPONSE | jq '{id, signingUrl: .recipients[0].signingUrl}'
 ````

 </Tab>
@@ -493,10 +470,8 @@ Send the same document to multiple recipients in parallel. Useful for policy ack
    Fetch the template and get the signer recipient slot ID
  </Step>
  <Step>
-    For each recipient, call <code>POST /template/use</code>
-  </Step>
-  <Step>
-    Distribute each returned envelope via <code>POST /envelope/distribute</code>
+    For each recipient, call <code>POST /template/use</code> with{' '}
+    <code>distributeDocument: true</code>
  </Step>
  <Step>
    Process in batches with a short delay to respect rate limits (e.g. 1000 requests/minute)
@@ -559,6 +534,7 @@ async function bulkSendFromTemplate(
            recipients: [
              { id: signerSlot.id, email: recipient.email, name: recipient.name },
            ],
+            distributeDocument: true,
            externalId: `bulk-${Date.now()}-${recipient.email}`,
          }),
        });
@@ -569,26 +545,10 @@ async function bulkSendFromTemplate(
        }

        const document = await response.json();
-
-        const distributeResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-          method: 'POST',
-          headers: {
-            Authorization: API_TOKEN,
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({ envelopeId: document.envelopeId }),
-        });
-
-        if (!distributeResponse.ok) {
-          const error = await distributeResponse.json();
-          throw new Error(error.message || 'Failed to distribute document');
-        }
-
-        const distributeResult = await distributeResponse.json();
        return {
          email: recipient.email,
-          envelopeId: document.envelopeId,
-          signingUrl: distributeResult.recipients[0].signingUrl,
+          envelopeId: document.id,
+          signingUrl: document.recipients[0].signingUrl,
        };
      }),
    );
@@ -661,24 +621,14 @@ for RECIPIENT in "${RECIPIENTS[@]}"; do
        \"email\": \"${EMAIL}\",
        \"name\": \"${NAME}\"
      }],
+      \"distributeDocument\": true,
      \"externalId\": \"bulk-$(date +%s)-${EMAIL}\"
    }")

-  if echo $RESPONSE | jq -e '.envelopeId' > /dev/null 2>&1; then
-    ENVELOPE_ID=$(echo $RESPONSE | jq -r '.envelopeId')
-    DISTRIBUTE_RESPONSE=$(curl -s -X POST "${BASE_URL}/envelope/distribute" \
-      -H "Authorization: ${API_TOKEN}" \
-      -H "Content-Type: application/json" \
-      -d "{\"envelopeId\": \"${ENVELOPE_ID}\"}")
-
-    if echo $DISTRIBUTE_RESPONSE | jq -e '.success' > /dev/null 2>&1; then
-      echo "  Success: ${ENVELOPE_ID}"
-      echo "  Signing URL: $(echo $DISTRIBUTE_RESPONSE | jq -r '.recipients[0].signingUrl')"
-    else
-      echo "  Failed to distribute: $(echo $DISTRIBUTE_RESPONSE | jq -r '.message')"
-    fi
+  if echo $RESPONSE | jq -e '.id' > /dev/null 2>&1; then
+    echo "  Success: $(echo $RESPONSE | jq -r '.id')"
  else
-    echo "  Failed to create: $(echo $RESPONSE | jq -r '.message')"
+    echo "  Failed: $(echo $RESPONSE | jq -r '.message')"
  fi

  # Rate limiting delay
@@ -881,15 +831,13 @@ After a document is completed, download the signed PDF with all signatures embed
  </Step>
 </Steps>

-The `version` query parameter accepts `original`, `pending`, or `signed`.
-
 <Tabs items={['TypeScript', 'curl']}>
 <Tab value="TypeScript">
 ```typescript
 const API_TOKEN = process.env.DOCUMENSO_API_TOKEN;
 const BASE_URL = 'https://app.documenso.com/api/v2';

-type DownloadVersion = 'original' | 'pending' | 'signed';
+type DownloadVersion = 'signed' | 'original';

 async function downloadDocument(
  envelopeId: string,
@@ -943,7 +891,7 @@ async function downloadAllCompletedDocuments(outputDir: string): Promise<void> {
      { headers: { Authorization: API_TOKEN } },
    );

-    const { data, count, currentPage, perPage, totalPages } = await response.json();
+    const { data, pagination } = await response.json();

    for (const envelope of data) {
      try {
@@ -957,8 +905,8 @@ async function downloadAllCompletedDocuments(outputDir: string): Promise<void> {
      await new Promise((resolve) => setTimeout(resolve, 500));
    }

-    hasMore = currentPage < totalPages;
-    page = currentPage + 1;
+    hasMore = page < pagination.totalPages;
+    page++;
  }
 }

@@ -1052,12 +1000,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;
      }

@@ -24,18 +24,20 @@ import { Step, Steps } from 'fumadocs-ui/components/steps';
 {/* prettier-ignore */}
 <Steps>
 <Step>
-### Select a team
+### Open settings

-Log in to Documenso and open the team that the integration should access. API tokens are scoped to a
-team.
+- Log in to your Documenso account
+- Click your avatar in the top right corner
+- Select **Settings** from the dropdown menu
+
+![User dropdown menu](/public-api-images/documenso-user-dropdown-menu.webp)

 </Step>

 <Step>
-### Open API Tokens
+### Navigate to the API Tokens tab

-Go to **Team Settings** → **API Tokens**, or open
-`/t/{teamUrl}/settings/tokens` after replacing `{teamUrl}` with your team's URL.
+Go to **Settings** and open the **API Tokens** tab.

 ![API tokens page](/public-api-images/api-tokens-page-documenso.webp)

@@ -46,7 +48,7 @@ Go to **Team Settings** → **API Tokens**, or open

 - Click **Create Token**
 - Enter a descriptive name (e.g., `production-backend`, `zapier-integration`)
- Select an expiration period: 7 days, 1 month, 3 months, 6 months, 12 months, or Never
+- Select an expiration period: never expires, 7 days, 1 month, 3 months, 6 months, or 1 year
 - Click **Create Token**

 </Step>
@@ -73,21 +75,21 @@ Include the token in the `Authorization` header of your HTTP requests.
 ### cURL

 ```bash
-curl https://app.documenso.com/api/v2/envelope \
+curl https://app.documenso.com/api/v2/document \
  -H "Authorization: api_xxxxxxxxxxxxxxxx"
 ```

 ### JavaScript / TypeScript

 ```typescript
-const response = await fetch('https://app.documenso.com/api/v2/envelope', {
+const response = await fetch('https://app.documenso.com/api/v2/document', {
  method: 'GET',
  headers: {
    Authorization: 'api_xxxxxxxxxxxxxxxx',
  },
 });

-const envelopes = await response.json();
+const documents = await response.json();
 ```

 ### Using the TypeScript SDK
@@ -127,7 +129,7 @@ SDKs are available for [TypeScript](https://github.com/documenso/sdk-typescript)

 ## Token Security

-API tokens grant full API access to the team they were created for. Follow these practices to keep them secure:
+API tokens grant full access to your account. Follow these practices to keep them secure:

 - **Never commit tokens to version control.** Use environment variables instead.
 - **Use descriptive names.** Names like `zapier-prod` or `backend-staging` help you identify token usage.
@@ -153,11 +155,12 @@ const client = new Documenso({

 ## Token Scope

-API tokens have full API access to the team they were created for, including:
+API tokens have full access to your account, including:

 - Creating, reading, updating, and deleting documents
 - Managing recipients and fields
 - Accessing templates
+- Managing team resources (if the token owner has team access)

 There is currently no way to create tokens with limited scopes or permissions.

@@ -168,7 +171,7 @@ To revoke a token:
 {/* prettier-ignore */}
 <Steps>
  <Step>
-    Go to **Team Settings** → **API Tokens**
+    Go to **Settings** > **API Tokens**
  </Step>
  <Step>
    Find the token you want to revoke
@@ -191,7 +194,7 @@ Revoked tokens stop working immediately. Any integrations using that token will
  </Accordion>
  <Accordion title="401 Unauthorized — Expired token">Create a new token in settings.</Accordion>
  <Accordion title="403 Forbidden — Token doesn't have access to the resource">
-    Ensure you're accessing resources owned by the token's team.
+    Ensure you're accessing resources owned by the token's account.
  </Accordion>
 </Accordions>

@@ -78,10 +78,12 @@ A successful response returns a list of your documents (envelopes):
      "createdAt": "2025-01-15T10:30:00.000Z"
    }
  ],
-  "count": 1,
-  "currentPage": 1,
-  "perPage": 10,
-  "totalPages": 1
+  "pagination": {
+    "page": 1,
+    "perPage": 10,
+    "totalPages": 1,
+    "totalItems": 1
+  }
 }
 ````

@@ -226,12 +228,9 @@ After creating a document, it's in `DRAFT` status. To send it to recipients, use
 <Tabs items={['curl', 'JavaScript']}>
 <Tab value="curl">
 ```bash
-curl -X POST "https://app.documenso.com/api/v2/envelope/distribute" \
+curl -X POST "https://app.documenso.com/api/v2/envelope/envelope_abc123/distribute" \
  -H "Authorization: YOUR_API_TOKEN" \
-  -H "Content-Type: application/json" \
-  -d '{
-    "envelopeId": "envelope_abc123"
-  }'
+  -H "Content-Type: application/json"
 ````

 </Tab>
@@ -239,14 +238,16 @@ curl -X POST "https://app.documenso.com/api/v2/envelope/distribute" \
 ```javascript
 const envelopeId = 'envelope_abc123';

-const response = await fetch('https://app.documenso.com/api/v2/envelope/distribute', {
-  method: 'POST',
-  headers: {
-    Authorization: 'YOUR_API_TOKEN',
-    'Content-Type': 'application/json',
+const response = await fetch(
+  `https://app.documenso.com/api/v2/envelope/${envelopeId}/distribute`,
+  {
+    method: 'POST',
+    headers: {
+      Authorization: 'YOUR_API_TOKEN',
+      'Content-Type': 'application/json',
+    },
  },
-  body: JSON.stringify({ envelopeId }),
-});
+);

 const data = await response.json();
 console.log('Document sent:', data);
@@ -336,14 +337,16 @@ async function createAndSendDocument(pdfPath, recipientEmail, recipientName) {
  console.log('Created envelope:', envelope.id);

  // Step 2: Send the document for signing
-  const distributeResponse = await fetch(`${BASE_URL}/envelope/distribute`, {
-    method: 'POST',
-    headers: {
-      'Authorization': API_TOKEN,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({ envelopeId: envelope.id }),
-  });
+  const distributeResponse = await fetch(
+    `${BASE_URL}/envelope/${envelope.id}/distribute`,
+    {
+      method: 'POST',
+      headers: {
+        'Authorization': API_TOKEN,
+        'Content-Type': 'application/json',
+      },
+    }
+  );

  if (!distributeResponse.ok) {
    const error = await distributeResponse.json();
@@ -419,12 +422,9 @@ echo "Created envelope: ${ENVELOPE_ID}"
 # Step 2: Send the document for signing

 echo "Sending document..."
-curl -s -X POST "${BASE_URL}/envelope/distribute" \
+curl -s -X POST "${BASE_URL}/envelope/${ENVELOPE_ID}/distribute" \
  -H "Authorization: ${API_TOKEN}" \
-  -H "Content-Type: application/json" \
-  -d "{
-    \"envelopeId\": \"${ENVELOPE_ID}\"
-  }"
+  -H "Content-Type: application/json"

 echo "Document sent for signing!"

@@ -441,7 +441,7 @@ The API returns standard HTTP status codes and JSON error responses:
 | `400` | Bad request - check your request payload |
 | `401` | Unauthorized - invalid or missing API token |
 | `404` | Not found - resource doesn't exist |
-| `429` | Rate limited - wait for the duration in the `Retry-After` header |
+| `429` | Rate limited - wait 60 seconds and retry |
 | `500` | Server error - retry or contact support |

 ### Error Response Format
@@ -485,7 +485,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. Every response includes `X-RateLimit-Remaining` and `X-RateLimit-Reset` (an epoch timestamp in seconds). When you receive a `429` response, read the `Retry-After` header and wait for that many seconds before retrying. See [Error Handling Patterns](/docs/developers/examples/common-workflows#error-handling-patterns) for a more complete retry strategy.
+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:

 ```javascript
 async function fetchWithRetry(url, options, maxRetries = 3) {
@@ -493,9 +493,8 @@ async function fetchWithRetry(url, options, maxRetries = 3) {
    const response = await fetch(url, options);

    if (response.status === 429) {
-      const retryAfterSeconds = Number.parseInt(response.headers.get('Retry-After') ?? '1', 10);
-      console.log(`Rate limited, waiting ${retryAfterSeconds} seconds...`);
-      await new Promise((resolve) => setTimeout(resolve, retryAfterSeconds * 1000));
+      console.log('Rate limited, waiting 60 seconds...');
+      await new Promise((resolve) => setTimeout(resolve, 60000));
      continue;
    }

@@ -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>

@@ -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
@@ -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).
@@ -255,7 +255,6 @@ const validEvents = [
  'DOCUMENT_REJECTED',
  'DOCUMENT_CANCELLED',
  'DOCUMENT_REMINDER_SENT',
-  'RECIPIENT_EXPIRED',
  'TEMPLATE_CREATED',
  'TEMPLATE_UPDATED',
  'TEMPLATE_DELETED',
@@ -10,7 +10,6 @@
    "postinstall": "fumadocs-mdx"
  },
  "dependencies": {
-    "@radix-ui/react-tabs": "^1.1.13",
    "fumadocs-core": "16.5.0",
    "fumadocs-mdx": "14.2.6",
    "fumadocs-ui": "16.5.0",
@@ -16,7 +16,7 @@
  },
  "devDependencies": {
    "@types/node": "^20",
-    "@types/react": "18.3.27",
+    "@types/react": "^19.2.17",
    "typescript": "5.6.2"
  }
 }
@@ -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>

@@ -18,7 +18,7 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { keepPreviousData } from '@tanstack/react-query';
-import { commandScore } from 'cmdk/dist/command-score';
+import { defaultFilter as commandScore } from 'cmdk';
 import {
  ArrowLeftIcon,
  CheckIcon,
@@ -146,14 +146,17 @@ export const DocumentSigningRadioField = ({ field, onSignField, onUnsignField }:
      {isLoading && <DocumentSigningFieldsLoader />}

      {!field.inserted && (
-        <RadioGroup onValueChange={(value) => handleSelectItem(value)} className="z-10 my-0.5 gap-y-1">
+        <RadioGroup
+          value={selectedOption}
+          onValueChange={(value) => handleSelectItem(value)}
+          className="z-10 my-0.5 gap-y-1"
+        >
          {values?.map((item, index) => (
            <div key={index} className="flex items-center">
              <RadioGroupItem
                className="h-3 w-3 shrink-0"
                value={item.value}
                id={`option-${field.id}-${item.id}`}
-                checked={item.checked}
                disabled={isReadOnly}
              />
              {!item.value.includes('empty-value-') && item.value && (
@@ -167,14 +170,13 @@ export const DocumentSigningRadioField = ({ field, onSignField, onUnsignField }:
      )}

      {field.inserted && (
-        <RadioGroup className="my-0.5 gap-y-1">
+        <RadioGroup value={field.customText ?? ''} className="my-0.5 gap-y-1">
          {values?.map((item, index) => (
            <div key={index} className="flex items-center">
              <RadioGroupItem
                className="h-3 w-3"
                value={item.value}
                id={`option-${field.id}-${item.id}`}
-                checked={item.value === field.customText}
                disabled={isReadOnly}
              />
              {!item.value.includes('empty-value-') && item.value && (
@@ -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`,
@@ -215,7 +215,7 @@ export default function PDFViewer({

 type VirtualizedPageListProps = {
  scrollParentRef: ScrollTarget;
-  constraintRef: React.RefObject<HTMLDivElement>;
+  constraintRef: React.RefObject<HTMLDivElement | null>;
  pages: PageMeta[];
  numPages: number;
  pdf: pdfjsLib.PDFDocumentProxy;
@@ -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.`,
@@ -31,6 +31,26 @@ function initPosthog() {
  }
 }

+/**
+ * Surfaces hydration recoveries (React 19 discards the server HTML and
+ * re-renders on the client instead of dying) so we can track how often
+ * extensions/early clicks interfere with hydration in the wild.
+ */
+function onRecoverableError(error: unknown, errorInfo: { componentStack?: string }) {
+  console.error('[hydration] recovered from error', error, errorInfo.componentStack);
+
+  if (extractPostHogConfig()) {
+    void import('posthog-js').then(({ default: posthog }) => {
+      if (posthog.__loaded) {
+        posthog.capture('$hydration_recoverable_error', {
+          message: error instanceof Error ? error.message : String(error),
+          componentStack: errorInfo.componentStack,
+        });
+      }
+    });
+  }
+}
+
 async function main() {
  const locale = detect(fromHtmlTag('lang')) || 'en';

@@ -44,6 +64,7 @@ async function main() {
          <HydratedRouter />
        </I18nProvider>
      </StrictMode>,
+      { onRecoverableError },
    );
  });

@@ -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) => {
@@ -57,9 +57,9 @@
    "papaparse": "^5.5.3",
    "posthog-js": "^1.297.2",
    "posthog-node": "4.18.0",
-    "react": "^18",
+    "react": "^19.2.7",
    "react-call": "^1.8.1",
-    "react-dom": "^18",
+    "react-dom": "^19.2.7",
    "react-dropzone": "^14.3.8",
    "react-hook-form": "^7.66.1",
    "react-hotkeys-hook": "^4.6.2",
@@ -93,8 +93,8 @@
    "@types/luxon": "^3.7.1",
    "@types/node": "^20",
    "@types/papaparse": "^5.5.0",
-    "@types/react": "18.3.27",
-    "@types/react-dom": "^18",
+    "@types/react": "^19.2.17",
+    "@types/react-dom": "^19.2.3",
    "@types/ua-parser-js": "^0.7.39",
    "cross-env": "^10.1.0",
    "esbuild": "^0.27.0",
@@ -48,14 +48,16 @@
  },
  "devDependencies": {
    "@biomejs/biome": "2.4.8",
+    "@types/react": "^19.2.17",
+    "@types/react-dom": "^19.2.3",
    "@commitlint/cli": "^20.1.0",
    "@commitlint/config-conventional": "^20.0.0",
    "@datadog/pprof": "^5.13.5",
    "@lingui/cli": "^5.6.0",
    "@prisma/client": "^6.19.0",
-    "@trpc/client": "11.8.1",
-    "@trpc/react-query": "11.8.1",
-    "@trpc/server": "11.8.1",
+    "@trpc/client": "11.17.0",
+    "@trpc/react-query": "11.17.0",
+    "@trpc/server": "11.17.0",
    "@ts-rest/core": "^3.52.1",
    "@ts-rest/open-api": "^3.52.1",
    "@ts-rest/serverless": "^3.52.1",
@@ -92,12 +94,40 @@
    "@lingui/conf": "^5.6.0",
    "@lingui/core": "^5.6.0",
    "@prisma/extension-read-replicas": "^0.4.1",
+    "@radix-ui/react-accordion": "^1.2.16",
+    "@radix-ui/react-alert-dialog": "^1.1.19",
+    "@radix-ui/react-aspect-ratio": "^1.1.11",
+    "@radix-ui/react-avatar": "^1.2.2",
+    "@radix-ui/react-checkbox": "^1.3.7",
+    "@radix-ui/react-collapsible": "^1.1.16",
+    "@radix-ui/react-context-menu": "^2.3.3",
+    "@radix-ui/react-dialog": "^1.1.19",
+    "@radix-ui/react-dropdown-menu": "^2.1.20",
+    "@radix-ui/react-hover-card": "^1.1.19",
+    "@radix-ui/react-label": "^2.1.11",
+    "@radix-ui/react-menubar": "^1.1.20",
+    "@radix-ui/react-navigation-menu": "^1.2.18",
+    "@radix-ui/react-popover": "^1.1.19",
+    "@radix-ui/react-progress": "^1.1.12",
+    "@radix-ui/react-radio-group": "^1.4.3",
+    "@radix-ui/react-scroll-area": "^1.2.14",
+    "@radix-ui/react-select": "^2.3.3",
+    "@radix-ui/react-separator": "^1.1.11",
+    "@radix-ui/react-slider": "^1.4.3",
+    "@radix-ui/react-slot": "^1.3.0",
+    "@radix-ui/react-switch": "^1.3.3",
+    "@radix-ui/react-tabs": "^1.1.17",
+    "@radix-ui/react-toast": "^1.2.19",
+    "@radix-ui/react-toggle": "^1.1.14",
+    "@radix-ui/react-toggle-group": "^1.1.15",
+    "@radix-ui/react-tooltip": "^1.2.12",
    "ai": "^5.0.104",
    "cron-parser": "^5.5.0",
    "luxon": "^3.7.2",
    "patch-package": "^8.0.1",
    "posthog-node": "4.18.0",
-    "react": "^18",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
    "typescript": "5.6.2",
    "@marsidev/react-turnstile": "^1.5.0",
    "zod": "^3.25.76"
@@ -106,6 +136,10 @@
    "lodash": "4.18.1",
    "pdfjs-dist": "5.4.296",
    "postcss": "^8.5.19",
+    "react": "$react",
+    "react-dom": "$react-dom",
+    "@types/react": "^19.2.17",
+    "@types/react-dom": "^19.2.3",
    "typescript": "5.6.2",
    "zod": "$zod",
    "fumadocs-mdx": {
@@ -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);
-  });
-});
@@ -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);
-  });
-});
@@ -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);
-  });
-});
@@ -19,7 +19,7 @@
    "arctic": "^3.7.0",
    "hono": "^4.12.14",
    "luxon": "^3.7.2",
-    "react": "^18",
+    "react": "^19.2.7",
    "ts-pattern": "^5.9.0",
    "zod": "^3.25.76"
  }
@@ -1,17 +1,19 @@
-export { Body } from '@react-email/body';
-export { Button } from '@react-email/button';
-export { Column } from '@react-email/column';
-export { Container } from '@react-email/container';
-export { Font } from '@react-email/font';
-export { Head } from '@react-email/head';
-export { Heading } from '@react-email/heading';
-export { Hr } from '@react-email/hr';
-export { Html } from '@react-email/html';
-export { Img } from '@react-email/img';
-export { Link } from '@react-email/link';
-export { Preview } from '@react-email/preview';
-export { render } from '@react-email/render';
-export { Row } from '@react-email/row';
-export { Section } from '@react-email/section';
-export { Tailwind } from '@react-email/tailwind';
-export { Text } from '@react-email/text';
+export {
+  Body,
+  Button,
+  Column,
+  Container,
+  Font,
+  Head,
+  Heading,
+  Hr,
+  Html,
+  Img,
+  Link,
+  Preview,
+  Row,
+  render,
+  Section,
+  Tailwind,
+  Text,
+} from 'react-email';
@@ -19,27 +19,9 @@
  "dependencies": {
    "@documenso/nodemailer-resend": "5.0.0",
    "@documenso/tailwind-config": "*",
-    "@react-email/body": "0.2.0",
-    "@react-email/button": "0.2.0",
-    "@react-email/code-block": "0.2.0",
-    "@react-email/code-inline": "0.0.5",
-    "@react-email/column": "0.0.13",
-    "@react-email/container": "0.0.15",
-    "@react-email/font": "0.0.9",
-    "@react-email/head": "0.0.12",
-    "@react-email/heading": "0.0.15",
-    "@react-email/hr": "0.0.11",
-    "@react-email/html": "0.0.11",
-    "@react-email/img": "0.0.11",
-    "@react-email/link": "0.0.12",
-    "@react-email/preview": "0.0.13",
-    "@react-email/render": "2.0.0",
-    "@react-email/row": "0.0.12",
-    "@react-email/section": "0.0.16",
-    "@react-email/tailwind": "^2.0.1",
-    "@react-email/text": "0.1.5",
+    "@react-email/render": "2.1.0",
    "nodemailer": "^9.0.0",
-    "react-email": "^5.0.6",
+    "react-email": "^6.9.0",
    "resend": "^6.5.2"
  },
  "devDependencies": {
@@ -8,7 +8,7 @@ type SaveRequest<T, R> = {
 export const useAutoSave = <T, R = void>(onSave: (data: T) => Promise<R>, options: { delay?: number } = {}) => {
  const { delay = 2000 } = options;

-  const saveTimeoutRef = useRef<NodeJS.Timeout>();
+  const saveTimeoutRef = useRef<NodeJS.Timeout | undefined>(undefined);
  const saveQueueRef = useRef<SaveRequest<T, R>[]>([]);
  const isProcessingRef = useRef(false);

@@ -15,7 +15,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 import { useLingui } from '@lingui/react/macro';
 import { EnvelopeType, Prisma, ReadStatus, SendStatus, SigningStatus } from '@prisma/client';
 import type React from 'react';
-import { createContext, useCallback, useContext, useMemo, useRef, useState } from 'react';
+import { createContext, useCallback, useContext, useMemo, useRef, useState, useSyncExternalStore } from 'react';
 import { useSearchParams } from 'react-router';

 import type { TDocumentEmailSettings } from '../../types/document-email';
@@ -107,7 +107,39 @@ export const EnvelopeEditorProvider = ({

  const [_searchParams, setSearchParams] = useSearchParams();

-  const [envelope, _setEnvelope] = useState(initialEnvelope);
+  /**
+   * The envelope is kept in a ref-backed external store instead of useState so
+   * that async consumers (debounced autosave callbacks, flushAutosave, resetForms)
+   * can synchronously read the latest value via `getEnvelope`.
+   *
+   * React subscribes to the store through useSyncExternalStore, keeping renders in
+   * sync without maintaining a separate copy of the state.
+   */
+  const envelopeStoreRef = useRef(initialEnvelope);
+  const envelopeStoreSubscribersRef = useRef(new Set<() => void>());
+
+  const subscribeToEnvelopeStore = useCallback((onStoreChange: () => void) => {
+    envelopeStoreSubscribersRef.current.add(onStoreChange);
+
+    return () => {
+      envelopeStoreSubscribersRef.current.delete(onStoreChange);
+    };
+  }, []);
+
+  const getEnvelope = useCallback(() => envelopeStoreRef.current, []);
+
+  const setEnvelope = useCallback((action: React.SetStateAction<TEditorEnvelope>) => {
+    const next = typeof action === 'function' ? action(envelopeStoreRef.current) : action;
+
+    envelopeStoreRef.current = next;
+
+    for (const onStoreChange of envelopeStoreSubscribersRef.current) {
+      onStoreChange();
+    }
+  }, []);
+
+  const envelope = useSyncExternalStore(subscribeToEnvelopeStore, getEnvelope, getEnvelope);
+
  const [autosaveError, setAutosaveError] = useState<boolean>(false);

  const isCscMode = IS_INSTANCE_CSC_MODE();
@@ -135,8 +167,6 @@ export const EnvelopeEditorProvider = ({
    };
  }, [isCscMode, providedEditorConfig]);

-  const envelopeRef = useRef(initialEnvelope);
-
  const externalFlushCallbacksRef = useRef<Map<string, () => Promise<void>>>(new Map());
  const pendingMutationsRef = useRef<Set<Promise<unknown>>>(new Set());

@@ -156,14 +186,6 @@ export const EnvelopeEditorProvider = ({
    });
  }, []);

-  const setEnvelope: typeof _setEnvelope = (action) => {
-    _setEnvelope((prev) => {
-      const next = typeof action === 'function' ? action(prev) : action;
-      envelopeRef.current = next;
-      return next;
-    });
-  };
-
  const isEmbedded = editorConfig.embedded !== undefined;

  const editorFields = useEditorFields({
@@ -192,16 +214,18 @@ export const EnvelopeEditorProvider = ({
    try {
      let recipients: TEditorEnvelope['recipients'] = [];

+      const currentEnvelope = getEnvelope();
+
      if (!isEmbedded) {
        const response = await setRecipientsMutation.mutateAsync({
-          envelopeId: envelope.id,
-          envelopeType: envelope.type,
+          envelopeId: currentEnvelope.id,
+          envelopeType: currentEnvelope.type,
          recipients: localRecipients,
        });

        recipients = response.data;
      } else {
-        recipients = mapLocalRecipientsToRecipients({ envelope, localRecipients });
+        recipients = mapLocalRecipientsToRecipients({ envelope: currentEnvelope, localRecipients });
      }

      setEnvelope((prev) => ({
@@ -211,9 +235,7 @@ export const EnvelopeEditorProvider = ({
      }));

      // Reset the local fields to ensure deleted recipient fields are removed.
-      editorFields.resetForm(
-        envelope.fields.filter((field) => recipients.some((recipient) => recipient.id === field.recipientId)),
-      );
+      editorFields.resetForm(getEnvelope().fields);

      setAutosaveError(false);
    } catch (err) {
@@ -248,16 +270,18 @@ export const EnvelopeEditorProvider = ({
    try {
      let fields: TSetEnvelopeFieldsResponse['data'] = [];

+      const currentEnvelope = getEnvelope();
+
      if (!isEmbedded) {
        const response = await setFieldsMutation.mutateAsync({
-          envelopeId: envelope.id,
-          envelopeType: envelope.type,
+          envelopeId: currentEnvelope.id,
+          envelopeType: currentEnvelope.type,
          fields: localFields,
        });

        fields = response.data;
      } else {
-        fields = mapLocalFieldsToFields({ envelope, localFields });
+        fields = mapLocalFieldsToFields({ envelope: currentEnvelope, localFields });
      }

      setEnvelope((prev) => ({
@@ -309,7 +333,7 @@ export const EnvelopeEditorProvider = ({
    try {
      const response = !isEmbedded
        ? await updateEnvelopeMutation.mutateAsync({
-            envelopeId: envelope.id,
+            envelopeId: getEnvelope().id,
            data,
            meta,
          })
@@ -467,12 +491,14 @@ export const EnvelopeEditorProvider = ({
  };

  const resetForms = () => {
+    const currentEnvelope = getEnvelope();
+
    editorRecipients.resetForm({
-      recipients: envelopeRef.current.recipients,
-      documentMeta: envelopeRef.current.documentMeta,
+      recipients: currentEnvelope.recipients,
+      documentMeta: currentEnvelope.documentMeta,
    });

-    editorFields.resetForm(envelopeRef.current.fields);
+    editorFields.resetForm(currentEnvelope.fields);
  };

  const flushAutosave = async (): Promise<TEditorEnvelope> => {
@@ -488,7 +514,7 @@ export const EnvelopeEditorProvider = ({
      await Promise.allSettled(Array.from(pendingMutationsRef.current));
    }

-    return envelopeRef.current;
+    return getEnvelope();
  };

  return (
@@ -64,7 +64,7 @@
    "postcss-selector-parser": "^7.1.4",
    "posthog-js": "^1.297.2",
    "posthog-node": "4.18.0",
-    "react": "^18",
+    "react": "^19.2.7",
    "remeda": "^2.32.0",
    "sharp": "0.34.5",
    "skia-canvas": "^3.0.8",
@@ -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,
@@ -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();
  };

@@ -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,
  };
@@ -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:
@@ -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')),
-  );
@@ -4,7 +4,6 @@ export const ExtendedDocumentStatus = {
  ...DocumentStatus,
  INBOX: 'INBOX',
  ALL: 'ALL',
-  EXPIRED: 'EXPIRED',
 } as const;

 export type ExtendedDocumentStatus = (typeof ExtendedDocumentStatus)[keyof typeof ExtendedDocumentStatus];
@@ -12,9 +12,9 @@
    "@documenso/prisma": "*",
    "@simplewebauthn/server": "^13.2.2",
    "@tanstack/react-query": "5.90.10",
-    "@trpc/client": "11.8.1",
-    "@trpc/react-query": "11.8.1",
-    "@trpc/server": "11.8.1",
+    "@trpc/client": "11.17.0",
+    "@trpc/react-query": "11.17.0",
+    "@trpc/server": "11.17.0",
    "@ts-rest/core": "^3.52.1",
    "formidable": "^3.5.4",
    "luxon": "^3.7.2",
@@ -23,7 +23,6 @@ export const findDocumentsInternalRoute = authenticatedProcedure
      orderByColumn,
      source,
      status,
-      hasExpiredRecipients,
      period,
      senderIds,
      folderId,
@@ -50,7 +49,6 @@ export const findDocumentsInternalRoute = authenticatedProcedure
        period,
        senderIds,
        folderId,
-        hasExpiredRecipients,
        orderBy: orderByColumn ? { column: orderByColumn, direction: orderByDirection } : undefined,
      }),
    ]);
@@ -20,7 +20,6 @@ export const ZFindDocumentsInternalResponseSchema = ZFindResultResponse.extend({
    [ExtendedDocumentStatus.COMPLETED]: z.number(),
    [ExtendedDocumentStatus.REJECTED]: z.number(),
    [ExtendedDocumentStatus.CANCELLED]: z.number(),
-    [ExtendedDocumentStatus.EXPIRED]: z.number(),
    [ExtendedDocumentStatus.INBOX]: z.number(),
    [ExtendedDocumentStatus.ALL]: z.number(),
  }),
@@ -11,18 +11,7 @@ export const findDocumentsRoute = authenticatedProcedure
  .query(async ({ input, ctx }) => {
    const { user, teamId } = ctx;

-    const {
-      query,
-      templateId,
-      page,
-      perPage,
-      orderByDirection,
-      orderByColumn,
-      source,
-      status,
-      hasExpiredRecipients,
-      folderId,
-    } = input;
+    const { query, templateId, page, perPage, orderByDirection, orderByColumn, source, status, folderId } = input;

    const documents = await findDocuments({
      userId: user.id,
@@ -31,7 +20,6 @@ export const findDocumentsRoute = authenticatedProcedure
      query,
      source,
      status,
-      hasExpiredRecipients,
      page,
      perPage,
      folderId,
@@ -21,11 +21,6 @@ export const ZFindDocumentsRequestSchema = ZFindSearchParamsSchema.extend({
  templateId: z.number().describe('Filter documents by the template ID used to create it.').optional(),
  source: z.nativeEnum(DocumentSource).describe('Filter documents by how it was created.').optional(),
  status: z.nativeEnum(DocumentStatus).describe('Filter documents by the current status').optional(),
-  hasExpiredRecipients: z
-    .enum(['true', 'false'])
-    .describe('Filter for documents that have at least one recipient whose signing link has expired.')
-    .transform((value) => value === 'true')
-    .optional(),
  folderId: z.string().describe('Filter documents by folder ID').optional(),
  orderByColumn: z.enum(['createdAt']).optional(),
  orderByDirection: z.enum(['asc', 'desc']).describe('').default('desc'),
@@ -9,7 +9,7 @@ export const redistributeDocumentMeta: TrpcRouteMeta = {
    path: '/document/redistribute',
    summary: 'Redistribute document',
    description:
-      'Deprecated: this endpoint is being replaced by the Envelope API. See https://docs.documenso.com/docs/developers/api/migrate-to-envelopes for the migration guide. Redistribute the document to the provided recipients who have not actioned the document. Will use the distribution method set in the document. This also refreshes the signing-link expiration for the targeted unsigned recipients, renewing any expired links.',
+      'Deprecated: this endpoint is being replaced by the Envelope API. See https://docs.documenso.com/docs/developers/api/migrate-to-envelopes for the migration guide. Redistribute the document to the provided recipients who have not actioned the document. Will use the distribution method set in the document',
    tags: ['Document'],
    deprecated: true,
  },
@@ -8,14 +8,13 @@ export const cancelEnvelopeMeta: TrpcRouteMeta = {
    method: 'POST',
    path: '/envelope/cancel',
    summary: 'Cancel envelope',
-    description: 'Cancel a pending envelope',
    tags: ['Envelope'],
  },
 };

 export const ZCancelEnvelopeRequestSchema = z.object({
-  envelopeId: z.string().describe('The ID of the envelope to cancel.'),
-  reason: z.string().describe('The reason for cancelling the envelope.').optional(),
+  envelopeId: z.string(),
+  reason: z.string().optional(),
 });

 export const ZCancelEnvelopeResponseSchema = ZSuccessResponseSchema;
@@ -8,13 +8,12 @@ export const deleteEnvelopeMeta: TrpcRouteMeta = {
    method: 'POST',
    path: '/envelope/delete',
    summary: 'Delete envelope',
-    description: 'Delete an envelope',
    tags: ['Envelope'],
  },
 };

 export const ZDeleteEnvelopeRequestSchema = z.object({
-  envelopeId: z.string().describe('The ID of the envelope to delete.'),
+  envelopeId: z.string(),
 });

 export const ZDeleteEnvelopeResponseSchema = ZSuccessResponseSchema;
@@ -29,17 +29,7 @@ export const updateEnvelopeFieldsRoute = authenticatedProcedure
        id: envelopeId,
      },
      type: null,
-      fields: fields.map((field) => ({
-        id: field.id,
-        type: field.type,
-        pageNumber: field.page,
-        pageX: field.positionX,
-        pageY: field.positionY,
-        width: field.width,
-        height: field.height,
-        fieldMeta: field.fieldMeta,
-        envelopeItemId: field.envelopeItemId,
-      })),
+      fields,
      requestMetadata: ctx.metadata,
    });

@@ -10,19 +10,7 @@ export const findEnvelopesRoute = authenticatedProcedure
  .query(async ({ input, ctx }) => {
    const { user, teamId } = ctx;

-    const {
-      query,
-      type,
-      templateId,
-      page,
-      perPage,
-      orderByDirection,
-      orderByColumn,
-      source,
-      status,
-      hasExpiredRecipients,
-      folderId,
-    } = input;
+    const { query, type, templateId, page, perPage, orderByDirection, orderByColumn, source, status, folderId } = input;

    ctx.logger.info({
      input: {
@@ -31,7 +19,6 @@ export const findEnvelopesRoute = authenticatedProcedure
        templateId,
        source,
        status,
-        hasExpiredRecipients,
        folderId,
        page,
        perPage,
@@ -46,7 +33,6 @@ export const findEnvelopesRoute = authenticatedProcedure
      query,
      source,
      status,
-      hasExpiredRecipients,
      page,
      perPage,
      folderId,
@@ -20,11 +20,6 @@ export const ZFindEnvelopesRequestSchema = ZFindSearchParamsSchema.extend({
  templateId: z.number().describe('Filter envelopes by the template ID used to create it.').optional(),
  source: z.nativeEnum(DocumentSource).describe('Filter envelopes by how it was created.').optional(),
  status: z.nativeEnum(DocumentStatus).describe('Filter envelopes by the current status.').optional(),
-  hasExpiredRecipients: z
-    .enum(['true', 'false'])
-    .describe('Filter for envelopes that have at least one recipient whose signing link has expired.')
-    .transform((value) => value === 'true')
-    .optional(),
  folderId: z.string().describe('Filter envelopes by folder ID.').optional(),
  orderByColumn: z.enum(['createdAt']).optional(),
  orderByDirection: z.enum(['asc', 'desc']).describe('Sort direction.').default('desc'),
@@ -10,7 +10,7 @@ export const redistributeEnvelopeMeta: TrpcRouteMeta = {
    path: '/envelope/redistribute',
    summary: 'Redistribute envelope',
    description:
-      'Redistribute the envelope to the provided recipients who have not actioned the envelope. Will use the distribution method set in the envelope. This also refreshes the signing-link expiration for the targeted unsigned recipients, renewing any expired links.',
+      'Redistribute the envelope to the provided recipients who have not actioned the envelope. Will use the distribution method set in the envelope',
    tags: ['Envelope'],
  },
 };
@@ -12,32 +12,24 @@ export const updateEnvelopeMeta: TrpcRouteMeta = {
    method: 'POST',
    path: '/envelope/update',
    summary: 'Update envelope',
-    description: 'Update envelope properties and settings',
    tags: ['Envelope'],
  },
 };

 export const ZUpdateEnvelopeRequestSchema = z.object({
-  envelopeId: z.string().describe('The ID of the envelope to update.'),
+  envelopeId: z.string(),
  data: z
    .object({
      title: ZDocumentTitleSchema.optional(),
      externalId: ZDocumentExternalIdSchema.nullish(),
      visibility: ZDocumentVisibilitySchema.optional(),
-      globalAccessAuth: z
-        .array(ZDocumentAccessAuthTypesSchema)
-        .describe('The authentication methods required to access the envelope.')
-        .optional(),
-      globalActionAuth: z
-        .array(ZDocumentActionAuthTypesSchema)
-        .describe('The authentication methods required to sign the envelope.')
-        .optional(),
-      folderId: z.string().describe('The ID of the folder containing the envelope.').nullish(),
-      templateType: z.nativeEnum(TemplateType).describe('The template type.').optional(),
+      globalAccessAuth: z.array(ZDocumentAccessAuthTypesSchema).optional(),
+      globalActionAuth: z.array(ZDocumentActionAuthTypesSchema).optional(),
+      folderId: z.string().nullish(),
+      templateType: z.nativeEnum(TemplateType).optional(),
    })
-    .describe('The envelope properties to update.')
    .optional(),
-  meta: ZDocumentMetaUpdateSchema.describe('The email and signing settings to update.').optional(),
+  meta: ZDocumentMetaUpdateSchema.optional(),
 });

 export const ZUpdateEnvelopeResponseSchema = ZEnvelopeLiteSchema;
@@ -35,7 +35,7 @@ export const SigningCard3D = ({ className, name, signature, signingCelebrationIm

  const [trackMouse, setTrackMouse] = useState(false);

-  const timeoutRef = useRef<number | undefined>();
+  const timeoutRef = useRef<number | undefined>(undefined);

  const cardX = useMotionValue(0);
  const cardY = useMotionValue(0);
@@ -18,59 +18,32 @@
    "@documenso/tailwind-config": "*",
    "@documenso/tsconfig": "*",
    "@types/luxon": "^3.7.1",
-    "@types/react": "18.3.27",
-    "@types/react-dom": "^18",
-    "react": "^18",
+    "@types/react": "^19.2.17",
+    "@types/react-dom": "^19.2.3",
+    "react": "^19.2.7",
    "typescript": "5.6.2"
  },
  "dependencies": {
    "@documenso/lib": "*",
-    "@hello-pangea/dnd": "^16.6.0",
+    "@hello-pangea/dnd": "^18.0.1",
    "@hookform/resolvers": "^3",
    "@lingui/macro": "^5.6.0",
    "@lingui/react": "^5.6.0",
-    "@radix-ui/react-accordion": "^1.2.12",
-    "@radix-ui/react-alert-dialog": "^1.1.15",
-    "@radix-ui/react-aspect-ratio": "^1.1.8",
-    "@radix-ui/react-avatar": "^1.1.11",
-    "@radix-ui/react-checkbox": "^1.3.3",
-    "@radix-ui/react-collapsible": "^1.1.12",
-    "@radix-ui/react-context-menu": "^2.2.16",
-    "@radix-ui/react-dialog": "^1.1.15",
-    "@radix-ui/react-dropdown-menu": "^2.1.16",
-    "@radix-ui/react-hover-card": "^1.1.15",
-    "@radix-ui/react-label": "^2.1.8",
-    "@radix-ui/react-menubar": "^1.1.16",
-    "@radix-ui/react-navigation-menu": "^1.2.14",
-    "@radix-ui/react-popover": "^1.1.15",
-    "@radix-ui/react-progress": "^1.1.8",
-    "@radix-ui/react-radio-group": "^1.3.8",
-    "@radix-ui/react-scroll-area": "^1.2.10",
-    "@radix-ui/react-select": "^2.2.6",
-    "@radix-ui/react-separator": "^1.1.8",
-    "@radix-ui/react-slider": "^1.3.6",
-    "@radix-ui/react-slot": "^1.2.4",
-    "@radix-ui/react-switch": "^1.2.6",
-    "@radix-ui/react-tabs": "^1.1.13",
-    "@radix-ui/react-toast": "^1.2.15",
-    "@radix-ui/react-toggle": "^1.1.10",
-    "@radix-ui/react-toggle-group": "^1.1.11",
-    "@radix-ui/react-tooltip": "^1.2.8",
    "@scure/base": "^1.2.6",
    "@tanstack/react-table": "^8.21.3",
    "class-variance-authority": "^0.7.1",
    "clsx": "^1.2.1",
-    "cmdk": "^0.2.1",
+    "cmdk": "^1.1.1",
    "colord": "^2.9.3",
    "framer-motion": "^12.23.24",
    "lucide-react": "^0.554.0",
    "luxon": "^3.7.2",
    "pdfjs-dist": "5.4.296",
    "perfect-freehand": "^1.2.2",
-    "react": "^18",
+    "react": "^19.2.7",
    "react-colorful": "^5.6.1",
    "react-day-picker": "^8.10.1",
-    "react-dom": "^18",
+    "react-dom": "^19.2.7",
    "react-hook-form": "^7.66.1",
    "react-rnd": "^10.5.2",
    "remeda": "^2.32.0",
@@ -145,7 +145,9 @@ const CommandItem = React.forwardRef<
  <CommandPrimitive.Item
    ref={ref}
    className={cn(
-      'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+      // cmdk 1.x always renders data-disabled="true|false", so the variant must
+      // check the value (bare data-[disabled] matches attribute presence).
+      'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50',
      className,
    )}
    {...props}
@@ -103,15 +103,10 @@ export const FieldContent = ({ field, documentMeta }: FieldIconProps) => {
  ) {
    return (
      <div className="flex flex-col gap-y-2 py-0.5">
-        <RadioGroup className="gap-y-1">
+        <RadioGroup value={field.customText ?? ''} className="gap-y-1">
          {field.fieldMeta.values.map((item, index) => (
            <div key={index} className="flex items-center">
-              <RadioGroupItem
-                className="pointer-events-none h-3 w-3"
-                value={item.value}
-                id={`option-${index}`}
-                checked={item.value === field.customText}
-              />
+              <RadioGroupItem className="pointer-events-none h-3 w-3" value={item.value} id={`option-${index}`} />
              {item.value && (
                <Label htmlFor={`option-${index}`} className="ml-1.5 font-normal text-foreground text-xs">
                  {item.value}
@@ -1,5 +1,6 @@
 import type { RecipientRole } from '@prisma/client';
 import { BadgeCheck, Copy, Eye, PencilLine, User } from 'lucide-react';
+import type { JSX } from 'react';

 export const ROLE_ICONS: Record<RecipientRole, JSX.Element> = {
  SIGNER: <PencilLine className="h-4 w-4" />,
@@ -13,7 +13,7 @@ import { getSvgPathFromStroke } from './helper';
 import { Point } from './point';
 import { SignaturePadColorPicker } from './signature-pad-color-picker';

-const checkSignatureValidity = (element: RefObject<HTMLCanvasElement>) => {
+const checkSignatureValidity = (element: RefObject<HTMLCanvasElement | null>) => {
  if (!element.current) {
    return false;
  }
Author	SHA1	Message	Date
Lucas Smith	82e0b4a845	fix: back envelope editor state with synchronous external store	2026-07-28 17:18:18 +10:00
Lucas Smith	4db4821288	fix: use defaultFilter export for command scoring with cmdk v1	2026-07-24 17:10:54 +10:00
Lucas Smith	d9164a3ba3	Merge remote-tracking branch 'origin/main' into spike/react-19	2026-07-24 17:09:36 +10:00
Lucas Smith	aedcc630ba	fix: migrate to react-email package	2026-07-23 14:40:27 +10:00
Lucas Smith	4eceb03ac3	fix: resolve ci failures	2026-07-21 16:23:47 +10:00
Lucas Smith	11970a3659	feat: migrate to react 19	2026-07-21 15:35:50 +10:00